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

Merge pull request #17611 from atm-maxime/fix/supplier_discount_replenish

Browse Source 
Fix use supplier relative discount in replenish order creation
This commit is contained in:
Laurent Destailleur 2021-05-17 09:44:39 +02:00 committed by GitHub
commit fd6147578a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,7 +211,9 @@ if ($action == 'order' && isset($_POST['valid']))
if ($resql && $db->num_rows($resql) > 0) {
$obj = $db->fetch_object($resql);
$order->fetch($obj->rowid);
$order->fetch_thirdparty();
foreach ($supplier['lines'] as $line) {
if(empty($line->remise_percent)) $line->remise_percent = $order->thirdparty->remise_supplier_percent;
$result = $order->addline(
$line->desc,
$line->subprice,
@ -248,6 +250,7 @@ if ($action == 'order' && isset($_POST['valid']))
//trick to know which orders have been generated this way
$order->source = 42;
foreach ($supplier['lines'] as $line) {
if(empty($line->remise_percent)) $line->remise_percent = $order->thirdparty->remise_supplier_percent;
$order->lines[] = $line;
}
$order->cond_reglement_id = $order->thirdparty->cond_reglement_supplier_id;