pre-commit update

This commit is contained in:
OCA-git-bot
2020-03-14 12:13:10 +01:00
committed by davidborromeo
parent 3fe0907150
commit 1ec8055a84
19 changed files with 450 additions and 389 deletions

View File

@@ -1,21 +1,19 @@
<?xml version="1.0"?>
<?xml version="1.0" ?>
<odoo>
<record model="ir.ui.view" id="mrp_area_tree">
<field name="name">mrp.area.tree</field>
<field name="model">mrp.area</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="MRP Area">
<field name="name"/>
<field name="warehouse_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="location_id"/>
<field name="calendar_id"/>
<field name="name" />
<field name="warehouse_id" />
<field name="company_id" groups="base.group_multi_company" />
<field name="location_id" />
<field name="calendar_id" />
</tree>
</field>
</record>
<record model="ir.ui.view" id="mrp_area_form">
<field name="name">mrp.area.form</field>
<field name="model">mrp.area</field>
@@ -23,32 +21,40 @@
<field name="arch" type="xml">
<form string="MRP Area">
<sheet>
<div class="oe_button_box" name="button_box"/>
<widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<div class="oe_button_box" name="button_box" />
<widget
name="web_ribbon"
title="Archived"
bg_color="bg-danger"
attrs="{'invisible': [('active', '=', True)]}"
/>
<label for="name" class="oe_edit_only" />
<h1>
<field name="name" />
</h1>
<group colspan="4" col="2">
<group>
<field name="active" invisible="1"/>
<field name="warehouse_id"/>
<field name="location_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="active" invisible="1" />
<field name="warehouse_id" />
<field name="location_id" />
<field
name="company_id"
groups="base.group_multi_company"
/>
</group>
<group name="settings">
<field name="calendar_id"/>
<field name="calendar_id" />
</group>
</group>
</sheet>
</form>
</field>
</record>
<record model="ir.actions.act_window" id="mrp_area_action">
<field name="name">MRP Area</field>
<field name="res_model">mrp.area</field>
<field name="type">ir.actions.act_window</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="mrp_area_tree"/>
<field name="view_id" ref="mrp_area_tree" />
</record>
</odoo>

View File

