[IMP] Reporting menu change

bzr revid: kjo@tinyerp.com-20120629104326-1x1ojw0xfegodhm4

16 files changed, 53 insertions, 99 deletions

diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index b6f76777f54..1f41411409e 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -90,7 +90,7 @@
         <field name="search_view_id" ref="view_evaluation_report_search"/>
     </record>
 
-    <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="3" groups="base.group_hr_manager"/>
+    <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="2" groups="base.group_hr_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 1299f4e9ce5..8b00e447ab9 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -8,7 +8,6 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'" string="Expenses Analysis">
-                <field name="date" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
@@ -97,7 +96,7 @@
     </record>
 
     <record id="action_hr_expense_report_all" model="ir.actions.act_window">
-        <field name="name">Expenses Analysis</field>
+        <field name="name">Expense Analysis</field>
         <field name="res_model">hr.expense.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
@@ -105,7 +104,7 @@
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
-    <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
+    <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 09809e488ba..6f9f61afabc 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -58,7 +58,6 @@ Note that:
         'hr_holidays_workflow.xml',
         'hr_holidays_view.xml',
         'hr_holidays_data.xml',
-        'hr_holidays_wizard.xml',
         'hr_holidays_report.xml',
         'report/hr_holidays_report_view.xml',
         'report/available_holidays_view.xml',
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
deleted file mode 100644
index 7ed381636cf..00000000000
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-     <menuitem
-            id="menu_hr_reporting_holidays"
-            name="Leaves"
-            parent="hr.menu_hr_reporting"
-            sequence="6"/>
- 	</data>
-</openerp>
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 082bf198e34..e7441060204 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -17,7 +17,7 @@
             name="Leaves Analysis" 
             id="menu_hr_available_holidays_report_tree" 
             action="action_hr_available_holidays_report" 
-            parent="menu_hr_reporting_holidays"/>
+            parent="hr.menu_hr_reporting" sequence="5" />
 
 
     </data>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index 72844a58ccb..d2518a0d7f7 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -32,7 +32,7 @@
 
         <menuitem
             name="Leaves by Department"
-            parent="menu_hr_reporting_holidays"
+            parent="hr_timesheet.menu_hr_reporting_timesheet"
             action="action_hr_holidays_summary_dept"
             id="menu_account_central_journal"
             icon="STOCK_PRINT"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 5ddbe5045ab..9d81d39f240 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -114,7 +114,7 @@
         <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
-    <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
+    <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index d3d2d745183..ab24066b1de 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -3,9 +3,9 @@
     <data>
          <menuitem
             id="menu_hr_reporting_timesheet"
-            name="Timesheet"
+            name="Reports"
             parent="hr.menu_hr_reporting"
-            sequence="5" />
+            sequence="6" />
         <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
 
         <report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 1eda6de05cb..ae7de4c03c7 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -2,43 +2,7 @@
 <openerp>
     <data>
 
-		<!-- Print Employee Timesheet -->
-    	<record id="view_hr_timesheet_employee" model="ir.ui.view">
-            <field name="name">hr.analytical.timesheet.employee.form</field>
-            <field name="model">hr.analytical.timesheet.employee</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-				<form string="Monthly Employee Timesheet">
-					<group colspan="4">
-						<field name="month"/>
-						<field name="year"/>
-						<field name="employee_id" colspan="3"/>
-					</group>
-					<separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-print" string="Print" name="print_report" type="object"/>
-                   </group>
-                </form>
-			</field>
-		</record>
-
-		<record id="action_hr_timesheet_employee" model="ir.actions.act_window">
-            <field name="name">Employee Timesheet</field>
-            <field name="res_model">hr.analytical.timesheet.employee</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_hr_timesheet_employee"/>
-           <field name="target">new</field>
-        </record>
-
-        <menuitem action="action_hr_timesheet_employee"
-        	id="menu_hr_timesheet_employee"
-        	parent="menu_hr_reporting_timesheet"
-        	sequence="2" icon="STOCK_PRINT"/>
-
-
-      <!-- Print My Timesheet -->
+		<!-- Print My Timesheet -->
       <record id="view_hr_timesheet_my" model="ir.ui.view">
             <field name="name">hr.analytical.timesheet.my.form</field>
             <field name="model">hr.analytical.timesheet.employee</field>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index 95b7bd3b93e..9336aff7ab3 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -8,20 +8,25 @@
             <field name="model">hr.analytical.timesheet.users</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Monthly Employees Timesheet">
