Merge lp:~openerp-dev/openobject-addons/trunk-bug-1179762-ishwar into lp:openobject-addons

[Ishwar Malvi(OpenERP)]

Hello,

    I have fixed the problem of bank reconciliation with voucher without partner.

Thanks,
Ishwar Malvi

[Mohammad Alhashash (alhashash)]

In line 21, account_id will always take the value of the first of account_id of random move line from the journal (first line from search in line 10) even if there is a partner!!!!

Unmerged revisions

8757. By Ishwar Malvi(OpenERP) on 2013-06-10

[FIX]bank reconciliation error with voucher without partner

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2013-05-28 09:19:41 +0000
+++ account_voucher/account_voucher.py	2013-06-10 13:10:46 +0000
@@ -1306,7 +1306,8 @@
 
         voucher = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
         current_currency_obj = voucher.currency_id or voucher.journal_id.company_id.currency_id
-
+        account_move_line_obj = self.pool.get('account.move.line')
+        move_line_id = account_move_line_obj.search(cr,uid,[('journal_id','=',voucher.journal_id.id)])
         if not currency_obj.is_zero(cr, uid, current_currency_obj, line_total):
             diff = line_total
             account_id = False
@@ -1315,9 +1316,13 @@
                 account_id = voucher.writeoff_acc_id.id
                 write_off_name = voucher.comment
             elif voucher.type in ('sale', 'receipt'):
-                account_id = voucher.partner_id.property_account_receivable.id
+                if voucher.partner_id:
+                    account_id = voucher.partner_id.property_account_receivable.id
+                account_id = account_move_line_obj.browse(cr,uid,move_line_id[0],context).account_id.id
             else:
-                account_id = voucher.partner_id.property_account_payable.id
+                if voucher.partner_id:
+                    account_id = voucher.partner_id.property_account_payable.id
+                account_id = account_move_line_obj.browse(cr,uid,move_line_id[0],context).account_id.id
             sign = voucher.type == 'payment' and -1 or 1
             move_line = {
                 'name': write_off_name or name,

=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
--- account_voucher/voucher_sales_purchase_view.xml	2013-05-14 11:52:13 +0000
+++ account_voucher/voucher_sales_purchase_view.xml	2013-06-10 13:10:46 +0000
@@ -223,9 +223,6 @@
                 <sheet string="Supplier Voucher">
                     <h1><label for="number" string="Purchase Receipt"/> <field name="number" class="oe_inline" readonly="1"/></h1>
 
-                    <field name="pay_now" invisible="1"/>
-                    <field name="account_id" domain="[('type','=','other')]"  invisible="True"/>
-                    <field name="type" invisible="True"/>
                     <group>
                         <group>
                             <field name="partner_id" domain="[('supplier','=',True)]" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
@@ -285,6 +282,11 @@
 			            </div>
                                     <field name="amount" class="oe_subtotal_footer_separator" nolabel="1"/>
                                 </group>
+                                <group>
+                                    <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
+                                    <field name="account_id" domain="[('type','=','other')]" attrs="{'invisible':[('pay_now','!=','pay_now')]}" />
+                                    <field name="type"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">