@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<?xml version="1.0" ?>
<odoo>
<record id="mrp_inventory_form" model="ir.ui.view">
<field name="name">mrp.inventory.form</field>
<field name="model">mrp.inventory</field>
@@ -10,79 +9,81 @@
<sheet>
<group>
<group>
<field name="mrp_area_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="product_id"/>
<field name="product_mrp_area_id"/>
<field name="supply_method"/>
<field name="date"/>
<field name="mrp_area_id" />
<field
name="company_id"
groups="base.group_multi_company"
/>
<field name="product_id" />
<field name="product_mrp_area_id" />
<field name="supply_method" />
<field name="date" />
</group>
<group>
<field name="initial_on_hand_qty"/>
<field name="demand_qty"/>
<field name="supply_qty"/>
<field name="final_on_hand_qty"/>
<field name="to_procure"/>
<field name="uom_id" groups="uom.group_uom"/>
<field name="initial_on_hand_qty" />
<field name="demand_qty" />
<field name="supply_qty" />
<field name="final_on_hand_qty" />
<field name="to_procure" />
<field name="uom_id" groups="uom.group_uom" />
</group>
</group>
</sheet>
</form>
</field>
</record>
<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>
<field name="arch" type="xml">
<tree string="MRP Inventory" create="false">
<field name="mrp_area_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="product_id"/>
<field name="date"/>
<field name="uom_id" groups="uom.group_uom"/>
<field name="initial_on_hand_qty"/>
<field name="demand_qty"/>
<field name="supply_qty"/>
<field name="final_on_hand_qty"/>
<field name="to_procure"/>
<field name="order_release_date"/>
<button string="Create Procurement"
name="%(mrp_multi_level.act_mrp_inventory_procure)d"
icon="fa-cogs" type="action"
attrs="{'invisible':[('to_procure','&lt;=',0.0)]}"/>
<field name="supply_method"/>
<field name="running_availability"/>
<field name="mrp_area_id" />
<field name="company_id" groups="base.group_multi_company" />
<field name="product_id" />
<field name="date" />
<field name="uom_id" groups="uom.group_uom" />
<field name="initial_on_hand_qty" />
<field name="demand_qty" />
<field name="supply_qty" />
<field name="final_on_hand_qty" />
<field name="to_procure" />
<field name="order_release_date" />
<button
string="Create Procurement"
name="%(mrp_multi_level.act_mrp_inventory_procure)d"
icon="fa-cogs"
type="action"
attrs="{'invisible':[('to_procure','&lt;=',0.0)]}"
/>
<field name="supply_method" />
<field name="running_availability" />
</tree>
</field>
</record>
<record id="view_mrp_inventory_pivot" model="ir.ui.view">
<field name="name">mrp.inventory.pivot</field>
<field name="model">mrp.inventory</field>
<field name="arch" type="xml">
<pivot string="MRP Inventory">
<field name="final_on_hand_qty" type="measure"/>
<field name="mrp_area_id" type="row"/>
<field name="product_mrp_area_id" type="row"/>
<field name="date" interval="day" type="col"/>
<field name="final_on_hand_qty" type="measure" />
<field name="mrp_area_id" type="row" />
<field name="product_mrp_area_id" type="row" />
<field name="date" interval="day" type="col" />
</pivot>
</field>
</record>
<record id="view_mrp_inventory_graph" model="ir.ui.view">
<field name="name">mrp.inventory.graph</field>
<field name="model">mrp.inventory</field>
<field name="arch" type="xml">
<graph string="MRP Inventory" type="line">
<field name="final_on_hand_qty" type="measure"/>
<field name="date" interval="day" type="row"/>
<field name="product_mrp_area_id" type="row"/>
<field name="final_on_hand_qty" type="measure" />
<field name="date" interval="day" type="row" />
<field name="product_mrp_area_id" type="row" />
</graph>
</field>
</record>
<record id="mrp_inventory_search" model="ir.ui.view">
<field name="name">mrp.inventory.search</field>
<field name="model">mrp.inventory</field>
@@ -90,39 +91,48 @@
<field name="arch" type="xml">
<search string="MRP Inventory">
<group name="select" expand="0" string="Selection...">
<field name="product_id"/>
<field name="mrp_area_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="product_id" />
<field name="mrp_area_id" />
<field name="company_id" groups="base.group_multi_company" />
</group>
<separator/>
<filter string="To Procure" name="filter_to_procure"
domain="[['to_procure','>',0.0]]"/>
<separator/>
<separator />
<filter
string="To Procure"
name="filter_to_procure"
domain="[['to_procure','>',0.0]]"
/>
<separator />
<group expand="0" string="Group By...">
<filter name="group_product"
string="Product"
context="{'group_by':'product_mrp_area_id'}"/>
<filter name="group_mrp_area"
string="MRP Area"
context="{'group_by':'mrp_area_id'}"/>
<filter name="group_supply_method"
string="Supply Method"
context="{'group_by':'supply_method'}"/>
<filter name="group_release_date"
string="Date to Procure"
context="{'group_by':'order_release_date'}"/>
<filter
name="group_product"
string="Product"
context="{'group_by':'product_mrp_area_id'}"
/>
<filter
name="group_mrp_area"
string="MRP Area"
context="{'group_by':'mrp_area_id'}"
/>
<filter
name="group_supply_method"
string="Supply Method"
context="{'group_by':'supply_method'}"
/>
<filter
name="group_release_date"
string="Date to Procure"
context="{'group_by':'order_release_date'}"
/>
</group>
</search>
</field>
</record>
<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>
<field name="view_mode">tree,form,pivot,graph</field>
<field name="view_id" ref="mrp_inventory_tree"/>
<field name="search_view_id" ref="mrp_inventory_search"/>
<field name="view_id" ref="mrp_inventory_tree" />
<field name="search_view_id" ref="mrp_inventory_search" />
</record>
</odoo>

View File

@@ -1,30 +1,33 @@
<?xml version="1.0"?>
<?xml version="1.0" ?>
<odoo>
<menuitem name="MRP"
id="menu_mrp_mrp"
parent="mrp.menu_mrp_root"
sequence="22"/>
<menuitem name="MRP Areas"
id="menu_mrp_areas"
action="mrp_area_action"
parent="mrp.menu_mrp_configuration"
sequence="50"/>
<menuitem name="Product MRP Area Parameters"
id="menu_product_mrp_area_parameters"
action="product_mrp_area_action"
parent="mrp.menu_mrp_bom"
sequence="10"/>
<menuitem name="MRP Inventory"
id="menu_mrp_inventory"
action="mrp_inventory_action"
parent="mrp.menu_mrp_manufacturing"
sequence="30"/>
<menuitem name="Run MRP Multi Level"
id="menu_mrp_multi_level"
action="action_mrp_multi_level"
parent="mrp.menu_mrp_manufacturing"
groups="mrp.group_mrp_manager"
sequence="40"/>
<menuitem name="MRP" id="menu_mrp_mrp" parent="mrp.menu_mrp_root" sequence="22" />
<menuitem
name="MRP Areas"
id="menu_mrp_areas"
action="mrp_area_action"
parent="mrp.menu_mrp_configuration"
sequence="50"
/>
<menuitem
name="Product MRP Area Parameters"
id="menu_product_mrp_area_parameters"
action="product_mrp_area_action"
parent="mrp.menu_mrp_bom"
sequence="10"
/>
<menuitem
name="MRP Inventory"
id="menu_mrp_inventory"
action="mrp_inventory_action"
parent="mrp.menu_mrp_manufacturing"
sequence="30"
/>
<menuitem
name="Run MRP Multi Level"
id="menu_mrp_multi_level"
action="action_mrp_multi_level"
parent="mrp.menu_mrp_manufacturing"
groups="mrp.group_mrp_manager"
sequence="40"
/>
</odoo>

