diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index 216f53e946b294d7045f4be9521fcfaa5cb1e323..c34e8596f010e157040d8f3845369ad90950b552 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 fce4df22c7ab8ab72f5a4f519bf478e917f72836..580012847f53d6c24c2882177629554111566959 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -38,7 +38,7 @@ $langs->load("cashdesk"); <input type="hidden" name="hdnSource" value="NULL" /> - <table> + <table class="center"> <tr><th class="label1"><?php echo $langs->trans("FilterRefOrLabelOrBC"); ?></th><th class="label1"><?php echo $langs->trans("Designation"); ?></th></tr> <tr> <!-- Affichage de la reference et de la designation --> @@ -89,42 +89,32 @@ $langs->load("cashdesk"); </select> </td> </tr> - <tr><td><div id="resultats_dhtml"></div></td></tr> </table> </form> <form id="frmQte" class="formulaire1" method="post" action="facturation_verif.php?action=ajout_article" onsubmit ="javascript: return verifSaisie();"> <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" /> - <table> - <tr><th><?php echo $langs->trans("Qty"); ?></th> - <th><?php echo $langs->trans("Stock"); ?></th> + <table class="center"> + <tr> + <th><?php echo $langs->trans("Qty"); ?></th> <th><?php echo $langs->trans("PriceUHT"); ?></th> - <th></th> <th><?php echo $langs->trans("Discount"); ?> (%)</th> - <th><?php echo $langs->trans("TotalHT"); ?></th> - <th> </th> <th><?php echo $langs->trans("VATRate"); ?></th> + <th></th> </tr> <tr> <td><input class="texte1 maxwidth50onsmartphone" type="text" id="txtQte" name="txtQte" value="1" onkeyup="javascript: modif();" onfocus="javascript: this.select();" /> <?php print genkeypad("txtQte", "frmQte");?> - </td> - <!-- Affichage du stock pour l'article courant --> - <td> - <input class="texte1_off maxwidth50onsmartphone" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled /> </td> <!-- Show unit price --> <?php // TODO Remove the disabled and use this value when adding product into cart ?> <td><input class="texte1_off maxwidth50onsmartphone" type="text" name="txtPrixUnit" value="<?php echo price2num($obj_facturation->prix(), 'MU'); ?>" onchange="javascript: modif();" disabled /></td> - <td></td> <!-- Choix de la remise --> <td><input class="texte1 maxwidth50onsmartphone" type="text" id="txtRemise" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/> <?php print genkeypad("txtRemise", "frmQte");?> </td> - <!-- Affichage du total HT --> - <td><input class="texte1_off maxwidth50onsmartphone" type="text" name="txtTotal" value="" disabled /></td><td></td> <!-- Choix du taux de TVA --> - <td class="select_tva"> + <td class="select_tva center"> <?php $vatrate = $obj_facturation->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); ?> </td> + <td></td> </tr> + <tr> + <!-- Affichage du stock pour l'article courant --> + <tr> + <td><?php echo $langs->trans("Stock"); ?></td> + <td> + <input class="texte1_off maxwidth50onsmartphone" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled /> + </td> + <td><?php echo $langs->trans("TotalHT"); ?></td> + <!-- Affichage du total HT --> + <td colspan="2"><input class="texte1_off maxwidth50onsmartphone" type="text" name="txtTotal" value="" disabled /></td><td></td> + </tr> + </table> <input class="button bouton_ajout_article" type="submit" id="sbmtEnvoyer" value="<?php echo $langs->trans("AddThisArticle"); ?>" /> @@ -149,13 +152,13 @@ $langs->load("cashdesk"); <tr><th class="label1"><?php echo $langs->trans("TotalTicket"); ?></th><th class="label1"><?php echo $langs->trans("Received"); ?></th><th class="label1"><?php echo $langs->trans("Change"); ?></th></tr> <tr> <!-- Affichage du montant du --> - <td><input class="texte2_off maxwidthonsmartphone" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prixTotalTtc(), 'MT'); ?>" disabled /></td> + <td><input class="texte2_off maxwidth100onsmartphone" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prixTotalTtc(), 'MT'); ?>" disabled /></td> <!-- Choix du montant encaisse --> - <td><input class="texte2 maxwidthonsmartphone" type="text" id="txtEncaisse" name="txtEncaisse" value="" onkeyup="javascript: verifDifference();" onfocus="javascript: this.select();" /> + <td><input class="texte2 maxwidth100onsmartphone" type="text" id="txtEncaisse" name="txtEncaisse" value="" onkeyup="javascript: verifDifference();" onfocus="javascript: this.select();" /> <?php print genkeypad("txtEncaisse", "frmDifference");?> </td> <!-- Affichage du montant rendu --> - <td><input class="texte2_off maxwidthonsmartphone" type="text" name="txtRendu" value="0" disabled /></td> + <td><input class="texte2_off maxwidth100onsmartphone" type="text" name="txtRendu" value="0" disabled /></td> </tr> <tr> </table>