From 672a646fa9d862c83bfd39d911323b1e5f28a932 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 19 May 2022 12:59:29 +0200 Subject: [PATCH] Fix scrutinizer --- htdocs/core/class/commonobjectline.class.php | 10 ++++++---- htdocs/fichinter/class/fichinterrec.class.php | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php index 509e97d6a17..c45e3f1698c 100644 --- a/htdocs/core/class/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.class.php @@ -76,10 +76,12 @@ abstract class CommonObjectLine extends CommonObject public $multilangs; - public $product_ref; - public $product_label; - public $product_type; - public $product_desc; + public $product_type; // type in line + public $product_ref; // ref in product table + public $product_label; // label in product table + public $product_desc; // desc in product table + public $fk_product_type; // type in product table + public $qty; public $duree; public $remise_percent; diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php index a8e9d7cebd3..beb17cd3a67 100644 --- a/htdocs/fichinter/class/fichinterrec.class.php +++ b/htdocs/fichinter/class/fichinterrec.class.php @@ -350,7 +350,7 @@ class FichinterRec extends Fichinter // phpcs:enable $this->lines = array(); - $sql = 'SELECT l.rowid, l.fk_product, l.product_type, l.label as custom_label, l.description, '; + $sql = 'SELECT l.rowid, l.fk_product, l.product_type as product_type, l.label as custom_label, l.description, '; $sql .= ' l.price, l.qty, l.tva_tx, l.remise, l.remise_percent, l.subprice, l.duree, '; $sql .= ' l.total_ht, l.total_tva, l.total_ttc,'; $sql .= ' l.rang, l.special_code,'; @@ -378,7 +378,7 @@ class FichinterRec extends Fichinter $line->product_ref = $objp->product_ref; // Ref product $line->product_label = $objp->product_label; // Label product $line->product_desc = $objp->product_desc; // Description product - $line->fk_product_type = $objp->fk_product_type; // Type of product + $line->fk_product_type = $objp->fk_product_type; // Type in product $line->qty = $objp->qty; $line->duree = $objp->duree; $line->duration = $objp->duree;