Merge lp:~openerp-dev/openobject-addons/7.0-opw-593538-dhr into lp:openobject-addons/7.0

[Dharti Ratani(OpenERP)]

Hello Sir,

Fixed the issue : when account_voucher is installed, it is impossible to import invoices that are partially paid in bank statements from Import Invoices button.

Thanks
dhr

[Naresh(OpenERP) (nch-openerp)]

review: Approve

Unmerged revisions

9219. By Dharti Ratani(OpenERP) on 2013-06-11

[FIX]Fixed the issue : when account_voucher is installed, it impossible to Import Invoices partially paid in bank statements

=== modified file 'account_voucher/wizard/account_statement_from_invoice.py'
--- account_voucher/wizard/account_statement_from_invoice.py	2012-12-18 17:55:47 +0000
+++ account_voucher/wizard/account_statement_from_invoice.py	2013-06-11 11:03:48 +0000
@@ -110,9 +110,13 @@
             if voucher_line_dict:
                 voucher_line_dict.update({'voucher_id': voucher_id})
                 voucher_line_obj.create(cr, uid, voucher_line_dict, context=context)
+                
+            #Updated the amount of voucher in case of partially paid invoice
+            amount_res = voucher_line_dict.get('amount_unreconciled',amount)
+            voucher_obj.write(cr, uid, voucher_id, {'amount':amount_res}, context=context)
             statement_line_obj.create(cr, uid, {
                 'name': line.name or '?',
-                'amount': amount,
+                'amount': amount_res if amount >= 0 else -amount_res,
                 'type': type,
                 'partner_id': line.partner_id.id,
                 'account_id': line.account_id.id,

=== modified file 'account_voucher/wizard/account_statement_from_invoice_view.xml'
--- account_voucher/wizard/account_statement_from_invoice_view.xml	2012-11-29 22:26:45 +0000
+++ account_voucher/wizard/account_statement_from_invoice_view.xml	2013-06-11 11:03:48 +0000
@@ -7,7 +7,7 @@
             <field name="arch" type="xml">
                 <form string="Import Entries" version="7.0">
                     <separator string="Payable and Receivables"/>
-                    <field height="300" width="700" name="line_ids" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
+                    <field height="300" width="700" name="line_ids" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('state', '=', 'valid')]"/>
                     <footer>
                         <button string="Ok" name="populate_statement" type="object" class="oe_highlight"/>
                         or