mirror of
https://github.com/OCA/manufacture.git
synced 2025-01-28 16:37:15 +02:00
[11.0][REN] multi_level_mrp -> mrp_multi_level
This commit is contained in:
committed by
Jordi Ballester Alomar
parent
cad67a0231
commit
7bc6533e98
@@ -2,7 +2,7 @@
|
||||
# Copyright 2016-18 Eficent Business and IT Consulting Services S.L.
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
||||
{
|
||||
'name': 'Multi Level MRP',
|
||||
'name': 'MRP Multi Level',
|
||||
'version': '11.0.1.0.0',
|
||||
'author': 'Ucamco, '
|
||||
'Eficent, '
|
||||
@@ -17,7 +17,7 @@
|
||||
'stock_demand_estimate',
|
||||
],
|
||||
'data': [
|
||||
'security/multi_level_mrp_security.xml',
|
||||
'security/mrp_multi_level_security.xml',
|
||||
'security/ir.model.access.csv',
|
||||
'views/mrp_area_view.xml',
|
||||
'views/product_view.xml',
|
||||
@@ -25,9 +25,9 @@
|
||||
'views/mrp_product_view.xml',
|
||||
'wizards/mrp_inventory_procure_view.xml',
|
||||
'views/mrp_inventory_view.xml',
|
||||
'wizards/multi_level_mrp_view.xml',
|
||||
'wizards/mrp_multi_level_view.xml',
|
||||
'views/mrp_menuitem.xml',
|
||||
'data/multi_level_mrp_cron.xml',
|
||||
'data/mrp_multi_level_cron.xml',
|
||||
'data/mrp_area_data.xml',
|
||||
],
|
||||
'demo': [
|
||||
@@ -1,16 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo noupdate="1">
|
||||
|
||||
<record id="multi_level_mrp_cron" model="ir.cron">
|
||||
<record id="mrp_multi_level_cron" model="ir.cron">
|
||||
<field name="name">Multi Level MRP</field>
|
||||
<field name="model_id" ref="multi_level_mrp.model_multi_level_mrp"/>
|
||||
<field name="model_id" ref="mrp_multi_level.model_mrp_multi_level"/>
|
||||
<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>
|
||||
<field name="doall" eval="False"/>
|
||||
<field name="model" eval="'multi.level.mrp'"/>
|
||||
<field name="function" eval="'run_multi_level_mrp'" />
|
||||
<field name="model" eval="'mrp.multi.level'"/>
|
||||
<field name="function" eval="'run_mrp_multi_level'" />
|
||||
<field name="args" eval="'(None, )'"/>
|
||||
</record>
|
||||
|
||||
@@ -7,7 +7,3 @@ access_mrp_product_user,mrp.product user,model_mrp_product,base.group_user,1,0,0
|
||||
access_mrp_product_manager,mrp.product manager,model_mrp_product,mrp.group_mrp_manager,1,1,1,1
|
||||
access_mrp_area_user,mrp.area user,model_mrp_area,mrp.group_mrp_user,1,0,0,0
|
||||
access_mrp_area_manager,mrp.area manager,model_mrp_area,mrp.group_mrp_manager,1,1,1,1
|
||||
access_mrp_forecast_forecast_user,mrp.forecast.forecast user,model_mrp_forecast_forecast,mrp.group_mrp_user,1,0,0,0
|
||||
access_mrp_forecast_forecast_manager,mrp.forecast.forecast manager,model_mrp_forecast_forecast,mrp.group_mrp_manager,1,1,1,1
|
||||
access_mrp_forecast_product_user,mrp.forecast.product user,model_mrp_forecast_product,mrp.group_mrp_user,1,0,0,0
|
||||
access_mrp_forecast_product_manager,mrp.forecast.product manager,model_mrp_forecast_product,mrp.group_mrp_manager,1,1,1,1
|
||||
|
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 9.2 KiB |
@@ -1,2 +1,2 @@
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
from . import test_multi_level_mrp
|
||||
from . import test_mrp_multi_level
|
||||
@@ -9,30 +9,30 @@ from odoo import fields
|
||||
from dateutil.rrule import WEEKLY
|
||||
|
||||
|
||||
class TestMultiLevelMRP(SavepointCase):
|
||||
class TestMrpMultiLevel(SavepointCase):
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
super(TestMultiLevelMRP, cls).setUpClass()
|
||||
super(TestMrpMultiLevel, cls).setUpClass()
|
||||
cls.mo_obj = cls.env['mrp.production']
|
||||
cls.po_obj = cls.env['purchase.order']
|
||||
cls.product_obj = cls.env['product.product']
|
||||
cls.partner_obj = cls.env['res.partner']
|
||||
cls.stock_picking_obj = cls.env['stock.picking']
|
||||
cls.estimate_obj = cls.env['stock.demand.estimate']
|
||||
cls.multi_level_mrp_wiz = cls.env['multi.level.mrp']
|
||||
cls.mrp_multi_level_wiz = cls.env['mrp.multi.level']
|
||||
cls.mrp_inventory_procure_wiz = cls.env['mrp.inventory.procure']
|
||||
cls.mrp_inventory_obj = cls.env['mrp.inventory']
|
||||
cls.mrp_product_obj = cls.env['mrp.product']
|
||||
cls.mrp_move_obj = cls.env['mrp.move']
|
||||
|
||||
cls.fp_1 = cls.env.ref('multi_level_mrp.product_product_fp_1')
|
||||
cls.fp_2 = cls.env.ref('multi_level_mrp.product_product_fp_2')
|
||||
cls.sf_1 = cls.env.ref('multi_level_mrp.product_product_sf_1')
|
||||
cls.sf_2 = cls.env.ref('multi_level_mrp.product_product_sf_2')
|
||||
cls.pp_1 = cls.env.ref('multi_level_mrp.product_product_pp_1')
|
||||
cls.pp_2 = cls.env.ref('multi_level_mrp.product_product_pp_2')
|
||||
cls.vendor = cls.env.ref('multi_level_mrp.res_partner_lazer_tech')
|
||||
cls.fp_1 = cls.env.ref('mrp_multi_level.product_product_fp_1')
|
||||
cls.fp_2 = cls.env.ref('mrp_multi_level.product_product_fp_2')
|
||||
cls.sf_1 = cls.env.ref('mrp_multi_level.product_product_sf_1')
|
||||
cls.sf_2 = cls.env.ref('mrp_multi_level.product_product_sf_2')
|
||||
cls.pp_1 = cls.env.ref('mrp_multi_level.product_product_pp_1')
|
||||
cls.pp_2 = cls.env.ref('mrp_multi_level.product_product_pp_2')
|
||||
cls.vendor = cls.env.ref('mrp_multi_level.res_partner_lazer_tech')
|
||||
cls.wh = cls.env.ref('stock.warehouse0')
|
||||
cls.stock_location = cls.wh.lot_stock_id
|
||||
cls.customer_location = cls.env.ref(
|
||||
@@ -100,7 +100,7 @@ class TestMultiLevelMRP(SavepointCase):
|
||||
|
||||
# Create test MO:
|
||||
date_mo = datetime.today() + timedelta(days=9)
|
||||
bom_fp_2 = cls.env.ref('multi_level_mrp.mrp_bom_fp_2')
|
||||
bom_fp_2 = cls.env.ref('mrp_multi_level.mrp_bom_fp_2')
|
||||
cls.mo = cls.mo_obj.create({
|
||||
'product_id': cls.fp_2.id,
|
||||
'bom_id': bom_fp_2.id,
|
||||
@@ -143,7 +143,7 @@ class TestMultiLevelMRP(SavepointCase):
|
||||
cls._create_demand_estimate(
|
||||
cls.prod_test, cls.stock_location, dr, qty)
|
||||
|
||||
cls.multi_level_mrp_wiz.create({}).run_multi_level_mrp()
|
||||
cls.mrp_multi_level_wiz.create({}).run_mrp_multi_level()
|
||||
|
||||
@classmethod
|
||||
def _create_demand_estimate(cls, product, location, date_range, qty):
|
||||
@@ -215,7 +215,7 @@ class TestMultiLevelMRP(SavepointCase):
|
||||
self.assertEqual(po_move.purchase_order_id, self.po)
|
||||
self.assertEqual(po_move.purchase_line_id, self.po.order_line)
|
||||
|
||||
def test_04_multi_level_mrp(self):
|
||||
def test_04_mrp_multi_level(self):
|
||||
"""Tests MRP inventories created."""
|
||||
# FP-1
|
||||
fp_1_inventory_lines = self.mrp_inventory_obj.search(
|
||||
@@ -37,7 +37,7 @@
|
||||
<field name="to_procure"/>
|
||||
<!--TODO: use same procurement wizard as ddmrp?-->
|
||||
<button string="Create Procurement"
|
||||
name="%(multi_level_mrp.act_mrp_inventory_procure)d"
|
||||
name="%(mrp_multi_level.act_mrp_inventory_procure)d"
|
||||
icon="fa-cogs" type="action"
|
||||
attrs="{'invisible':[('to_procure','==',0.0)]}"/>
|
||||
</tree>
|
||||
@@ -25,8 +25,8 @@
|
||||
sequence="30"/>
|
||||
|
||||
<menuitem name="Run Multi Level MRP"
|
||||
id="menu_multi_level_mrp"
|
||||
action="action_multi_level_mrp"
|
||||
id="menu_mrp_multi_level"
|
||||
action="action_mrp_multi_level"
|
||||
parent="menu_mrp_mrp"
|
||||
sequence="40"/>
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
from . import multi_level_mrp
|
||||
from . import mrp_multi_level
|
||||
from . import mrp_inventory_procure
|
||||
@@ -32,13 +32,13 @@ class MrpInventoryProcure(models.TransientModel):
|
||||
def fields_view_get(self, view_id=None, view_type='form', toolbar=False,
|
||||
submenu=False):
|
||||
if self.user_has_groups(
|
||||
"multi_level_mrp.group_change_mrp_procure_qty"):
|
||||
"mrp_multi_level.group_change_mrp_procure_qty"):
|
||||
view_id = self.env.ref(
|
||||
'multi_level_mrp.'
|
||||
'mrp_multi_level.'
|
||||
'view_mrp_inventory_procure_wizard').id
|
||||
else:
|
||||
view_id = self.env.ref(
|
||||
'multi_level_mrp.'
|
||||
'mrp_multi_level.'
|
||||
'view_mrp_inventory_procure_without_security').id
|
||||
return super(MrpInventoryProcure, self).fields_view_get(
|
||||
view_id=view_id, view_type=view_type, toolbar=toolbar,
|
||||
@@ -53,7 +53,7 @@
|
||||
<field name="view_mode">form</field>
|
||||
<field name="target">new</field>
|
||||
<field name="binding_model_id"
|
||||
ref="multi_level_mrp.model_mrp_inventory"/>
|
||||
ref="mrp_multi_level.model_mrp_inventory"/>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
@@ -15,7 +15,7 @@ ODOO_READ_GROUP_DAY_FORMAT = '%d %b %Y'
|
||||
|
||||
|
||||
class MultiLevelMrp(models.TransientModel):
|
||||
_name = 'multi.level.mrp'
|
||||
_name = 'mrp.multi.level'
|
||||
|
||||
# TODO: dates are not being correctly computed for supply...
|
||||
|
||||
@@ -962,7 +962,7 @@ class MultiLevelMrp(models.TransientModel):
|
||||
logger.info('END MRP FINAL PROCESS')
|
||||
|
||||
@api.multi
|
||||
def run_multi_level_mrp(self):
|
||||
def run_mrp_multi_level(self):
|
||||
self._mrp_cleanup()
|
||||
mrp_lowest_llc = self._low_level_code_calculation()
|
||||
self._calculate_mrp_applicable()
|
||||
@@ -1,13 +1,13 @@
|
||||
<?xml version="1.0"?>
|
||||
<odoo>
|
||||
|
||||
<record id="view_run_multi_level_mrp_wizard" model="ir.ui.view">
|
||||
<record id="view_run_mrp_multi_level_wizard" model="ir.ui.view">
|
||||
<field name="name">Run MRP</field>
|
||||
<field name="model">multi.level.mrp</field>
|
||||
<field name="model">mrp.multi.level</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Run Multi Level MRP">
|
||||
<footer>
|
||||
<button name="run_multi_level_mrp" string="Run MRP" type="object" class="oe_highlight" />
|
||||
<button name="run_mrp_multi_level" string="Run MRP" type="object" class="oe_highlight" />
|
||||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel" />
|
||||
</footer>
|
||||
@@ -16,12 +16,12 @@
|
||||
</record>
|
||||
|
||||
<act_window name="Run MRP"
|
||||
res_model="multi.level.mrp"
|
||||
src_model="multi.level.mrp"
|
||||
res_model="mrp.multi.level"
|
||||
src_model="mrp.multi.level"
|
||||
view_mode="form"
|
||||
target="new"
|
||||
key2="client_action_multi"
|
||||
id="action_multi_level_mrp"/>
|
||||
id="action_mrp_multi_level"/>
|
||||
|
||||
</odoo>
|
||||
|
||||
Reference in New Issue
Block a user