Merge pull request #8324 from atm-maxime/fix_unit_replen

Fix unit in replenish #7225
This commit is contained in:
Laurent Destailleur 2018-03-10 12:58:16 +01:00 committed by GitHub
commit faef7a2e0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -154,6 +154,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;
} }
} }
@ -198,7 +200,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) {