odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MOD,IMP] Improvement in manufaturing menu chagnes 

bzr revid: vir@tinyerp.com-20100111110421-lusv8b2q8w26aq6j
This commit is contained in:
Vir (Open ERP) 2010-01-11 16:34:21 +05:30
parent ac8dc75e42
commit 2415d1c4e0
3 changed files with 69 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
addons/mrp/mrp_view.xml
View File

@ -4,13 +4,14 @@
<menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing"
groups="group_mrp_user,group_mrp_manager"/>
<menuitem id="menu_mrp_reordering" name="Automatic Requisitions" parent="stock.menu_stock_root" sequence="4"/>
<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="menu_mrp_root" sequence="1"/>
<menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="menu_mrp_root" sequence="1"/>
<menuitem name="Control" id="menu_mrp_control" parent="menu_mrp_root" sequence="3" />
<menuitem name="Master Data"
id="menu_mrp_bom"
parent="menu_mrp_root"
sequence="5" />
sequence="5" />
<!--
Property / Property Group
-->
@ -79,7 +80,7 @@
id="menu_mrp_property"
parent="menu_mrp_configuration"
groups="base.group_extended"
sequence="10" />
sequence="20" />
<menuitem
action="mrp_property_action"
id="menu_mrp_property_action"
@ -227,8 +228,8 @@
</record>
<!-- <menuitem name="Routings" id="menu_mrp_routing_and_workcenters" parent="mrp.menu_mrp_bom" groups="base.group_extended"
sequence="100" />-->
<menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" />
<menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_bom" groups="base.group_extended"/>
<menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="40" />
<menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="30"/>
<!--
Bill of Materials
@ -314,7 +315,7 @@
</record>
<!-- BOM menus -->
<!-- <menuitem name="Bill of Materials"
id="menu_mrp_bom"
parent="menu_mrp_bom"
@ -381,7 +382,7 @@
<field name="model">mrp.production</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date and state in ('done','cancel') " string="Production orders">
<tree colors="red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date and state in ('done','cancel') " string="Manufacturing Orders">
<field name="name"/>
<field name="product_id"/>
<field name="product_qty" sum="Total Qty"/>
@ -401,7 +402,7 @@
<field name="type">calendar</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<calendar color="routing_id" date_start="date_planned" string="Production Orders">
<calendar color="routing_id" date_start="date_planned" string="Manufacturing Orders">
<field name="origin"/>
<field name="product_id"/>
<field name="product_qty"/>
@ -430,7 +431,7 @@
<field name="model">mrp.production</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Production orders" type="bar">
<graph string="Manufacturing Orders" type="bar">
<field name="date_planned_date"/>
<field name="hour_total" operator="+"/>
<field name="cycle_total" operator="+"/>
@ -450,7 +451,7 @@
<field name="model">mrp.production</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Production orders">
<form string="Manufacturing Orders">
<group colspan="4" col="7">
<field name="name" select="1"/>
<field name="date_planned" select="1"/>
@ -531,8 +532,8 @@
<field name="arch" type="xml">
<search string="Search Production">
<group col='8' colspan='4'>
<filter icon="terp-mrp" string="Ready" domain="[('state','=','ready')]" help="Production orders which are ready to produce"/>
<filter icon="terp-mrp" string="In Production" domain="[('state','=','in_production')]" help="Production orders which are in production"/>
<filter icon="terp-mrp" string="Ready" domain="[('state','=','ready')]" help="Manufacturing Orders which are ready to produce"/>
<filter icon="terp-mrp" string="In Production" domain="[('state','=','in_production')]" help="Manufacturing Orders which are in production"/>
<separator orientation="vertical"/>
<field name="name" select='1'/>
<field name="product_id" select='1'/>
@ -544,7 +545,7 @@
</record>
<record id="mrp_production_action" model="ir.actions.act_window">
<field name="name">Production Orders</field>
<field name="name">Manufacturing Orders</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.production</field>
<field name="view_type">form</field>
@ -552,10 +553,10 @@
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_mrp_production_filter"/>
</record>
<menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" sequence="-30"/>
<menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" sequence="1"/>
<record id="mrp_production_action2_gantt" model="ir.actions.act_window">
<field name="name">Production Orders Planning</field>
<field name="name">Manufacturing Orders Planning</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.production</field>
<field name="view_type">form</field>
@ -564,7 +565,7 @@
</record>
<record id="mrp_production_action2" model="ir.actions.act_window">
<field name="name">Production Orders To Start</field>
<field name="name">Manufacturing Orders To Start</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.production</field>
<field name="view_type">form</field>
@ -575,7 +576,7 @@
</record>
<record id="mrp_production_action3" model="ir.actions.act_window">
<field name="name">Production Orders in Progress</field>
<field name="name">Manufacturing Orders in Progress</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.production</field>
<field name="view_type">form</field>
@ -586,7 +587,7 @@
</record>
<record id="mrp_production_action4" model="ir.actions.act_window">
<field name="name">Production Orders Waiting Products</field>
<field name="name">Manufacturing Orders Waiting Products</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.production</field>
<field name="view_type">form</field>
@ -660,7 +661,7 @@
</record>
<!--
Requisition
Procurement
-->
<record id="mrp_procurement_tree_view" model="ir.ui.view">
@ -668,7 +669,7 @@
<field name="model">mrp.procurement</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Requisition Lines">
<tree string="Procurement Lines">
<field name="name"/>
<field name="product_id"/>
<field name="product_qty"/>
@ -686,10 +687,10 @@
<field name="model">mrp.procurement</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Requisition">
<form string="Procurement">
<group col="2" colspan="2">
<separator colspan="2" string="References"/>
<field name="name" select="1" string="Requisition Reason"/>
<field name="name" select="1" string="Procurement Reason"/>
<field name="origin" select="2"/>
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
</group>
@ -700,7 +701,7 @@
<field name="priority" groups="base.group_extended"/>
</group>
<notebook colspan="4">
<page string="Requisition Details">
<page string="Procurement Details">
<separator colspan="4" string="Product &amp; Location"/>
<field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
<field name="location_id" select="2"/>
@ -717,7 +718,7 @@
<button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
<button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
<button name="button_cancel" states="exception,waiting" string="Cancel" icon="gtk-cancel"/>
<button name="button_check" states="confirmed" string="Run Requisition" icon="gtk-media-play"/>
<button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
<button name="button_cancel" states="draft,running" string="Cancel" icon="gtk-cancel"/>
</group>
</page>
@ -734,7 +735,7 @@
<page string="Notes">
<separator colspan="4" string="Note" />
<field name="note" colspan="4" nolabel="1"/>
</page>
</page>
</notebook>
</form>
</field>
@ -744,9 +745,9 @@
<field name="model">mrp.procurement</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Requisition">
<search string="Search Procurement">
<group col='8' colspan='4'>
<filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Requisition orders with exceptions"/>
<filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
<separator orientation="vertical"/>
<field name="name" select='1'/>
<field name="product_id" select='1'/>
@ -757,7 +758,7 @@
</field>
</record>
<record id="mrp_procurement_action" model="ir.actions.act_window">
<field name="name">Requisition Orders</field>
<field name="name">Procurement Orders</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field>
<field name="view_type">form</field>
@ -765,10 +766,10 @@
<field name="search_view_id" ref="view_mrp_procurement_filter"/>
</record>
<menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_manufacturing"
sequence="-40" />
sequence="2" />
<record id="mrp_procurement_action3" model="ir.actions.act_window">
<field name="name">Unscheduled Requisitions</field>
<field name="name">Unscheduled Procurements</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field>
<field name="view_type">form</field>
@ -777,7 +778,7 @@
</record>
<record id="mrp_procurement_action5" model="ir.actions.act_window">
<field name="name">Requisition Exceptions</field>
<field name="name">Procurement Exceptions</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field>
<field name="view_type">form</field>
@ -785,8 +786,10 @@
<field name="domain">[('state','=','exception')]</field>
</record>
<menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_exception_action" parent="mrp.menu_mrp_control"
sequence="1" />
<record id="mrp_procurement_action4" model="ir.actions.act_window">
<field name="name">Requisition Exceptions to Fix</field>
<field name="name">Procurement Exceptions to Fix</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field>
<field name="view_type">form</field>
@ -796,7 +799,7 @@
</record>
<record id="mrp_procurement_action11" model="ir.actions.act_window">
<field name="name">Temporary Requisition Exceptions</field>
<field name="name">Temporary Procurement Exceptions</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field>
<field name="view_type">form</field>

23
addons/mrp_operations/mrp_operations_view.xml
View File

@ -138,7 +138,7 @@
<field name="res_model">mrp.production.workcenter.line</field>
<field name="view_type">form</field>
<field name="domain">[('production_state','in',('ready','confirmed','in_production'))]</field>
<field name="view_mode">gantt,tree,form,graph,calendar</field>
<field name="view_mode">tree,form,graph,calendar</field>
</record>
@ -151,7 +151,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph,gantt,calendar</field>
<field name="domain">[('production_state','=','ready')]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
</record>
<!-- Action for Draft Operations -->
@ -163,7 +163,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
</record>
<record model="ir.values" id="mrp_production_wc_action_open">
@ -175,7 +175,10 @@
</record>
<menuitem name="All Work Orders" parent="menu_mrp_planning" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/>
<menuitem action="mrp.mrp_production_action" id="menu_mrp_production_order_action" parent="menu_mrp_planning" sequence="1"/>
<menuitem name="Work Orders" parent="mrp.menu_mrp_manufacturing" id="menu_mrp_production_wc_order" action="mrp_production_wc_action_form"/>
<menuitem name="Work Orders" parent="menu_mrp_planning" id="menu_mrp_production_wc_action_planning" action="mrp_production_wc_action_planning" sequence="2"/>
<!-- <menuitem name="All Work Orders" parent="menu_mrp_planning" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/>-->
<!-- Operation codes -->
@ -214,7 +217,7 @@
<field name="view_id" ref="mrp_production_code_tree_view"/>
</record>
<menuitem name="Start - Stop Codes" parent="menu_mrp_planning" id="menu_mrp_production_code_action" action="mrp_production_code_action"/>
<!-- <menuitem name="Start - Stop Codes" parent="menu_mrp_planning" id="menu_mrp_production_code_action" action="mrp_production_code_action"/>-->
<!-- Operations -->
@ -271,11 +274,11 @@
<field name="view_id" ref="mrp_production_operation_tree_view"/>
</record>
<menuitem
name="Work Order Events Using Bar Codes"
parent="menu_mrp_planning"
id="menu_mrp_production_operation_action"
action="mrp_production_operation_action"/>
<!-- <menuitem-->
<!-- name="Work Order Events Using Bar Codes"-->
<!-- parent="menu_mrp_planning"-->
<!-- id="menu_mrp_production_operation_action"-->
<!-- action="mrp_production_operation_action"/>-->
<record id="mrp_production_reorder_form_view" model="ir.ui.view">
<field name="name">mrp.production.allow_reorder.form</field>

