Skip to content
Snippets Groups Projects
Commit ee857055 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge remote-tracking branch 'origin/3.8' into 3.9

parents 4436ec95 660f825a
Branches
Tags
No related merge requests found
...@@ -2810,6 +2810,7 @@ class Propal extends CommonObject ...@@ -2810,6 +2810,7 @@ class Propal extends CommonObject
$this->lines[$i]->id = $obj->rowid; // for backward compatibility $this->lines[$i]->id = $obj->rowid; // for backward compatibility
$this->lines[$i]->rowid = $obj->rowid; $this->lines[$i]->rowid = $obj->rowid;
$this->lines[$i]->label = $obj->custom_label; $this->lines[$i]->label = $obj->custom_label;
$this->lines[$i]->desc = $obj->description;
$this->lines[$i]->description = $obj->description; $this->lines[$i]->description = $obj->description;
$this->lines[$i]->fk_product = $obj->fk_product; $this->lines[$i]->fk_product = $obj->fk_product;
$this->lines[$i]->ref = $obj->ref; $this->lines[$i]->ref = $obj->ref;
......
...@@ -1695,6 +1695,7 @@ class Commande extends CommonOrder ...@@ -1695,6 +1695,7 @@ class Commande extends CommonOrder
$line->commande_id = $objp->fk_commande; $line->commande_id = $objp->fk_commande;
$line->label = $objp->custom_label; $line->label = $objp->custom_label;
$line->desc = $objp->description; $line->desc = $objp->description;
$line->description = $objp->description; // Description line
$line->product_type = $objp->product_type; $line->product_type = $objp->product_type;
$line->qty = $objp->qty; $line->qty = $objp->qty;
$line->tva_tx = $objp->tva_tx; $line->tva_tx = $objp->tva_tx;
......
...@@ -1092,6 +1092,7 @@ class Facture extends CommonInvoice ...@@ -1092,6 +1092,7 @@ class Facture extends CommonInvoice
$line->rowid = $objp->rowid; // deprecated $line->rowid = $objp->rowid; // deprecated
$line->label = $objp->custom_label; // deprecated $line->label = $objp->custom_label; // deprecated
$line->desc = $objp->description; // Description line $line->desc = $objp->description; // Description line
$line->description = $objp->description; // Description line
$line->product_type = $objp->product_type; // Type of line $line->product_type = $objp->product_type; // Type of line
$line->ref = $objp->product_ref; // Ref product $line->ref = $objp->product_ref; // Ref product
$line->product_ref = $objp->product_ref; // Ref product $line->product_ref = $objp->product_ref; // Ref product
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment