audrius/manufacture
1
0
Fork 0
mirror of https://github.com/OCA/manufacture.git synced 2025-01-28 16:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes, and add migration script

Browse Source
This commit is contained in:
Jordi Ballester Alomar
2018-11-28 12:56:38 +01:00
committed by JasminSForgeFlow
parent 556f49e65f
commit 4b1e05da41
7 changed files with 113 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
mrp_multi_level/migrations/11.0.2.0.0/post-migration.py Normal file
View File

@@ -0,0 +1,50 @@
# Copyright 2019 Eficent Business and IT Consulting Services, S.L.
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
import logging
from odoo import api, SUPERUSER_ID
_logger = logging.getLogger(__name__)
__name__ = "Upgrade to 11.0.2.0.0"
def _migrate_product_to_product_mrp_area(env):
_logger.info("Migrating product parameters to Product MRP Areas")
env.cr.execute("""
SELECT DISTINCT mrp_area.id, pr.id, pr.mrp_applicable, pr.mrp_exclude,
pr.mrp_inspection_delay, pr.mrp_maximum_order_qty,
pr.mrp_minimum_order_qty, pr.mrp_minimum_stock, pr.mrp_nbr_days,
pr.mrp_qty_multiple, pr.mrp_transit_delay, pr.mrp_verified, pr.active
FROM product_product AS pr
CROSS JOIN mrp_area
LEFT JOIN product_template AS pt
ON pt.id = pr.product_tmpl_id
WHERE pr.mrp_exclude = False
AND pt.type = 'product'
""")
product_mrp_area_model = env['product.mrp.area']
for mrp_area_id, product_id, mrp_applicable, mrp_exclude,\
mrp_inspection_delay, mrp_maximum_order_qty, mrp_minimum_order_qty, \
mrp_minimum_stock, mrp_nbr_days, mrp_qty_multiple, mrp_transit_delay,\
mrp_verified, active in env.cr.fetchall():
product_mrp_area_model.create({
'mrp_area_id': mrp_area_id,
'product_id': product_id,
'mrp_applicable': mrp_applicable,
'mrp_exclude': mrp_exclude,
'mrp_inspection_delay': mrp_inspection_delay,
'mrp_maximum_order_qty': mrp_maximum_order_qty,
'mrp_minimum_order_qty': mrp_minimum_order_qty,
'mrp_minimum_stock': mrp_minimum_stock,
'mrp_nbr_days': mrp_nbr_days,
'mrp_qty_multiple': mrp_qty_multiple,
'mrp_transit_delay': mrp_transit_delay,
'mrp_verified': mrp_verified,
'active': active,
})
def migrate(cr, version):
with api.Environment.manage():
env = api.Environment(cr, SUPERUSER_ID, {})
_migrate_product_to_product_mrp_area(env)

10
mrp_multi_level/models/product_product.py
View File

@@ -1,7 +1,7 @@
# Copyright 2016 Ucamco - Wim Audenaert <wim.audenaert@ucamco.com> # Copyright 2016 Ucamco - Wim Audenaert <wim.audenaert@ucamco.com>
# Copyright 2016-18 Eficent Business and IT Consulting Services S.L. # Copyright 2016-18 Eficent Business and IT Consulting Services S.L.
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
import ast
from odoo import api, fields, models from odoo import api, fields, models
@@ -41,11 +41,19 @@ class Product(models.Model):
self.ensure_one() self.ensure_one()
action = self.env.ref('mrp_multi_level.product_mrp_area_action') action = self.env.ref('mrp_multi_level.product_mrp_area_action')
result = action.read()[0] result = action.read()[0]
ctx = ast.literal_eval(result.get('context'))
if not ctx:
ctx = {}
mrp_areas = self.env['mrp.area'].search([])
if len(mrp_areas) == 1:
ctx.update({'default_mrp_area_id': mrp_areas[0].id})
area_ids = self.mrp_area_ids.ids area_ids = self.mrp_area_ids.ids
ctx.update({'default_product_id': self.id})
if self.mrp_area_count != 1: if self.mrp_area_count != 1:
result['domain'] = [('id', 'in', area_ids)] result['domain'] = [('id', 'in', area_ids)]
else: else:
res = self.env.ref('mrp_multi_level.product_mrp_area_form', False) res = self.env.ref('mrp_multi_level.product_mrp_area_form', False)
result['views'] = [(res and res.id or False, 'form')] result['views'] = [(res and res.id or False, 'form')]
result['res_id'] = area_ids[0] result['res_id'] = area_ids[0]
result['context'] = ctx
return result return result

