Merge lp:~openerp-dev/openobject-addons/trunk-bug-946866-amp into lp:openobject-addons

[Amit Parik]

Fixes the delete invoice problem

Once the invoice is confirmed the internal number id generated and after that when we cancel it internal_number doesn't set as a False.
That's why when we cancelled the invoice and then try to delete it or "set to draft" the invoice and then try to delete. It doesn't allow to delete.

This fix is solved this problem.

Thanks.

[Amit Parik (amit-parik)]

Hance the bug is invalidted by FP, I am going to close this branch!

review: Abstain

Unmerged revisions

6696. By Amit Parik on 2012-03-28

[FIX] account : Fixes not able to delete draft and cancel invoice problem once it's confirmed

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2012-02-28 14:08:16 +0000
+++ account/account_invoice.py	2012-03-28 06:39:22 +0000
@@ -1030,7 +1030,7 @@
                         raise osv.except_osv(_('Error !'), _('You can not cancel an invoice which is partially paid! You need to unreconcile related payment entries first!'))
 
         # First, set the invoices as cancelled and detach the move ids
-        self.write(cr, uid, ids, {'state':'cancel', 'move_id':False})
+        self.write(cr, uid, ids, {'state':'cancel', 'move_id':False, 'internal_number': False})
         if move_ids:
             # second, invalidate the move(s)
             account_move_obj.button_cancel(cr, uid, move_ids, context=context)