Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] pre-commit: first run on whole repo

Browse Source
This commit is contained in:
Kevin Khao
2021-11-26 18:54:38 +03:00
parent a04b8980e1
commit 167aefee13
289 changed files with 6020 additions and 4170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mrp_average_cost/__manifest__.py
View File

@@ -3,12 +3,12 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{
'name': 'MRP Average Cost',
'version': '12.0.1.0.0', # WARNING: we'll probably not port this module to v14, because part of its feature is now provided by the module mrp_account
'category': 'Manufactuing',
'license': 'AGPL-3',
'summary': 'Update standard_price upon validation of a manufacturing order',
'description': """
"name": "MRP Average Cost",
"version": "12.0.1.0.0", # WARNING: we'll probably not port this module to v14, because part of its feature is now provided by the module mrp_account
"category": "Manufactuing",
"license": "AGPL-3",
"summary": "Update standard_price upon validation of a manufacturing order",
"description": """
MRP Average Cost
================
@@ -20,14 +20,14 @@ Together with this module, I recommend the use of my module product_usability, a
This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
""",
'author': 'Akretion',
'website': 'http://www.akretion.com',
'depends': ['mrp'],
'data': [
'security/mrp_average_cost_security.xml',
'security/ir.model.access.csv',
'data/mrp_data.xml',
'views/mrp_view.xml',
],
'installable': False,
"author": "Akretion",
"website": "https://github.com/OCA/odoo-usability",
"depends": ["mrp"],
"data": [
"security/mrp_average_cost_security.xml",
"security/ir.model.access.csv",
"data/mrp_data.xml",
"views/mrp_view.xml",
],
"installable": False,
}

10
mrp_average_cost/data/mrp_data.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo noupdate="1">
<record forcecreate="True" id="labour_hours" model="decimal.precision">
@@ -9,13 +9,13 @@
<record id="phantom_update_product_standard_price" model="ir.cron">
<field name="name">Update Cost Price of products with Phantom BOM</field>
<field name="active" eval="False"/>
<field name="user_id" ref="base.user_root"/>
<field name="active" eval="False" />
<field name="user_id" ref="base.user_root" />
<field name="interval_number">1</field>
<field name="interval_type">days</field>
<field name="numbercall">-1</field> <!-- don't limit the number of calls -->
<field name="doall" eval="False"/>
<field name="model_id" ref="mrp.model_mrp_bom"/>
<field name="doall" eval="False" />
<field name="model_id" ref="mrp.model_mrp_bom" />
<field name="state">code</field>
<field name="code">model._phantom_update_product_standard_price()</field>
</record>

274
mrp_average_cost/models/mrp.py
View File

@@ -2,194 +2,217 @@
# @author Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import models, fields, api, _
import odoo.addons.decimal_precision as dp
import logging
from odoo import _, api, fields, models
from odoo.exceptions import UserError
from odoo.tools import float_compare, float_is_zero
import logging
import odoo.addons.decimal_precision as dp
logger = logging.getLogger(__name__)
class MrpBomLabourLine(models.Model):
_name = 'mrp.bom.labour.line'
_description = 'Labour lines on BOM'
_name = "mrp.bom.labour.line"
_description = "Labour lines on BOM"
bom_id = fields.Many2one(
comodel_name='mrp.bom',
string='Labour Lines',
ondelete='cascade')
comodel_name="mrp.bom", string="Labour Lines", ondelete="cascade"
)
labour_time = fields.Float(
string='Labour Time',
string="Labour Time",
required=True,
digits=dp.get_precision('Labour Hours'),
help="Average labour time for the production of "
"items of the BOM, in hours.")
digits=dp.get_precision("Labour Hours"),
help="Average labour time for the production of " "items of the BOM, in hours.",
)
labour_cost_profile_id = fields.Many2one(
comodel_name='labour.cost.profile',
string='Labour Cost Profile',
required=True)
comodel_name="labour.cost.profile", string="Labour Cost Profile", required=True
)
note = fields.Text(
string='Note')
note = fields.Text(string="Note")
_sql_constraints = [(
'labour_time_positive',
'CHECK (labour_time >= 0)',
"The value of the field 'Labour Time' must be positive or 0.")]
_sql_constraints = [
(
"labour_time_positive",
"CHECK (labour_time >= 0)",
"The value of the field 'Labour Time' must be positive or 0.",
)
]
class MrpBom(models.Model):
_inherit = 'mrp.bom'
_inherit = "mrp.bom"
@api.depends(
'labour_line_ids.labour_time',
'labour_line_ids.labour_cost_profile_id.hour_cost')
"labour_line_ids.labour_time",
"labour_line_ids.labour_cost_profile_id.hour_cost",
)
def _compute_total_labour_cost(self):
for bom in self:
cost = 0.0
for lline in bom.labour_line_ids:
cost += lline.labour_time *\
lline.labour_cost_profile_id.hour_cost
cost += lline.labour_time * lline.labour_cost_profile_id.hour_cost
bom.total_labour_cost = cost
@api.depends(
'bom_line_ids.product_id.standard_price',
'total_labour_cost', 'extra_cost')
"bom_line_ids.product_id.standard_price", "total_labour_cost", "extra_cost"
)
def _compute_total_cost(self):
for bom in self:
comp_cost = 0.0
for line in bom.bom_line_ids:
comp_price = line.product_id.standard_price
comp_qty_product_uom = line.product_uom_id._compute_quantity(
line.product_qty, line.product_id.uom_id)
line.product_qty, line.product_id.uom_id
)
comp_cost += comp_price * comp_qty_product_uom
total_cost = comp_cost + bom.extra_cost + bom.total_labour_cost
bom.total_components_cost = comp_cost
bom.total_cost = total_cost
labour_line_ids = fields.One2many(
'mrp.bom.labour.line', 'bom_id', string='Labour Lines')
"mrp.bom.labour.line", "bom_id", string="Labour Lines"
)
total_labour_cost = fields.Float(
compute='_compute_total_labour_cost', readonly=True,
digits=dp.get_precision('Product Price'),
string="Total Labour Cost", store=True)
compute="_compute_total_labour_cost",
readonly=True,
digits=dp.get_precision("Product Price"),
string="Total Labour Cost",
store=True,
)
extra_cost = fields.Float(
string='Extra Cost', track_visibility='onchange',
digits=dp.get_precision('Product Price'),
string="Extra Cost",
track_visibility="onchange",
digits=dp.get_precision("Product Price"),
help="Extra cost for the production of the quantity of "
"items of the BOM, in company currency. "
"You can use this field to enter the cost of the consumables "
"that are used to produce the product but are not listed in "
"the BOM")
"the BOM",
)
total_components_cost = fields.Float(
compute='_compute_total_cost', readonly=True,
digits=dp.get_precision('Product Price'),
string='Total Components Cost')
compute="_compute_total_cost",
readonly=True,
digits=dp.get_precision("Product Price"),
string="Total Components Cost",
)
total_cost = fields.Float(
compute='_compute_total_cost', readonly=True,
string='Total Cost',
digits=dp.get_precision('Product Price'),
help="Total Cost = Total Components Cost + "
"Total Labour Cost + Extra Cost")
compute="_compute_total_cost",
readonly=True,
string="Total Cost",
digits=dp.get_precision("Product Price"),
help="Total Cost = Total Components Cost + " "Total Labour Cost + Extra Cost",
)
company_currency_id = fields.Many2one(
related='company_id.currency_id', string='Company Currency')
related="company_id.currency_id", string="Company Currency"
)
@api.model
def _phantom_update_product_standard_price(self):
logger.info('Start to auto-update cost price from phantom bom')
boms = self.search([('type', '=', 'phantom')])
logger.info("Start to auto-update cost price from phantom bom")
boms = self.search([("type", "=", "phantom")])
boms.with_context(
product_price_history_origin='Automatic update of Phantom BOMs')\
.manual_update_product_standard_price()
logger.info('End of the auto-update cost price from phantom bom')
product_price_history_origin="Automatic update of Phantom BOMs"
).manual_update_product_standard_price()
logger.info("End of the auto-update cost price from phantom bom")
return True
def manual_update_product_standard_price(self):
if 'product_price_history_origin' not in self._context:
if "product_price_history_origin" not in self._context:
self = self.with_context(
product_price_history_origin='Manual update from BOM')
precision = self.env['decimal.precision'].precision_get(
'Product Price')
product_price_history_origin="Manual update from BOM"
)
precision = self.env["decimal.precision"].precision_get("Product Price")
for bom in self:
wproduct = bom.product_id
if not wproduct:
wproduct = bom.product_tmpl_id
if float_compare(
wproduct.standard_price, bom.total_cost,
precision_digits=precision):
wproduct.with_context().write(
{'standard_price': bom.total_cost})
wproduct.standard_price, bom.total_cost, precision_digits=precision
):
wproduct.with_context().write({"standard_price": bom.total_cost})
logger.info(
'Cost price updated to %s on product %s',
bom.total_cost, wproduct.display_name)
"Cost price updated to %s on product %s",
bom.total_cost,
wproduct.display_name,
)
return True
class MrpBomLine(models.Model):
_inherit = 'mrp.bom.line'
_inherit = "mrp.bom.line"
standard_price = fields.Float(
related='product_id.standard_price',
readonly=True,
string='Standard Price')
related="product_id.standard_price", readonly=True, string="Standard Price"
)
class LabourCostProfile(models.Model):
_name = 'labour.cost.profile'
_inherit = ['mail.thread']
_description = 'Labour Cost Profile'
_name = "labour.cost.profile"
_inherit = ["mail.thread"]
_description = "Labour Cost Profile"
name = fields.Char(
string='Name',
required=True,
track_visibility='onchange')
name = fields.Char(string="Name", required=True, track_visibility="onchange")
hour_cost = fields.Float(
string='Cost per Hour',
string="Cost per Hour",
required=True,
digits=dp.get_precision('Product Price'),
track_visibility='onchange',
help="Labour cost per hour per person in company currency")
digits=dp.get_precision("Product Price"),
track_visibility="onchange",
help="Labour cost per hour per person in company currency",
)
company_id = fields.Many2one(
comodel_name='res.company',
string='Company',
comodel_name="res.company",
string="Company",
required=True,
default=lambda self: self.env['res.company']._company_default_get())
default=lambda self: self.env["res.company"]._company_default_get(),
)
company_currency_id = fields.Many2one(
related='company_id.currency_id',
related="company_id.currency_id",
readonly=True,
store=True,
string='Company Currency')
string="Company Currency",
)
@api.depends('name', 'hour_cost', 'company_currency_id.symbol')
@api.depends("name", "hour_cost", "company_currency_id.symbol")
def name_get(self):
res = []
for record in self:
res.append((record.id, u'%s (%s %s)' % (
record.name, record.hour_cost,
record.company_currency_id.symbol)))
res.append(
(
record.id,
u"%s (%s %s)"
% (
record.name,
record.hour_cost,
record.company_currency_id.symbol,
),
)
)
return res
class MrpProduction(models.Model):
_inherit = 'mrp.production'
_inherit = "mrp.production"
unit_cost = fields.Float(
string='Unit Cost', readonly=True,
digits=dp.get_precision('Product Price'),
string="Unit Cost",
readonly=True,
digits=dp.get_precision("Product Price"),
help="This cost per unit in the unit of measure of the product "
"in company currency takes into account "
"the cost of the raw materials and the labour cost defined on"
"the BOM.")
"the BOM.",
)
company_currency_id = fields.Many2one(
related='company_id.currency_id', readonly=True,
string='Company Currency')
related="company_id.currency_id", readonly=True, string="Company Currency"
)
def compute_order_unit_cost(self):
self.ensure_one()
@@ -200,8 +223,7 @@ class MrpProduction(models.Model):
# I read the raw materials MO, not on BOM, in order to make
# it work with the "dynamic" BOMs (few raw material are auto-added
# on the fly on MO)
prec = self.env['decimal.precision'].precision_get(
'Product Unit of Measure')
prec = self.env["decimal.precision"].precision_get("Product Unit of Measure")
for raw_smove in self.move_raw_ids:
# I don't filter on state, in order to make it work with
# partial productions
@@ -212,9 +234,11 @@ class MrpProduction(models.Model):
raw_price = raw_smove.product_id.standard_price
raw_material_cost = raw_price * raw_smove.product_qty
logger.info(
'MO %s product %s: raw_material_cost=%s',
self.name, raw_smove.product_id.display_name,
raw_material_cost)
"MO %s product %s: raw_material_cost=%s",
self.name,
raw_smove.product_id.display_name,
raw_material_cost,
)
mo_total_price += raw_material_cost
if self.bom_id:
bom = self.bom_id
@@ -224,48 +248,60 @@ class MrpProduction(models.Model):
# _("Total Labor Cost is 0 on bill of material '%s'.")
# % bom.name)
if float_is_zero(bom.product_qty, precision_digits=prec):
raise UserError(_(
"Missing Product Quantity on bill of material '%s'.")
% bom.display_name)
raise UserError(
_("Missing Product Quantity on bill of material '%s'.")
% bom.display_name
)
bom_qty_product_uom = bom.product_uom_id._compute_quantity(
bom.product_qty, bom.product_tmpl_id.uom_id)
assert bom_qty_product_uom > 0, 'BoM qty should be positive'
bom.product_qty, bom.product_tmpl_id.uom_id
)
assert bom_qty_product_uom > 0, "BoM qty should be positive"
labor_cost_per_unit = bom.total_labour_cost / bom_qty_product_uom
extra_cost_per_unit = bom.extra_cost / bom_qty_product_uom
if bom.type == 'subcontract':
one_finished_move = self.env['stock.move'].search([
('production_id', '=', self.id),
('product_id', '=', self.product_id.id),
('move_dest_ids', '!=', False)], limit=1)
if bom.type == "subcontract":
one_finished_move = self.env["stock.move"].search(
[
("production_id", "=", self.id),
("product_id", "=", self.product_id.id),
("move_dest_ids", "!=", False),
],
limit=1,
)
if one_finished_move:
subcontract_cost_per_unit = one_finished_move.move_dest_ids[0].price_unit
subcontract_cost_per_unit = one_finished_move.move_dest_ids[
0
].price_unit
# mo_standard_price and labor_cost_per_unit are
# in the UoM of the product (not of the MO/BOM)
mo_qty_product_uom = self.product_uom_id._compute_quantity(
self.product_qty, self.product_id.uom_id)
assert mo_qty_product_uom > 0, 'MO qty should be positive'
self.product_qty, self.product_id.uom_id
)
assert mo_qty_product_uom > 0, "MO qty should be positive"
mo_standard_price = mo_total_price / mo_qty_product_uom
logger.info(
'MO %s: labor_cost_per_unit=%s extra_cost_per_unit=%s '
'subcontract_cost_per_unit=%s',
self.name, labor_cost_per_unit, extra_cost_per_unit,
subcontract_cost_per_unit)
"MO %s: labor_cost_per_unit=%s extra_cost_per_unit=%s "
"subcontract_cost_per_unit=%s",
self.name,
labor_cost_per_unit,
extra_cost_per_unit,
subcontract_cost_per_unit,
)
mo_standard_price += labor_cost_per_unit
mo_standard_price += extra_cost_per_unit
mo_standard_price += subcontract_cost_per_unit
return mo_standard_price
def post_inventory(self):
'''This is the method where _action_done() is called on finished move
"""This is the method where _action_done() is called on finished move
So we write on 'price_unit' of the finished move and THEN we call
super() which will call _action_done() which itself calls
product_price_update_before_done()'''
product_price_update_before_done()"""
for order in self:
if order.product_id.cost_method == 'average':
if order.product_id.cost_method == "average":
unit_cost = order.compute_order_unit_cost()
order.write({'unit_cost': unit_cost})
logger.info('MO %s: unit_cost=%s', order.name, unit_cost)
order.write({"unit_cost": unit_cost})
logger.info("MO %s: unit_cost=%s", order.name, unit_cost)
order.move_finished_ids.filtered(
lambda x: x.product_id == order.product_id).write({
'price_unit': unit_cost})
lambda x: x.product_id == order.product_id
).write({"price_unit": unit_cost})
return super(MrpProduction, self).post_inventory()

8
mrp_average_cost/security/mrp_average_cost_security.xml
View File

@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo noupdate="1">
<record id="labour_cost_profile_rule" model="ir.rule">
<field name="name">Labour Cost Profile multi-company</field>
<field name="model_id" ref="model_labour_cost_profile"/>
<field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
<field name="model_id" ref="model_labour_cost_profile" />
<field
name="domain_force"
>['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
</record>
</odoo>

117
mrp_average_cost/views/mrp_view.xml
View File

@@ -1,44 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<!--
Copyright (C) 2016-2019 Akretion (http://www.akretion.com/)
@author Alexis de Lattre <alexis.delattre@akretion.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
<odoo>
<record id="mrp_bom_form_view" model="ir.ui.view">
<field name="name">mrp_average_cost.mrp.bom.form</field>
<field name="model">mrp.bom</field>
<field name="inherit_id" ref="mrp.mrp_bom_form_view"/>
<field name="inherit_id" ref="mrp.mrp_bom_form_view" />
<field name="arch" type="xml">
<field name="picking_type_id" position="after">
<field name="total_components_cost" widget="monetary"
options="{'currency_field': 'company_currency_id'}"/>
<field name="total_labour_cost" widget="monetary"
options="{'currency_field': 'company_currency_id'}"/>
<field name="extra_cost" widget="monetary"
options="{'currency_field': 'company_currency_id'}"/>
<label for="total_cost"/>
<div>
<field name="total_cost" widget="monetary"
<field
name="total_components_cost"
widget="monetary"
options="{'currency_field': 'company_currency_id'}"
class="oe_inline"/>
<button type="object" name="manual_update_product_standard_price"
string="Update Cost Price of Product" class="oe_link"/>
/>
<field
name="total_labour_cost"
widget="monetary"
options="{'currency_field': 'company_currency_id'}"
/>
<field
name="extra_cost"
widget="monetary"
options="{'currency_field': 'company_currency_id'}"
/>
<label for="total_cost" />
<div>
<field
name="total_cost"
widget="monetary"
options="{'currency_field': 'company_currency_id'}"
class="oe_inline"
/>
<button
type="object"
name="manual_update_product_standard_price"
string="Update Cost Price of Product"
class="oe_link"
/>
</div>
<field name="company_currency_id" invisible="1"/>
<field name="company_currency_id" invisible="1" />
</field>
<notebook position="inside">
<page string="Labour" name="labour_lines">
<group name="labour_lines_grp">
<field name="labour_line_ids" nolabel="1"/>
<field name="labour_line_ids" nolabel="1" />
</group>
</page>
</notebook>
<xpath expr="//field[@name='bom_line_ids']/tree/field[@name='operation_id']" position="after">
<field name="standard_price"/>
<xpath
expr="//field[@name='bom_line_ids']/tree/field[@name='operation_id']"
position="after"
>
<field name="standard_price" />
</xpath>
</field>
</record>
@@ -48,10 +66,13 @@
<field name="model">mrp.bom.labour.line</field>
<field name="arch" type="xml">
<tree string="Labour Lines" editable="bottom">
<field name="bom_id" invisible="not context.get('mrp_bom_labour_line_main_view')"/>
<field name="labour_time" string="Labour Time (hours)"/>
<field name="labour_cost_profile_id"/>
<field name="note"/>
<field
name="bom_id"
invisible="not context.get('mrp_bom_labour_line_main_view')"
/>
<field name="labour_time" string="Labour Time (hours)" />
<field name="labour_cost_profile_id" />
<field name="note" />
</tree>
</field>
</record>
@@ -62,13 +83,16 @@
<field name="arch" type="xml">
<form string="Labour Line">
<group name="main">
<field name="bom_id" invisible="not context.get('mrp_bom_labour_line_main_view')"/>
<label for="labour_time"/>
<field
name="bom_id"
invisible="not context.get('mrp_bom_labour_line_main_view')"
/>
<label for="labour_time" />
<div name="labour_time">
<field name="labour_time" class="oe_inline"/> hours
<field name="labour_time" class="oe_inline" /> hours
</div>
<field name="labour_cost_profile_id"/>
<field name="note"/>
<field name="labour_cost_profile_id" />
<field name="note" />
</group>
</form>
</field>
@@ -82,10 +106,14 @@
<field name="arch" type="xml">
<form string="Labour Cost Profile">
<group name="main">
<field name="name"/>
<field name="hour_cost" widget="monetary" options="{'currency_field': 'company_currency_id'}"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="company_currency_id" invisible="1"/>
<field name="name" />
<field
name="hour_cost"
widget="monetary"
options="{'currency_field': 'company_currency_id'}"
/>
<field name="company_id" groups="base.group_multi_company" />
<field name="company_currency_id" invisible="1" />
</group>
</form>
</field>
@@ -96,9 +124,9 @@
<field name="model">labour.cost.profile</field>
<field name="arch" type="xml">
<tree string="Labour Cost Profiles">
<field name="name"/>
<field name="hour_cost"/>
<field name="company_currency_id"/>
<field name="name" />
<field name="hour_cost" />
<field name="company_currency_id" />
</tree>
</field>
</record>
@@ -109,17 +137,26 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem id="labour_cost_profile_menu" action="labour_cost_profile_action"
parent="mrp.menu_mrp_configuration" sequence="200"/>
<menuitem
id="labour_cost_profile_menu"
action="labour_cost_profile_action"
parent="mrp.menu_mrp_configuration"
sequence="200"
/>
<record id="mrp_production_form_view" model="ir.ui.view">
<field name="name">mrp_average_cost.mrp_production_form</field>
<field name="inherit_id" ref="mrp.mrp_production_form_view"/>
<field name="inherit_id" ref="mrp.mrp_production_form_view" />
<field name="model">mrp.production</field>
<field name="arch" type="xml">
<field name="availability" position="after">
<field name="unit_cost" widget="monetary" options="{'currency_field': 'company_currency_id'}" attrs="{'invisible': [('state', '!=', 'done')]}"/>
<field name="company_currency_id" invisible="1"/>
<field
name="unit_cost"
widget="monetary"
options="{'currency_field': 'company_currency_id'}"
attrs="{'invisible': [('state', '!=', 'done')]}"
/>
<field name="company_currency_id" invisible="1" />
</field>
</field>
</record>