Jagdish Panchal (Open ERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-clean_test_yml_hr_attendance-jap into 
lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean_test_yml_hr_attendance-jap/+merge/86885

hr_attendance:-
-------------------

   >>  add timer in the attendance_process.yml 
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean_test_yml_hr_attendance-jap/+merge/86885
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-clean_test_yml_hr_attendance-jap.
=== modified file 'hr_attendance/test/attendance_process.yml'
--- hr_attendance/test/attendance_process.yml	2011-12-22 15:39:11 +0000
+++ hr_attendance/test/attendance_process.yml	2011-12-26 08:59:27 +0000
@@ -1,8 +1,18 @@
 -
   In order to test attendance process in OpenERP, at the time of login, I use "Sign In/Sign Out" wizard for attendances.
+<<<<<<< TREE
   I click on this wizard to login.
+=======
+-
+  !record {model: hr.sign.in.out, id: employee_sign_in}:
+    emp_id: hr.employee3
+    state: absent
+-
+  I click on "Sign In" button of this wizard.
+>>>>>>> MERGE-SOURCE
 -
   !python {model: hr.sign.in.out}: |
+<<<<<<< TREE
     hr_employee = self.pool.get('hr.employee')
     uid = ref('base.user_al')
     emp_ids = hr_employee.search(cr, uid, [('user_id', '=', uid)])
@@ -10,15 +20,23 @@
         employee = hr_employee.browse(cr, uid, emp_ids)[0]
         id = self.create(cr, uid, {'emp_id': employee.id, 'name': employee.name, 'state': employee.state})
         self.si_check(cr, uid, [id])
+=======
+    import time
+    from datetime import datetime, date, timedelta
+    employee = self.pool.get('hr.employee').read(cr, uid, [ref('hr.employee3')])[0]
+    self.write(cr, uid, [ref('employee_sign_in')], {'name': employee['name'], 'state': employee['state'], 'emp_id': employee['id']})
+    self.si_check(cr, uid, [ref("employee_sign_in")])
+>>>>>>> MERGE-SOURCE
 -
   I check that Employee is "Present".
 -
   !assert {model: hr.employee, id: hr.employee_al, severity: error, string: Employee should be in present state}:
     - state == 'present'
 -
-  I click on "Sign In" button of this wizard, this will Open a new form which ask for Last Sign Out date.
+  I click on "Sign out" button of this wizard.
 -
   !python {model: hr.sign.in.out}: |
+<<<<<<< TREE
     hr_employee = self.pool.get('hr.employee')
     uid = ref('base.user_al')
     emp_ids = hr_employee.search(cr, uid, [('user_id', '=', uid)])
@@ -48,3 +66,12 @@
 -
   !assert {model: hr.employee, id: hr.employee_al, severity: error, string: Employee should be in present state}:
     - state == 'present'
+=======
+    import time
+    time.sleep(2)
+    self.so_check(cr, uid, [ref("employee_sign_in")])
+-
+  I check that Employee is "absent".
+-
+  !assert {model: hr.employee, id: hr.employee3, severity: error, string: Employee should be in absent state}:
+    - state == 'absent'>>>>>>> MERGE-SOURCE

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to