From 73f6c9210fa4e020870a4188af05086c76f34b58 Mon Sep 17 00:00:00 2001
From: atm-quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Tue, 31 Mar 2020 11:01:01 +0200
Subject: [PATCH 1/2] FIX multicurrency manage on hidden conf
 SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL

---
 .../class/supplier_proposal.class.php         | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index e528b5ae5e7..6ad2dd1a2df 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1848,11 +1848,12 @@ class SupplierProposal extends CommonObject
      */
     public function createPriceFournisseur($product, $user)
     {
+        global $conf;
+        if(!empty($conf->multicurrency->enabled)) include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
         $price=price2num($product->subprice*$product->qty, 'MU');
         $qty=price2num($product->qty);
         $unitPrice = price2num($product->subprice, 'MU');
         $now=dol_now();
-
         $values = array(
             "'".$this->db->idate($now)."'",
             $product->fk_product,
@@ -1864,9 +1865,27 @@ class SupplierProposal extends CommonObject
             $product->tva_tx,
             $user->id
         );
+        if(!empty($conf->multicurrency->enabled)) {
+            $multicurrency = new MultiCurrency($this->db); //need to fetch because empty fk_multicurrency and rate
+            if(!empty($product->multicurrency_code)) {
+                $multicurrency->fetch(0, $product->multicurrency_code);
+                if(! empty($multicurrency->id)) {
+                    $values[] = $multicurrency->id;
+                    $values[] = "'".$product->multicurrency_code."'";
+                    $values[] = $product->multicurrency_subprice;
+                    $values[] = $product->multicurrency_total_ht;
+                    $values[] = $multicurrency->rate->rate;
+                }
+                else {
+                    for($i = 0; $i < 5; $i++) $values[] = 'NULL';
+                }
+            }
+        }
 
         $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_fournisseur_price ';
-        $sql .= '(datec, fk_product, fk_soc, ref_fourn, price, quantity, unitprice, tva_tx, fk_user) VALUES ('.implode(',', $values).')';
+        $sql .= '(datec, fk_product, fk_soc, ref_fourn, price, quantity, unitprice, tva_tx, fk_user';
+        if(!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) $sql .= ',fk_multicurrency, multicurrency_code, multicurrency_unitprice, multicurrency_price, multicurrency_tx';
+        $sql .= ')  VALUES ('.implode(',', $values).')';
 
         $resql = $this->db->query($sql);
         if (!$resql) {

From c6f57c46a890bf8736e98497bb09e6935ad4e607 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Apr 2020 13:01:49 +0200
Subject: [PATCH 2/2] Update supplier_proposal.class.php

---
 .../class/supplier_proposal.class.php                 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 6ad2dd1a2df..b91c6c43ffe 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1849,8 +1849,8 @@ class SupplierProposal extends CommonObject
     public function createPriceFournisseur($product, $user)
     {
         global $conf;
-        if(!empty($conf->multicurrency->enabled)) include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
-        $price=price2num($product->subprice*$product->qty, 'MU');
+        
+		$price=price2num($product->subprice*$product->qty, 'MU');
         $qty=price2num($product->qty);
         $unitPrice = price2num($product->subprice, 'MU');
         $now=dol_now();
@@ -1865,9 +1865,10 @@ class SupplierProposal extends CommonObject
             $product->tva_tx,
             $user->id
         );
-        if(!empty($conf->multicurrency->enabled)) {
-            $multicurrency = new MultiCurrency($this->db); //need to fetch because empty fk_multicurrency and rate
-            if(!empty($product->multicurrency_code)) {
+        if (!empty($conf->multicurrency->enabled)) {
+            if (!empty($product->multicurrency_code)) {
+				include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+	            $multicurrency = new MultiCurrency($this->db); //need to fetch because empty fk_multicurrency and rate
                 $multicurrency->fetch(0, $product->multicurrency_code);
                 if(! empty($multicurrency->id)) {
                     $values[] = $multicurrency->id;