[MOD] Modifications for New Project Management menus

bzr revid: vir@tinyerp.com-20100111132751-mdw5s2fpfzy4gwbg

diff --git a/addons/crm_project/crm_bugs_menu.xml b/addons/crm_project/crm_bugs_menu.xml
index fbf98b2..c73be68 100644 (file)
--- a/addons/crm_project/crm_bugs_menu.xml
+++ b/addons/crm_project/crm_bugs_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    
+
 
     <record model="crm.case.categ" id="categ1">
         <field name="name">Bugs</field>
@@ -22,15 +22,15 @@
     <record model="crm.case.stage" id="stage5">
         <field name="name">Awaiting Response</field>
         <field name="section_id" ref="section_support"/>
-    </record>    
+    </record>
     <record model="crm.case.stage" id="stage7">
         <field name="name">Future</field>
         <field name="section_id" ref="section_support"/>
-    </record>    
-    
-    
+    </record>
+
+
     ######################## BUG TRACKING (menu) ###########################
-    <!-- 
+    <!--
         ALL BUGS
     -->
     <record model="ir.actions.act_window" id="crm_case_categ_act0">
@@ -40,14 +40,14 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="context" eval="{'default_state':'open'}"/>
-        <field name="search_view_id" ref="view_crm_case_bugs_filter"/>        
+        <field name="search_view_id" ref="view_crm_case_bugs_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_act0"/>
-    </record>    
+    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
@@ -60,8 +60,8 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_act0"/>
     </record>
-    
-    <menuitem id="menu_aftertask" name="Bug" parent="project.menu_main"/>
-    <menuitem name="Bug Tracking" id="menu_crm_case_bug_track"  parent="menu_aftertask" action="crm_case_categ_act0"/>
+
+    <!--<menuitem id="menu_aftertask" name="Bug" parent="project.menu_main" visible="False"/>-->
+    <menuitem name="Issues" id="menu_crm_case_bug_track"  parent="project.menu_project_management" action="crm_case_categ_act0"/>
 </data>
 </openerp>

diff --git a/addons/crm_project/crm_feature_menu.xml b/addons/crm_project/crm_feature_menu.xml
index 3cedcab..7ccfa99 100644 (file)
--- a/addons/crm_project/crm_feature_menu.xml
+++ b/addons/crm_project/crm_feature_menu.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">   
+<data noupdate="1">
+
 
-    
     <record model="crm.case.categ" id="future_patch_categ">
         <field name="name">Patches</field>
         <field name="section_id" ref="section_support"/>
@@ -14,11 +14,11 @@
     <record model="crm.case.stage" id="future_awaiting_categ">
         <field name="name">Awaiting Response</field>
         <field name="section_id" ref="section_support"/>
-    </record>    
-    
-    
+    </record>
+
+
     ######################## Future Request (menu) ###########################
-    <!-- 
+    <!--
         ALL BUGS
     -->
     <record model="ir.actions.act_window" id="action_crm_case_future">
@@ -28,14 +28,14 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_future_tree_view"/>
         <field name="context" eval="{'default_state':'open'}"/>
-        <field name="search_view_id" ref="view_crm_case_future_filter"/>        
+        <field name="search_view_id" ref="view_crm_case_future_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_future_tree_view0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_future_tree_view"/>
         <field name="act_window_id" ref="action_crm_case_future"/>
-    </record>    
+    </record>
     <record model="ir.actions.act_window.view" id="action_crm_future_calendar_view0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
@@ -47,8 +47,8 @@
         <field name="view_mode">form</field>
         <field name="view_id" ref="crm_case_future_form_view"/>
         <field name="act_window_id" ref="action_crm_case_future"/>
-    </record>   
-    
-    <menuitem name="Future Requests" id="menu_crm_case_future_request"  parent="menu_aftertask" action="action_crm_case_future"/>
+    </record>
+
+    <menuitem name="Feature Requests" id="menu_crm_case_future_request"  parent="project.menu_project_management" action="action_crm_case_future"/>
 </data>
 </openerp>

diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index 9c422c4..e032e46 100644 (file)
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-
+          <menuitem
+            id="menu_hr_reporting"
+            name="Reporting"
+            parent="hr.menu_hr_root"
+            sequence="40" />
         <!-- Menu Items -->
 
         <record id="view_hr_holidays_filter" model="ir.ui.view">

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 541c38d..7cd931f 100644 (file)
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
+
     <data>
         <record id="hr_timesheet_line_tree" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.tree</field>

diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py
index 821a3aa..d4cb6e9 100644 (file)
--- a/addons/project/__terp__.py
+++ b/addons/project/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,7 +26,7 @@
     "author" : "Tiny",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Projects & Services",
-    "depends" : ["product", "account", "hr", "process", "mail_gateway"],
+    "depends" : ["product", "account", "hr", "process", "mail_gateway","hr_timesheet_sheet","report_timesheet","account_budget"],
     "description": """Project management module that track multi-level projects, tasks,
 works done on tasks, eso. It is able to render planning, order tasks, eso.
     """,
