diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php index 01ceec35b0d..0423fa639c2 100644 --- a/htdocs/societe/commerciaux.php +++ b/htdocs/societe/commerciaux.php @@ -31,6 +31,7 @@ require("./pre.inc.php"); $user->getrights(); $langs->load("companies"); +$langs->load("commercial"); $langs->load("customers"); $langs->load("suppliers"); @@ -93,11 +94,11 @@ if($_GET["socid"]) $h = 1; $head[$h][0] = 'lien.php?socid='.$soc->id; - $head[$h][1] = 'Lien'; + $head[$h][1] = $langs->trans("Links"); $h++; $head[$h][0] = 'commerciaux.php?socid='.$soc->id; - $head[$h][1] = 'Commerciaux'; + $head[$h][1] = $langs->trans("SalesRepresentative"); $h++; $head[$h][0] = DOL_URL_ROOT.'/socnote.php?socid='.$soc->id; @@ -111,15 +112,20 @@ if($_GET["socid"]) */ print ''; - print ''; + print ''; - print '"; + print ""; - print ''; + print '"; + print '"; + print ''; + + print ''; + print ''; print ''; - print ''; @@ -136,7 +142,7 @@ if($_GET["socid"]) $socm = new Societe($db); $socm->fetch($soc->parent); - print ''; + print ''; } /* ********** */ @@ -148,6 +154,9 @@ if($_GET["socid"]) $sql .= " AND sc.fk_user = u.rowid"; $sql .= " ORDER BY u.name ASC "; + print ''; + print ''."\n"; + print '
'; $i++; } - print "
'.$langs->trans('Name').''.$soc->nom.'
'.$langs->trans('Name').''.$soc->nom.''.$langs->trans('Prefix').''.$soc->prefix_comm.'
'.$langs->trans('Address')."".nl2br($soc->adresse)."
".$soc->cp." ".$soc->ville." ".$soc->pays."
".$langs->trans('Address')."".nl2br($soc->adresse)."
'.$langs->trans('Phone').''.dolibarr_print_phone($soc->tel).'
'.$langs->trans('Zip').''.$soc->cp."'.$langs->trans('Town').''.$soc->ville."
'.$langs->trans('Country').''.$soc->pays.'
'.$langs->trans('Phone').''.dolibarr_print_phone($soc->tel).''.$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) { @@ -127,7 +133,7 @@ if($_GET["socid"]) } print '
'.$langs->trans('Web').''; + print '
'.$langs->trans('Web').''; if ($soc->url) { print 'http://'.$soc->url.''; } print '
Maison mère'.$socm->nom_url.' ('.$socm->code_client.')
'.$socm->ville.'
'.$langs->trans("ParentCompany").''.$socm->nom_url.' ('.$socm->code_client.')
'.$socm->ville.'
'.$langs->trans("SalesRepresentative").''; + $result = $db->query($sql); if ($result) { @@ -157,23 +166,22 @@ if($_GET["socid"]) while ($i < $num) { $obj = $db->fetch_object(); - - print '
Commercial'; print stripslashes($obj->firstname)." " .stripslashes($obj->name)."\n"; print ' '; print ''; print img_delete(); - print '
"; $db->free(); } else { dolibarr_print_error($db); } + if($i == 0) { print $langs->trans("NoSalesRepresentativeAffected"); } + print ""; print ''; @@ -188,7 +196,8 @@ if($_GET["socid"]) * */ - $title=$langs->trans("Liste des utilisateurs"); + $langs->load("users"); + $title=$langs->trans("ListOfUsers"); $sql = "SELECT u.rowid, u.name, u.firstname"; $sql .= " FROM ".MAIN_DB_PREFIX."user as u"; @@ -205,7 +214,7 @@ if($_GET["socid"]) // Lignes des titres print ''; print ''; - print ''; + print ''; print ''; print "\n"; @@ -217,7 +226,7 @@ if($_GET["socid"]) $var=!$var; print "\n"; - print ''; + print ''; print ''."\n"; $i++; diff --git a/htdocs/societe/lien.php b/htdocs/societe/lien.php index f77c1e155ae..9443922b6a5 100644 --- a/htdocs/societe/lien.php +++ b/htdocs/societe/lien.php @@ -78,7 +78,11 @@ if($_GET["socid"]) $h = 1; $head[$h][0] = 'lien.php?socid='.$soc->id; - $head[$h][1] = 'Lien'; + $head[$h][1] = $langs->trans("Links"); + $h++; + + $head[$h][0] = 'commerciaux.php?socid='.$soc->id; + $head[$h][1] = $langs->trans("SalesRepresentative"); $h++; $head[$h][0] = DOL_URL_ROOT.'/socnote.php?socid='.$soc->id; @@ -106,7 +110,7 @@ if($_GET["socid"]) print $soc->code_client; if ($soc->check_codeclient() <> 0) { - print "Code incorrect"; + print $langs->trans("WrongCode"); } print ''; @@ -126,7 +130,7 @@ if($_GET["socid"]) $socm = new Societe($db); $socm->fetch($soc->parent); - print ''; + print ''; } print '
'.$langs->trans("Nom").''.$langs->trans("Name").' 
"; print stripslashes($obj->firstname)." " .stripslashes($obj->name)."Sélectionner'.$langs->trans("Add").'
Maison mère'.$socm->nom_url.' ('.$socm->code_client.')
'.$socm->ville.'
'.$langs->trans("ParentCompany").''.$socm->nom_url.' '.($socm->code_client?"(".$socm->code_client.")":"").'
'.$socm->ville.'
'; @@ -235,7 +239,7 @@ if($_GET["socid"]) print " "; } - print 'Sélectionner'; + print ''.$langs->trans("Select").''; print ''."\n"; $i++;