openerp-dev-web team mailing list archive

["Sbh \(Open ERP\)" <sbh@xxxxxxxxxxx>]

Sbh (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/sbh-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #644398 Resource : there is no menu entry to configure resource.calendar
  https://bugs.launchpad.net/bugs/644398
  #671360 [RC1] base_report_designer can't push report to db
  https://bugs.launchpad.net/bugs/671360
  #680121 Partner : History tab should be invisible by default,must be available on request of concerned modules.
  https://bugs.launchpad.net/bugs/680121
  #684791 troubles with recurency in calendar
  https://bugs.launchpad.net/bugs/684791
  #689574 Not possible to create a Inbound call from the history tab of the partner form
  https://bugs.launchpad.net/bugs/689574
  #691006 cannot save new lead after have duplicated it.
  https://bugs.launchpad.net/bugs/691006
  #691640 Required field customer in project empty after customer delete
  https://bugs.launchpad.net/bugs/691640
  #692971 Sign in / Sign out by project : shouldn't be available if the project module isn't installed
  https://bugs.launchpad.net/bugs/692971


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

=== modified file 'hr_timesheet/test/test_hr_timesheet.yml'
--- hr_timesheet/test/test_hr_timesheet.yml	2010-10-09 05:27:04 +0000
+++ hr_timesheet/test/test_hr_timesheet.yml	2010-12-22 05:11:58 +0000
@@ -94,7 +94,7 @@
 -
   !python {model: hr.sign.in.project}: |
     uid = ref('test_timesheet_user1')
-    self.check_state(cr, uid, [ref("hr_employee_fracline1")], {"active_ids": [ref("hr_timesheet.menu_hr_timesheet_sign_in")]})
+    self.check_state(cr, uid, [ref("hr_employee_fracline1")], {"active_ids": [ref("hr_timesheet.action_hr_timesheet_sign_in")]})
 -
   I select start date and Perform start work on project.
 -
@@ -110,7 +110,7 @@
   !python {model: hr.sign.in.project}: |
        uid = ref('test_timesheet_user1')
        ids = self.search(cr, uid, [('emp_id', '=', ref('hr_employee_fracline1')),('name', '=', 'Francline')])
-       self.check_state(cr, uid, ids, {"active_ids": [ref("hr_timesheet.menu_hr_timesheet_sign_in")]
+       self.check_state(cr, uid, ids, {"active_ids": [ref("hr_timesheet.action_hr_timesheet_sign_in")]
              })
 
 -

=== modified file 'hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml'
--- hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml	2010-11-12 11:54:13 +0000
+++ hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml	2010-12-22 05:11:58 +0000
@@ -51,12 +51,6 @@
             <field name="help">Employees can encode their time spent on the different projects. A project is an analytic account and the time spent on a project generate costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet.</field>
         </record>
 
-        <menuitem action="action_hr_timesheet_sign_in"
-            id="menu_hr_timesheet_sign_in"
-            groups="base.group_extended"
-            parent="hr_attendance.menu_hr_attendance"
-            sequence="5" />
-
         <record id="view_hr_timesheet_sign_out" model="ir.ui.view">
             <field name="name">hr.sign.out.project.form</field>
             <field name="model">hr.sign.out.project</field>

=== modified file 'project_timesheet/project_timesheet_view.xml'
--- project_timesheet/project_timesheet_view.xml	2010-12-09 12:06:15 +0000
+++ project_timesheet/project_timesheet_view.xml	2010-12-22 05:11:58 +0000
@@ -123,6 +123,11 @@
 			<field name="search_view_id" ref="view_account_analytic_line_filter_inherit_buttons"/>
             <field name="help">This lists show you every task work you can invoice to the customer. Select the lines in order to generate the invoices automatically.</field>
         </record>
+  		<menuitem action="hr_timesheet.action_hr_timesheet_sign_in"
+            id="menu_hr_timesheet_sign_in"
+            groups="base.group_extended"
+            parent="hr_attendance.menu_hr_attendance"
+            sequence="5" />
 
         <menuitem id="menu_project_billing" name="Invoicing"
                   parent="base.menu_main_pm" sequence="5"/>