From b04296984d4d3b6c5e25123bd26e42157a17e5b3 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Wed, 10 Apr 2019 10:29:17 +0200 Subject: [PATCH 1/2] NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN --- htdocs/compta/facture/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index e8da06ee2ca..ba959d94b9b 100755 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -1391,7 +1391,7 @@ if (empty($reshook)) $desc=(! empty($lines[$i]->desc)?$lines[$i]->desc:$lines[$i]->libelle); if ($object->situation_counter == 1) $lines[$i]->situation_percent = 0; - if ($lines[$i]->subprice < 0) + if ($lines[$i]->subprice < 0 && empty($conf->global->KEEP_DISCOUNT_LINES_FROM_ORIGIN)) { // Negative line, we create a discount line $discount = new DiscountAbsolute($db); From 4f87018c330a3a91d946b2e85ecbbfdcc4424226 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Apr 2019 16:31:13 +0200 Subject: [PATCH 2/2] Update card.php --- htdocs/compta/facture/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index ba959d94b9b..c40059417de 100755 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -1391,7 +1391,7 @@ if (empty($reshook)) $desc=(! empty($lines[$i]->desc)?$lines[$i]->desc:$lines[$i]->libelle); if ($object->situation_counter == 1) $lines[$i]->situation_percent = 0; - if ($lines[$i]->subprice < 0 && empty($conf->global->KEEP_DISCOUNT_LINES_FROM_ORIGIN)) + if ($lines[$i]->subprice < 0 && empty($conf->global->INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN)) { // Negative line, we create a discount line $discount = new DiscountAbsolute($db);