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

[FIX] {purchase_,}mrp: set costs for RFQ in MO Overview

Browse Source 
While the cost of a line related to an RFQ was saved, it was not used in
the displayed costs.
Also, it used the wrong cost (don't need to factor in taxes), not did it
factor the quantity used in the cost.
Fixes as well the MO Cost for partially in-stock products.

Part of task-3217757

Part-of: odoo/odoo#118023
This commit is contained in:
clesgow
2023-04-13 15:26:41 +02:00
parent 3784b0882e
commit a145830b34
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp/report/mrp_report_mo_overview.py
+14 -7
View File
@@ -186,8 +186,10 @@ class ReportMoOverview(models.AbstractModel):
def _format_component_move(self, production, move_raw, replenishments, company, replenish_data, level, index):
product = move_raw.product_id
mo_cost = sum(rep.get('summary', {}).get('mo_cost', 0.0) for rep in replenishments)
product_cost = product.standard_price * move_raw.product_qty
replenish_mo_cost = sum(rep.get('summary', {}).get('mo_cost', 0.0) for rep in replenishments)
replenish_quantity = sum(rep.get('summary', {}).get('quantity', 0.0) for rep in replenishments)
missing_quantity = move_raw.product_uom_qty - replenish_quantity
mo_cost = replenish_mo_cost + (product.standard_price * move_raw.product_uom._compute_quantity(missing_quantity, product.uom_id))
component = {
'level': level,
'index': index,
@@ -203,8 +205,8 @@ class ReportMoOverview(models.AbstractModel):
'quantity_on_hand': product.uom_id._compute_quantity(product.qty_available, move_raw.product_uom) if product.type == 'product' else False,
'quantity_reserved': self._get_reserved_qty(move_raw, production.warehouse_id, replenish_data),
'receipt': self._check_planned_start(production.date_start, self._get_component_receipt(product, move_raw, production.warehouse_id, replenishments, replenish_data)),
'mo_cost': company.currency_id.round(mo_cost if replenishments else product_cost),
'product_cost': company.currency_id.round(product_cost),
'mo_cost': company.currency_id.round(mo_cost),
'product_cost': company.currency_id.round(product.standard_price * move_raw.product_qty),
'currency_id': company.currency_id.id,
'currency': company.currency_id,
}
@@ -276,7 +278,7 @@ class ReportMoOverview(models.AbstractModel):
'quantity': min(move_raw.product_uom_qty, forecast_uom_id._compute_quantity(forecast_line['quantity'], move_raw.product_uom)), # Avoid over-rounding
'uom_name': move_raw.product_uom.display_name,
'uom_precision': self._get_uom_precision(forecast_line['uom_id']['rounding']),
'mo_cost': self._get_replenishment_cost(product, forecast_line['quantity'], forecast_uom_id, currency, forecast_line['move_in']),
'mo_cost': forecast_line.get('cost', self._get_replenishment_cost(product, forecast_line['quantity'], forecast_uom_id, currency, forecast_line.get('move_in'))),
'product_cost': currency.round(forecast_uom_id._compute_quantity(forecast_line['quantity'], product.uom_id) * product.standard_price),
'currency_id': currency.id,
'currency': currency,
@@ -400,7 +402,11 @@ class ReportMoOverview(models.AbstractModel):
continue
if production_id and extra.get('production_id', False) and extra['production_id'] != production_id:
continue
taken_from_extra = min(line_qty, extra['uom']._compute_quantity(extra['quantity'], forecast_line['uom_id']))
if 'init_quantity' not in extra:
extra['init_quantity'] = extra['quantity']
converted_qty = extra['uom']._compute_quantity(extra['quantity'], forecast_line['uom_id'])
taken_from_extra = min(line_qty, converted_qty)
ratio = taken_from_extra / extra['uom']._compute_quantity(extra['init_quantity'], forecast_line['uom_id'])
line_qty -= taken_from_extra
# Create copy of the current forecast line to add a possible replenishment.
# Needs to be a copy since it might take multiple replenishment to fulfill a single "out" line.
@@ -410,8 +416,9 @@ class ReportMoOverview(models.AbstractModel):
'_name': extra['_name'],
'id': extra['id'],
}
new_extra_line['cost'] = extra['cost'] * ratio
lines_with_extras.append(new_extra_line)
extra['quantity'] -= taken_from_extra
extra['quantity'] -= forecast_line['uom_id']._compute_quantity(taken_from_extra, extra['uom'])
if float_compare(extra['quantity'], 0, precision_rounding=product_rounding) <= 0:
index_to_remove.append(index)
if float_is_zero(line_qty, precision_rounding=product_rounding):
addons/purchase_mrp/report/mrp_report_mo_overview.py
+13 -3
View File
@@ -30,10 +30,14 @@ class ReportMoOverview(models.AbstractModel):
return res
def _format_extra_replenishment(self, po_line, quantity, production_id=False):
po = po_line.order_id
price = po_line.taxes_id.with_context(round=False).compute_all(
po_line.price_unit, currency=po.currency_id, quantity=quantity, product=po_line.product_id, partner=po.partner_id
)['total_void']
return {
'_name': 'purchase.order',
'id': po_line.order_id.id,
'cost': po_line.price_total,
'id': po.id,
'cost': price,
'quantity': quantity,
'uom': po_line.product_uom,
'production_id': production_id
@@ -61,5 +65,11 @@ class ReportMoOverview(models.AbstractModel):
def _get_replenishment_cost(self, product, quantity, uom_id, currency, move_in=False):
if move_in and move_in.purchase_line_id:
return currency.round(move_in.purchase_line_id.price_unit * uom_id._compute_quantity(quantity, move_in.purchase_line_id.product_uom))
po_line = move_in.purchase_line_id
po = po_line.order_id
price = po_line.taxes_id.with_context(round=False).compute_all(
po_line.price_unit, currency=po.currency_id, quantity=uom_id._compute_quantity(quantity, move_in.purchase_line_id.product_uom),
product=po_line.product_id, partner=po.partner_id
)['total_void']
return currency.round(price)
return super()._get_replenishment_cost(product, quantity, uom_id, currency, move_in)