Merge lp:~openerp-dev/openobject-addons/trunk-bug-862218-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello Sir,

Thanks for your solution, i have applied the suggested solution and now the functionality in hr_payroll_account is working as expected.

Thanks & Regards,
Devnani Bharat R.

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[qdp (OpenERP) (qdp)]

no, the right patch was the following:

=== modified file 'hr_payroll_account/hr_payroll_account.py'
--- hr_payroll_account/hr_payroll_account.py 2011-09-24 15:15:33 +0000
+++ hr_payroll_account/hr_payroll_account.py 2011-10-07 13:47:43 +0000
@@ -59,9 +59,10 @@
         move_ids = []
         move_to_cancel = []
         for slip in self.browse(cr, uid, ids, context=context):
- move_ids.append(slip.move_id.id)
- if slip.move_id.state == 'posted':
- move_to_cancel.append(slip.move_id.id)
+ if slip.move_id:
+ move_ids.append(slip.move_id.id)
+ if slip.move_id.state == 'posted':
+ move_to_cancel.append(slip.move_id.id)
         move_pool.button_cancel(cr, uid, move_to_cancel, context=context)
         move_pool.unlink(cr, uid, move_ids, context=context)
         return super(hr_payslip, self).cancel_sheet(cr, uid, ids, context=context)

it's now merged in addons trunk

[qdp (OpenERP) (qdp)]

in revision 5315

Unmerged revisions

5239. By Bharat Devnani (Open ERP) on 2011-09-30

 hr : when tried to cancel Employee payslip

=== modified file 'hr_payroll_account/hr_payroll_account.py'
--- hr_payroll_account/hr_payroll_account.py	2011-09-24 15:15:33 +0000
+++ hr_payroll_account/hr_payroll_account.py	2011-09-30 06:10:30 +0000
@@ -39,7 +39,7 @@
         'journal_id': fields.many2one('account.journal', 'Expense Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True),
         'move_id': fields.many2one('account.move', 'Accounting Entry', readonly=True),
     }
-    
+
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
@@ -59,8 +59,8 @@
         move_ids = []
         move_to_cancel = []
         for slip in self.browse(cr, uid, ids, context=context):
-            move_ids.append(slip.move_id.id)
             if slip.move_id.state == 'posted':
+                move_ids.append(slip.move_id.id)
                 move_to_cancel.append(slip.move_id.id)
         move_pool.button_cancel(cr, uid, move_to_cancel, context=context)
         move_pool.unlink(cr, uid, move_ids, context=context)