diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php index 6d1f29b1dbb..d40f1e09622 100644 --- a/htdocs/comm/clients.php +++ b/htdocs/comm/clients.php @@ -20,6 +20,14 @@ * $Source$ * */ + +/** + \file htdocs/comm/clients.php + \ingroup commercial, societe + \brief Liste des clients + \version $Revision$ +*/ + require("./pre.inc.php"); /* @@ -99,9 +107,9 @@ if ($result) $addu = "&page=$page&begin=$begin&search_nom=".$_GET["search_nom"]; print ''; print ''; - print_liste_field_titre($langs->trans("Companies"),"clients.php","s.nom",$addu,"",''); - print_liste_field_titre($langs->trans("Code"),"clients.php","s.code_client",$addu,"",''); - print_liste_field_titre($langs->trans("Town"),"clients.php","s.ville",$addu); + print_liste_field_titre($langs->trans("Companies"),"clients.php","s.nom",$addu,"","",$sortfield); + print_liste_field_titre($langs->trans("CustomerCode"),"clients.php","s.code_client",$addu,"","",$sortfield); + print_liste_field_titre($langs->trans("Town"),"clients.php","s.ville",$addu,"","",$sortfield); print "\n"; print ''; @@ -110,7 +118,7 @@ if ($result) print ''; print '"; print "\n"; @@ -128,7 +136,7 @@ if ($result) print " idp\">".stripslashes($obj->nom)."\n"; print "\n"; print "\n"; - print '\n"; $i++; diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index f53f962b6c9..5b56eda7e83 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -21,6 +21,14 @@ * $Source$ * */ + +/** + \file htdocs/comm/contact.php + \ingroup commercial + \brief Liste des contacts + \version $Revision$ +*/ + require("./pre.inc.php"); $langs->load("companies"); @@ -133,7 +141,7 @@ if ($result) print_barre_liste("Liste des contacts $label",$page, "contact.php", "&type=$type",$sortfield,$sortorder,"",$num); - print '
 
'; print ''; - print ''; + print ' '; print "
".$obj->code_client." ".$obj->ville." '; + print ''; print img_folder(); print "
'; + print '
'; print ''; print_liste_field_titre($langs->trans("Lastname"),"contact.php","lower(p.name)", $begin,"&type=$type"); print_liste_field_titre($langs->trans("Firstname"),"contact.php","lower(p.firstname)", $begin,"&type=$type"); @@ -150,8 +158,8 @@ if ($result) $var=!$var; print ""; - print ''; + print ''; print ""; print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -271,7 +271,7 @@ elseif ($_GET["action"] == 'edit') print ''; print ''; - print ''; print '
'.img_file(); - print ' '.$obj->name.''.img_file(); + print ' '.$obj->name.'$obj->firstnamefiltrer '; diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index d56f8b7f117..9035d0d2d45 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -31,3 +31,4 @@ Supplier=Supplier CompanyList=Companies' list AddContact=Add new contact PersonalInformations=Personal data +CustomerCode=Customer code diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index b3dfb165f50..f8722bac69a 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -34,4 +34,5 @@ AddContact=Ajouter un contact NewSocGroup=Nouveau groupement de sociétés SocGroup=Groupement de sociétés Created=Date saisie -PersonalInformations=Informations personnelles \ No newline at end of file +PersonalInformations=Informations personnelles +CustomerCode=Code client \ No newline at end of file diff --git a/htdocs/soc.php b/htdocs/soc.php index 41e9558fb36..e0bc15b0ee0 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -181,7 +181,7 @@ if ($_GET["action"] == 'create') print '
'.$langs->trans('Phone').''.$langs->trans('Fax').'
'.$langs->trans('Code client').'
'.$langs->trans('CustomerCode').'
'.$langs->trans('Web').'
'.$langs->trans('ProfIdSiren').'
'.$langs->trans('Phone').''.$langs->trans('Fax').'
'.$langs->trans('Code client').''; + print '
'.$langs->trans('CustomerCode').''; if ($soc->codeclient_modifiable == 1) { @@ -416,7 +416,7 @@ else print ''.$langs->trans('Fax').''.dolibarr_print_phone($soc->fax).'
'; - print $langs->trans('Code client').''; + print $langs->trans('CustomerCode').''; print $soc->code_client; if ($soc->check_codeclient() <> 0) {