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

Merge pull request #20405 from elsp1991/fix/pmp_price_of_produced_prod_mrp

Browse Source 
FIX MO produced product WAP calculation when MO is based on BOM (not free lines)
This commit is contained in:
Laurent Destailleur 2022-03-24 14:29:33 +01:00 committed by GitHub
commit 0fde73b4bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/mrp/mo_production.php
View File

@ -808,7 +808,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$tmpproduct->fetch($line->fk_product); $tmpproduct->fetch($line->fk_product);
$linecost = price2num($tmpproduct->pmp, 'MT'); $linecost = price2num($tmpproduct->pmp, 'MT');
if ($line->origin_type == 'free' && $object->qty > 0) { if ($object->qty > 0) {
// add free consume line cost to bomcost // add free consume line cost to bomcost
$costprice = price2num((!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp); $costprice = price2num((!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp);
if (empty($costprice)) { if (empty($costprice)) {
@ -822,12 +822,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
} }
$linecost = price2num(($line->qty * $costprice) / $object->qty, 'MT'); $linecost = price2num(($line->qty * $costprice) / $object->qty, 'MT');
$bomcost += $linecost; $bomcost += $linecost;
} elseif ($line->origin_id > 0 && $line->origin_type == 'bom' && $object->qty > 0) {
foreach ($bom->lines as $bomline) {
if ($bomline->id == $line->origin_id) {
$linecost = price2num(($line->qty * $bomline->unit_cost) / $object->qty, 'MT');
}
}
} }
$bomcost = price2num($bomcost, 'MU'); $bomcost = price2num($bomcost, 'MU');