diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php index 5849c353d55..62fd38af2ca 100644 --- a/htdocs/societe/commerciaux.php +++ b/htdocs/societe/commerciaux.php @@ -21,7 +21,7 @@ /** * \file htdocs/societe/commerciaux.php * \ingroup societe - * \brief Page d'affectations des commerciaux aux societes + * \brief Page of links to sales representatives * \version $Id$ */ @@ -87,7 +87,10 @@ if($_GET["socid"] && $_GET["delcommid"]) * View */ -llxHeader(); +$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; +llxHeader('',$langs->trans("ThirdParty"),$help_url); + +$form = new Form($db); if ($_GET["socid"]) { @@ -104,25 +107,27 @@ if ($_GET["socid"]) */ print ''; - print ''; - print ''; + print ''; + + print ''; + print 'global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>'; + print $soc->code_client; + if ($soc->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode"); print ''; - - // Prefix if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field { - print ''; + print ''; } - else print ''; + print ''; print ''; print ""; - print '"; + print '"; print '"; print ''; diff --git a/htdocs/societe/lien.php b/htdocs/societe/lien.php index b5641dc7c67..5840387e935 100644 --- a/htdocs/societe/lien.php +++ b/htdocs/societe/lien.php @@ -89,7 +89,10 @@ if($_GET["socid"] && $_GET["delsocid"]) * View */ -llxHeader(); +$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; +llxHeader('',$langs->trans("ThirdParty"),$help_url); + +$form = new Form($db); if($_GET["socid"]) { @@ -107,25 +110,26 @@ if($_GET["socid"]) */ print '
'.$langs->trans('Name').''.$soc->nom.'
'; - print $langs->trans('CustomerCode').''; - print $soc->code_client; - if ($soc->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode"); + print '
'.$langs->trans('Name').''; + print $form->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom'); + print '
'.$langs->trans('CustomerCode').''.$langs->trans('Prefix').''.$soc->prefix_comm.''.$langs->trans('Prefix').''.$soc->prefix_comm.' 
".$langs->trans('Address')."".nl2br($soc->address)."
'.$langs->trans('Zip').''.$soc->cp."
'.$langs->trans('Zip').''.$soc->cp."'.$langs->trans('Town').''.$soc->ville."
'.$langs->trans('Country').''.$soc->pays.'
'; - print ''; - print ''; + print ''; + + print ''; + print 'global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>'; print $soc->code_client; if ($soc->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode"); print ''; - - if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field { print ''; } - else print ''; print ''; print ""; - print ""; + print ""; print ""; print "";
'.$langs->trans('Name').''.$soc->nom.'
'; - print $langs->trans('CustomerCode').''; + print '
'.$langs->trans('Name').''; + print $form->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom'); + print '
'.$langs->trans('CustomerCode').''.$langs->trans('Prefix').''.$soc->prefix_comm.' 
".$langs->trans('Address')."".nl2br($soc->address)."
".$langs->trans('Zip')."".$soc->cp."
".$langs->trans('Zip').''.$soc->cp."".$langs->trans('Town')."".$soc->ville."
".$langs->trans('Country')."".$soc->pays."