diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index e9e11b656b9f97e1db7fb8974a60cd44178db556..a77751fcb29c37811c29d9fb32703c8df9409ce5 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -278,7 +278,7 @@ if ($socid) // Address print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3">'; - print dol_print_address($soc->address,'gmap','thirdparty',$object->id); + print dol_print_address($soc->address,'gmap','thirdparty',$soc->id); print '</td></tr>'; // Zip / Town diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 3ec602c9d2b78beb26830fe2d9e591608b8aabb8..cdb7e2b4d781f29dfb69265bb57ba5c12e51dbe6 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4574,6 +4574,7 @@ function dol_eval($s,$returnvalue=0) global $leftmenu; global $rights; global $object; + global $soc; //print $s."<br>\n"; if ($returnvalue) return @eval('return '.$s.';'); diff --git a/htdocs/societe/info.php b/htdocs/societe/info.php index 305936e6f568b4e8dd29377b44f68b7e674901a7..9d06d203d9c5ead152f1d0676c8228b2b4e2de2c 100644 --- a/htdocs/societe/info.php +++ b/htdocs/societe/info.php @@ -59,21 +59,21 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; llxHeader('',$langs->trans("ThirdParty"),$help_url); -$soc = new Societe($db); -$soc->fetch($socid); -$soc->info($socid); +$object = new Societe($db); +$object->fetch($socid); +$object->info($socid); /* * Affichage onglets */ -$head = societe_prepare_head($soc); +$head = societe_prepare_head($object); dol_fiche_head($head, 'info', $langs->trans("ThirdParty"),0,'company'); print '<table width="100%"><tr><td>'; -dol_print_object_info($soc); +dol_print_object_info($object); print '</td></tr></table>';