diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 35fa58a5f06..d882ebb67d1 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -137,7 +137,7 @@ print '
'; print ''; print ''; print ''; -print ""; +print ''; print "\n"; print ""; @@ -145,7 +145,7 @@ print ''; print "
Rechercher un adhérent'.$langs->trans("SearchAMember").'
'; print $langs->trans("Lastname").'/'.$langs->trans("Firstname").' '; -print '  '; +print '  '; print '
"; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 44b19a5d628..b18783e6431 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -93,9 +93,9 @@ if ($conf->propal->enabled) { $var=false; print '
'; print ''; - print ''; + print ''; print ''; + print $langs->trans("Ref").' :  '; print "
Rechercher une proposition
'.$langs->trans("SearchAProposal").'
'; - print $langs->trans("Ref").' :  

\n"; } @@ -106,9 +106,9 @@ if ($conf->contrat->enabled) { $var=false; print '
'; print ''; - print ''; + print ''; print ''; + print $langs->trans("Ref").' :  '; print "
Rechercher un contrat
'.$langs->trans("SearchAContract").'
'; - print $langs->trans("Ref").' :  

\n"; } diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 8012d2eee2e..a24e18f2477 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -58,9 +58,9 @@ if ($conf->propal->enabled) { print '
'; print ''; - print ''; + print ''; print "'; + print $langs->trans("Ref").' : '; print "
Rechercher une proposition
'.$langs->trans("SearchAProposal").'
"; - print $langs->trans("Ref").' :

\n"; } diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 2b85b95053d..ec786d93a1d 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -87,9 +87,9 @@ print ''; print '
'; print ''; print ""; -print ''; +print ''; print "'; +print $langs->trans("Ref").' :  '; print "
Rechercher une facture
'.$langs->trans("SearchABill").'
"; -print $langs->trans("Ref").' :  

"; diff --git a/htdocs/compta/param/comptes/index.php b/htdocs/compta/param/comptes/index.php index 0c329cbfdc6..01ff73027b3 100644 --- a/htdocs/compta/param/comptes/index.php +++ b/htdocs/compta/param/comptes/index.php @@ -61,9 +61,9 @@ print ''; print '
'; print ''; print ""; -print ''; +print ''; print "'; +print $langs->trans("Ref").' :  '; print "
Rechercher une facture
'.$langs->trans("SearchABill").'
"; -print $langs->trans("Ref").' :  

"; diff --git a/htdocs/compta/param/index.php b/htdocs/compta/param/index.php index 0c329cbfdc6..01ff73027b3 100644 --- a/htdocs/compta/param/index.php +++ b/htdocs/compta/param/index.php @@ -61,9 +61,9 @@ print ''; print '
'; print ''; print ""; -print ''; +print ''; print "'; +print $langs->trans("Ref").' :  '; print "
Rechercher une facture
'.$langs->trans("SearchABill").'
"; -print $langs->trans("Ref").' :  

"; diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 3388da1b735..61856ee0748 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -93,7 +93,7 @@ if ($result) print '
'; print ''; - print ''; + print ''; print ' '; diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 6a310b38b09..76ee0d3fcbd 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -87,13 +87,13 @@ if ( $db->query($sql) ) print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; + print ''; print ''; print ''; diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php index a83cee60498..eb89c244518 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.php @@ -93,7 +93,7 @@ if ($result) print ''; print ''; - print ''; + print ''; print ''; diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 6a41333ae56..ae42db2e3e5 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -40,9 +40,9 @@ print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/telephonie/contrat/liste.php b/htdocs/telephonie/contrat/liste.php index 6d08f722ef3..b62ad389105 100644 --- a/htdocs/telephonie/contrat/liste.php +++ b/htdocs/telephonie/contrat/liste.php @@ -125,7 +125,7 @@ if ($result) print ''; print ''; - print ''; + print ''; print ''; diff --git a/htdocs/telephonie/facture/liste.php b/htdocs/telephonie/facture/liste.php index 420faafb663..9fd3e5aa9ed 100644 --- a/htdocs/telephonie/facture/liste.php +++ b/htdocs/telephonie/facture/liste.php @@ -106,7 +106,7 @@ if ($result) print ''; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/telephonie/ligne/communications.php b/htdocs/telephonie/ligne/communications.php index 6a5bb89751c..ad00f90ed09 100644 --- a/htdocs/telephonie/ligne/communications.php +++ b/htdocs/telephonie/ligne/communications.php @@ -102,7 +102,7 @@ if ($result) print ''; print ''; - print ''; + print ''; diff --git a/htdocs/telephonie/ligne/groupe.php b/htdocs/telephonie/ligne/groupe.php index 8b24f1c488d..d586b23112b 100644 --- a/htdocs/telephonie/ligne/groupe.php +++ b/htdocs/telephonie/ligne/groupe.php @@ -135,9 +135,7 @@ if ($result) print ''; print ''; - print ''; - - + print ''; print ''; diff --git a/htdocs/telephonie/ligne/liste.php b/htdocs/telephonie/ligne/liste.php index 3580dfb7355..93e6de71c9a 100644 --- a/htdocs/telephonie/ligne/liste.php +++ b/htdocs/telephonie/ligne/liste.php @@ -126,7 +126,7 @@ if ($result) print ''; print ''; - print ''; + print ''; print ''; diff --git a/htdocs/telephonie/ligne/listecommande.php b/htdocs/telephonie/ligne/listecommande.php index 5545d01a55c..27390b9e47d 100644 --- a/htdocs/telephonie/ligne/listecommande.php +++ b/htdocs/telephonie/ligne/listecommande.php @@ -116,7 +116,7 @@ if ($result) print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/telephonie/ligne/numdata.php b/htdocs/telephonie/ligne/numdata.php index 58345783bee..e5ea1582275 100644 --- a/htdocs/telephonie/ligne/numdata.php +++ b/htdocs/telephonie/ligne/numdata.php @@ -119,7 +119,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; diff --git a/htdocs/telephonie/service/vendus.php b/htdocs/telephonie/service/vendus.php index 60f6be1f06d..09b06b18740 100644 --- a/htdocs/telephonie/service/vendus.php +++ b/htdocs/telephonie/service/vendus.php @@ -126,7 +126,7 @@ if ($result) print ''; print ''; - print ''; + print ''; print ''; diff --git a/htdocs/user/home.php b/htdocs/user/home.php index 0e77bf27c6e..6fad807f7a5 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -50,9 +50,9 @@ print '
FactureSociétéDate demande'.$langs->trans("Bill").''.$langs->trans("Company").'Date demandeEmetteur
-'; print ' '; - print ' 
 
