Merge lp:~openerp-dev/openobject-addons/6.1-opw-584844-nep into lp:openobject-addons/6.1

[Nehal Panchal (OpenERP)]

Hello,

You can delete the confirmed payslip.

This fixes the issue.

Thanks

Unmerged revisions

7139. By Nehal Panchal (OpenERP) on 2013-01-31

[FIX] hr_payroll : Fixed the issue for not allowing to delete done payslip

=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2012-01-31 13:36:57 +0000
+++ hr_payroll/hr_payroll.py	2013-01-31 09:11:44 +0000
@@ -305,6 +305,12 @@
         return True
 
     _constraints = [(_check_dates, "Payslip 'Date From' must be before 'Date To'.", ['date_from', 'date_to'])]  
+    
+    def unlink(self, cr, uid, ids, context=None):
+        for payslip in self.browse(cr, uid, ids, context=context):
+            if payslip.state not in  ['draft','cancel']:
+                raise osv.except_osv(_('Warning!'),_('You cannot delete a payslip which is not draft or cancelled!'))
+        return super(hr_payslip, self).unlink(cr, uid, ids, context)    
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default: