diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index d322dd201df..e36eef20ff4 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -47,6 +47,8 @@ abstract class CommonObject public $array_options=array(); + public $thirdparty; + public $linkedObjectsIds; // Loaded by ->fetchObjectLinked public $linkedObjects; // Loaded by ->fetchObjectLinked diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index 766e44cf9a7..dad3c5cb5e0 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -64,19 +64,19 @@ print '
'; print ''; print ''; print ''; -print ''; +print ''; print "'; print ''; if (! empty($conf->barcode->enabled)) { - print "'; //print ''; print ''; } -print "'; +print "'; //print ''; print ''; @@ -121,7 +121,7 @@ print '
'.$langs->trans("Search").'
'.$langs->trans("Search").'
"; print ':
"; + print "
"; print ':
"; -print ':
"; +print ':
'; print ''; if (! empty($conf->use_javascript_ajax) && ((round($third['prospect'])?1:0)+(round($third['customer'])?1:0)+(round($third['supplier'])?1:0)+(round($third['other'])?1:0) >= 2)) { - print '
'.$langs->trans("Statistics").'
'; + print '
'; $dataseries=array(); if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) $dataseries[]=array('label'=>$langs->trans("Prospects"),'data'=>round($third['prospect'])); if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Customers"),'data'=>round($third['customer']));