Anup(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-5625-ach into
lp:openobject-addons/6.0.
Requested reviews:
Jay Vora (OpenERP) (jvo-openerp)
Related bugs:
Bug #779815 in OpenERP Addons: "[V6] Import partial payment in bank statement"
https://bugs.launchpad.net/openobject-addons/+bug/779815
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5625-ach/+merge/62470
Hello,
The Partially Paid Invoices were not coming in the Bank Statement when
importing invoices due to a domain.
Even after fixing the domain the amount was not coming and was giving the
wrongly calculated amount.
Fixed that too.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5625-ach/+merge/62470
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-5625-ach.
=== modified file 'account_voucher/wizard/account_statement_from_invoice.py'
--- account_voucher/wizard/account_statement_from_invoice.py 2011-01-14 00:11:01 +0000
+++ account_voucher/wizard/account_statement_from_invoice.py 2011-05-26 11:46:00 +0000
@@ -98,6 +98,10 @@
if voucher_line_dict:
voucher_line_dict.update({'voucher_id': voucher_id})
voucher_line_obj.create(cr, uid, voucher_line_dict, context=context)
+
+ amount_res = voucher_line_dict['amount_unreconciled']
+ voucher_obj.write(cr, uid, voucher_id, {'amount':amount_res}, context=context)
+
if line.journal_id.type == 'sale':
type = 'customer'
elif line.journal_id.type == 'purchase':
@@ -106,7 +110,7 @@
type = 'general'
statement_line_obj.create(cr, uid, {
'name': line.name or '?',
- 'amount': amount,
+ 'amount': 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 2011-01-14 00:11:01 +0000
+++ account_voucher/wizard/account_statement_from_invoice_view.xml 2011-05-26 11:46:00 +0000
@@ -38,7 +38,7 @@
<form string="Import Entries">
<group colspan="4" expand="1">
<separator string="Payable and Receivables" colspan="4"/>
- <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
+ <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('journal_id.type','in',['sale','purchase']), ('state', '=', 'valid')]"/>
</group>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help : https://help.launchpad.net/ListHelp
