diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 2948ec5ee2a8755e1e4700777cf222dc8ffbacf1..3a2db8aaf59a4c9906e9aaf9157eab648b95e90b 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -44,7 +44,9 @@ class Contact extends CommonObject var $id; var $civilite_id; var $name; + var $nom; var $firstname; + var $prenom; var $address; var $cp; // TODO deprecated var $zip; @@ -436,7 +438,9 @@ class Contact extends CommonObject function fetch($id, $user=0) { global $langs; + $langs->load("companies"); + $sql = "SELECT c.rowid, c.fk_soc, c.civilite as civilite_id, c.name, c.firstname,"; $sql.= " c.address, c.cp, c.ville,"; $sql.= " c.fk_pays,"; diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index dc956a809f0dcdc37173ab6056ce69a01ed5e9bf..e13f90e3967826c2afd8e2440e8de6f26ac26906 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -314,7 +314,9 @@ if (! empty($objcanvas->template_dir)) else if ($action == 'edit') { $objcanvas->fetch($id); // Reload object - $objcanvas->assign_post(); // Assign POST data + if (! empty($_POST)) { + $objcanvas->assign_post(); // Assign POST data + } $objcanvas->assign_values($action); // Set value for templates $objcanvas->display_canvas($action); // Show template }