[11.0][REW/IMP] mrp_multi_level:

* Extract concept of planned orders from mrp.move.
* Fix error grouping demand when there is no supply for a the first day of grouping.
* Adapt tests.
This commit is contained in:
Lois Rilo
2019-05-21 12:51:37 +02:00
committed by JasminSForgeFlow
parent 4baa262471
commit 68a7cb40cb
18 changed files with 467 additions and 348 deletions

View File

@@ -21,17 +21,28 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="MRP Area">
<group colspan="4" col="2">
<group>
<field name="name"/>
<field name="active"/>
<sheet>
<div class="oe_button_box" name="button_box">
<button name="toggle_active" type="object"
class="oe_stat_button" icon="fa-archive">
<field name="active" widget="boolean_button"
options='{"terminology": "archive"}'/>
</button>
</div>
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<group colspan="4" col="2">
<group>
<field name="warehouse_id"/>
<field name="location_id"/>
</group>
<group name="settings">
<field name="warehouse_id"/>
<field name="location_id"/>
<field name="calendar_id"/>
</group>
</group>
<group>
<field name="warehouse_id"/>
<field name="location_id"/>
<field name="calendar_id"/>
</group>
</group>
</sheet>
</form>
</field>
</record>

View File

@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<odoo>
<record model="ir.ui.view" id="mrp_inventory_form">
<record id="mrp_inventory_form" model="ir.ui.view">
<field name="name">mrp.inventory.form</field>
<field name="model">mrp.inventory</field>
<field name="type">form</field>
@@ -29,7 +29,7 @@
</field>
</record>
<record model="ir.ui.view" id="mrp_inventory_tree">
<record id="mrp_inventory_tree" model="ir.ui.view">
<field name="name">mrp.inventory.tree</field>
<field name="model">mrp.inventory</field>
<field name="type">tree</field>
@@ -49,6 +49,7 @@
name="%(mrp_multi_level.act_mrp_inventory_procure)d"
icon="fa-cogs" type="action"
attrs="{'invisible':[('to_procure','&lt;=',0.0)]}"/>
<field name="running_availability"/>
</tree>
</field>
</record>
@@ -78,7 +79,7 @@
</field>
</record>
<record model="ir.ui.view" id="mrp_inventory_search">
<record id="mrp_inventory_search" model="ir.ui.view">
<field name="name">mrp.inventory.search</field>
<field name="model">mrp.inventory</field>
<field name="type">search</field>
@@ -108,7 +109,7 @@
</field>
</record>
<record model="ir.actions.act_window" id="mrp_inventory_action">
<record id="mrp_inventory_action" model="ir.actions.act_window">
<field name="name">MRP Inventory</field>
<field name="res_model">mrp.inventory</field>
<field name="type">ir.actions.act_window</field>

View File

@@ -49,13 +49,15 @@
<field name="mrp_exclude"/>
<field name="mrp_verified"/>
<field name="mrp_nbr_days"/>
<field name="mrp_transit_delay"/>
<field name="mrp_inspection_delay"/>
<!--hide delays for now-->
<field name="mrp_transit_delay" invisible="1"/>
<field name="mrp_inspection_delay" invisible="1"/>
<field name="mrp_minimum_stock"/>
<field name="mrp_minimum_order_qty"/>
<field name="mrp_maximum_order_qty"/>
<field name="mrp_qty_multiple"/>
<field name="supply_method"/>
<field name="mrp_lead_time"/>
<field name="main_supplierinfo_id"/>
</group>
</group>
@@ -63,7 +65,6 @@
<page name="mrp_moves" string="MRP Moves" groups="base.group_no_one">
<field name="mrp_move_ids" nolabel="1">
<tree>
<field name="mrp_action_date"/>
<field name="mrp_date"/>
<field name="current_date"/>
<field name="mrp_origin"/>
@@ -73,12 +74,21 @@
<field name="name"/>
<field name="mrp_qty"/>
<field name="current_qty"/>
<field name="running_availability"/>
<field name="mrp_minimum_stock" />
<field name="mrp_action"/>
<field name="mrp_type"/>
<field name="mrp_move_up_ids"/>
<field name="mrp_processed"/>
<field name="planned_order_up_ids"/>
</tree>
</field>
</page>
<page name="planned_orders" string="Planned Orders" groups="base.group_no_one">
<field name="planned_order_ids" nolabel="1">
<tree>
<field name="order_release_date"/>
<field name="due_date"/>
<field name="name"/>
<field name="mrp_qty"/>
<field name="mrp_action"/>
<field name="qty_released"/>
<field name="fixed"/>
</tree>
</field>
</page>