From: Raphael Collet <rco@openerp.com>
Date: Tue, 10 Jan 2012 15:13:12 +0000 (+0100)
Subject: [MERGE] lp:912179 (account_voucher: fix code creating voucher line from bank statement)
X-Git-Tag: 6.1.0-rc1-addons~61
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=8b817b4a3f049f5b939b261efe2c9546d1e8caf4;p=odoo%2Fodoo.git

[MERGE] lp:912179 (account_voucher: fix code creating voucher line from bank statement)

bzr revid: rco@openerp.com-20120110151312-s1z2r9kiaddwc296
---

8b817b4a3f049f5b939b261efe2c9546d1e8caf4
diff --cc addons/account_voucher/wizard/account_statement_from_invoice.py
index 5fb3fc2,dcf5551..1b921e0
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@@ -89,11 -89,16 +89,10 @@@ class account_statement_from_invoice_li
              voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
  
              voucher_line_dict =  {}
-             if result['value']['line_ids']:
-                 for line_dict in result['value']['line_ids']:
-                     move_line = line_obj.browse(cr, uid, line_dict['move_line_id'], context)
-                     if line.move_id.id == move_line.move_id.id:
-                         voucher_line_dict = line_dict
 -            if result['value']['line_cr_ids']:
 -                for line_dict in result['value']['line_cr_ids']:
 -                    move_line = line_obj.browse(cr, uid, line_dict['move_line_id'], context)
 -                    if line.move_id.id == move_line.move_id.id:
 -                        voucher_line_dict = line_dict
 -            if result['value']['line_dr_ids']:
 -                for line_dict in result['value']['line_dr_ids']:
 -                    move_line = line_obj.browse(cr, uid, line_dict['move_line_id'], context)
 -                    if line.move_id.id == move_line.move_id.id:
 -                        voucher_line_dict = line_dict
++            for line_dict in result['value']['line_cr_ids'] + result['value']['line_dr_ids']:
++                move_line = line_obj.browse(cr, uid, line_dict['move_line_id'], context)
++                if line.move_id.id == move_line.move_id.id:
++                    voucher_line_dict = line_dict
  
              if voucher_line_dict:
                  voucher_line_dict.update({'voucher_id': voucher_id})
@@@ -190,4 -195,4 +189,4 @@@ class account_statement_from_invoice(os
          }
  
  account_statement_from_invoice()
--# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
++# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: