lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix scrutinizer

Browse Source
This commit is contained in:
Laurent Destailleur 2022-05-19 12:59:29 +02:00
parent 5dfd5ed444
commit 672a646fa9
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/commonobjectline.class.php
View File

@ -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;

4
htdocs/fichinter/class/fichinterrec.class.php
View File

@ -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;