diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index dc79e395697..21f638a28a0 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1938,7 +1938,7 @@ class Propal extends CommonObject $sql .= ' d.fk_unit,'; $sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_tobatch, p.barcode as product_barcode,'; $sql .= ' p.weight, p.weight_units, p.volume, p.volume_units,'; - $sql .= ' d.date_start, d.date_end,'; + $sql .= ' d.date_start, d.date_end, d.extraparams,'; $sql .= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc'; $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as d'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (d.fk_product = p.rowid)'; @@ -2019,6 +2019,8 @@ class Propal extends CommonObject $line->date_start = $this->db->jdate($objp->date_start); $line->date_end = $this->db->jdate($objp->date_end); + $line->extraparams = !empty($objp->extraparams) ? (array) json_decode($objp->extraparams, true) : array(); + // Multicurrency $line->fk_multicurrency = $objp->fk_multicurrency; $line->multicurrency_code = $objp->multicurrency_code; diff --git a/htdocs/comm/propal/class/propaleligne.class.php b/htdocs/comm/propal/class/propaleligne.class.php index b976193a0e1..31616d5cb85 100644 --- a/htdocs/comm/propal/class/propaleligne.class.php +++ b/htdocs/comm/propal/class/propaleligne.class.php @@ -374,7 +374,7 @@ class PropaleLigne extends CommonObjectLine $sql .= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc,'; $sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,'; $sql .= ' p.packaging,'; - $sql .= ' pd.date_start, pd.date_end, pd.product_type'; + $sql .= ' pd.date_start, pd.date_end, pd.product_type, pd.extraparams'; $sql .= ' FROM '.MAIN_DB_PREFIX.'propaldet as pd'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid'; $sql .= ' WHERE pd.rowid = '.((int) $rowid); @@ -428,6 +428,8 @@ class PropaleLigne extends CommonObjectLine $this->date_start = $this->db->jdate($objp->date_start); $this->date_end = $this->db->jdate($objp->date_end); + $this->extraparams = !empty($objp->extraparams) ? (array) json_decode($objp->extraparams, true) : array(); + // Multicurrency $this->fk_multicurrency = $objp->fk_multicurrency; $this->multicurrency_code = $objp->multicurrency_code; diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 05c18321cf7..3673db2be8c 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -2154,7 +2154,7 @@ class Commande extends CommonOrder $sql = 'SELECT l.rowid, l.fk_product, l.fk_parent_line, l.product_type, l.fk_commande, l.label as custom_label, l.description, l.price, l.qty, l.vat_src_code, l.tva_tx, l.ref_ext,'; $sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.fk_remise_except, l.remise_percent, l.subprice, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.rang, l.info_bits, l.special_code,'; $sql .= ' l.total_ht, l.total_ttc, l.total_tva, l.total_localtax1, l.total_localtax2, l.date_start, l.date_end,'; - $sql .= ' l.fk_unit,'; + $sql .= ' l.fk_unit, l.extraparams,'; $sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,'; $sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tosell as product_tosell, p.tobuy as product_tobuy, p.tobatch as product_tobatch, p.barcode as product_barcode,'; $sql .= ' p.weight, p.weight_units, p.volume, p.volume_units, p.packaging'; @@ -2228,6 +2228,8 @@ class Commande extends CommonOrder $line->fk_product_type = $objp->fk_product_type; // Produit ou service $line->fk_unit = $objp->fk_unit; + $line->extraparams = !empty($objp->extraparams) ? (array) json_decode($objp->extraparams, true) : array(); + $line->weight = $objp->weight; $line->weight_units = $objp->weight_units; $line->volume = $objp->volume; diff --git a/htdocs/commande/class/orderline.class.php b/htdocs/commande/class/orderline.class.php index 618bbcccf74..ecec0f20fb8 100644 --- a/htdocs/commande/class/orderline.class.php +++ b/htdocs/commande/class/orderline.class.php @@ -175,7 +175,7 @@ class OrderLine extends CommonOrderLine $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_label, p.description as product_desc, p.tobatch as product_tobatch,'; $sql .= ' p.packaging,'; - $sql .= ' cd.date_start, cd.date_end, cd.vat_src_code'; + $sql .= ' cd.date_start, cd.date_end, cd.vat_src_code, cd.extraparams'; $sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid'; $sql .= ' WHERE cd.rowid = '.((int) $rowid); @@ -234,6 +234,8 @@ class OrderLine extends CommonOrderLine $this->date_start = $this->db->jdate($objp->date_start); $this->date_end = $this->db->jdate($objp->date_end); + $this->extraparams = !empty($objp->extraparams) ? (array) json_decode($objp->extraparams, true) : array(); + $this->fk_multicurrency = $objp->fk_multicurrency; $this->multicurrency_code = $objp->multicurrency_code; $this->multicurrency_subprice = $objp->multicurrency_subprice; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index e0637070717..32fe9af0e6a 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2339,7 +2339,7 @@ class Facture extends CommonInvoice $sql .= ' l.rang, l.special_code, l.batch, l.fk_warehouse,'; $sql .= ' l.date_start as date_start, l.date_end as date_end,'; $sql .= ' l.info_bits, l.total_ht, l.total_tva, l.total_localtax1, l.total_localtax2, l.total_ttc, l.fk_code_ventilation, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht,'; - $sql .= ' l.fk_unit,'; + $sql .= ' l.fk_unit, l.extraparams,'; $sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,'; $sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc, p.barcode as product_barcode'; $sql .= ' FROM '.MAIN_DB_PREFIX.'facturedet as l'; @@ -2404,6 +2404,8 @@ class Facture extends CommonInvoice $line->fk_prev_id = $objp->fk_prev_id; $line->fk_unit = $objp->fk_unit; + $line->extraparams = !empty($objp->extraparams) ? (array) json_decode($objp->extraparams, true) : array(); + $line->batch = $objp->batch; $line->fk_warehouse = $objp->fk_warehouse; diff --git a/htdocs/compta/facture/class/factureligne.class.php b/htdocs/compta/facture/class/factureligne.class.php index da644fff225..8de79169b17 100644 --- a/htdocs/compta/facture/class/factureligne.class.php +++ b/htdocs/compta/facture/class/factureligne.class.php @@ -211,7 +211,7 @@ class FactureLigne extends CommonInvoiceLine $sql .= ' fd.fk_code_ventilation,'; $sql .= ' fd.batch, fd.fk_warehouse,'; $sql .= ' fd.fk_unit, fd.fk_user_author, fd.fk_user_modif,'; - $sql .= ' fd.situation_percent, fd.fk_prev_id,'; + $sql .= ' fd.situation_percent, fd.fk_prev_id, fd.extraparams,'; $sql .= ' fd.multicurrency_subprice,'; $sql .= ' fd.multicurrency_total_ht,'; $sql .= ' fd.multicurrency_total_tva,'; @@ -281,6 +281,8 @@ class FactureLigne extends CommonInvoiceLine $this->situation_percent = $objp->situation_percent; $this->fk_prev_id = $objp->fk_prev_id; + $this->extraparams = !empty($objp->extraparams) ? (array) json_decode($objp->extraparams, true) : array(); + $this->multicurrency_subprice = $objp->multicurrency_subprice; $this->multicurrency_total_ht = $objp->multicurrency_total_ht; $this->multicurrency_total_tva = $objp->multicurrency_total_tva;