diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index 216f53e946b..c34e8596f01 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -267,7 +267,6 @@ p.titre { /* --------------------- Combo lists ------------------- */ .select_design { - width: 370px; overflow: auto; } diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index fce4df22c7a..580012847f5 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -38,7 +38,7 @@ $langs->load("cashdesk"); - +
@@ -89,42 +89,32 @@ $langs->load("cashdesk"); -
trans("FilterRefOrLabelOrBC"); ?>trans("Designation"); ?>
- - - +
trans("Qty"); ?>trans("Stock"); ?>
+ + - - - + - - - - - - + + + + + + + + + + +
trans("Qty"); ?> trans("PriceUHT"); ?> trans("Discount"); ?> (%)trans("TotalHT"); ?>  trans("VATRate"); ?>
- - + vatrate; // To get vat rate we just have selected @@ -133,7 +123,20 @@ $langs->load("cashdesk"); echo $form->load_tva('selTva', (isset($_POST["selTva"])?GETPOST("selTva",'alpha',2):$vatrate), $mysoc, $buyer, 0, 0, '', false, -1); ?>
trans("Stock"); ?> + + trans("TotalHT"); ?>
" /> @@ -149,13 +152,13 @@ $langs->load("cashdesk"); trans("TotalTicket"); ?>trans("Received"); ?>trans("Change"); ?> - + - + - +