View File

@@ -1,31 +1,29 @@
<?xml version="1.0"?>
<?xml version="1.0" ?>
<odoo>
<record model="ir.ui.view" id="product_mrp_area_tree">
<field name="name">product.mrp.area.tree</field>
<field name="model">product.mrp.area</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Product MRP Area parameters">
<field name="mrp_area_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="product_tmpl_id"/>
<field name="product_id" groups="product.group_product_variant"/>
<field name="mrp_exclude"/>
<field name="mrp_verified"/>
<field name="mrp_nbr_days"/>
<field name="mrp_transit_delay"/>
<field name="mrp_inspection_delay"/>
<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="main_supplierinfo_id"/>
<field name="mrp_area_id" />
<field name="company_id" groups="base.group_multi_company" />
<field name="product_tmpl_id" />
<field name="product_id" groups="product.group_product_variant" />
<field name="mrp_exclude" />
<field name="mrp_verified" />
<field name="mrp_nbr_days" />
<field name="mrp_transit_delay" />
<field name="mrp_inspection_delay" />
<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="main_supplierinfo_id" />
</tree>
</field>
</record>
<record model="ir.ui.view" id="product_mrp_area_form">
<field name="name">product.mrp.area.form</field>
<field name="model">product.mrp.area</field>
@@ -33,72 +31,93 @@
<field name="arch" type="xml">
<form string="Product MRP Area parameters">
<sheet>
<div class="oe_button_box" name="button_box"/>
<widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
<div class="oe_button_box" name="button_box" />
<widget
name="web_ribbon"
title="Archived"
bg_color="bg-danger"
attrs="{'invisible': [('active', '=', True)]}"
/>
<group colspan="4" col="2">
<group>
<field name="active" invisible="1"/>
<field name="mrp_area_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="product_tmpl_id" invisible="1"/>
<field name="product_id"/>
<field name="location_id" invisible="1"/>
<field name="location_proc_id" options="{'no_create': True}"/>
<field name="active" invisible="1" />
<field name="mrp_area_id" />
<field
name="company_id"
groups="base.group_multi_company"
/>
<field name="product_tmpl_id" invisible="1" />
<field name="product_id" />
<field name="location_id" invisible="1" />
<field
name="location_proc_id"
options="{'no_create': True}"
/>
</group>
<group>
<field name="mrp_exclude"/>
<field name="mrp_verified"/>
<field name="mrp_nbr_days"/>
<field name="mrp_exclude" />
<field name="mrp_verified" />
<field name="mrp_nbr_days" />
<!--hide delays for now-->
<field name="mrp_transit_delay" invisible="1"/>
<field name="mrp_inspection_delay" invisible="1"/>
<field name="mrp_minimum_stock"/>
<label for="mrp_minimum_order_qty"/>
<field name="mrp_transit_delay" invisible="1" />
<field name="mrp_inspection_delay" invisible="1" />
<field name="mrp_minimum_stock" />
<label for="mrp_minimum_order_qty" />
<div name="mrp_minimum_order_qty" class="o_row">
<field name="mrp_minimum_order_qty"/>
<field name="mrp_minimum_order_qty" />
<span name="update_min_qty">
<button string="Get from main supplier" type="object"
<button
string="Get from main supplier"
type="object"
name="update_min_qty_from_main_supplier"
attrs="{'invisible':[('supply_method', '!=', 'buy'), ('main_supplierinfo_id', '=', False)]}"
class="oe_link pt-0 oe_inline"
/>
</span>
</div>
<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"/>
<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>
<notebook>
<page name="mrp_moves" string="MRP Moves" groups="base.group_no_one">
<page
name="mrp_moves"
string="MRP Moves"
groups="base.group_no_one"
>
<field name="mrp_move_ids" nolabel="1">
<tree>
<field name="mrp_date"/>
<field name="current_date"/>
<field name="mrp_origin"/>
<field name="state"/>
<field name="mrp_order_number"/>
<field name="parent_product_id"/>
<field name="name"/>
<field name="mrp_qty"/>
<field name="current_qty"/>
<field name="mrp_type"/>
<field name="planned_order_up_ids"/>
<field name="mrp_date" />
<field name="current_date" />
<field name="mrp_origin" />
<field name="state" />
<field name="mrp_order_number" />
<field name="parent_product_id" />
<field name="name" />
<field name="mrp_qty" />
<field name="current_qty" />
<field name="mrp_type" />
<field name="planned_order_up_ids" />
</tree>
</field>
</page>
<page name="planned_orders" string="Planned Orders" groups="base.group_no_one">
<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"/>
<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>
@@ -107,28 +126,29 @@
</form>
</field>
</record>
<record model="ir.ui.view" id="product_mrp_area_search">
<field name="name">product.mrp.area.search</field>
<field name="model">product.mrp.area</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Product MRP Area parameters">
<field name="product_id"/>
<field name="mrp_area_id"/>
<separator/>
<filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
<field name="product_id" />
<field name="mrp_area_id" />
<separator />
<filter
string="Archived"
name="inactive"
domain="[('active','=',False)]"
/>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="product_mrp_area_action">
<field name="name">Product MRP Area Parameters</field>
<field name="res_model">product.mrp.area</field>
<field name="type">ir.actions.act_window</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="product_mrp_area_tree"/>
<field name="search_view_id" ref="product_mrp_area_search"/>
<field name="view_id" ref="product_mrp_area_tree" />
<field name="search_view_id" ref="product_mrp_area_search" />
</record>
</odoo>

