Merge lp:~openerp-dev/openobject-addons/6.1-bug-1085223-dhs into lp:openobject-addons/6.1

[Dhruti Shastri(OpenERP)]

Unmerged revisions

7108. By Dhruti Shastri(OpenERP) on 2012-12-20

[FIX][account_voucher]:Error to cancel payment of partner

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2012-12-05 17:57:01 +0000
+++ account_voucher/account_voucher.py	2012-12-20 07:27:14 +0000
@@ -1196,6 +1196,7 @@
             context = {}
         move_pool = self.pool.get('account.move')
         move_line_pool = self.pool.get('account.move.line')
+        line_pool = self.pool.get('account.voucher.line')
         for voucher in self.browse(cr, uid, ids, context=context):
             if voucher.move_id:
                 continue
@@ -1219,6 +1220,11 @@
                 line_total = line_total - self._convert_amount(cr, uid, voucher.tax_amount, voucher.id, context=ctx)
             elif voucher.type == 'purchase':
                 line_total = line_total + self._convert_amount(cr, uid, voucher.tax_amount, voucher.id, context=ctx)
+            # Check if any voucher_line is exist with amount 0.0 while validating voucher according to bug:1085223
+            line_ids = ids and line_pool.search(cr, uid, [('voucher_id','=',voucher.id),('amount','=',0.0)])
+            if line_ids:
+                line_pool.unlink(cr,uid, line_ids)
+
             # Create one move line per voucher line where amount is not 0.0
             line_total, rec_list_ids = self.voucher_move_line_create(cr, uid, voucher.id, line_total, move_id, company_currency, current_currency, context)