Merge lp:~openerp-dev/openobject-addons/trunk-bug-784006-ara into lp:openobject-addons

[Ashvin Rathod (OpenERP)]

Hello,

Fix: account_move_line: improved account selection when partner changes

Thanks,
ara

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

in line number 14 instead of using else you can use elif as given in the patch.
Because if the selected partner is not customer and not supplier then we can not propose the account.

Thanks,
mra

review: Needs Fixing

[Ashvin Rathod (OpenERP) (ara-tinyerp)]

Hello,

I have changed as you describe as above.

Thanks,
ara

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2011-07-01 23:41:24 +0000
+++ account/account_move_line.py	2011-07-05 06:23:11 +0000
@@ -650,8 +650,13 @@
                 #if jt in ('sale', 'purchase_refund', 'bank', 'cash'):
                 if jt in ('sale', 'purchase_refund'):
                     val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id2)
-                elif jt in ('purchase', 'sale_refund', 'expense', 'bank', 'cash'):
+                elif jt in ('purchase', 'sale_refund'):
                     val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id1)
+                elif jt in ('general', 'bank', 'cash'):
+                    if part.customer and not part.supplier:
+                        val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id2)
+                    elif part.supplier and not part.customer:
+                        val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id1)
                 if val.get('account_id', False):
                     d = self.onchange_account_id(cr, uid, ids, val['account_id'])
                     val.update(d['value'])