diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 3fbd4fa462d..6091171dfe6 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -659,6 +659,7 @@ while ($i < min($num,$limit)) $contactstatic->id=$obj->cidp; $contactstatic->statut=$obj->statut; $contactstatic->poste=$obj->poste; + $contactstatic->email=$obj->email; $contactstatic->phone_pro=$obj->phone_pro; $contactstatic->phone_perso=$obj->phone_perso; $contactstatic->phone_mobile=$obj->phone_mobile; diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index 891694670f4..1971532433a 100755 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -36,7 +36,7 @@ * $type, $text, $description, $line */ -global $forceall, $senderissupplier, $inputalsopricewithtax, $usemargins, $outputalsopricetotalwithtax; +global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax; $usemargins=0; if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1; @@ -46,7 +46,7 @@ if (empty($forceall)) $forceall=0; if (empty($senderissupplier)) $senderissupplier=0; if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0; if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax=0; -if (empty($usemargins)) $usemargins=0; + ?> diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 4a0be451c45..cc5ab706fb0 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -904,8 +904,12 @@ while ($i < min($num, $limit)) $companystatic->fournisseur=$obj->fournisseur; $companystatic->code_client=$obj->code_client; $companystatic->code_fournisseur=$obj->code_fournisseur; - $companystatic->fk_prospectlevel=$obj->fk_prospectlevel; - $companystatic->name_alias=$obj->name_alias; + + $companystatic->code_compta_client=$obj->code_compta; + $companystatic->code_compta_fournisseur=$obj->code_compta_fournisseur; + + $companystatic->fk_prospectlevel=$obj->fk_prospectlevel; + $companystatic->name_alias=$obj->name_alias; print ""; if (! empty($arrayfields['s.nom']['checked']))