Merge

bzr revid: stephane@tinyerp.com-20081027133459-kz6dbyb9wqbfvr5i

addons/account_analytic_analysis/account_analytic_analysis_menu.xml

@@ -73,7 +73,7 @@
             <field name="domain">[('state','=','draft')]</field>
         </record>
 
-        <menuitem action="action_account_analytic_all_draft" id="menu_action_account_analytic_all_draft" parent="next_id_71"/>
+        <menuitem action="action_account_analytic_all_draft" id="menu_action_account_analytic_all_draft" parent="menu_action_account_analytic_all"/>
 
         <record id="action_account_analytic_all_open" model="ir.actions.act_window">
             <field name="name">Open Analytic Accounts</field>
@@ -84,7 +84,7 @@
             <field name="domain">[('state','=','open')]</field>
         </record>
 
-        <menuitem action="action_account_analytic_all_open" id="menu_action_account_analytic_all_open" parent="account_analytic_analysis.next_id_71"/>
+        <menuitem action="action_account_analytic_all_open" id="menu_action_account_analytic_all_open" parent="menu_action_account_analytic_all"/>
 
         <record id="action_account_analytic_all_pending" model="ir.actions.act_window">
             <field name="name">Pending Analytic Accounts</field>
@@ -95,7 +95,7 @@
             <field name="domain">[('state','=','pending')]</field>
         </record>
 
-        <menuitem action="action_account_analytic_all_pending" id="menu_action_account_analytic_all_pending" parent="account_analytic_analysis.next_id_71"/>
+        <menuitem action="action_account_analytic_all_pending" id="menu_action_account_analytic_all_pending" parent="menu_action_account_analytic_all"/>
 
         <record id="action_account_analytic_all_simplified" model="ir.actions.act_window">
             <field name="name">Simplified View Analytic Accounts</field>
@@ -106,7 +106,7 @@
             <field name="domain">[]</field>
         </record>
 
-        <menuitem action="action_account_analytic_all_simplified" id="menu_action_account_analytic_all_simplified" parent="account_analytic_analysis.next_id_71"/>
+        <menuitem action="action_account_analytic_all_simplified" id="menu_action_account_analytic_all_simplified" parent="menu_action_account_analytic_all"/>
 
     </data>
 </openerp>

addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml

@@ -25,7 +25,7 @@
             <field name="model">hr_timesheet_sheet.sheet.account</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Timesheet by accounts">
+                <form string="Timesheet by Accounts">
                     <field name="sheet_id" select="1"/>
                     <field name="name" select="1"/>
                     <field name="total" sum="Total"/>
@@ -149,17 +149,6 @@
                             <field name="total_timesheet" widget="float_time"/>
                             <field name="total_difference" widget="float_time"/>
                         </page>
-                        <!--
-                    <page string="By account">
-                        <field name="account_ids" colspan="4" nolabel="1">
-                            <tree string="Analytic accounts">
-                                <field name="name"/>
-                                <field name="total" widget="float_time"/>
-                                <field name="invoice_rate"/>
-                            </tree>
-                        </field>
-                    </page>
-                    -->
                     </notebook>
                     <field name="state"/>
                     <group col="4" colspan="2">
@@ -201,14 +190,13 @@
         </record>
         <menuitem action="act_hr_timesheet_sheet_form_my_confirm" id="menu_act_hr_timesheet_sheet_form_my_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my"/>
         
-        <wizard id="act_hr_timesheet_sheet_form_department_current" model="hr.employee" name="hr_timesheet_sheet.department.open" string="My department's timesheet"/>
+        <wizard id="act_hr_timesheet_sheet_form_department_current" model="hr.employee" name="hr_timesheet_sheet.department.open" string="My Department's Timesheet"/>
         <menuitem action="act_hr_timesheet_sheet_form_department_current" icon="STOCK_JUSTIFY_FILL" id="menu_act_hr_timesheet_sheet_form_department_current" parent="hr_timesheet_sheet.next_id_60" type="wizard"/>
         
-        <wizard id="act_hr_timesheet_sheet_form_department_validate" model="hr.employee" name="hr_timesheet_sheet.department.validate.open" string="My department's timesheet"/>
+        <wizard id="act_hr_timesheet_sheet_form_department_validate" model="hr.employee" name="hr_timesheet_sheet.department.validate.open" string="My Department's Timesheet to Validate"/>
         <menuitem action="act_hr_timesheet_sheet_form_department_validate" icon="STOCK_JUSTIFY_FILL" id="menu_act_hr_timesheet_sheet_form_department_validate" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current" type="wizard"/>
         
-        
-        <wizard id="act_hr_timesheet_sheet_form_department_confirm" model="hr.employee" name="hr_timesheet_sheet.department.confirm.open" string="My department's timesheet"/>
+        <wizard id="act_hr_timesheet_sheet_form_department_confirm" model="hr.employee" name="hr_timesheet_sheet.department.confirm.open" string="My Department's Timesheet to Confirm"/>
         <menuitem action="act_hr_timesheet_sheet_form_department_confirm" icon="STOCK_JUSTIFY_FILL" id="menu_act_hr_timesheet_sheet_form_department_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current" type="wizard"/>
         
         

addons/product/product_view.xml

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
         <menuitem icon="terp-product" id="menu_main_product" name="Products"/>
         <menuitem id="menu_config_product" name="Configuration" parent="product.menu_main_product" sequence="1"/>
-        
         <record id="product_product_tree_view" model="ir.ui.view">
             <field name="name">product.product.tree</field>
             <field name="model">product.product</field>

addons/project/project.py

@@ -120,8 +120,8 @@ class project(osv.osv):
         'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
         'parent_id': fields.many2one('project.project', 'Parent Project'),
         'child_id': fields.one2many('project.project', 'parent_id', 'Subproject'),
-        'planned_hours': fields.function(_calc_planned, method=True, string='Planned hours'),
-        'effective_hours': fields.function(_calc_effective, method=True, string='Hours spent'),
+        'planned_hours': fields.function(_calc_planned, method=True, string='Planned hours', help="Sum of planned hours of all tasks related to this project."),
+        'effective_hours': fields.function(_calc_effective, method=True, string='Hours spent', help="Sum of spent hours of all tasks related to this project."),
         'progress_rate': fields.function(_progress_rate, method=True, string='Progress', type='float', help="Percent of tasks closed according to the total of tasks todo."),
         'date_start': fields.date('Starting Date'),
         'date_end': fields.date('Expected End'),