Merge lp:~openbig/bigconsulting/fix_bug_account_id into lp:bigconsulting

[gpa(OpenERP)]

Fixed the problem of account_id when pay from simple pay invoice wizard.

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-08-13 09:34:37 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-08-13 10:37:40 +0000
@@ -348,7 +348,7 @@
                                 tax_value = invoice_tax_obj.browse(cr, uid, tax_id)
                                 tax_account_id = tax_value.account_id.id
                                 tax_code_id = tax_value.tax_code_id.id
-                           
+
                             if invoice.company_id.currency_id.id<>invoice.currency_id.id:
                                 tax_amount_currency = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, tax_real_amt, context=context)
                             l3 = {
@@ -361,7 +361,7 @@
                                 'currency_id':currency_id,
                                 'amount_currency':tax_amount_currency and direction * tax_amount_currency or 0.0,
                                 'tax_code_id':tax_code_id,
-                                'tax_amount':tax_real_amt,
+                                'tax_amount':-tax_real_amt,
                             }
                             l3['name'] = name
                             lines.append((0, 0, l3))
@@ -382,7 +382,7 @@
                         'amount_currency':move_line_data.amount_currency and direction * move_line_data.amount_currency or 0.0,
                         'name':move_line_data.name,
                         'tax_code_id':move_line_data.tax_code_id.id,
-                        'tax_amount':move_line_data.tax_amount,
+                        'tax_amount':-move_line_data.tax_amount,
                       }
                 lines.append((0, 0, l4))
         else:
@@ -390,6 +390,11 @@
                 account_id = False
                 if 'account_id' in context and context['account_id']:
                     account_id = context['account_id']
+                else:
+                    account_id = self._get_account(cr, uid, ids , pay_amount, invoice.payment_term.id, context=context)
+                    fpos = invoice.fiscal_position or False
+                    if account_id:
+                        account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account_id)
 
                 for line in invoice.invoice_line:
                     tax_account_id = False
@@ -422,7 +427,7 @@
                             tax_value = invoice_tax_obj.browse(cr, uid, tax_id)
                             tax_account_id = tax_value.account_id.id
                             base_code_id = tax_value.base_code_id.id
-                    
+
                     if invoice.company_id.currency_id.id<>invoice.currency_id.id:
                         discount_amount = discount_ratio - total_tax_amount
                         discount_amount_currency = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, discount_amount, context=context)
@@ -436,11 +441,10 @@
                         'currency_id':currency_id,
                         'amount_currency':discount_amount_currency and direction * discount_amount_currency or 0.0,
                         'tax_code_id':base_code_id,
-                        'tax_amount':(discount_ratio - total_tax_amount),
+                        'tax_amount':-(discount_ratio - total_tax_amount),
                     }
                     l4['name'] = name
                     lines.append((0, 0, l4))
-        
         move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
         move_id = move_obj.create(cr, uid, move, context=context)