[IMP]:improved the menu of Resources in project_long_term and mrp

bzr revid: rvo@tinyerp.co.in-20100303112640-ye7j3c0j0u31zzx6

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index d47311f..fde53d5 100644 (file)
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -2,15 +2,15 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing"
+        <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
             groups="group_mrp_user,group_mrp_manager" sequence="3"/>
         <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 id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
 
-        <menuitem name="Control" id="menu_mrp_control" parent="menu_mrp_root"  sequence="3" />
+        <menuitem name="Control" id="menu_mrp_control" parent="base.menu_mrp_root"  sequence="3" />
        <menuitem name="Master Data"
                   id="menu_mrp_bom"
-                  parent="menu_mrp_root"
+                  parent="base.menu_mrp_root"
                   sequence="5" />
         <!--
         Property / Property Group
@@ -38,7 +38,7 @@
         <menuitem
             id="menu_mrp_configuration"
             name="Configuration"
-            parent="menu_mrp_root"
+            parent="base.menu_mrp_root"
             groups="group_mrp_manager"
             sequence="50" />
 
@@ -446,7 +446,7 @@
             id="mrp.wizard_change_production_qty"
             keyword="client_action_multi"
             multi="True"/>
-       
+
         <record id="mrp_production_form_view" model="ir.ui.view">
             <field name="name">mrp.production.form</field>
             <field name="model">mrp.production</field>
@@ -457,17 +457,17 @@
                         <field name="name" select="1" string="Reference"/>
                         <field name="date_planned" select="1"/>
                         <field name="origin" select="1"/>
-                        <field name="product_id" on_change="product_id_change(product_id)" select="1"/>                        
+                        <field name="product_id" on_change="product_id_change(product_id)" select="1"/>
                         <field name="product_qty"/>
                         <group colspan="2" col="3">
                             <field name="product_uom"/>
                         </group>
-                        <label string="" colspan="2"/>                          
-                        <field name="product_uos_qty" groups="product.group_uos"/>                        
+                        <label string="" colspan="2"/>
+                        <field name="product_uos_qty" groups="product.group_uos"/>
                         <group colspan="2" col="3" groups="product.group_uos">
                             <field name="product_uos"/>
-                            <label string=""/> 
-                        </group>                        
+                            <label string=""/>
+                        </group>
                     </group>
 
                     <notebook colspan="4">
@@ -510,7 +510,7 @@
                                                <field name="product_uom" readonly="1" />
                                                <field name="state" invisible="1" />
                                                <field name="location_id" readonly="1"/>
-                                               <field name="prodlot_id" />                                             
+                                               <field name="prodlot_id" />
                                                <button
                                                        name="%(stock.track_line)d"
                                                        string="Split in production lots"
@@ -527,13 +527,13 @@
                                                <field name="product_qty" />
                                                <field name="product_uom" />
                                        </form>
-                               </field>                                                
+                               </field>
 
                             <group col="9" colspan="4">
                                 <field name="state" select="2"/>
                                 <button name="action_compute" states="draft" string="Compute Data" type="object" icon="gtk-execute"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
-                                <button name="button_produce" states="ready" string="Mark as Start" icon="gtk-execute"/>                                
+                                <button name="button_produce" states="ready" string="Mark as Start" icon="gtk-execute"/>
                                 <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
                                 <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
                                 <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-cancel"/>
@@ -576,11 +576,11 @@
                                                <field name="product_uom" readonly="1" />
                                                <field name="state" invisible="1" />
                                                <field name="location_id" readonly="1"/>
-                                               <field name="prodlot_id" />                                             
-                                               <button name="%(stock.track_line)d" 
+                                               <field name="prodlot_id" />
+                                               <button name="%(stock.track_line)d"
                                             string="Split in production lots" type="action" icon="gtk-justify-fill" states="done,cancel"/>
                                                <button name="%(stock.move_scrap)d"
-                                                       string="D" type="action" icon="gtk-go-forward" 
+                                                       string="D" type="action" icon="gtk-go-forward"
                                                        states="done,cancel" />
                                        </tree>
                                        <form string="Finished Products">
@@ -867,7 +867,7 @@
                                help="Procurement started late" />
                        <separator orientation="vertical"/>
                        <field name="name"/>
-                       <field name="origin"/> 
+                       <field name="origin"/>
                        <field name="product_id" />
                        <field name="date_planned" widget="date"/>
                        <field name="state" />
@@ -898,12 +898,12 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_mrp_procurement_filter"/>
-            <field name="domain">[]</field> 
-            <field name="context">{}</field>            
+            <field name="domain">[]</field>
+            <field name="context">{}</field>
         </record>
 
       <menuitem action="mrp_procurement_action3" id="menu_procurement_requisitions" parent="purchase.menu_procurement_management"
-                  name="Requisitions" sequence="5" />  
+                  name="Requisitions" sequence="5" />
 
 
 
@@ -968,7 +968,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record id="view_warehouse_orderpoint_form" model="ir.ui.view">
             <field name="name">stock.warehouse.orderpoint.form</field>
             <field name="model">stock.warehouse.orderpoint</field>
@@ -1037,5 +1037,6 @@
             name="Bill of Materials"
             res_model="mrp.bom"
             src_model="product.product"/>
+
     </data>
 </openerp>

diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index cc9e4aa..7400149 100644 (file)
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute Schedulers" name="mrp.procurement.compute.all"/>
-        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="menu_mrp_root" sequence="4"/>   
+        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
         <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" type="wizard" sequence="90"/>
         <!--
           <menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>

diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 9f891b4..db71ead 100644 (file)
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-       <menuitem id="menu_mrp_planning" name="Planning" parent="mrp.menu_mrp_root" sequence="2"/>
+       <menuitem id="menu_mrp_planning" name="Planning" parent="base.menu_mrp_root" sequence="2"/>
     <record model="ir.ui.view" id="mrp_production_workcenter_tree_view_inherit">
         <field name="name">mrp.production.workcenter.line.tree</field>
         <field name="model">mrp.production.workcenter.line</field>

diff --git a/addons/project_long_term/__terp__.py b/addons/project_long_term/__terp__.py
index 80c9a9d..44a15c5 100644 (file)
--- a/addons/project_long_term/__terp__.py
+++ b/addons/project_long_term/__terp__.py
@@ -32,6 +32,7 @@
     "init_xml" : [],
     "demo_xml" : ["project_demo.xml"],
     "update_xml": [
+        'security/ir.model.access.csv',
         "project_wizard.xml" ,
         "project_view.xml",
         "project_phase_workflow.xml"

diff --git a/addons/project_long_term/project_wizard.xml b/addons/project_long_term/project_wizard.xml
index 05d4d1f..c61a104 100644 (file)
--- a/addons/project_long_term/project_wizard.xml
+++ b/addons/project_long_term/project_wizard.xml
@@ -4,6 +4,7 @@
         <wizard id="wizard_compute_phase" menu="False" model="project.phase" name="wizard.compute.phases" string="Compute Phase Scheduling"/>
         <wizard id="wizard_schedule_task" menu="False" model="project.phase" name="phase.schedule.tasks" string="Schedule Tasks"/>
         <wizard id="wizard_compute_task" model="project.task" menu="False" name="wizard.compute.tasks" string="Compute Task Scheduling"/>
+               <menuitem icon="terp-project" id="base.menu_main" name="Project Management" sequence="1"/>
                <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/>
                <menuitem
             action="wizard_compute_phase"

diff --git a/addons/report_mrp/report_mrp_view.xml b/addons/report_mrp/report_mrp_view.xml
index 90eba6c..c14688d 100644 (file)
--- a/addons/report_mrp/report_mrp_view.xml
+++ b/addons/report_mrp/report_mrp_view.xml
@@ -50,7 +50,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem id="next_id_77" name="Reporting" parent="mrp.menu_mrp_root" sequence="49"/>
+        <menuitem id="next_id_77" name="Reporting" parent="base.menu_mrp_root" sequence="49"/>
         <menuitem action="action_report_workcenter_load_tree" id="menu_report_workcenter_load" parent="next_id_77"/>
 
         <!-- stock.move compared to internal location src/dest -->

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 36f1512..b42cf31 100755 (executable)
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main" name="Project Management" sequence="1"/>
-        <menuitem id="base.menu_pm_resources" name="Resources" parent="base.menu_main" sequence="2"/>
-
         <record id="resource_calendar_form" model="ir.ui.view">
             <field name="name">resource.calendar.form</field>
             <field name="model">resource.calendar</field>
@@ -24,7 +21,6 @@
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
         </record>
-        <menuitem string="Resource Calendar" action="action_resource_calendar_form" id="menu_resource_calendar_form" parent="base.menu_pm_resources"/>
 
         <record id="view_resource_calendar_week_tree" model="ir.ui.view">
             <field name="name">resource.calendar.week.tree</field>
@@ -65,7 +61,6 @@
             </field>
         </record>
 
-
         <act_window
         id="resource_calendar_closing_days"
         name="Closing Days"
@@ -82,7 +77,6 @@
         view_mode="calendar,tree,form"
         domain="[('calendar_id','=',active_id), ('resource_id','!=',False)]"/>
 
-
         <record id="resource_resource_form" model="ir.ui.view">
             <field name="name">resource.resource.form</field>
             <field name="model">resource.resource</field>
@@ -120,8 +114,6 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_resource_resource_tree" id="base.menu_resource_resource_tree" parent="base.menu_pm_resources" />
-
         <record id="resource_calendar_leave_form" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.form</field>
             <field name="model">resource.calendar.leaves</field>
@@ -158,7 +150,19 @@
             <field name="view_mode">tree,form,calendar</field>
         </record>
 
-        <menuitem action="action_resource_calendar_leave_tree" id="menu_resource_calendar_leave_tree" parent="base.menu_pm_resources"/>
+               <!-- Menu for Resource for Long Term Project -->
+               <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+        <menuitem id="menu_pm_resources_project1" name="Resources" parent="base.menu_main_pm" sequence="2"/>
+               <menuitem action="action_resource_resource_tree" id="menu_resource_resource_tree1" parent="menu_pm_resources_project1"/>
+               <menuitem action="action_resource_calendar_form" id="menu_resource_calendar_form1" parent="menu_pm_resources_project1"/>
+               <menuitem action="action_resource_calendar_leave_tree" id="menu_resource_calendar_leave_tree1" parent="menu_pm_resources_project1"/>
+
+                <!-- Menu for Resource for MRP-->
+               <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" sequence="3"/>
+        <menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root" sequence="2"/>
+               <menuitem action="action_resource_resource_tree" id="menu_resource_resource_tree" parent="menu_pm_resources_mrp" />
+               <menuitem action="action_resource_calendar_form" id="menu_resource_calendar_form" parent="menu_pm_resources_mrp"/>
+               <menuitem action="action_resource_calendar_leave_tree" id="menu_resource_calendar_leave_tree" parent="menu_pm_resources_mrp"/>
 
     </data>
 </openerp>