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

Merge pull request #11237 from ATM-Marc/FIX_8.0_situation_discount

Browse Source 
FIX: situation invoices: block progress percentage change for discount lines
This commit is contained in:
Laurent Destailleur 2019-05-24 12:53:34 +02:00 committed by GitHub
commit 5d6e4a444a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/compta/facture/class/facture.class.php
View File

@ -3031,6 +3031,12 @@ class Facture extends CommonInvoice
{ {
global $mysoc,$user; global $mysoc,$user;
// Progress should never be changed for discounts
if(($line->info_bits & 2) == 2)
{
return;
}
include_once(DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php'); include_once(DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php');
// Cap percentages to 100 // Cap percentages to 100
@ -3047,7 +3053,6 @@ class Facture extends CommonInvoice
$line->multicurrency_total_ttc = $tabprice[18]; $line->multicurrency_total_ttc = $tabprice[18];
$line->update($user); $line->update($user);
$this->update_price(1); $this->update_price(1);
$this->db->commit();
} }
/** /**