Merge lp:~openerp-dev/openobject-addons/7.0-opw-592632-dhr into lp:openobject-addons/7.0

[Dharti Ratani(OpenERP)]

Hello Sir,

Made the Sign In - Sign Out button invisible for waiting approval and approved timesheets so that attendances can't be added on waiting approval and approved timesheets.

Thanks
dhr

[lp:~openerp-dev/openobject-addons/7.0-opw-592632-dhr]

9144. By Dharti Ratani(OpenERP) on 2013-05-21

[IMP]Removed extra indentation

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

This patch only addresses the view buttons on hr_timesheet.sheet

There is also the sign in wigdet that would generate the same issue.

I think it would be more efficient to solve this in python than only in views.

Thanks

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/7.0-opw-592632-dhr]

9145. By Dharti Ratani(OpenERP) on 2013-05-23

[IMP]Added restriction for creating attendance from py if timesheet for an employee is in waiting approval or approved state

9146. By Dharti Ratani(OpenERP) on 2013-05-24

[IMP]Checked that current timesheet is closed or not

9147. By Dharti Ratani(OpenERP) on 2013-06-10

[IMP]Removed extra '|' in attrs

[Naresh(OpenERP) (nch-openerp)]

Hello Dharti,

I am still able to sign / sign out in an approved / waiting approval timesheets. can you please retest the fix. ?

second there are extra '|' o'ring(pipe) in the attrs domain.

Please update this too.

Thanks,
Naresh Soni
OpenERP Enterprise Services

review: Needs Fixing

[Martin Trigaux (OpenERP) (mat-openerp)]

Hello,

This merge proposal will work only on the onchange from the attendance form, not form other menu. If you use the form view of hr.attendance, there will have no verification. Same if you use python code or another module creating attendances.
As said Yannick, it would be better to check on the creation of hr.attendance.

I have created a branch doing so
lp:~openerp-dev/openobject-addons/7.0-timesheet-attendance-submit-mat

review: Disapprove

Unmerged revisions

9147. By Dharti Ratani(OpenERP) on 2013-06-10

[IMP]Removed extra '|' in attrs

9146. By Dharti Ratani(OpenERP) on 2013-05-24

[IMP]Checked that current timesheet is closed or not

9145. By Dharti Ratani(OpenERP) on 2013-05-23

[IMP]Added restriction for creating attendance from py if timesheet for an employee is in waiting approval or approved state

9144. By Dharti Ratani(OpenERP) on 2013-05-21

[IMP]Removed extra indentation

9143. By Dharti Ratani(OpenERP) on 2013-05-21

[FIX]Attendances can't be added on waiting approval and approved timesheets

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2013-05-08 08:59:38 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2013-06-10 11:57:27 +0000
@@ -422,6 +422,7 @@
                     raise osv.except_osv(_('User Error!'), _('You cannot enter an attendance ' \
                             'date outside the current timesheet dates.'))
         return res
+    
 
     def _check(self, cr, uid, ids):
         for att in self.browse(cr, uid, ids):
@@ -431,6 +432,23 @@
 
 hr_attendance()
 
+class hr_employee(osv.osv):
+    _inherit = "hr.employee"
+    _description = "Employee"
+    
+    def attendance_action_change(self, cr, uid, ids, context=None):
+        timesheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
+        timesheet_ids = timesheet_obj.search(cr, uid, [('employee_id', '=', ids[0])], context=context)
+        current_date = time.strftime('%Y-%m-%d')
+        for timesheet_id in timesheet_ids:
+            timesheet = timesheet_obj.browse(cr, uid, timesheet_id, context)
+            if timesheet.date_from < current_date < timesheet.date_to and timesheet.state not in ('draft','new'):
+                 raise osv.except_osv(_('Warning!'), _('You cannot add an attendance in a confirmed timesheet'))
+        return super(hr_employee, self).attendance_action_change(cr, uid, ids, context=context)
+
+hr_employee()
+
+
 class hr_timesheet_sheet_sheet_day(osv.osv):
     _name = "hr_timesheet_sheet.sheet.day"
     _description = "Timesheets by Period"