Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-26 18:53:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.9' into develop

Browse Source 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/member.lib.php
	htdocs/expedition/card.php
This commit is contained in:
Laurent Destailleur
2016-02-20 04:25:39 +01:00
parent 277d92af75 7def330f54
commit d3960b0809
9 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1229,7 +1229,8 @@ class Commande extends CommonOrder
if (empty($txlocaltax1)) $txlocaltax1=0;
if (empty($txlocaltax2)) $txlocaltax2=0;
if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
if (empty($this->fk_multicurrency)) $this->fk_multicurrency=0;
$remise_percent=price2num($remise_percent);
$qty=price2num($qty);
$pu_ht=price2num($pu_ht);