Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/core/class/discount.class.php

@@ -199,8 +199,17 @@ class DiscountAbsolute
         $this->amount_ht=price2num($this->amount_ht);
         $this->amount_tva=price2num($this->amount_tva);
         $this->amount_ttc=price2num($this->amount_ttc);
+
         $this->tva_tx=price2num($this->tva_tx);
 
+        $this->multicurrency_amount_ht=price2num($this->multicurrency_amount_ht);
+        $this->multicurrency_amount_tva=price2num($this->multicurrency_amount_tva);
+        $this->multicurrency_amount_ttc=price2num($this->multicurrency_amount_ttc);
+
+        if (empty($this->multicurrency_amount_ht)) $this->multicurrency_amount_ht=0;
+        if (empty($this->multicurrency_amount_tva)) $this->multicurrency_amount_tva=0;
+        if (empty($this->multicurrency_amount_ttc)) $this->multicurrency_amount_ttc=0;
+
         // Check parameters
         if (empty($this->description))
         {