12
mrp_multi_level/models/product_template.py
View File

@@ -1,6 +1,6 @@
# Copyright 2018 Eficent Business and IT Consulting Services S.L. # Copyright 2018 Eficent Business and IT Consulting Services S.L.
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
import ast
from odoo import api, fields, models from odoo import api, fields, models
@@ -28,12 +28,22 @@ class ProductTemplate(models.Model):
self.ensure_one() self.ensure_one()
action = self.env.ref('mrp_multi_level.product_mrp_area_action') action = self.env.ref('mrp_multi_level.product_mrp_area_action')
result = action.read()[0] result = action.read()[0]
ctx = ast.literal_eval(result.get('context'))
mrp_areas = self.env['mrp.area'].search([])
if 'context' not in result:
result['context'] = {}
if len(mrp_areas) == 1:
ctx.update({'default_mrp_area_id': mrp_areas[0].id})
mrp_area_ids = self.with_context( mrp_area_ids = self.with_context(
active_test=False).mrp_area_ids.ids active_test=False).mrp_area_ids.ids
if len(self.product_variant_ids) == 1:
variant = self.product_variant_ids[0]
ctx.update({'default_product_id': variant.id})
if len(mrp_area_ids) != 1: if len(mrp_area_ids) != 1:
result['domain'] = [('id', 'in', mrp_area_ids)] result['domain'] = [('id', 'in', mrp_area_ids)]
else: else:
res = self.env.ref('mrp_multi_level.product_mrp_area_form', False) res = self.env.ref('mrp_multi_level.product_mrp_area_form', False)
result['views'] = [(res and res.id or False, 'form')] result['views'] = [(res and res.id or False, 'form')]
result['res_id'] = mrp_area_ids[0] result['res_id'] = mrp_area_ids[0]
result['context'] = ctx
return result return result

46
mrp_multi_level/views/product_mrp_area_views.xml
View File

@@ -59,28 +59,30 @@
<field name="main_supplierinfo_id"/> <field name="main_supplierinfo_id"/>
</group> </group>
</group> </group>
<group string="MRP moves" name="mrp_moves" groups="base.group_no_one"> <notebook>
<field name="mrp_move_ids" nolabel="1"> <page name="mrp_moves" string="MRP Moves" groups="base.group_no_one">
<tree> <field name="mrp_move_ids" nolabel="1">
<field name="mrp_action_date"/> <tree>
<field name="mrp_date"/> <field name="mrp_action_date"/>
<field name="current_date"/> <field name="mrp_date"/>
<field name="mrp_origin"/> <field name="current_date"/>
<field name="state"/> <field name="mrp_origin"/>
<field name="mrp_order_number"/> <field name="state"/>
<field name="parent_product_id"/> <field name="mrp_order_number"/>
<field name="name"/> <field name="parent_product_id"/>
<field name="mrp_qty"/> <field name="name"/>
<field name="current_qty"/> <field name="mrp_qty"/>
<field name="running_availability"/> <field name="current_qty"/>
<field name="mrp_minimum_stock" /> <field name="running_availability"/>
<field name="mrp_action"/> <field name="mrp_minimum_stock" />
<field name="mrp_type"/> <field name="mrp_action"/>
<field name="mrp_move_up_ids"/> <field name="mrp_type"/>
<field name="mrp_processed"/> <field name="mrp_move_up_ids"/>
</tree> <field name="mrp_processed"/>
</field> </tree>
</group> </field>
</page>
</notebook>
</sheet> </sheet>
</form> </form>
</field> </field>

