From 76173cfd4b7ada251a8cc7791832526405a5dd26 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 13 Sep 2009 22:24:46 +0000 Subject: [PATCH] Fix: A lot of fix on point of sale module --- htdocs/cashdesk/langs/en_US/cashdesk.lang | 7 ++++- htdocs/cashdesk/langs/fr_FR/cashdesk.lang | 7 ++++- htdocs/cashdesk/style.css | 3 +- .../cashdesk/templates/facturation1.tpl.php | 30 +++++++++++-------- .../cashdesk/templates/liste_articles.tpl.php | 7 ++++- htdocs/cashdesk/templates/menu.tpl.php | 4 +-- htdocs/cashdesk/templates/ticket.tpl.php | 28 +++++++---------- htdocs/cashdesk/templates/validation1.tpl.php | 26 ++++++++-------- htdocs/langs/en_US/bills.lang | 2 ++ htdocs/langs/en_US/main.lang | 1 + htdocs/langs/fr_FR/bills.lang | 1 + htdocs/langs/fr_FR/main.lang | 1 + htdocs/societe.class.php | 6 ++-- 13 files changed, 71 insertions(+), 52 deletions(-) diff --git a/htdocs/cashdesk/langs/en_US/cashdesk.lang b/htdocs/cashdesk/langs/en_US/cashdesk.lang index 09ce84f5575..7d58116e489 100644 --- a/htdocs/cashdesk/langs/en_US/cashdesk.lang +++ b/htdocs/cashdesk/langs/en_US/cashdesk.lang @@ -5,4 +5,9 @@ CashDesk=Point of sale CashDesks=Point of sales CashDeskBank=Bank account CashDeskWarehouse=Warehouse -CashDeskThirdParty=Third party \ No newline at end of file +CashDeskThirdParty=Third party +ShoppingCart=Shopping cart +NewSell=New sell +BackOffice=Back office +AddThisArticle=Add this article +RestartSelling=Go back on sell \ No newline at end of file diff --git a/htdocs/cashdesk/langs/fr_FR/cashdesk.lang b/htdocs/cashdesk/langs/fr_FR/cashdesk.lang index 026e048098b..1030d752f1d 100644 --- a/htdocs/cashdesk/langs/fr_FR/cashdesk.lang +++ b/htdocs/cashdesk/langs/fr_FR/cashdesk.lang @@ -5,4 +5,9 @@ CashDesk=Caisse enregistreuse CashDesks=Caisse enregistreuses CashDeskBank=Compte bancaire CashDeskWarehouse=Entrepôt -CashDeskThirdParty=Tiers \ No newline at end of file +CashDeskThirdParty=Tiers +ShoppingCart=Panier +NewSell=Nouvelle vente +BackOffice=Back office +AddThisArticle=Ajouter cet article +RestartSelling=Reprendre la vente \ No newline at end of file diff --git a/htdocs/cashdesk/style.css b/htdocs/cashdesk/style.css index 2d476369941..bd6ed86abc1 100644 --- a/htdocs/cashdesk/style.css +++ b/htdocs/cashdesk/style.css @@ -468,4 +468,5 @@ p.titre { .dhtml_selection { background-color: #3366cc; color: white ! important; -} \ No newline at end of file +} + diff --git a/htdocs/cashdesk/templates/facturation1.tpl.php b/htdocs/cashdesk/templates/facturation1.tpl.php index 730c3cfaef4..c59ed8086ba 100644 --- a/htdocs/cashdesk/templates/facturation1.tpl.php +++ b/htdocs/cashdesk/templates/facturation1.tpl.php @@ -1,3 +1,7 @@ +load("main"); +$langs->load("bills"); +?> -
Article +
trans("Article"); ?>
- +
CodeDesignation
trans("Code"); ?>trans("Designation"); ?>
- + @@ -141,7 +145,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
QuantiteStockPrix unitaireTaux TVARemise (%)Prix total
trans("Qty"); ?>trans("Stock"); ?>trans("PriceUHT"); ?>trans("VATRate"); ?>trans("Discount"); ?> (%)trans("TotalHT"); ?>
- + " /> @@ -149,12 +153,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
Difference +
trans("Difference"); ?> - + - + @@ -164,19 +168,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Montant duEncaisseRendu
trans("DueAmount"); ?>trans("Received"); ?>trans("RemainderToPay"); ?>
-
Mode de paiement +
trans("PaymentMode"); ?> - - - + + +
" onclick="javascript: verifClic('ESP');" />" onclick="javascript: verifClic('CB');" />" onclick="javascript: verifClic('CHQ');" />
diff --git a/htdocs/cashdesk/templates/liste_articles.tpl.php b/htdocs/cashdesk/templates/liste_articles.tpl.php index 76dc4c23056..18793f4a44e 100644 --- a/htdocs/cashdesk/templates/liste_articles.tpl.php +++ b/htdocs/cashdesk/templates/liste_articles.tpl.php @@ -1,3 +1,8 @@ +load("main"); +$langs->load("bills"); +$langs->load("cashdesk"); +?> -Impression du ticket +Print ticket
- - Date limite de paiement : + " onclick="javascript: verifClic('DIF');" /> + trans("DateEcheance"); ?> :