From 4874d08062ed78dc66ea3bb6e24e5431b5644f05 Mon Sep 17 00:00:00 2001 From: De Coninck Laurent Date: Fri, 19 Jan 2018 08:59:04 +0100 Subject: [PATCH 1/2] fix the bill replacement with discounts #8028 --- htdocs/compta/facture/class/facture.class.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 3c35a03f218b8..748f83f5a533d 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -539,6 +539,15 @@ function create($user,$notrigger=0,$forceduedate=0) } $newinvoiceline->fk_parent_line=$fk_parent_line; + + if($newinvoiceline->fk_remise_except){ + $discount = new DiscountAbsolute($this->db); + $discount->fetch($newinvoiceline->fk_remise_except); + + $discountId = $soc->set_remise_except($discount->amount_ht, $user, $discount->description, $discount->tva_tx); + $newinvoiceline->fk_remise_except = $discountId; + } + $result=$newinvoiceline->insert(); // Defined the new fk_parent_line From 53ac13c792dddc0cbd073ea25657900a323d6dc6 Mon Sep 17 00:00:00 2001 From: De Coninck Laurent Date: Tue, 23 Jan 2018 18:03:29 +0100 Subject: [PATCH 2/2] check on type replacement #8028 --- htdocs/compta/facture/class/facture.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 748f83f5a533d..72285e8780859 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -540,7 +540,7 @@ function create($user,$notrigger=0,$forceduedate=0) $newinvoiceline->fk_parent_line=$fk_parent_line; - if($newinvoiceline->fk_remise_except){ + if($this->type === Facture::TYPE_REPLACEMENT && $newinvoiceline->fk_remise_except){ $discount = new DiscountAbsolute($this->db); $discount->fetch($newinvoiceline->fk_remise_except);