openerp-dev-web team mailing list archive

["uco \(OpenERP\)" <uco@xxxxxxxxxxx>]

uco (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #690109 The Parent Project field gives access to the list of analytic accounts
  https://bugs.launchpad.net/bugs/690109
  #691481 bug with the "lead converted into opportunity" log 
  https://bugs.launchpad.net/bugs/691481

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/uco-dev-addons1/+merge/44726

[FIX] 
--------
* crm: Removed section_id field to fix type error on web-client.

[IMP]
--------
* hr_timesheet, project_timesheet: Usability improvements for menus.


-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/uco-dev-addons1/+merge/44726
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

=== modified file 'crm/res_partner_view.xml'
--- crm/res_partner_view.xml	2010-12-14 10:50:14 +0000
+++ crm/res_partner_view.xml	2010-12-27 11:11:20 +0000
@@ -22,8 +22,6 @@
                              <button name="stage_next" string="Next"
                                  states="open,pending" type="object"
                                  icon="gtk-go-forward" />
-                             <field name="section_id"
-                                 invisible="context.get('invisible_section', True)" />
                              <field name="user_id" />
                              <field name="state" />
                              <button name="case_cancel" string="Cancel"
@@ -73,8 +71,7 @@
 
                     <field name="date" required="1"/>
                     <field name="user_id"/>
-                    <field name="section_id" colspan="1" widget="selection" />
-                    <button string="aaaaaaaaaConvert to Opportunity"
+                    <button string="Convert to Opportunity"
                         name="%(phonecall2opportunity_act)d"
                         icon="gtk-index" type="action"
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />

=== modified file 'hr_timesheet/hr_timesheet_view.xml'
--- hr_timesheet/hr_timesheet_view.xml	2010-12-14 06:22:11 +0000
+++ hr_timesheet/hr_timesheet_view.xml	2010-12-27 11:11:20 +0000
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-        <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
-                  parent="base.menu_main_pm" sequence="3"/>
 
         <record id="hr_timesheet_line_tree" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.tree</field>
@@ -97,8 +94,7 @@
             <field name="help">Through Working Hours you can register your working hours by project every day.</field>
         </record>
 
-    <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
-    <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
+        <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
 
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_data.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_data.xml	2010-10-18 06:22:15 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_data.xml	2010-12-27 11:11:20 +0000
@@ -19,13 +19,6 @@
             <field name="icon">STOCK_JUSTIFY_FILL</field>
             <field name="action" ref="ir_actions_server_timsheet_sheet"/>
         </record>
-        <record id="menu_act_project_management_timesheet_sheet_form" model="ir.ui.menu">
-            <field name="name">My Timesheet</field>
-            <field eval="5" name="sequence"/>
-            <field name="parent_id" ref="base.menu_project_management_time_tracking"/>
-            <field name="icon">STOCK_JUSTIFY_FILL</field>
-            <field name="action" ref="ir_actions_server_timsheet_sheet"/>
-        </record>
 
     </data>
 </openerp>

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_view.xml	2010-12-23 15:41:41 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_view.xml	2010-12-27 11:11:20 +0000
@@ -177,13 +177,6 @@
             <field name="help">Check your timesheets for a specific period. You can also encode time spent on a project (i.e. an analytic account) thus generating costs in the analytic account concerned.</field>
         </record>
 
-        <!--Time Tracking menu in project Management-->
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-        <menuitem
-             id="base.menu_project_management_time_tracking"
-             name="Time Tracking"
-             parent="base.menu_main_pm" sequence="5"/>
-
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
              sequence="2"/>
 

=== modified file 'hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml'
--- hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml	2010-10-27 07:03:24 +0000
+++ hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml	2010-12-27 11:11:20 +0000
@@ -28,9 +28,5 @@
 
     <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
 
-    <menuitem action="action_hr_timesheet_current_open"
-        id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
-        sequence="5"/>
-
     </data>
 </openerp>

=== modified file 'project_timesheet/__openerp__.py'
--- project_timesheet/__openerp__.py	2010-10-15 10:43:08 +0000
+++ project_timesheet/__openerp__.py	2010-12-27 11:11:20 +0000
@@ -31,7 +31,7 @@
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice'],
-    'init_xml': [],
+    'init_xml': ['project_timesheet_data.xml'],
     'update_xml': ["security/ir.model.access.csv","process/project_timesheet_process.xml", "report/task_report_view.xml", "project_timesheet_view.xml"],
     'demo_xml': ["project_timesheet_demo.xml"],
     'test': [

=== added file 'project_timesheet/project_timesheet_data.xml'
--- project_timesheet/project_timesheet_data.xml	1970-01-01 00:00:00 +0000
+++ project_timesheet/project_timesheet_data.xml	2010-12-27 11:11:20 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+    
+        <record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
+            <field name="name">Time Tracking</field>
+            <field eval="5" name="sequence"/>
+            <field name="parent_id" ref="base.menu_main_pm"/>
+        </record>
+
+        <record id="menu_act_project_management_timesheet_sheet_form" model="ir.ui.menu">
+            <field name="name">My Timesheet</field>
+            <field eval="5" name="sequence"/>
+            <field name="parent_id" ref="base.menu_project_management_time_tracking"/>
+            <field name="icon">STOCK_JUSTIFY_FILL</field>
+            <field name="action" ref="hr_timesheet_sheet.ir_actions_server_timsheet_sheet"/>
+        </record>
+    
+    </data>
+</openerp>

=== modified file 'project_timesheet/project_timesheet_view.xml'
--- project_timesheet/project_timesheet_view.xml	2010-12-22 04:53:53 +0000
+++ project_timesheet/project_timesheet_view.xml	2010-12-27 11:11:20 +0000
@@ -133,7 +133,12 @@
                   parent="base.menu_main_pm" sequence="5"/>
         <menuitem id="menu_project_billing_line" name="Invoice Tasks Work"
             parent="menu_project_billing" action="action_project_timesheet_bill_task"/>
-        <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
-                parent="base.menu_main_pm" sequence="5"/>
+            
+        <!--
+            Time Tracking menu in project Management
+        -->
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
+        <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="hr_timesheet.act_hr_timesheet_line_evry1_all_form"/>
+        
     </data>
 </openerp>