From 3fa55a59b72c7df0b8cff0804cdae85dc6832b33 Mon Sep 17 00:00:00 2001 From: javierybar <36415318+javierybar@users.noreply.github.com> Date: Wed, 26 Feb 2020 22:45:32 +0100 Subject: [PATCH 1/2] New TAKEPOS_NUMBERING_PREFIX const --- htdocs/takepos/invoice.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index 85544d5b837..68a8dd10fdb 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -168,6 +168,8 @@ if ($action == 'valid' && $user->rights->facture->creer) $invoice->update($user); } + if ($conf->global->TAKEPOS_NUMBERING_PREFIX) $conf->global->FACTURE_ADDON = $conf->global->TAKEPOS_NUMBERING_PREFIX; + $constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"]; if ($invoice->statut != Facture::STATUS_DRAFT) { From 2cfc62d753785654dd99a9a4973903e888f9df0a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 27 Feb 2020 00:11:13 +0100 Subject: [PATCH 2/2] Update invoice.php --- htdocs/takepos/invoice.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index 68a8dd10fdb..6a919054ee0 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -167,8 +167,13 @@ if ($action == 'valid' && $user->rights->facture->creer) $invoice->fk_facture_source = $fk_source; $invoice->update($user); } - - if ($conf->global->TAKEPOS_NUMBERING_PREFIX) $conf->global->FACTURE_ADDON = $conf->global->TAKEPOS_NUMBERING_PREFIX; + + $sav_FACTURE_ADDON=''; + if (! empty($conf->global->TAKEPOS_ADDON)) + { + $sav_FACTURE_ADDON = $conf->global->FACTURE_ADDON; + $conf->global->FACTURE_ADDON = $conf->global->TAKEPOS_ADDON; + } $constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"]; if ($invoice->statut != Facture::STATUS_DRAFT) @@ -206,6 +211,12 @@ if ($action == 'valid' && $user->rights->facture->creer) $res = $invoice->validate($user); } + // Restore save values + if (! empty($sav_FACTURE_ADDON)) + { + $conf->global->FACTURE_ADDON = $sav_FACTURE_ADDON; + } + $remaintopay = $invoice->getRemainToPay(); // Add the payment