@@ -35,10 +35,10 @@ works done on tasks, eso. It is able to render planning, order tasks, eso.
     "update_xml": [
         "security/project_security.xml",
         "security/ir.model.access.csv",
-        "project_data.xml", 
-        "project_wizard.xml", 
-        "project_view.xml", 
-        "project_report.xml", 
+        "project_data.xml",
+        "project_wizard.xml",
+        "project_view.xml",
+        "project_report.xml",
         "process/task_process.xml"
     ],
     'demo_xml': ['project_demo.xml'],

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 3b4eee9..ee89f61 100644 (file)
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -2,8 +2,25 @@
 <openerp>
     <data>
         <menuitem icon="terp-project" id="menu_main" name="Project Management"/>
-        <menuitem id="menu_tasks" name="Tasks" parent="menu_main"/>
-        <menuitem id="menu_definitions" name="Configuration" parent="project.menu_main" sequence="1"/>
+         <menuitem id="menu_project_management" name="Project Management" parent="menu_main" sequence="1"/>
+        <!-- <menuitem id="menu_tasks" name="Tasks" parent="menu_main"/>-->
+
+        <menuitem id="menu_pm_invoicing" name="Invoicing" parent="menu_main" sequence="7"/>
+        <menuitem id="menu_pm_budget" name="Budgets" parent="menu_pm_invoicing"/>
+        <menuitem action="account_budget.open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
+        <menuitem parent="menu_pm_budget"
+             id="menu_act_pm_crossovered_budget_view"
+             action="account_budget.act_crossovered_budget_view" />
+         <menuitem id="menu_definitions" name="Configuration" parent="project.menu_main" sequence="60"/>
+         <!--Time Tracking menu-->
+               <menuitem
+             id="menu_project_management_time_tracking"
+             name="Time Tracking"
+             parent="menu_main" sequence="3"/>
+         <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="menu_project_management_time_tracking"
+             groups="hr.group_hr_manager"/>
+        <menuitem action="report_timesheet.action_random_timesheet_lines_board" id="menu_project_management_timesheet_lines_board" parent="menu_project_management_time_tracking"/>
+        <menuitem action="hr_attendance.si_so" id="menu_project_management_si_so" parent="menu_project_management_time_tracking" type="wizard"/>
 
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
@@ -144,7 +161,7 @@
                 </tree>
             </field>
         </record>
-        <menuitem id="menu_all_project" parent="project.menu_main" name="Projects"/>
+        <!--<menuitem id="menu_all_project" parent="project.menu_main" name="Projects"/> -->
 
         <record id="open_view_project_all" model="ir.actions.act_window">
             <field name="name">All projects</field>
@@ -154,7 +171,7 @@
             <field name="view_id" ref="view_project"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
         </record>
-        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_all_project"/>
+        <!--<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_all_project"/> -->
 
         <record id="open_view_template_project" model="ir.actions.act_window">
             <field name="name">Templates of Projects</field>
@@ -163,8 +180,9 @@
             <field name="domain">[('state','=','template')]</field>
             <field name="view_id" ref="view_project"/>
         </record>
-        <menuitem action="open_view_template_project" id="menu_template_project" parent="project.menu_definitions"/>
-
+        <!--<menuitem action="open_view_template_project" id="menu_template_project" parent="project.menu_definitions"/>-->
+               <menuitem  id="menu_template_project_specification" parent="project.menu_definitions" name="Specification" sequence="1"/>
+        <menuitem action="open_view_template_project" id="menu_template_project" parent="project.menu_template_project_specification" name="Specification Template"/>
         <record id="view_task_work_form" model="ir.ui.view">
             <field name="name">project.task.work.form</field>
             <field name="model">project.task.work</field>
@@ -218,10 +236,10 @@
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_id" ref="view_my_project"/>
         </record>
-        <menuitem
+        <!--<menuitem
             action="open_view_my_project_open"
             id="menu_open_view_my_project_open"
-            parent="project.menu_all_project"/>
+            parent="project.menu_all_project"/>-->
 
     <!-- Wizard for compute remaining hours -->
 
@@ -485,7 +503,8 @@
             <field eval="False" name="view_id"/>
             <field eval="True" name="filter"/>
         </record>
-        <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_tasks"/>
+        <!--<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_tasks"/> -->
+               <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" name="Tasks"/>
 
         <record id="action_view_task_department" model="ir.actions.act_window">
             <field name="name">My Department Tasks</field>
@@ -728,8 +747,8 @@ menu_main
             <field name="view_id" ref="view_project_message_tree"/>
        </record>
 
-               <menuitem id="menu_message_main" name="Message" parent="menu_main"/>
-        <menuitem action="action_view_project_messages_tree" id="menu_message_tree" parent="menu_message_main"/>
+               <!--<menuitem id="menu_message_main" name="Message" parent="menu_main"/>-->
+        <menuitem action="action_view_project_messages_tree" id="menu_message_tree" parent="menu_project_management" sequence="11"/>
 
         <act_window domain="[('user_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
 

diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index b3c8d69..3b9e211 100644 (file)
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -123,11 +123,11 @@
         <field name="search_view_id" ref="project.view_task_search_form"/>
     </record>
 
-    <menuitem name="Todo List"
+  <!--  <menuitem name="Todo List"
         groups="group_project_getting"
         id="menu_task_inbox"
         parent="project.menu_main"
-        action="action_prject_task_tree"/>
+        action="action_prject_task_tree"/>-->
 
     <act_window name="My Inbox"
         domain="[('user_id', '=', uid),('state','in',('draft','open'))]"

diff --git a/addons/project_timesheet/__terp__.py b/addons/project_timesheet/__terp__.py
index 889fcac..2916bf6 100644 (file)
--- a/addons/project_timesheet/__terp__.py
+++ b/addons/project_timesheet/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,7 +31,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'project', 'hr_timesheet_sheet'],
+    'depends': ['base', 'project', 'hr_timesheet_sheet','hr_timesheet'],
     'init_xml': [],
     'update_xml': ["process/project_timesheet_process.xml"],
     'demo_xml': [],

diff --git a/addons/project_timesheet/process/project_timesheet_process.xml b/addons/project_timesheet/process/project_timesheet_process.xml
index 301ee3c..213d48f 100644 (file)
--- a/addons/project_timesheet/process/project_timesheet_process.xml
+++ b/addons/project_timesheet/process/project_timesheet_process.xml
@@ -7,7 +7,7 @@
         -->
 
         <record id="process_node_timesheettask0" model="process.node">
-            <field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form"/>
+         <!--   <field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form"/>-->
             <field name="model_id" ref="hr_timesheet.model_hr_analytic_timesheet"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Timesheet task&quot;&quot;&quot;" name="name"/>

diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml
index 825daf5..7a92460 100644 (file)
--- a/addons/report_analytic_planning/report_analytic_planning_view.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
        <data>
-       
+
         <!-- Planning -->
                <record id="account_analytic_planning_view_tree" model="ir.ui.view">
                        <field name="name">report.account.analytic.planning.tree</field>
@@ -97,9 +97,9 @@
                                                                        <page string="Information">
                                                                            <group col="3" colspan="4">
                                                                                <field name="effective_hours" widget="float_time" invisible="True" />
-                                                                               <field name="planned_hours" 
+                                                                               <field name="planned_hours"
                                                                                    widget="float_time"
-                                                                                   attrs="{'readonly':[('state','!=','draft')]}" 
+                                                                                   attrs="{'readonly':[('state','!=','draft')]}"
                                                                                    on_change="onchange_planned(planned_hours,effective_hours)"/>
                                                                                <field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"/>
                                                                                <button name="%(project.action_config_compute_remaining)d" string="Review" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
@@ -114,7 +114,7 @@
                                                                                <button groups="base.group_extended" name="%(project.wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
                                                                                <button name="%(project.wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
                                                                                <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
-                                               
+
                                                                            </group>
                                                                     </page>
                                                                        <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
@@ -154,7 +154,7 @@
                                </form>
                        </field>
                </record>
-               
+
                <record id="account_analytic_planning_view_search" model="ir.ui.view">
                        <field name="name">report.account.analytic.planning.search</field>
                        <field name="model">report_account_analytic.planning</field>
@@ -217,10 +217,10 @@
                        <field name="view_mode">tree,form</field>
                        <field name="search_view_id" ref="account_analytic_planning_view_search"/>
                </record>
-               
+               <menuitem id="menu_pm_planning" name="Planning" parent="project.menu_main" sequence="5"/>
                <menuitem id="planning_main" name="Long Term Planning"
-                       parent="project.menu_main" />
-                       
+                       parent="menu_pm_planning" />
+
                <menuitem action="action_account_analytic_planning_form"
                        id="menu_report_account_analytic_planning" parent="planning_main" />
 
@@ -338,8 +338,8 @@
                 </notebook>
             </field>
         </record>
-        
-        
+
+
 <!--           Task Form -->
 
         <record id="view_task_planning_form" model="ir.ui.view">
@@ -359,8 +359,8 @@
                        id="act_task_of_lines" name="Planning tasks" res_model="project.task"
                        src_model="report_account_analytic.planning"
                />
-               
-               <!-- company form --> 
+
+               <!-- company form -->
         <record id="planning_company" model="ir.ui.view">
             <field name="name">res.company.planning.config</field>
             <field name="model">res.company</field>

diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index ce88e57..e88f886 100644 (file)
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -359,7 +359,7 @@
 
                <record model="ir.actions.act_window" id="action_random_timesheet_lines_board">
             <field name="type">ir.actions.act_window</field>
-            <field name="name">Random Timesheet Lines</field>
+            <field name="name">Timesheet Lines</field>
             <field name="res_model">random.timesheet.lines</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>