diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index af8e70d1956..dbb61279714 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -103,11 +103,11 @@ if ( $db->query($sql) ) $societe = new Societe($db); $societe->fetch($socid); - print_barre_liste("Liste des actions commerciales réalisées ou à faire sur " . $societe->nom, $page, "index.php",'',$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("DoneAndToDoTasksFor",$societe->nom), $page, "index.php",'',$sortfield,$sortorder,'',$num); } else { - print_barre_liste("Liste des actions commerciales réalisées ou à faire", $page, "index.php",'',$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("DoneAndToDoTasks"), $page, "index.php",'',$sortfield,$sortorder,'',$num); } $i = 0; print ""; diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php index 562684b7f56..ad3cf2983c3 100644 --- a/htdocs/comm/clients.php +++ b/htdocs/comm/clients.php @@ -99,7 +99,7 @@ if ($result) llxHeader(); - print_barre_liste("Liste des clients", $page, "clients.php","",$sortfield,$sortorder,"",$num); + print_barre_liste($langs->trans("ListOfCustomers"), $page, "clients.php","",$sortfield,$sortorder,"",$num); $i = 0; diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 60b9c9829c7..fead1460fa6 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -59,15 +59,8 @@ if ($user->societe_id > 0) } -if (! $sortfield) -{ - $sortfield="p.name"; -} -if (! $sortorder) -{ - $sortorder="ASC"; -} - +if (! $sortfield) $sortfield="p.name"; +if (! $sortorder) $sortorder="ASC"; if ($page == -1) { $page = 0 ; } $limit = $conf->liste_limit; $offset = $limit * $page ; @@ -75,17 +68,17 @@ $offset = $limit * $page ; if ($type == "c") { - $label = " clients"; + $label = $langs->trans("Customers"); $urlfiche="fiche.php"; } if ($type == "p") { - $label = " prospects"; + $label = $langs->trans("Prospects"); $urlfiche="prospect/fiche.php"; } if ($type == "f") { - $label = " fournisseurs"; + $label = $langs->trans("Suppliers"); $urlfiche="fiche.php"; } @@ -151,7 +144,7 @@ if ($result) { $num = $db->num_rows(); - print_barre_liste("Liste des contacts $label",$page, "contact.php", "&type=$type",$sortfield,$sortorder,"",$num); + print_barre_liste($langs->trans("ListOfContacts").($label?" (".$label.")":""),$page, "contact.php", "&type=$type",$sortfield,$sortorder,"",$num); print '
'; print ''; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 7140a4f29dd..b24a1600f43 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -826,11 +826,9 @@ if ($_GET["propalid"]) else { /**************************************************************************** - * * * * * Mode Liste des propales * * * - * * ****************************************************************************/ $sortorder=$_GET["sortorder"]; @@ -838,15 +836,8 @@ else $page=$_GET["page"]; $viewstatut=$_GET["viewstatut"]; - if ($sortfield == "") - { - $sortfield="p.datep"; - } - if ($sortorder == "") - { - $sortorder="DESC"; - } - + if (! $sortfield) $sortfield="p.datep"; + if (! $sortorder) $sortorder="DESC"; $limit = $conf->liste_limit; $offset = $limit * $page ; $pageprev = $page - 1; @@ -886,7 +877,7 @@ else if ( $db->query($sql) ) { $num = $db->num_rows(); - print_barre_liste($langs->trans("Proposals"), $page,"propal.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("ListOfProposals"), $page,"propal.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index ae781aa1bb7..9aea9a069b7 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -93,7 +93,7 @@ $sql .= $db->plimit($limit + 1,$offset); if ( $db->query($sql) ) { $num = $db->num_rows(); - print_barre_liste($langs->trans("Orders"), $_GET["page"], "liste.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("ListOfOrders"), $_GET["page"], "liste.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; print '
'; diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index cb84366a4a3..f5dcaa3657d 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -107,7 +107,7 @@ $year=$_GET["year"]; $filtre=$_GET["filtre"]; //if (! $year) { $year=date("Y", time()); } -print_fiche_titre("Charges sociales",($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":"")); +print_fiche_titre($langs->trans("SocialContributions"),($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":"")); print "
\n"; if ($mesg) { diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php index 0a86228081e..e40fc5936eb 100644 --- a/htdocs/contact/index.php +++ b/htdocs/contact/index.php @@ -23,7 +23,7 @@ */ -/*! +/** \file htdocs/contact/index.php \ingroup societe \brief Page liste des contacts @@ -61,25 +61,18 @@ $sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"]; $sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; $page = isset($_GET["page"])?$_GET["page"]:$_POST["page"]; -if ($sortorder == "") -{ - $sortorder="ASC"; -} -if ($sortfield == "") -{ - $sortfield="p.name"; -} - +if (! $sortorder) $sortorder="ASC"; +if (! $sortfield) $sortfield="p.name"; if ($page < 0) { $page = 0 ; } $limit = $conf->liste_limit; $offset = $limit * $page ; -if ($type == "f") { $text.=$langs->trans("Suppliers")." "; } -if ($type == "c") { $text.=$langs->trans("Customers")." "; } +if ($type == "f") { $text.=$langs->trans("Suppliers"); } +if ($type == "c") { $text.=$langs->trans("Customers"); } if ($view == 'phone') { $text="(Vue Téléphones)"; } if ($view == 'mail') { $text="(Vue EMail)"; } if ($view == 'recent') { $text="(Récents)"; } -$titre = $langs->trans("ListOfContacts").": $text"; +$titre = $langs->trans("ListOfContacts")." ($text)"; if ($_POST["button_removefilter"] == $langs->trans("RemoveFilter")) { $search_nom=""; @@ -90,10 +83,8 @@ if ($_POST["button_removefilter"] == $langs->trans("RemoveFilter")) { /* - * * Mode liste * - * */ $sql = "SELECT s.idp, s.nom, p.idp as cidp, p.name, p.firstname, p.email, p.phone, p.phone_mobile, p.fax "; diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php index a9b01222893..22f9990dafc 100644 --- a/htdocs/fourn/contact.php +++ b/htdocs/fourn/contact.php @@ -87,7 +87,7 @@ $result = $db->query($sql); if ($result) { $num = $db->num_rows(); - print_barre_liste("Liste des contacts fournisseurs",$page, "contact.php", "",$sortfield,$sortorder,"",$num); + print_barre_liste($langs->trans("ListOfContacts")." (".$langs->trans("Suppliers").")",$page, "contact.php", "",$sortfield,$sortorder,"",$num); print '
'; print ""; diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang index 4cb385127a7..b102854bb30 100644 --- a/htdocs/langs/en_US/commercial.lang +++ b/htdocs/langs/en_US/commercial.lang @@ -20,7 +20,9 @@ ErrorWrongCode=Wrong code NoSalesRepresentativeAffected=No particular sales representative affected ShowCustomer=Show customer ShowProspect=Show prospect -ListOfProspects=Prospects list -ListOfCustomers=Customers list +ListOfProspects=List of prospects +ListOfCustomers=List of customers LastDoneTasks=Last done tasks LastRecordedTasks=Last recorded tasks +DoneAndToDoTasksFor=Done and To do tasks for +DoneAndToDoTasks=Done and To do tasks \ No newline at end of file diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index e2c221e7d10..33fc4e26221 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -19,4 +19,5 @@ VATToCollect=VAT to collect VATSummary=VAT Summary VATPayed=VAT payed SocialContributions=Social contributions -AccountancyTreasuryArea=Accountancy/Treasury area \ No newline at end of file +AccountancyTreasuryArea=Accountancy/Treasury area +NewPayment=New payment \ No newline at end of file diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 696ab0af867..0b2825b2ffc 100755 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -20,4 +20,5 @@ LastOrders=Last %s orders AllOrders=All orders NbOfOrders=Number of orders OrdersStatistics=Orders' statistics -NumberOfOrdersByMonth=Number of orders by month \ No newline at end of file +NumberOfOrdersByMonth=Number of orders by month +ListOfOrders=Liste of orders \ No newline at end of file diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index af1aaf6a2fe..6784cd06f15 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -20,4 +20,5 @@ NumberOfProposalsByMonth=Number by month NbOfProposals=Number of commercial proposals ShowPropal=Show proposal PropalsDraft=Drafts -PropalsOpened=Opened \ No newline at end of file +PropalsOpened=Opened +ListOfProposals=List of commercial proposals \ No newline at end of file diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang index 114217fdce1..75cbb863f4e 100644 --- a/htdocs/langs/fr_FR/commercial.lang +++ b/htdocs/langs/fr_FR/commercial.lang @@ -24,3 +24,5 @@ ListOfProspects=Liste des prospects ListOfCustomers=Liste des clients LastDoneTasks=Dernières actions effectuées LastRecordedTasks=Dernières actions enregistrées +DoneAndToDoTasksFor=Liste des actions commerciales réalisées ou à faire pour +DoneAndToDoTasks=Liste des actions commerciales réalisées ou à faire diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 2365932adf3..2b258edfc97 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -19,4 +19,5 @@ VATToCollect=TVA VATSummary=Résumé TVA VATPayed=TVA payée SocialContributions=Charges sociales -AccountancyTreasuryArea=Espace Compta/Tréso \ No newline at end of file +AccountancyTreasuryArea=Espace Compta/Tréso +NewPayment=Nouveau paiment \ No newline at end of file diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang index f1d9617da8d..2b9f7e8c8c9 100755 --- a/htdocs/langs/fr_FR/orders.lang +++ b/htdocs/langs/fr_FR/orders.lang @@ -20,4 +20,5 @@ LastOrders=Les %s dernieres commandes AllOrders=Toutes les commandes NbOfOrders=Nombre de commandes OrdersStatistics=Statistiques des commandes -NumberOfOrdersByMonth=Nombre de commandes par mois \ No newline at end of file +NumberOfOrdersByMonth=Nombre de commandes par mois +ListOfOrders=Liste des commandes \ No newline at end of file diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang index 80b11d6e48f..7b405769a89 100644 --- a/htdocs/langs/fr_FR/propal.lang +++ b/htdocs/langs/fr_FR/propal.lang @@ -20,4 +20,5 @@ NumberOfProposalsByMonth=Nombre par mois NbOfProposals=Nombre de propositions commerciales ShowPropal=Afficher proposition PropalsDraft=Brouillons -PropalsOpened=Ouvertes \ No newline at end of file +PropalsOpened=Ouvertes +ListOfProposals=Liste des devis/propositions commerciales \ No newline at end of file