diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index c63abd12f3c..60c3a35de9a 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -19,4 +19,5 @@ TVAIntra=Intracommunautary VAT ProspectCustomer=Prospect / Customer Prospect=Prospect Customer=Customer -Supplier=Supplier \ No newline at end of file +Supplier=Supplier +CompanyList=Companies' list \ No newline at end of file diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 94b1f41b61a..19ec2a8097c 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -31,6 +31,7 @@ DevelopmentTeam=Development Team Logout=Logout Setup=Setup Alert=Alert -Previous=Précédent -Next=Suivant -ErrorForbidden=Access is forbidden \ No newline at end of file +Previous=Previous +Next=Next +ErrorForbidden=Access is forbidden +Cards=Cards \ No newline at end of file diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index 2aeaea23919..7e7caf7331e 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -19,4 +19,5 @@ TVAIntra=Num ProspectCustomer=Prospect / Client Prospect=Prospect Customer=Client -Supplier=Fournisseur \ No newline at end of file +Supplier=Fournisseur +ComanyList=Liste des sociétés \ No newline at end of file diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 0272b8056e2..bfa5b962cab 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -33,4 +33,5 @@ Setup=Configuration Alert=Alerte Previous=Précédent Next=Suivant -ErrorForbidden=Accès non autorisé \ No newline at end of file +ErrorForbidden=Accès non autorisé +Cards=Fiches \ No newline at end of file diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index ca5d509847c..6953214bff7 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -920,15 +920,15 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so function print_fleche_navigation($page,$file,$options='', $nextpage) { - global $conf; + global $conf, $langs; if ($page > 0) { - print 'Page précédente'; + print ''.$langs->trans('; } if ($nextpage > 0) { - print 'Page suivante'; + print ''.$langs->trans('; } } diff --git a/htdocs/societe.php b/htdocs/societe.php index 31c77f27a91..ba04a3e0cbc 100644 --- a/htdocs/societe.php +++ b/htdocs/societe.php @@ -36,6 +36,10 @@ if ($user->societe_id > 0) llxHeader(); +$sortorder=$_GET["sortorder"]; +$sortfield=$_GET["sortfield"]; +$page=$_GET["page"]; + if ($sortorder == "") { $sortorder="ASC"; } @@ -49,6 +53,10 @@ $offset = $conf->liste_limit * $page ; $pageprev = $page - 1; $pagenext = $page + 1; +$langs->load("companies"); +$langs->load("customers"); +$langs->load("suppliers"); + /* * Recherche @@ -106,7 +114,7 @@ if ($result) $params = "&socname=$socname"; - print_barre_liste("Liste des societes", $page, $PHP_SELF,$params,$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("CompanyList"), $page, $PHP_SELF,$params,$sortfield,$sortorder,'',$num); if ($sortorder == "DESC") { @@ -117,13 +125,13 @@ if ($result) $sortorder="DESC"; } - print ''; + print '
'; print ''; print ''; + print_liste_field_titre($langs->trans("Town"),$PHP_SELF,"s.ville",$params); + print ''; print "\n"; $var=True; @@ -139,11 +147,11 @@ if ($result) print '
'; - print_liste_field_titre("Société",$PHP_SELF,"s.nom", $params); + print_liste_field_titre($langs->trans("Company"),$PHP_SELF,"s.nom", $params); print ""; - print_liste_field_titre("Ville",$PHP_SELF,"s.ville",$params); - print 'Fiches'.$langs->trans("Cards").'
'; if ($obj->client==1) { - print "idp\">Client\n"; + print "idp\">".$langs->trans("Customer")."\n"; } elseif ($obj->client==2) { - print "idp\">Prospect\n"; + print "idp\">".$langs->trans("Prospect")."\n"; } else { @@ -152,7 +160,7 @@ if ($result) print ""; if ($obj->fournisseur) { - print 'fournisseur'; + print ''.$langs->trans("Supplier").''; } else {