-					<group height="260" width="460">
-						<group colspan="4">
-							<field name="month"/>
-							<field name="year"/>
-                            <separator string="Employees" colspan="4"/>
-							<field name="employee_ids" colspan="4" nolabel="1"/>
-						</group>
-						<separator colspan="4"/>
-						<group colspan="4">
-							<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-							<button icon="gtk-print" string="Print" name="print_report" type="object"/>
-						</group>
-					</group>
+				<form string="Monthly Employees Timesheet" version="7.0">
+                    <header>
+                    	<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+	                </header>
+                    <sheet>
+                        <group><label for="month" string="Period" />
+             				<div>
+								<field name="month" nolabel="1" class="oe_inline"/>
+								<field name="year" nolabel="1" class="oe_inline"/>
+							</div> 
+                        </group>
+                        <group>
+                            <div>
+                                <separator string="Employees" colspan="4"/>
+							    <field name="employee_ids" colspan="4" nolabel="1"/>
+                            </div> 
+                        </group>						
+                    </sheet>
 				</form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index 56c18c82b7a..280784ab6a1 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -7,23 +7,26 @@
             <field name="model">hr.timesheet.analytic.profit</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Timesheet Profit">
-					<group height="420" width="370">
-						<group col="4" colspan="4">
-							<field name="date_from"/>
-							<field name="date_to"/>
-                            <separator string="Journals" colspan="4"/>
-							<field name="journal_ids" colspan="4" nolabel="1"/>
-                            <separator string="Users" colspan="4"/>
-							<field name="employee_ids" colspan="4" nolabel="1"/>
-						</group>
-						<separator colspan="4"/>
-						<group col="2" colspan="4">
-							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-							<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
-						</group>
-					</group>
-				</form>
+				<form string="Timesheet Profit" version="7.0">
+                   <header>
+                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                   </header>
+                   <sheet>
+                       <group> <label for="date_from" string="Duration" />					
+                           <div>
+ 						       <field name="date_from" nolabel="1" class="oe_inline" />
+                               - <field name="date_to" nolabel="1" class="oe_inline"/>
+                           </div>
+                       </group>
+                       <group>
+                           <separator string="Journals" colspan="4"/>
+						   <field name="journal_ids" colspan="4" nolabel="1"/>
+                           <separator string="Users" colspan="4"/>
+						   <field name="employee_ids" colspan="4" nolabel="1"/>
+					   </group>
+                   </sheet>
+			   </form>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 8b102b19f72..fd5d6b0b6d1 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -82,6 +82,6 @@
         <menuitem
             action="action_hr_timesheet_report_stat_all"
             id="menu_hr_timesheet_report_all"
-            parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="0"/>
+            parent="hr.menu_hr_reporting" sequence="3"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index fe497b6f46c..613f92d3cf6 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -110,6 +110,6 @@
             <field name="search_view_id" ref="view_timesheet_report_search"/>
         </record>
         <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
-                parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1" groups="base.group_hr_manager"/>
+                parent="hr.menu_hr_reporting" sequence="4" groups="base.group_hr_manager"/>
     </data>
 </openerp>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 69daeefc758..3f7f3b26d96 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -79,11 +79,11 @@
             <field name="view_mode">graph,tree</field>
             <field name="view_id" ref="view_task_history_graph"/>
             <field eval="False" name="filter"/>
-            <field name="context">{"search_default_open":1, "search_default_this_month": 1, "search_default_project_id": project_id}</field>
+            <field name="context">{"search_default_open":1, "search_default_this_month": 1}</field>
         </record>
         <menuitem action="action_view_task_history_cumulative"
             id="menu_action_view_task_history_cumulative"
-            parent="project_report_task" />
+            parent="base.menu_project_report" />
 
 
         <!--<record id="action_view_task_history_burndown" model="ir.actions.act_window">-->
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 58f7739e96d..eac361a19c0 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -54,7 +54,6 @@ class report_project_task_user(osv.osv):
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True, groups="base.group_multi_company"),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
-        'type_id': fields.many2one('project.task.type', 'Stage', readonly=True),
     }
     _order = 'name desc, project_id'
 
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index a5711239f87..40235ad03b7 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -5,8 +5,6 @@
         <menuitem id="base.menu_project_report" name="Project"
             groups="project.group_project_manager"
             parent="base.menu_reporting" sequence="25"/>
-        <menuitem id="project_report_task" name="Tasks Analysis"
-            parent="base.menu_project_report"/>
 
         <record id="view_task_project_user_tree" model="ir.ui.view">
             <field name="name">report.project.task.user.tree</field>
@@ -23,7 +21,6 @@
                     <field name="date_end" invisible="1"/>
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                     <field name="partner_id" invisible="1"/>
-                    <field name="type_id" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="year" invisible="1"/>
@@ -101,7 +98,6 @@
                     <newline/>
                     <group expand="0" string="Extended Filters...">
                         <field name="priority"/>
-                        <field name="type_id" widget="selection"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
@@ -115,7 +111,6 @@
                         <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
-                        <filter string="Stage" icon="terp-stage" context="{'group_by':'type_id'}" />
                         <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
@@ -135,7 +130,7 @@
             <field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
         </record>
 
-        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="project_report_task"/>
+        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
 
     </data>
 </openerp>