openerp-dev-web team mailing list archive

["Jagdish Panchal \(Open ERP\)" <jap@xxxxxxxxxxx>]

Jagdish Panchal (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/6.0-opw-5577-jap into lp:openobject-addons/6.0.

Requested reviews:
  Jay Vora (OpenERP) (jvo-openerp)
Related bugs:
  Bug #767058 in OpenERP Addons: "invoice payment should pay only the invoice I started from"
  https://bugs.launchpad.net/openobject-addons/+bug/767058

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5577-jap/+merge/60181

Hello,

   This fixes the bug 767058.
   When you pay invoice in the voucher dedicated invoice should only be displayed to be paid.


Thanks.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5577-jap/+merge/60181
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw-5577-jap.

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2011-01-17 11:20:56 +0000
+++ account_voucher/account_voucher.py	2011-05-06 13:21:21 +0000
@@ -460,7 +460,10 @@
             account_type = 'receivable'
 
         if not context.get('move_line_ids', False):
-            ids = move_line_pool.search(cr, uid, [('state','=','valid'), ('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', '=', partner_id)], context=context)
+            domain = [('state','=','valid'), ('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', '=', partner_id)]
+            if context.get('invoice_id', False):
+	            domain.append(('invoice', '=', context['invoice_id']))
+	            ids = move_line_pool.search(cr, uid, domain, context=context)    
         else:
             ids = context['move_line_ids']
         ids.reverse()

=== modified file 'account_voucher/voucher_payment_receipt_view.xml'
--- account_voucher/voucher_payment_receipt_view.xml	2011-03-01 11:49:27 +0000
+++ account_voucher/voucher_payment_receipt_view.xml	2011-05-06 13:21:21 +0000
@@ -88,12 +88,12 @@
             <field name="arch" type="xml">
                 <form string="Bill Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" context="{'invoice_currency':currency_id}" string="Supplier"/>
-                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id}" string="Supplier"/>
+                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             widget="selection" select="1"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
+                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)"
                             string="Payment Method"/>
                         <field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
                         <field name="reference" select="1" string="Payment Ref"/>
@@ -151,12 +151,12 @@
             <field name="arch" type="xml">
                 <form string="Bill Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" context="{'invoice_currency':currency_id}" string="Supplier"/>
-                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id}" string="Supplier"/>
+                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             widget="selection" select="1"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
+                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)"
                             string="Payment Method"/>
                         <field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
                         <field name="reference" select="1" string="Payment Ref"/>
@@ -288,14 +288,14 @@
             <field name="arch" type="xml">
                 <form string="Customer Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" string="Customer"/>
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer"/>
                         <field name="amount"
                             string="Paid Amount"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
+                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             widget="selection" select="1"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
+                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)"
                             string="Payment Method"/>
                         <field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
                         <field name="reference" select="1" string="Payment Ref"/>