From 38d8d30c85c3b258421ffa9efed09e84f2c8c554 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 25 Jul 2024 13:59:12 +0200 Subject: [PATCH] Code comment --- htdocs/comm/propal/class/propal.class.php | 4 ++-- htdocs/commande/class/commande.class.php | 4 ++-- htdocs/compta/facture/class/facture.class.php | 4 ++-- htdocs/install/mysql/tables/llx_facture_fourn_det.sql | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index dd065db3b57..b424f61832e 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -483,9 +483,9 @@ class Propal extends CommonObject // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** - * Adding line of fixed discount in the proposal in DB + * Add a discount line into an proposal (as a proposal line) using an existing absolute discount (Consume the discount) * - * @param int $idremise Id of fixed discount + * @param int $idremise Id of fixed discount from table llx_societe_remise_except * @return int >0 if OK, <0 if KO */ public function insert_discount($idremise) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index ffd5df5c357..937ecbb5582 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -2010,9 +2010,9 @@ class Commande extends CommonOrder // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** - * Add line of fixed discount in the order in DB + * Add a discount line into a sale order (as a sale order line) using an existing absolute discount (Consume the discount) * - * @param int $idremise Id for the fixed discount + * @param int $idremise Id for the fixed discount from table llx_societe_remise_except * @return int >0 if OK, <0 if KO */ public function insert_discount($idremise) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 88c88da5901..2985c0f75bb 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2574,13 +2574,13 @@ class Facture extends CommonInvoice /** * Add a discount line into an invoice (as an invoice line) using an existing absolute discount (Consume the discount) * - * @param int $idremise Id of absolute discount + * @param int $idremise Id of absolute discount from table llx_societe_remise_except * @return int >0 if OK, <0 if KO */ public function insert_discount($idremise) { // phpcs:enable - global $conf, $langs; + global $langs; include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index 8daf658fa68..cecc98f6c91 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -46,13 +46,13 @@ create table llx_facture_fourn_det product_type integer DEFAULT 0, date_start datetime DEFAULT NULL, -- date debut si service date_end datetime DEFAULT NULL, -- date fin si service - info_bits integer DEFAULT 0, -- TVA NPR ou non + info_bits integer DEFAULT 0, -- TVA NPR or not fk_code_ventilation integer DEFAULT 0 NOT NULL, special_code integer DEFAULT 0, -- code for special lines rang integer DEFAULT 0, import_key varchar(14), fk_unit integer DEFAULT NULL, - + fk_multicurrency integer, multicurrency_code varchar(3), multicurrency_subprice double(24,8) DEFAULT 0,