From f66c90ca8b2fc833a3fc1acc6b49d58308146735 Mon Sep 17 00:00:00 2001 From: oscim Date: Tue, 31 Mar 2020 10:57:52 +0200 Subject: [PATCH 1/2] Update expedition.class.php report usage multicurrency of thirdparty in fetch method expedition for use in other process --- htdocs/expedition/class/expedition.class.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 52540901c33..82b5072fa88 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -622,7 +622,14 @@ class Expedition extends CommonObject // Retreive extrafields $this->fetch_optionals(); - + + // Fix Get multicurrency param for transmited + if (!empty($conf->multicurrency->enabled)) + { + if (!empty($this->multicurrency_code)) $this->multicurrency_code = $this->thirdparty->multicurrency_code; + if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) $this->multicurrency_tx = $this->thirdparty->multicurrency_tx; + } + /* * Lines */ From 5a62da101d62cc9b1be960d8244b6a8f7cfbb223 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 31 Mar 2020 09:04:46 +0000 Subject: [PATCH 2/2] Fixing style errors. --- htdocs/expedition/class/expedition.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 82b5072fa88..c0ac5eb262e 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -622,14 +622,14 @@ class Expedition extends CommonObject // Retreive extrafields $this->fetch_optionals(); - + // Fix Get multicurrency param for transmited if (!empty($conf->multicurrency->enabled)) { if (!empty($this->multicurrency_code)) $this->multicurrency_code = $this->thirdparty->multicurrency_code; if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) $this->multicurrency_tx = $this->thirdparty->multicurrency_tx; } - + /* * Lines */