|
@@ -9,7 +9,7 @@
|
|
|
* Copyright (C) 2015-2018 Frédéric France <frederic.france@netlogic.fr>
|
|
|
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
|
|
|
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
|
|
|
- * Copyright (C) 2016-2021 Ferran Marcet <fmarcet@2byte.es>
|
|
|
+ * Copyright (C) 2016-2023 Ferran Marcet <fmarcet@2byte.es>
|
|
|
* Copyright (C) 2018 Charlene Benke <charlie@patas-monkey.com>
|
|
|
* Copyright (C) 2021 Anthony Berton <anthony.berton@bb2a.fr>
|
|
|
*
|
|
@@ -403,7 +403,7 @@ if (empty($reshook)) {
|
|
|
$desc = dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day'));
|
|
|
}
|
|
|
|
|
|
- if ($lines[$i]->subprice < 0) {
|
|
|
+ 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);
|
|
|
$discount->fk_soc = $objecttmp->socid;
|