lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: object instead of soc and vis versa.

Browse Source
This commit is contained in:
Laurent Destailleur 2015-01-15 03:51:47 +01:00
parent c5a3b4481e
commit e20c1decdf
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/categories/categorie.php
View File

@ -278,7 +278,7 @@ if ($socid)
// Address // Address
print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3">'; 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>'; print '</td></tr>';
// Zip / Town // Zip / Town

1
htdocs/core/lib/functions.lib.php
View File

@ -4574,6 +4574,7 @@ function dol_eval($s,$returnvalue=0)
global $leftmenu; global $leftmenu;
global $rights; global $rights;
global $object; global $object;
global $soc;
//print $s."<br>\n"; //print $s."<br>\n";
if ($returnvalue) return @eval('return '.$s.';'); if ($returnvalue) return @eval('return '.$s.';');

10
htdocs/societe/info.php
View File

@ -59,21 +59,21 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('',$langs->trans("ThirdParty"),$help_url); llxHeader('',$langs->trans("ThirdParty"),$help_url);
$soc = new Societe($db); $object = new Societe($db);
$soc->fetch($socid); $object->fetch($socid);
$soc->info($socid); $object->info($socid);
/* /*
* Affichage onglets * Affichage onglets
*/ */
$head = societe_prepare_head($soc); $head = societe_prepare_head($object);
dol_fiche_head($head, 'info', $langs->trans("ThirdParty"),0,'company'); dol_fiche_head($head, 'info', $langs->trans("ThirdParty"),0,'company');
print '<table width="100%"><tr><td>'; print '<table width="100%"><tr><td>';
dol_print_object_info($soc); dol_print_object_info($object);
print '</td></tr></table>'; print '</td></tr></table>';