diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php index f9c438149e7..9f76343a69e 100644 --- a/htdocs/cashdesk/admin/cashdesk.php +++ b/htdocs/cashdesk/admin/cashdesk.php @@ -148,12 +148,12 @@ if (! empty($conf->stock->enabled)) print ''.$langs->trans("CashDeskDoNotDecreaseStock").''; // Force warehouse (this is not a default value) print ''; if (empty($conf->productbatch->enabled)) { - print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK', $conf->global->CASHDESK_NO_DECREASE_STOCK, 1); + print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK', $conf->global->CASHDESK_NO_DECREASE_STOCK, 1); } else { if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) { - $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity); + $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity); } print $langs->trans("Yes").'
'; print ''.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').''; diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index 2f8a993829e..a8119225db9 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -194,9 +194,9 @@ class Facturation { if ($poscart[$key]['id'] != $aArticle) { - $newposcart[$j]=$poscart[$key]; - $newposcart[$j]['id']=$j; - $j++; + $newposcart[$j]=$poscart[$key]; + $newposcart[$j]['id']=$j; + $j++; } } unset($poscart); diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index e8dad4d2fb1..77de0e4ed8e 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -56,30 +56,33 @@ $langs->loadLangs(array("main","bills","cashdesk")); diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php index cb7b7dd2f10..813364d18a5 100644 --- a/htdocs/cashdesk/tpl/ticket.tpl.php +++ b/htdocs/cashdesk/tpl/ticket.tpl.php @@ -85,7 +85,7 @@ $object->fetch($facid); for($i=0;$i < $tab_size;$i++) { $remise = $tab[$i]['remise']; - ?> + ?> @@ -93,7 +93,7 @@ $object->fetch($facid); currency);?> - diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index e8c16712b74..fcbd95e8f29 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -36,16 +36,16 @@ $langs->loadLangs(array("main","bills","banks")); trans("Invoice"); ?>numInvoice(); ?> trans("TotalHT"); ?>prixTotalHt(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency); ?> - montantTva() ) { - echo (''.$langs->trans("VAT").''.price(price2num($obj_facturation->montantTva(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).''); - } - else - { - echo (''.$langs->trans("VAT").''.$langs->trans("NoVAT").''); - } - ?> +montantTva() ) { + echo (''.$langs->trans("VAT").''.price(price2num($obj_facturation->montantTva(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).''); +} +else +{ + echo (''.$langs->trans("VAT").''.$langs->trans("NoVAT").''); +} +?> trans("TotalTTC"); ?> prixTotalTtc(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency); ?> trans("PaymentMode"); ?> loadLangs(array("main","bills","banks")); ?> - getsetPaymentMode() == 'DIF' ) { - echo (''.$langs->trans("DateDue").''.$obj_facturation->paiementLe().''); - } else { - echo (''.$langs->trans("Received").''.price(price2num($obj_facturation->montantEncaisse(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).''); - } +getsetPaymentMode() == 'DIF' ) { + echo (''.$langs->trans("DateDue").''.$obj_facturation->paiementLe().''); +} else { + echo (''.$langs->trans("Received").''.price(price2num($obj_facturation->montantEncaisse(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).''); +} - // Affichage du montant rendu (reglement en especes) - if ( $obj_facturation->montantRendu() ) { - echo (''.$langs->trans("Change").''.price(price2num($obj_facturation->montantRendu(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).''); - } +// Affichage du montant rendu (reglement en especes) +if ( $obj_facturation->montantRendu() ) { + echo (''.$langs->trans("Change").''.price(price2num($obj_facturation->montantRendu(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).''); +} - ?> +?>