Merge lp:~openerp-dev/openobject-addons/trunk-opw-575085-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

         On clicking the "Confirm" button the salary slip must be computed as well, which is not happening yet.

         This branch fixes the issue.
         Code is forward port from 6.1

Thanks
Mayur

=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2012-10-12 11:42:58 +0000
+++ hr_payroll/hr_payroll.py	2012-11-01 05:13:21 +0000
@@ -331,6 +331,7 @@
         return self.write(cr, uid, ids, {'paid': True, 'state': 'done'}, context=context)
 
     def hr_verify_sheet(self, cr, uid, ids, context=None):
+        self.compute_sheet(cr, uid, ids, context)
         return self.write(cr, uid, ids, {'state': 'verify'}, context=context)
 
     def refund_sheet(self, cr, uid, ids, context=None):