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

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

parents 101e5ae4 d09faadc
No related branches found
No related tags found
No related merge requests found
...@@ -2813,6 +2813,7 @@ class Propal extends CommonObject ...@@ -2813,6 +2813,7 @@ class Propal extends CommonObject
$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;
$this->lines[$i]->product_ref = $obj->ref;
$this->lines[$i]->entity = $obj->entity; // Product entity $this->lines[$i]->entity = $obj->entity; // Product entity
$this->lines[$i]->product_label = $obj->product_label; $this->lines[$i]->product_label = $obj->product_label;
$this->lines[$i]->product_desc = $obj->product_desc; $this->lines[$i]->product_desc = $obj->product_desc;
......
...@@ -1093,6 +1093,7 @@ class Facture extends CommonInvoice ...@@ -1093,6 +1093,7 @@ class Facture extends CommonInvoice
$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->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->product_ref = $objp->product_ref; // Ref product $line->product_ref = $objp->product_ref; // Ref product
$line->libelle = $objp->product_label; // TODO deprecated $line->libelle = $objp->product_label; // TODO deprecated
$line->product_label = $objp->product_label; // Label product $line->product_label = $objp->product_label; // Label product
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment