pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mrp, mrp_operations: fixed gantt view and fixed menuitemms consistancy

Browse Source 
bzr revid: qdp-launchpad@tinyerp.com-20101019115920-h2th5uuvd89dqmfr
This commit is contained in:
qdp-launchpad@tinyerp.com
2010-10-19 13:59:20 +02:00
parent c85cbf6db2
commit d657c75980
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp/mrp_view.xml
+11 -12
View File
@@ -200,16 +200,6 @@
</field>
</record>
<record id="mrp_workcenter_action" model="ir.actions.act_window">
<field name="name">Work Centers</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.workcenter</field>
<field name="view_type">form</field>
<field name="view_id" ref="mrp_workcenter_tree_view"/>
<field name="search_view_id" ref="view_mrp_workcenter_search"/>
<field name="help">Work Centers allows you to create and manage manufacturing units consisting of one or several people and/or machines that can be considered as a unit for capacity and planning forecasting.</field>
</record>
<!--
Routings
-->
@@ -314,7 +304,6 @@
<field name="search_view_id" ref="mrp_routing_search_view"/>
<field name="help">Routings allows you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.</field>
</record>
<menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="40" />
<menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="30"/>
<!--
@@ -923,8 +912,18 @@
<!-- Menu for Resource for MRP-->
<record id="mrp_workcenter_action" model="ir.actions.act_window">
<field name="name">Work Centers</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.workcenter</field>
<field name="view_type">form</field>
<field name="view_id" ref="mrp_workcenter_tree_view"/>
<field name="search_view_id" ref="view_mrp_workcenter_search"/>
<field name="help">Work Centers allows you to create and manage manufacturing units consisting of one or several people and/or machines that can be considered as a unit for capacity and planning forecasting.</field>
</record>
<menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
<menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
addons/mrp_operations/mrp_operations_view.xml
+11 -7
View File
@@ -181,9 +181,10 @@
<field name="model">mrp.production.workcenter.line</field>
<field name="type">gantt</field>
<field name="arch" type="xml">
<gantt color="production_id" date_stop="date_planned_end" date_start="date_planned" string="Operations">
<level object="mrp.workcenter" link="workcenter_id" domain="[]">
<gantt color="workcenter_id" date_delay="hour" date_start="date_planned" string="Operations">
<level object="mrp.workcenter" link="production_id" domain="[]">
<field name="product"/>
<field name="hour"/>
<field name="production_id"/>
</level>
</gantt>
@@ -219,22 +220,23 @@
<field name="model">mrp.production.workcenter.line</field>
<field name="type">gantt</field>
<field name="arch" type="xml">
<gantt color="workcenter_id" date_delay="delay" date_start="date_planned" string="Resources">
<gantt color="production_id" date_delay="hour" date_start="date_planned">
<level object="mrp.workcenter" link="workcenter_id" domain="[]">
<field name="delay"/>
<field name="workcenter_id"/>
<field name="product"/>
<field name="hour"/>
<field name="production_id"/>
</level>
</gantt>
</field>
</record>
<record model="ir.actions.act_window" id="mrp_production_wc_resource_planning">
<field name="name">Resources</field>
<field name="name">Work Centers</field>
<field name="type">ir.actions.act_window</field>
<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</field>
<field name="view_mode">gantt,tree,form,calendar,graph</field>
<field name="view_id" ref="workcenter_line_resource_gantt"/>
</record>
@@ -279,10 +281,12 @@
id="menu_mrp_production_wc_action_planning"
action="mrp_production_wc_action_planning"
sequence="2"
icon="STOCK_INDENT"
groups="base.group_extended"/>
<menuitem parent="mrp.menu_mrp_planning"
id="menu_mrp_production_wc_resource_planning"
action="mrp_production_wc_resource_planning"
icon="STOCK_INDENT"
groups="base.group_extended"/>
<!-- Operation codes -->