Trad: Et de la traduction...

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 "<table class=\"noborder\" width=\"100%\">";

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;
   

htdocs/comm/contact.php

@@ -59,15 +59,8 @@ if ($user->societe_id > 0)
 }
 
 
-if (! $sortfield)
+if (! $sortfield) $sortfield="p.name";
-{
+if (! $sortorder) $sortorder="ASC";
-  $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 '<table class="noborder" width="100%">';
   print '<tr class="liste_titre">';

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 == "")
+  if (! $sortfield) $sortfield="p.datep";
-    {
+  if (! $sortorder) $sortorder="DESC";
-      $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;

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 '<table class="noborder" width="100%">';

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?"<a href='index.php?year=".($year-1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='index.php?year=".($year+1)."'>".img_next()."</a>":""));
+print_fiche_titre($langs->trans("SocialContributions"),($year?"<a href='index.php?year=".($year-1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='index.php?year=".($year+1)."'>".img_next()."</a>":""));
 print "<br>\n";
 
 if ($mesg) {

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 == "")
+if (! $sortorder) $sortorder="ASC";
-{
+if (! $sortfield) $sortfield="p.name";
-  $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 == "f") { $text.=$langs->trans("Suppliers"); }
-if ($type == "c") { $text.=$langs->trans("Customers")." "; }
+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 ";

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 '<table class="noborder" width="100%">';
   print "<tr class=\"liste_titre\">";

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
+ListOfProspects=List of prospects
-ListOfCustomers=Customers list
+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

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
+AccountancyTreasuryArea=Accountancy/Treasury area
+NewPayment=New payment

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
+NumberOfOrdersByMonth=Number of orders by month
+ListOfOrders=Liste of orders

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
+PropalsOpened=Opened
+ListOfProposals=List of commercial proposals

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

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
+AccountancyTreasuryArea=Espace Compta/Tréso
+NewPayment=Nouveau paiment

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
+NumberOfOrdersByMonth=Nombre de commandes par mois
+ListOfOrders=Liste des commandes

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
+PropalsOpened=Ouvertes
+ListOfProposals=Liste des devis/propositions commerciales