'; print ''; print ''; -print ''; +print ''; print "'; +print $langs->trans("Ref").' : '; print "
Rechercher une expédition
'.$langs->trans("SearchASending").'
"; -print $langs->trans("Ref").' :
\n"; /* diff --git a/htdocs/expedition/pre.inc.php b/htdocs/expedition/pre.inc.php index f7eaf649e7e..f02a18aa430 100644 --- a/htdocs/expedition/pre.inc.php +++ b/htdocs/expedition/pre.inc.php @@ -31,14 +31,10 @@ require("../main.inc.php"); require("../commande/commande.class.php"); require("./expedition.class.php"); -$form_search = '
-Rechercher une expédition
-  -
'; -function llxHeader($head = "", $title="", $help_url='', $form_search='', $author='') +function llxHeader($head = "", $title="", $help_url='') { - global $user, $conf, $form_search, $langs; + global $user, $conf, $langs; /* * @@ -48,10 +44,10 @@ function llxHeader($head = "", $title="", $help_url='', $form_search='', $author $menu = new Menu(); - $menu->add(DOL_URL_ROOT."/commande/", "Commandes"); + $menu->add(DOL_URL_ROOT."/commande/", $langs->trans("Orders")); - $menu->add(DOL_URL_ROOT."/expedition/", "Expeditions"); - $menu->add_submenu(DOL_URL_ROOT."/expedition/liste.php", "Liste"); + $menu->add(DOL_URL_ROOT."/expedition/", $langs->trans("Sendings")); + $menu->add_submenu(DOL_URL_ROOT."/expedition/liste.php", $langs->trans("List")); $menu->add(DOL_URL_ROOT."/expedition/stats/", $langs->trans("Statistics")); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index dbf7c7201f9..e7bd72ac0bb 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -61,8 +61,8 @@ Module70Name=Intervention Module70Desc=Interventions' management Module75Name=Trips Module75Desc=Trips' management -Module80Name=Shipping -Module80Desc=Shippings' management +Module80Name=Sendings +Module80Desc=Sendings' management Module85Name=Banks and cash Module85Desc=Management of bank or cash accounts Module86Name=Store diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 5a0db61d600..b171f3f5697 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -11,6 +11,7 @@ ClassifyPayed=Classify 'Payed' ClassifyCanceled=Classify 'Abandonned' CreateBill=Create Bill AddBill=Add bill +SearchABill=Search a bill Send=Send SendRemind=Send reminder DoPaiement=Do payment diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang index b579b371be5..ae5015af05c 100644 --- a/htdocs/langs/en_US/contracts.lang +++ b/htdocs/langs/en_US/contracts.lang @@ -6,4 +6,5 @@ ContractStatusRunning=Running ContractStatusClosed=Closed Contracts=Contracts Contract=Contract -AddContract=Add contract \ No newline at end of file +AddContract=Add contract +SearchAContract=Search a contract \ No newline at end of file diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 482b53fc383..0a529ce7e69 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -9,4 +9,5 @@ MembersListResiliated=List of resiliated members DateAbonment=Abonment date NewMember=New member MembersTypes=Members types -MembersAttribute=Members attributes \ No newline at end of file +MembersAttribute=Members attributes +SearchAMember=Search a member \ No newline at end of file diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 83a765f0d2c..d18e12eac87 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -26,6 +26,8 @@ WarehouseOpened=Warehouse opened WarehouseClosed=Warehouse closed Stock=Stock Stocks=Stocks +Movement=Movement +Movements=Movements OnSell=On sell NotOnSell=Out of Sell UpdatePrice=Update price diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index 79f7cdb8e64..e564bd6146c 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -10,3 +10,4 @@ AddProp=Add proposal ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ? LastPropals=Last %s proposals AllPropals=All proposals +SearchAProposal=Search a proposal diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index f309bcfb36c..954445d7152 100755 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -14,6 +14,8 @@ ConfirmDisableUser=Are you sure you want to disable user %s ? ConfirmDisableUser=Are you sure you want to delete group %s ? NewUser=New user CreateUser=Create user +SearchAGroup=Search a group +SearchAUser=Search a user ErrorGroupAlreadyExists=Group %s already exists. ErrorLoginAlreadyExists=Login %s already exists. LoginNotDefined=Login is not defined. diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 3b708db34e6..b34fece0013 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -11,6 +11,7 @@ ClassifyPayed=Classer 'Pay ClassifyCanceled=Classer 'Abandonnée' CreateBill=Créer Facture AddBill=Créer facture +SearchABill=Rechercher une facture Send=Envoyer SendRemind=Envoyer rappel DoPaiement=Émettre paiement diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang index ad6f78b9c18..ca763d2d99f 100644 --- a/htdocs/langs/fr_FR/contracts.lang +++ b/htdocs/langs/fr_FR/contracts.lang @@ -6,4 +6,5 @@ ContractStatusRunning=En service ContractStatusClosed=Clôturé Contracts=Contrats Contract=Contrat -AddContract=Créer contrat \ No newline at end of file +AddContract=Créer contrat +SearchAContract=Rechercher un contrat \ No newline at end of file diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang index ad0e95d17dd..17f641ec105 100644 --- a/htdocs/langs/fr_FR/members.lang +++ b/htdocs/langs/fr_FR/members.lang @@ -9,4 +9,5 @@ MembersListResiliated=Liste des adh DateAbonment=Date cotisation NewMember=Nouvel adhérent MembersTypes=Types d'adhérents -MembersAttributes=Attributs adhérents \ No newline at end of file +MembersAttributes=Attributs adhérents +SearchAMember=Rechercher un membre \ No newline at end of file diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang index ff76657c2db..c077cf2c488 100644 --- a/htdocs/langs/fr_FR/products.lang +++ b/htdocs/langs/fr_FR/products.lang @@ -28,6 +28,8 @@ WarehouseOpened=Entrep WarehouseClosed=Entrepôt fermé Stock=Stock Stocks=Stocks +Movement=Mouvement +Movements=Mouvements OnSell=En vente NotOnSell=Hors vente UpdatePrice=Changer le prix diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang index 24188baeb04..85b79142768 100644 --- a/htdocs/langs/fr_FR/propal.lang +++ b/htdocs/langs/fr_FR/propal.lang @@ -10,3 +10,4 @@ AddProp=Cr ConfirmDeleteProp=Etes-vous sûr de vouloir effacer cette proposition commerciale ? LastPropals=Les %s dernieres propales AllPropals=Toutes les propales +SearchAProposal=Rechercher une propale diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang index f2cd786ae2a..081bf01f96d 100755 --- a/htdocs/langs/fr_FR/users.lang +++ b/htdocs/langs/fr_FR/users.lang @@ -14,6 +14,8 @@ ConfirmDisableUser=Etes-vous s ConfirmDisableGroup=Etes-vous sûr de vouloir supprimer le groupe %s ? NewUser=Nouvel utilisateur CreateUser=Créer l'utilisateur +SearchAGroup=Recherche un groupe +SearchAUser=Recherche un utilisateur ErrorLoginAlreadyExists=Le login %s existe déjà. ErrorGroupAlreadyExists=Le groupe %s existe déjà. LoginNotDefined=Le login n'est pas défini. diff --git a/htdocs/telephonie/client/liste.php b/htdocs/telephonie/client/liste.php index a02078ff9ce..dabb5119b17 100644 --- a/htdocs/telephonie/client/liste.php +++ b/htdocs/telephonie/client/liste.php @@ -101,7 +101,7 @@ if ($result) print '
  
      
  
 
'; $var=false; print '
'; print ''; - print ''; + print ''; print ''; + print $langs->trans("Ref").' :  '; print "
Rechercher un utilisateur
'.$langs->trans("SearchAUser").'
'; - print $langs->trans("Ref").' :  

\n"; /* @@ -61,9 +61,9 @@ print '
'; $var=false; print '
'; print ''; - print ''; + print ''; print ''; + print $langs->trans("Ref").' :  '; print "
Rechercher un groupe
'.$langs->trans("SearchAGroup").'
'; - print $langs->trans("Ref").' :  

\n";