openerp-dev-web team mailing list archive

["Ashvin Rathod \(OpenERP\)" <ara@xxxxxxxxxxx>]

Ashvin Rathod (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-hr_timesheet_fix_yml-ara into lp:openobject-addons.

Requested reviews:
  qdp (OpenERP) (qdp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-hr_timesheet_fix_yml-ara/+merge/59775

Hello,

Fix: hr_timesheet_* -Fix following yml warning

     -->hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml[warning]: AssertionError in Python code
     -->hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml: ('ValidateError', u"Error occurred while validating the field(s) date_from,date_to: You can not have 2 timesheets that overlaps !\nPlease use he menu 'My Current Timesheet' to avoid this problem.")

Thanks,
ara 
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-hr_timesheet_fix_yml-ara/+merge/59775
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-hr_timesheet_fix_yml-ara.

=== modified file 'hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml'
--- hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml	2011-01-14 00:11:01 +0000
+++ hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml	2011-05-03 13:09:26 +0000
@@ -56,7 +56,7 @@
     for invoice in invoice_id.invoice_line:
       product = invoice.product_id.id
 
-    product_exp = data['product']
+    product_exp = data['product'][0]
 
     assert product == product_exp
     assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."

=== modified file 'hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml'
--- hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml	2011-01-14 00:11:01 +0000
+++ hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml	2011-05-03 13:09:26 +0000
@@ -27,7 +27,7 @@
     gender: male
     marital: hr.hr_employee_marital_status_single
     name: Mark Johnson
-    user_id: base.user_root
+    user_id: base.user_demo
 
 -
   I create new Timesheet journal for employee.
@@ -69,7 +69,7 @@
     date_to: !eval "'%s-05-31' %(datetime.now().year)"
     name: !eval "'Week-22(%s)' %(datetime.now().year)"
     state: new
-    user_id: base.user_root
+    user_id: base.user_demo
     employee_id: 'hr_employee_employee0'
 -
   Now , at the time of login, I create Attendances and perform "Sign In" action.