pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mrp: workorder cost not included in price

Browse Source 
When auto-fill the duration of workorders in immediate production, the
workorder cost is not included in the price of the product.
It happens becuase we calculate the price in _post_inventory but we set
the duration after _post_inventory. To fix, we set the duration of the
workorders in before _post_inventory.

closes odoo/odoo#111898

X-original-commit: 707769478b9f63319689ff2347d300ce1800d1d0
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Yuchen Huang (yhu) <yhu@odoo.com>
This commit is contained in:
yhu-odoo
2023-02-03 17:41:21 +01:00
parent 2f069b9ce8
commit 5e2b97b47f
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp/models/mrp_production.py
+6 -10
View File
@@ -1482,6 +1482,12 @@ class MrpProduction(models.Model):
if finish_moves and not finish_moves.quantity_done:
finish_moves._set_quantity_done(float_round(order.qty_producing - order.qty_produced, precision_rounding=order.product_uom_id.rounding, rounding_method='HALF-UP'))
finish_moves.move_line_ids.lot_id = order.lot_producing_id
# workorder duration need to be set to calculate the price of the product
for workorder in order.workorder_ids:
if workorder.state not in ('done', 'cancel'):
workorder.duration_expected = workorder._get_duration_expected()
if workorder.duration == 0.0:
workorder.duration = workorder.duration_expected * order.qty_produced/order.product_qty
order._cal_price(moves_to_do_by_order[order.id])
moves_to_finish = self.move_finished_ids.filtered(lambda x: x.state not in ('done', 'cancel'))
moves_to_finish = moves_to_finish._action_done(cancel_backorder=cancel_backorder)
@@ -1768,11 +1774,7 @@ class MrpProduction(models.Model):
'state': 'done',
'product_uom_qty': 0.0,
})
diff_per_production = {}
for production in self:
diff_per_production[production] = 1
if production.qty_produced != production.product_qty:
diff_per_production[production] = production.qty_produced/production.product_qty
production.write({
'date_finished': fields.Datetime.now(),
'product_qty': production.qty_produced,
@@ -1781,12 +1783,6 @@ class MrpProduction(models.Model):
'state': 'done',
})
for workorder in self.workorder_ids:
if workorder.state not in ('done', 'cancel'):
workorder.duration_expected = workorder._get_duration_expected()
if workorder.duration == 0.0:
workorder.duration = workorder.duration_expected * diff_per_production[workorder.production_id]
if not backorders:
if self.env.context.get('from_workorder'):
return {