2
mrp_multi_level/views/product_product_views.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<odoo> <odoo>
<record model="ir.ui.view" id="view_product_mrp_area_product_form"> <record model="ir.ui.view" id="view_mrp_product_product_form">
<field name="name">view.product.mrp.area.product.form</field> <field name="name">view.product.mrp.area.product.form</field>
<field name="model">product.product</field> <field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view"/> <field name="inherit_id" ref="product.product_normal_form_view"/>

8
mrp_multi_level/views/product_template_views.xml
View File

@@ -8,10 +8,10 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<div name="button_box" position="inside"> <div name="button_box" position="inside">
<button type="object" <button type="object"
name="action_view_mrp_area_parameters" name="action_view_mrp_area_parameters"
class="oe_stat_button" class="oe_stat_button"
icon="fa-eject" icon="fa-eject"
groups="mrp.group_mrp_user,rma.group_mrp_manager"> groups="mrp.group_mrp_user,rma.group_mrp_manager">
<field name="mrp_area_count" widget="statinfo" <field name="mrp_area_count" widget="statinfo"
string="MRP Areas"/> string="MRP Areas"/>
</button> </button>

28
mrp_multi_level/wizards/mrp_multi_level.py
View File

@@ -531,7 +531,7 @@ class MultiLevelMrp(models.TransientModel):
product_mrp_area.mrp_minimum_stock - \ product_mrp_area.mrp_minimum_stock - \
product_mrp_area - last_qty product_mrp_area - last_qty
cm = self.create_move( cm = self.create_move(
product_mrp_area_id=product_mrp_area.id, product_mrp_area_id=product_mrp_area,
mrp_date=last_date, mrp_date=last_date,
mrp_qty=qtytoorder, mrp_qty=qtytoorder,
name=name) name=name)
@@ -562,7 +562,7 @@ class MultiLevelMrp(models.TransientModel):
(product_mrp_area.mrp_nbr_days, ) (product_mrp_area.mrp_nbr_days, )
qtytoorder = product_mrp_area.mrp_minimum_stock - onhand - last_qty qtytoorder = product_mrp_area.mrp_minimum_stock - onhand - last_qty
cm = self.create_move( cm = self.create_move(
product_mrp_area_id=product_mrp_area.id, mrp_date=last_date, product_mrp_area_id=product_mrp_area, mrp_date=last_date,
mrp_qty=qtytoorder, name=name) mrp_qty=qtytoorder, name=name)
qty_ordered = cm['qty_ordered'] qty_ordered = cm['qty_ordered']
onhand += qty_ordered onhand += qty_ordered
@@ -748,18 +748,18 @@ class MultiLevelMrp(models.TransientModel):
for move in moves: for move in moves:
qoh = qoh + move.mrp_qty qoh = qoh + move.mrp_qty
move.running_availability = qoh move.running_availability = qoh
# TODO: Possible clean up needed here
nbr_actions = product_mrp_area.mrp_move_ids.filtered( # nbr_actions = product_mrp_area.mrp_move_ids.filtered(
lambda m: m.mrp_action != 'none') # lambda m: m.mrp_action != 'none')
horizon_4w = fields.Date.to_string( # horizon_4w = fields.Date.to_string(
date.today() + timedelta(weeks=4)) # date.today() + timedelta(weeks=4))
nbr_actions_4w = nbr_actions.filtered( # nbr_actions_4w = nbr_actions.filtered(
lambda m: m.mrp_action_date < horizon_4w) # lambda m: m.mrp_action_date < horizon_4w)
if nbr_actions: # if nbr_actions:
product_mrp_area.write({ # product_mrp_area.write({
'nbr_mrp_actions': len(nbr_actions), # 'nbr_mrp_actions': len(nbr_actions),
'nbr_mrp_actions_4w': len(nbr_actions_4w), # 'nbr_mrp_actions_4w': len(nbr_actions_4w),
}) # })
logger.info('END MRP FINAL PROCESS') logger.info('END MRP FINAL PROCESS')
@api.multi @api.multi