lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/core/class/commonobject.class.php
This commit is contained in:
Laurent Destailleur 2018-03-11 19:28:39 +01:00
commit d5d6939fd9
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/product/stock/replenish.php
View File

@ -158,6 +158,8 @@ if ($action == 'order' && isset($_POST['valid']))
$line->total_ttc = $line->total_ht + $line->total_tva; $line->total_ttc = $line->total_ht + $line->total_tva;
$line->remise_percent = $obj->remise_percent; $line->remise_percent = $obj->remise_percent;
$line->ref_fourn = $obj->ref_fourn; $line->ref_fourn = $obj->ref_fourn;
$line->type = $product->type;
$line->fk_unit = $product->fk_unit;
$suppliers[$obj->fk_soc]['lines'][] = $line; $suppliers[$obj->fk_soc]['lines'][] = $line;
} }
} }
@ -202,7 +204,13 @@ if ($action == 'order' && isset($_POST['valid']))
$line->remise_percent, $line->remise_percent,
'HT', 'HT',
0, 0,
$line->info_bits $line->type,
0,
false,
null,
null,
0,
$line->fk_unit
); );
} }
if ($result < 0) { if ($result < 0) {