Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/html.form.class.php
This commit is contained in:
Laurent Destailleur
2018-06-13 23:04:08 +02:00
parent 76ee88f0b1 09c92b7cc8
commit 4c2af6fc70
7 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/commande/class/commande.class.php
View File

@@ -1282,6 +1282,7 @@ class Commande extends CommonOrder
$remise_percent=price2num($remise_percent);
$qty=price2num($qty);
$pu_ht=price2num($pu_ht);
$pu_ht_devise=price2num($pu_ht_devise);
$pu_ttc=price2num($pu_ttc);
$pa_ht=price2num($pa_ht);
$txtva = price2num($txtva);
@@ -2870,6 +2871,7 @@ class Commande extends CommonOrder
$qty=price2num($qty);
$pu = price2num($pu);
$pa_ht=price2num($pa_ht);
$pu_ht_devise=price2num($pu_ht_devise);
$txtva=price2num($txtva);
$txlocaltax1=price2num($txlocaltax1);
$txlocaltax2=price2num($txlocaltax2);