Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Standardize code: Property product_libelle renamed into product_label

Browse Source 
Move common vars declaration into parent class.
This commit is contained in:
Laurent Destailleur
2020-10-12 19:33:00 +02:00
parent ad461a098b
commit fcd4645509
6 changed files with 76 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/commande/class/commande.class.php
View File

@@ -3994,11 +3994,6 @@ class OrderLine extends CommonOrderLine
public $fk_parent_line;
public $fk_facture;
/**
* @var string Order lines label
*/
public $label;
public $ref_ext;
public $fk_remise_except;
@@ -4049,7 +4044,7 @@ class OrderLine extends CommonOrderLine
$sql .= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht, cd.rang, cd.special_code,';
$sql .= ' cd.fk_unit,';
$sql .= ' cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
$sql .= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc, p.tobatch as product_tobatch,';
$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc, p.tobatch as product_tobatch,';
$sql .= ' cd.date_start, cd.date_end';
$sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
@@ -4093,9 +4088,9 @@ class OrderLine extends CommonOrderLine
$this->rang = $objp->rang;
$this->ref = $objp->product_ref; // deprecated
$this->product_ref = $objp->product_ref;
$this->libelle = $objp->product_libelle; // deprecated
$this->product_label = $objp->product_libelle;
$this->product_ref = $objp->product_ref;
$this->product_label = $objp->product_label;
$this->product_desc = $objp->product_desc;
$this->product_tobatch = $objp->product_tobatch;
$this->fk_unit = $objp->fk_unit;