← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-760493-skh into lp:openobject-addons

 

Somesh Khare(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-760493-skh into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #760493 in OpenERP Addons: "Adding working time in a confirmed timesheet"
  https://bugs.launchpad.net/openobject-addons/+bug/760493

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-760493-skh/+merge/57822

Hello,

[Fix] : Adding working time in a confirmed timesheet.

Thanks,
skh
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-760493-skh/+merge/57822
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-760493-skh.
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2011-04-07 09:27:30 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2011-04-15 08:53:25 +0000
@@ -481,6 +481,19 @@
         'date': _get_default_date,
     }
 
+    def _check_sheet_state(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        line = self.browse(cr, uid, ids, context=context)
+        for timesheet in line:
+            if timesheet.sheet_id and timesheet.sheet_id.state not in ('draft', 'new'):
+                return False
+        return True
+
+    _constraints = [
+        (_check_sheet_state, 'You can not modify an entry in a confirmed timesheet !.', ['state']),
+    ]
+
     def create(self, cr, uid, vals, *args, **kwargs):
         if vals.get('sheet_id', False):
             ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, vals['sheet_id'])


Follow ups