View File

@@ -1,20 +1,20 @@
<?xml version="1.0"?>
<?xml version="1.0" ?>
<odoo>
<record model="ir.ui.view" id="view_mrp_product_product_form">
<field name="name">view.product.mrp.area.product.form</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" />
<field name="type">form</field>
<field name="arch" type="xml">
<div name="button_box" position="inside">
<button type="object"
<button
type="object"
name="action_view_mrp_area_parameters"
class="oe_stat_button"
icon="fa-eject"
groups="mrp.group_mrp_user">
<field name="mrp_area_count" widget="statinfo"
string="MRP Areas"/>
groups="mrp.group_mrp_user"
>
<field name="mrp_area_count" widget="statinfo" string="MRP Areas" />
</button>
</div>
</field>

View File

@@ -1,22 +1,21 @@
<?xml version="1.0"?>
<?xml version="1.0" ?>
<odoo>
<record id="product_template_only_form_view_mrp" model="ir.ui.view">
<field name="name">product.template.product.form.mrp</field>
<field name="model">product.template</field>
<field name="inherit_id" ref="product.product_template_only_form_view"/>
<field name="inherit_id" ref="product.product_template_only_form_view" />
<field name="arch" type="xml">
<div name="button_box" position="inside">
<button type="object"
name="action_view_mrp_area_parameters"
class="oe_stat_button"
icon="fa-eject"
groups="mrp.group_mrp_user">
<field name="mrp_area_count" widget="statinfo"
string="MRP Areas"/>
<button
type="object"
name="action_view_mrp_area_parameters"
class="oe_stat_button"
icon="fa-eject"
groups="mrp.group_mrp_user"
>
<field name="mrp_area_count" widget="statinfo" string="MRP Areas" />
</button>
</div>
</field>
</record>
</odoo>

View File

@@ -1,38 +1,33 @@
<?xml version="1.0"?>
<?xml version="1.0" ?>
<odoo>
<record id="view_location_form" model="ir.ui.view">
<field name="name">stock.location.form</field>
<field name="model">stock.location</field>
<field name="inherit_id" ref="stock.view_location_form"/>
<field name="inherit_id" ref="stock.view_location_form" />
<field name="arch" type="xml">
<field name="company_id" position="before">
<field name="mrp_area_id"/>
<field name="mrp_area_id" />
</field>
</field>
</record>
<record id="view_location_search" model="ir.ui.view">
<field name="name">stock.location.search</field>
<field name="model">stock.location</field>
<field name="inherit_id" ref="stock.view_location_search"/>
<field name="inherit_id" ref="stock.view_location_search" />
<field name="arch" type="xml">
<field name="location_id" position="after">
<field name="mrp_area_id"/>
<field name="mrp_area_id" />
</field>
</field>
</record>
<record id="view_location_tree2" model="ir.ui.view">
<field name="name">stock.location.tree</field>
<field name="model">stock.location</field>
<field name="inherit_id" ref="stock.view_location_tree2"/>
<field name="inherit_id" ref="stock.view_location_tree2" />
<field name="arch" type="xml">
<field name="company_id" position="before">
<field name="mrp_area_id"/>
<field name="mrp_area_id" />
</field>
</field>
</record>
</odoo>