From c55008e8af0b79536c88ea9a1a50d773b48a79ed Mon Sep 17 00:00:00 2001 From: Gauthier PC portable 024 Date: Tue, 16 Nov 2021 16:02:55 +0100 Subject: [PATCH] NEW : insert_discount() functions handle --- htdocs/compta/facture/class/facture.class.php | 9 ++++++++- htdocs/fourn/class/fournisseur.facture.class.php | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 81e3584b773..44297da0ff3 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1954,7 +1954,7 @@ class Facture extends CommonInvoice public function insert_discount($idremise) { // phpcs:enable - global $langs; + global $conf, $langs; include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; @@ -1986,6 +1986,13 @@ class Facture extends CommonInvoice $facligne->rang = -1; $facligne->info_bits = 2; + if(!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { + $facligne->rang = 1; + for ($ii = 1; $ii <= count($this->lines); $ii++) { + $this->updateRangOfLine($this->lines[$ii - 1]->id, $ii+1); + } + } + // Get buy/cost price of invoice that is source of discount if ($remise->fk_facture_source > 0) { diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 34c9f8de335..8e12bf11b45 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1025,7 +1025,7 @@ class FactureFournisseur extends CommonInvoice public function insert_discount($idremise) { // phpcs:enable - global $langs; + global $conf, $langs; include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; @@ -1058,6 +1058,13 @@ class FactureFournisseur extends CommonInvoice $facligne->rang = -1; $facligne->info_bits = 2; + if(!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { + $facligne->rang = 1; + for ($ii = 1; $ii <= count($this->lines); $ii++) { + $this->updateRangOfLine($this->lines[$ii - 1]->id, $ii+1); + } + } + // Get buy/cost price of invoice that is source of discount if ($remise->fk_invoice_supplier_source > 0) {