37
addons/mrp_operations/process/mrp_operation_process.xml
View File

@ -1,21 +1,21 @@
<?xml version="1.0" ?>
<openerp>
<data>
<!--
Process
-->
<record id="process_process_mrpoperationprocess0" model="process.process">
<field eval="&quot;&quot;&quot;Mrp Operations&quot;&quot;&quot;" name="name"/>
<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
<field eval="1" name="active"/>
</record>
<!--
Process Node
-->
<record id="process_node_productionorder0" model="process.node">
<field name="menu_id" ref="mrp.menu_mrp_production_action"/>
<field name="model_id" ref="mrp.model_mrp_production"/>
@ -26,9 +26,9 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/>
</record>
<record id="process_node_workorder0" model="process.node">
<field name="menu_id" ref="menu_mrp_production_operation_action"/>
<!-- <field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Information from the routing definition.&quot;&quot;&quot;" name="note"/>
@ -37,9 +37,9 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/>
</record>
<record id="process_node_startoperation0" model="process.node">
<field name="menu_id" ref="menu_mrp_production_operation_action"/>
<!-- <field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Start the operation.&quot;&quot;&quot;" name="note"/>
@ -48,9 +48,9 @@
<field eval="&quot;&quot;&quot;object.state=='startworking'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_doneoperation0" model="process.node">
<field name="menu_id" ref="menu_mrp_production_operation_action"/>
<!-- <field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Finish the operation.&quot;&quot;&quot;" name="note"/>
@ -59,9 +59,9 @@
<field eval="&quot;&quot;&quot;object.state=='done'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_canceloperation0" model="process.node">
<field name="menu_id" ref="menu_mrp_production_operation_action"/>
<!-- <field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Cancel the operation.&quot;&quot;&quot;" name="note"/>
@ -70,11 +70,11 @@
<field eval="&quot;&quot;&quot;object.state=='cancel'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<!--
Process Transition
-->
<record id="process_transition_productionstart0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -83,7 +83,7 @@
<field model="process.node" name="target_node_id" ref="process_node_startoperation0"/>
<field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
</record>
<record id="process_transition_workstartoperation0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -92,7 +92,7 @@
<field model="process.node" name="target_node_id" ref="process_node_startoperation0"/>
<field model="process.node" name="source_node_id" ref="process_node_workorder0"/>
</record>
<record id="process_transition_startdoneoperation0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -101,7 +101,7 @@
<field model="process.node" name="target_node_id" ref="process_node_doneoperation0"/>
<field model="process.node" name="source_node_id" ref="process_node_startoperation0"/>
</record>
<record id="process_transition_startcanceloperation0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -110,7 +110,6 @@
<field model="process.node" name="target_node_id" ref="process_node_canceloperation0"/>
<field model="process.node" name="source_node_id" ref="process_node_startoperation0"/>
</record>
</data>
</openerp>