diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index cdd81877d7bb4bdafa9f5ffa172d84f3cb1864ca..055086bbdbbaea06e4ae54df6d4b47e5fcaf751a 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -195,16 +195,6 @@ if ($resql) if ($status == 'done') $title=$langs->trans("DoneActions"); if ($status == 'todo') $title=$langs->trans("ToDoActions"); - /*if ($socid) - { - $societe = new Societe($db); - $societe->fetch($socid); - $newtitle=$langs->trans($title).' '.$langs->trans("For").' '.$societe->nom; - } - else - { - $newtitle=$langs->trans($title); - }*/ $newtitle=$langs->trans($title); $tabactive=''; @@ -298,7 +288,7 @@ if ($resql) { $societestatic->id=$obj->socid; $societestatic->client=$obj->client; - $societestatic->nom=$obj->societe; + $societestatic->name=$obj->societe; print $societestatic->getNomUrl(1,'',10); } else print ' '; diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index 86333a3996c66379b9f61d720a93b38aecdfa47d..438f22d28c268e25236f93db3c4d20bb719ccd11 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -304,7 +304,7 @@ elseif ($action == 'edit') $societe->fetch($socid); $head = societe_prepare_head($societe); - dol_fiche_head($head, 'card', $societe->nom); + dol_fiche_head($head, 'card', $societe->name); print_titre($langs->trans("EditAddress")); print "<br>\n"; @@ -407,7 +407,7 @@ else $societe->fetch($object->socid); $head = societe_prepare_head($societe); - dol_fiche_head($head, 'customer', $societe->nom); + dol_fiche_head($head, 'customer', $societe->name); // Confirmation delete diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 814ed4832b3691688d9183c380ac4aea89c173b8..96a9d89b9e0e13cdae28e7536349edcfede0d126 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -58,6 +58,7 @@ class Societe extends CommonObject * @deprecated Use $name instead */ var $nom; + var $firstname; var $lastname; var $particulier; @@ -65,6 +66,7 @@ class Societe extends CommonObject var $address; var $zip; var $town; + /** * 0=activity ceased, 1= in activity * @var int @@ -443,7 +445,7 @@ class Societe extends CommonObject { // Call trigger $result=$this->call_trigger('COMPANY_CREATE',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers } else $error++; @@ -879,7 +881,7 @@ class Societe extends CommonObject { // Call trigger $result=$this->call_trigger('COMPANY_MODIFY',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers } @@ -1245,7 +1247,7 @@ class Societe extends CommonObject // Call trigger $result=$this->call_trigger('COMPANY_DELETE',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers if (! $error)