From d9e82272cf3a85113813642bb0c935e668886ff4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 14 Sep 2009 01:27:00 +0000
Subject: [PATCH] Fix: Some fixes in point of sale module

---
 htdocs/cashdesk/templates/facturation1.tpl.php   | 2 +-
 htdocs/cashdesk/templates/liste_articles.tpl.php | 3 +--
 htdocs/cashdesk/templates/ticket.tpl.php         | 5 ++---
 htdocs/langs/en_US/bills.lang                    | 2 ++
 htdocs/langs/fr_FR/bills.lang                    | 2 ++
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/cashdesk/templates/facturation1.tpl.php b/htdocs/cashdesk/templates/facturation1.tpl.php
index c59ed8086ba..3dfd017a7ef 100644
--- a/htdocs/cashdesk/templates/facturation1.tpl.php
+++ b/htdocs/cashdesk/templates/facturation1.tpl.php
@@ -155,7 +155,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 	<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
 <fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Difference"); ?></legend>
 		<table>
-			<tr><th class="label1"><?php echo $langs->trans("DueAmount"); ?></th><th class="label1"><?php echo $langs->trans("Received"); ?></th><th class="label1"><?php echo $langs->trans("RemainderToPay"); ?></th></tr>
+			<tr><th class="label1"><?php echo $langs->trans("AmountExpected"); ?></th><th class="label1"><?php echo $langs->trans("Received"); ?></th><th class="label1"><?php echo $langs->trans("ExcessReceived"); ?></th></tr>
 			<tr>
 			<!-- Affichage du montant du -->
 			<td><input class="texte2_off" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prix_total_ttc (), 'MT'); ?>" disabled="disabled" /></td>
diff --git a/htdocs/cashdesk/templates/liste_articles.tpl.php b/htdocs/cashdesk/templates/liste_articles.tpl.php
index 18793f4a44e..e6f54eab523 100644
--- a/htdocs/cashdesk/templates/liste_articles.tpl.php
+++ b/htdocs/cashdesk/templates/liste_articles.tpl.php
@@ -59,9 +59,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 				}
 
 				$remise = $tab[$i]['remise'];
-				$total_ht = ($tab[$i]['total_ht'] - $remise);
 
-				echo ('<p>'.$tab[$i]['qte'].' x '.price2num( $tab[$i]['price'], 'MT').$remise_percent.' = '.price2num($total_ht, 'MT').' '.$conf->monnaie.' HT ('.price2num($tab[$i]['total_ttc'], 'MT').' '.$conf->monnaire.' TTC)</p>'."\n");
+				echo ('<p>'.$tab[$i]['qte'].' x '.price2num( $tab[$i]['price'], 'MT').$remise_percent.' = '.price2num($tab[$i]['total_ht'], 'MT').' '.$conf->monnaie.' HT ('.price2num($tab[$i]['total_ttc'], 'MT').' '.$conf->monnaie.' TTC)</p>'."\n");
 			echo ('</div>'."\n");
 
 		}
diff --git a/htdocs/cashdesk/templates/ticket.tpl.php b/htdocs/cashdesk/templates/ticket.tpl.php
index 4e464db196a..647e75d0e34 100644
--- a/htdocs/cashdesk/templates/ticket.tpl.php
+++ b/htdocs/cashdesk/templates/ticket.tpl.php
@@ -40,6 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 			position: absolute;
 			top: 0;
 			right: 0;
+			font-size: 16px;
 		}
 
 		.infos {
@@ -133,9 +134,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 			for ( $i = 0; $i < count($tab); $i++ ) {
 
 				$remise = $tab[$i]['remise'];
-				$total_ht = $tab[$i]['total_ht'] - $remise;
-
-				echo ('<tr><td>'.$tab[$i]['ref'].'</td><td>'.$tab[$i]['label'].'</td><td>'.$tab[$i]['qte'].'</td><td>'.$tab[$i]['remise_percent'].'</td><td class="total">'.price2num($total_ht,'MT').' '.$conf->monnaie.'</td></tr>'."\n");
+				echo ('<tr><td>'.$tab[$i]['ref'].'</td><td>'.$tab[$i]['label'].'</td><td>'.$tab[$i]['qte'].'</td><td>'.$tab[$i]['remise_percent'].'</td><td class="total">'.price2num($tab[$i]['total_ht'],'MT').' '.$conf->monnaie.'</td></tr>'."\n");
 
 			}
 
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 9c5be50210e..346c4b4e62d 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -351,6 +351,8 @@ UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address i
 ShowUnpaidLateOnly=Show late unpaid invoice only
 PaymentInvoiceRef=Payment invoice %s
 ValidateInvoice=Validate invoice
+Cash=Cash
+Reported=Delayed
 
 # oursin PDF model
 Of=du
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 49f64914c33..aa44f6bdc70 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -353,6 +353,8 @@ ShowUnpaidAll=Afficher tous les impayés
 ShowUnpaidLateOnly=Afficher impayés en retard uniquement
 PaymentInvoiceRef=Paiement facture %s
 ValidateInvoice=Valider facture
+Cash=Liquide
+Reported=Différé
 
 # oursin PDF model
 Of=du