From 66dd7e30ae9bc2cb68bb6b929702460367e54fc9 Mon Sep 17 00:00:00 2001 From: Marc de Lima Lucio Date: Wed, 22 May 2019 10:46:38 +0200 Subject: [PATCH 1/2] FIX: situation invoices: block progress percentage change for discount lines --- htdocs/compta/facture/class/facture.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 93f67a5a064..85933ef3e73 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -3031,6 +3031,12 @@ class Facture extends CommonInvoice { 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'); // Cap percentages to 100 From 54f8c98b27cfd34a75606496fcddc34c6326b819 Mon Sep 17 00:00:00 2001 From: Marc de Lima Lucio Date: Wed, 22 May 2019 11:12:02 +0200 Subject: [PATCH 2/2] FIX: remove isolated transaction commit --- htdocs/compta/facture/class/facture.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 85933ef3e73..f35281f73d6 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -3053,7 +3053,6 @@ class Facture extends CommonInvoice $line->multicurrency_total_ttc = $tabprice[18]; $line->update($user); $this->update_price(1); - $this->db->commit(); } /**