From 203a98d4aebc15a192b4d7a8be3cc26632d88088 Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Mon, 25 Nov 2013 10:30:02 +0100
Subject: [PATCH 1/2] fix language and standardize code

---
 htdocs/compta/paiement/cheque/fiche.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php
index c860e04ecd6..6c601b20f72 100644
--- a/htdocs/compta/paiement/cheque/fiche.php
+++ b/htdocs/compta/paiement/cheque/fiche.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2007-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2013 		Philippe Grand      	<philippe.grand@atoo-net.com>
  *
  * 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
@@ -60,7 +61,6 @@ $offset = $limit * $page ;
 $dir=$conf->banque->dir_output.'/bordereau/';
 $filterdate=dol_mktime(0, 0, 0, GETPOST('fdmonth'), GETPOST('fdday'), GETPOST('fdyear'));
 $filteraccountid=GETPOST('accountid');
-//var_dump($_POST);
 
 $object = new RemiseCheque($db);
 
@@ -80,12 +80,12 @@ if ($action == 'setdate' && $user->rights->banque->cheque)
         $result=$object->set_date($user,$date);
         if ($result < 0)
         {
-            $mesg='<div class="error">'.$object->error.'</div>';
+			setEventMessage($object->error, 'errors');
         }
     }
     else
     {
-        $mesg='<div class="error">'.$object->error.'</div>';
+        setEventMessage($object->error, 'errors');
     }
 }
 
@@ -103,12 +103,12 @@ if ($action == 'setrefext' && $user->rights->banque->cheque)
         $result=$object->setValueFrom('ref_ext', $ref_ext);
         if ($result < 0)
         {
-            $mesg='<div class="error">'.$object->error.'</div>';
+            setEventMessage($object->error, 'errors');
         }
     }
     else
     {
-        $mesg='<div class="error">'.$object->error.'</div>';
+        setEventMessage($object->error, 'errors');
     }
 }
 
@@ -140,12 +140,12 @@ if ($action == 'create' && $_POST["accountid"] > 0 && $user->rights->banque->che
 		}
 		else
 		{
-			$mesg='<div class="error">'.$object->error.'</div>';
+			setEventMessage($object->error, 'errors');
 		}
 	}
 	else
 	{
-        $mesg=$langs->trans("ErrorSelectAtLeastOne");
+		setEventMessage($langs->trans("ErrorSelectAtLeastOne"));
 	    $action='new';
 	}
 }
@@ -161,7 +161,7 @@ if ($action == 'remove' && $id > 0 && $_GET["lineid"] > 0 && $user->rights->banq
 	}
 	else
 	{
-		$mesg='<div class="error">'.$object->error.'</div>';
+		setEventMessage($object->error, 'errors');
 	}
 }
 
@@ -176,7 +176,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->c
 	}
 	else
 	{
-		$mesg='<div class="error">'.$paiement->error.'</div>';
+		setEventMessage($paiement->error, 'errors');
 	}
 }
 
@@ -203,7 +203,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->banque->c
 	}
 	else
 	{
-		$mesg='<div class="error">'.$paiement->error.'</div>';
+		setEventMessage($paiement->error, 'errors');
 	}
 }
 
@@ -582,7 +582,7 @@ else
 
 		$param="&amp;id=".$object->id;
 		print '<tr class="liste_titre">';
-		print_liste_field_titre($langs->trans("Cheque"),'','','','','width="30"');
+		print_liste_field_titre($langs->trans("Cheques"),'','','','','width="30"');
 		print_liste_field_titre($langs->trans("DateChequeReceived"),$_SERVER["PHP_SELF"],"b.dateo,b.rowid", "",$param,'align="center"',$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("Numero"),$_SERVER["PHP_SELF"],"b.num_chq", "",$param,'align="center"',$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("CheckTransmitter"),$_SERVER["PHP_SELF"],"b.emetteur", "",$param,"",$sortfield,$sortorder);

From e8e5f4d943d1e32d7daf39a84a54a8ecfb3695f0 Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Mon, 25 Nov 2013 13:55:01 +0100
Subject: [PATCH 2/2] missing trad

---
 htdocs/langs/en_US/compta.lang | 1 +
 htdocs/langs/fr_FR/compta.lang | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 48aa8be111a..1b93b084f10 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -30,6 +30,7 @@ Profit=Profit
 Balance=Balance
 Debit=Debit
 Credit=Credit
+Piece=Voucher
 Withdrawal=Withdrawal
 Withdrawals=Withdrawals
 AmountHTVATRealReceived=Net collected
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 540f92e135f..32310e22816 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -30,6 +30,7 @@ Profit=Bénéfice
 Balance=Solde
 Debit=Débit
 Credit=Crédit
+Piece=Pièce
 Withdrawal=Retrait
 Withdrawals=Retraits
 AmountHTVATRealReceived=HT collectée