From b7d35c7802b2163fe7647268436a9ad89edf7cd1 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Thu, 10 Jun 2010 15:15:14 +0000
Subject: [PATCH] Trad:  Standing orders Fix: Withdrawals. Creation buttons
 position more in line with header information

---
 htdocs/compta/facture/prelevement.php | 3 ++-
 htdocs/compta/prelevement/create.php  | 6 +++---
 htdocs/langs/ca_ES/withdrawals.lang   | 6 ++++--
 htdocs/langs/en_US/withdrawals.lang   | 6 ++++--
 htdocs/langs/es_ES/withdrawals.lang   | 6 ++++--
 htdocs/langs/fr_FR/withdrawals.lang   | 6 ++++--
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 93ecf2e38d6..c9de68d9e63 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -223,7 +224,7 @@ if ($_GET["facid"] > 0)
 
 				print "<tr $bc[$var]>";
 				print '<td align="left">'.dol_print_date($db->jdate($obj->date_demande),'day')."</td>\n";
-				print '<td align="center">En attente de traitement</td>';
+				print '<td align="center">'.$langs->trans("OrderWaiting").'</td>';
 				print '<td align="center">'.price($obj->amount).'</td>';
 				print '<td align="center">-</td>';
 				print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 5397f006c90..2e51b28486f 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -113,10 +113,10 @@ if ($nb)
 {
 	print "<div class=\"tabsAction\">\n";
 
-	if ($nb) print '<a class="butAction" href="create.php?action=create">'.$langs->trans("Create")."</a>\n";
-	if ($nb1) print '<a class="butAction" href="create.php?action=create&amp;banque=1&amp;guichet=1">'.$langs->trans("CreateGuichet")."</a>\n";
+	if ($nb) print '<a class="butAction" href="create.php?action=create">'.$langs->trans("CreateAll")."</a>\n";
 	if ($nb11) print '<a class="butAction" href="create.php?action=create&amp;banque=1">'.$langs->trans("CreateBanque")."</a>\n";
-
+	if ($nb1) print '<a class="butAction" href="create.php?action=create&amp;banque=1&amp;guichet=1">'.$langs->trans("CreateGuichet")."</a>\n";
+	
 	print "</div>\n";
 }
 else
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 53f9da2df90..56a3ca68da7 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -59,5 +59,7 @@ StatusMotif5=Compte inexistent
 StatusMotif6=Compte sense saldo
 StatusMotif7=Decisió judicial
 StatusMotif8=Altre motiu
-CreateGuichet=Només Oficina
-CreateBanque=Només Banc
\ No newline at end of file
+CreateAll=Domiciliar totes
+CreateGuichet=Només oficina
+CreateBanque=Només banc
+OrderWaiting=A l'espera de procés
\ No newline at end of file
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index c90f7ed0a2c..78afbdcc76b 100755
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -59,5 +59,7 @@ StatusMotif5=RIB inexploitable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
 StatusMotif8=Other reason
-CreateGuichet=Only Office
-CreateBanque=only Bank
\ No newline at end of file
+CreateAll=Withdraw all
+CreateGuichet=Only office
+CreateBanque=Only bank
+OrderWaiting=Waiting for treatment
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index d6780a19801..f3b9eb74420 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -59,5 +59,7 @@ StatusMotif5=Cuenta inexistente
 StatusMotif6=Cuenta sin saldo
 StatusMotif7=Decisión judicial
 StatusMotif8=Otro motivo
-CreateGuichet=Sólo Oficina
-CreateBanque=Sólo Banco
\ No newline at end of file
+CreateAll=Domiciliar todas
+CreateGuichet=Sólo oficina
+CreateBanque=Sólo banco
+OrderWaiting=En espera de proceso
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index c77de4f945f..d8be84ac389 100755
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -59,5 +59,7 @@ StatusMotif5=RIB inexploitable
 StatusMotif6=Compte solde
 StatusMotif7=Decision judiciaire
 StatusMotif8=Autre motif
-CreateGuichet=Seulement Guichet
-CreateBanque=Seulement Banque
\ No newline at end of file
+CreateAll=Prélever tout
+CreateGuichet=Seulement guichet
+CreateBanque=Seulement banque
+OrderWaiting=En attente de traitement
\ No newline at end of file