From 5895858546d0f1d7b73e1ad1c45ab48c3ad7fe29 Mon Sep 17 00:00:00 2001 From: oscim Date: Tue, 31 Mar 2020 10:54:14 +0200 Subject: [PATCH 1/2] Update expedition.class.php report fk_unit line in fetch_line methode --- htdocs/expedition/class/expedition.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 52540901c33..ed701d9d2bf 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -1389,7 +1389,7 @@ class Expedition extends CommonObject // TODO: recuperer les champs du document associe a part $this->lines = array(); - $sql = "SELECT cd.rowid, cd.fk_product, cd.label as custom_label, cd.description, cd.qty as qty_asked, cd.product_type"; + $sql = "SELECT cd.rowid, cd.fk_product, cd.label as custom_label, cd.description, cd.qty as qty_asked, cd.product_type, cd.fk_unit"; $sql .= ", cd.total_ht, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.total_tva"; $sql .= ", cd.vat_src_code, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.info_bits, cd.price, cd.subprice, cd.remise_percent,cd.buy_price_ht as pa_ht"; $sql .= ", cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc, cd.rang"; @@ -1470,7 +1470,8 @@ class Expedition extends CommonObject $line->surface_units = $obj->surface_units; $line->volume = $obj->volume; $line->volume_units = $obj->volume_units; - + $line->fk_unit = $obj->fk_unit; + $line->pa_ht = $obj->pa_ht; // Local taxes From 24c5f57da2680e82899dfc1f145cfe682528f657 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 31 Mar 2020 08:56:26 +0000 Subject: [PATCH 2/2] Fixing style errors. --- htdocs/expedition/class/expedition.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index ed701d9d2bf..677fcfa3d41 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -1471,7 +1471,7 @@ class Expedition extends CommonObject $line->volume = $obj->volume; $line->volume_units = $obj->volume_units; $line->fk_unit = $obj->fk_unit; - + $line->pa_ht = $obj->pa_ht; // Local taxes