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

Dolibarr · Nov 20, 2016 · fa3a8de · fa3a8de
2 parents e3c529d + ef18964
commit fa3a8de
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
@@ -3240,7 +3240,7 @@ function insert($notrigger=0)
         if (empty($this->pa_ht)) $this->pa_ht=0;
         if (empty($this->multicurrency_subprice))  $this->multicurrency_subprice=0;
         if (empty($this->multicurrency_total_ht))  $this->multicurrency_total_ht=0;
-        if (empty($this->multicurrency_total_vat)) $this->multicurrency_total_vat=0;
+        if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
         if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=0;
 
        // if buy price not defined, define buyprice as configured in margin admin