lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13222 from javierybar/develop

Browse Source 
New TAKEPOS_ADDON const
This commit is contained in:
Laurent Destailleur 2020-02-27 00:13:18 +01:00 committed by GitHub
commit f79c1e475d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/takepos/invoice.php
View File

@ -167,6 +167,13 @@ if ($action == 'valid' && $user->rights->facture->creer)
$invoice->fk_facture_source = $fk_source; $invoice->fk_facture_source = $fk_source;
$invoice->update($user); $invoice->update($user);
} }
$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"]; $constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
if ($invoice->statut != Facture::STATUS_DRAFT) if ($invoice->statut != Facture::STATUS_DRAFT)
@ -204,6 +211,12 @@ if ($action == 'valid' && $user->rights->facture->creer)
$res = $invoice->validate($user); $res = $invoice->validate($user);
} }
// Restore save values
if (! empty($sav_FACTURE_ADDON))
{
$conf->global->FACTURE_ADDON = $sav_FACTURE_ADDON;
}
$remaintopay = $invoice->getRemainToPay(); $remaintopay = $invoice->getRemainToPay();
// Add the payment // Add the payment