From 0291ffa1e506f051b880759ed40bb2431ebdd241 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Wed, 22 Dec 2010 14:33:17 +0100 Subject: [PATCH 1/2] [FIX] account, account.move.line: removed the string replacement on the fields_view_get in order to allow the translations bzr revid: qdp-launchpad@tinyerp.com-20101222133317-jfa6kqp9mcekjvcj --- addons/account/account_move_line.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 5674567ffcf..ffd82d329f7 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -955,7 +955,6 @@ class account_move_line(osv.osv): if field in widths: attrs.append('width="'+str(widths[field])+'"') - attrs.append('string="'+field_it[2]+'"') attrs.append("invisible=\"context.get('visible_id') not in %s\"" % (fields.get(field))) xml += '''\n''' % (field,' '.join(attrs)) From 02af34f56048406372b55ae89131f75f8d3688e5 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Wed, 22 Dec 2010 14:35:10 +0100 Subject: [PATCH 2/2] [FIX] account_voucher: multi_currency handling with proper rate (based on the voucher date instead of current date) bzr revid: qdp-launchpad@tinyerp.com-20101222133510-f8xzfmx9mufkuq8v --- addons/account_voucher/account_voucher.py | 49 ++++++++++--------- .../account_voucher/account_voucher_view.xml | 4 +- addons/account_voucher/test/sales_payment.yml | 2 +- addons/account_voucher/test/sales_receipt.yml | 2 +- .../voucher_payment_receipt_view.xml | 30 ++++++------ .../voucher_sales_purchase_view.xml | 10 ++-- 6 files changed, 50 insertions(+), 47 deletions(-) diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 570bfb1d8b7..ee41bd4a38e 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -401,7 +401,7 @@ class account_voucher(osv.osv): return default - def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, context=None): + def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None): """price Returns a dict that contains new values and context @@ -415,6 +415,9 @@ class account_voucher(osv.osv): context = {} if not journal_id: return {} + context_multi_currency = context.copy() + if date: + context_multi_currency.update({'date': date}) line_pool = self.pool.get('account.voucher.line') line_ids = ids and line_pool.search(cr, uid, [('voucher_id', '=', ids[0])]) or False @@ -476,9 +479,9 @@ class account_voucher(osv.osv): company_currency = journal.company_id.currency_id.id if company_currency != currency_id and ttype == 'payment': - total_debit = currency_pool.compute(cr, uid, currency_id, company_currency, total_debit) + total_debit = currency_pool.compute(cr, uid, currency_id, company_currency, total_debit, context=context_multi_currency) elif company_currency != currency_id and ttype == 'receipt': - total_credit = currency_pool.compute(cr, uid, currency_id, company_currency, total_credit) + total_credit = currency_pool.compute(cr, uid, currency_id, company_currency, total_credit, context=context_multi_currency) for line in moves: if line.credit and line.reconcile_partial_id and ttype == 'receipt': @@ -500,18 +503,18 @@ class account_voucher(osv.osv): 'type': line.credit and 'dr' or 'cr', 'move_line_id':line.id, 'account_id':line.account_id.id, - 'amount_original':currency_pool.compute(cr, uid, company_currency, currency_id, original_amount), + 'amount_original':currency_pool.compute(cr, uid, company_currency, currency_id, original_amount, context=context_multi_currency), 'date_original':line.date, 'date_due':line.date_maturity, - 'amount_unreconciled':currency_pool.compute(cr, uid, company_currency, currency_id, line.amount_unreconciled) + 'amount_unreconciled':currency_pool.compute(cr, uid, company_currency, currency_id, line.amount_unreconciled, context=context_multi_currency) } if line.credit: amount = min(line.amount_unreconciled, total_debit) - rs['amount'] = currency_pool.compute(cr, uid, company_currency, currency_id, amount) + rs['amount'] = currency_pool.compute(cr, uid, company_currency, currency_id, amount, context=context_multi_currency) total_debit -= amount else: amount = min(line.amount_unreconciled, total_credit) - rs['amount'] = currency_pool.compute(cr, uid, company_currency, currency_id, amount) + rs['amount'] = currency_pool.compute(cr, uid, company_currency, currency_id, amount, context=context_multi_currency) total_credit -= amount default['value']['line_ids'].append(rs) @@ -528,7 +531,7 @@ class account_voucher(osv.osv): return default - def onchange_date(self, cr, user, ids, date, context=None): + def onchange_date(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None): """ @param date: latest value from user input for field date @param args: other arguments @@ -536,14 +539,11 @@ class account_voucher(osv.osv): @return: Returns a dict which contains new values, and context """ period_pool = self.pool.get('account.period') - pids = period_pool.search(cr, user, [('date_start', '<=', date), ('date_stop', '>=', date)]) - if not pids: - return {} - return { - 'value':{ - 'period_id':pids[0] - } - } + res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=context) + pids = period_pool.search(cr, uid, [('date_start', '<=', date), ('date_stop', '>=', date)]) + if pids: + res['value'].update({'period_id':pids[0]}) + return res def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context=None): if not journal_id: @@ -642,6 +642,9 @@ class account_voucher(osv.osv): for inv in self.browse(cr, uid, ids, context=context): if inv.move_id: continue + context_multi_currency = context.copy() + context_multi_currency.update({'date': inv.date}) + if inv.number: name = inv.number elif inv.journal_id.sequence_id: @@ -671,9 +674,9 @@ class account_voucher(osv.osv): # TODO: is there any other alternative then the voucher type ?? # -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt if inv.type in ('purchase', 'payment'): - credit = currency_pool.compute(cr, uid, current_currency, company_currency, inv.amount) + credit = currency_pool.compute(cr, uid, current_currency, company_currency, inv.amount, context=context_multi_currency) elif inv.type in ('sale', 'receipt'): - debit = currency_pool.compute(cr, uid, current_currency, company_currency, inv.amount) + debit = currency_pool.compute(cr, uid, current_currency, company_currency, inv.amount, context=context_multi_currency) if debit < 0: credit = -debit debit = 0.0 @@ -701,14 +704,14 @@ class account_voucher(osv.osv): rec_list_ids = [] line_total = debit - credit if inv.type == 'sale': - line_total = line_total - currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.tax_amount) + line_total = line_total - currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.tax_amount, context=context_multi_currency) elif inv.type == 'purchase': - line_total = line_total + currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.tax_amount) + line_total = line_total + currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.tax_amount, context=context_multi_currency) for line in inv.line_ids: if not line.amount: continue - amount = currency_pool.compute(cr, uid, current_currency, company_currency, line.untax_amount or line.amount) + amount = currency_pool.compute(cr, uid, current_currency, company_currency, line.untax_amount or line.amount, context=context_multi_currency) move_line = { 'journal_id': inv.journal_id.id, 'period_id': inv.period_id.id, @@ -770,7 +773,7 @@ class account_voucher(osv.osv): 'date': inv.date, 'credit': diff > 0 and diff or 0.0, 'debit': diff < 0 and -diff or 0.0, - 'amount_currency': company_currency <> current_currency and currency_pool.compute(cr, uid, company_currency, current_currency, diff * -1) or 0.0, + 'amount_currency': company_currency <> current_currency and currency_pool.compute(cr, uid, company_currency, current_currency, diff * -1, context=context_multi_currency) or 0.0, 'currency_id': company_currency <> current_currency and current_currency or False, } @@ -1004,4 +1007,4 @@ class account_bank_statement_line(osv.osv): account_bank_statement_line() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index c41356f3973..5a2c4b88dd9 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -29,9 +29,10 @@
+ - + @@ -54,7 +55,6 @@ - diff --git a/addons/account_voucher/test/sales_payment.yml b/addons/account_voucher/test/sales_payment.yml index e6e3be8f920..f6025389896 100644 --- a/addons/account_voucher/test/sales_payment.yml +++ b/addons/account_voucher/test/sales_payment.yml @@ -42,7 +42,7 @@ import netsvc vals = {} journal_id = self.default_get(cr, uid, ['journal_id']).get('journal_id',None) - res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), journal_id, 0.0, 1, ttype='receipt') + res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), journal_id, 0.0, 1, ttype='receipt', date=False) vals = { 'account_id': ref('account.cash'), 'amount': 450.0, diff --git a/addons/account_voucher/test/sales_receipt.yml b/addons/account_voucher/test/sales_receipt.yml index 628d1795bc8..a1793527f67 100644 --- a/addons/account_voucher/test/sales_receipt.yml +++ b/addons/account_voucher/test/sales_receipt.yml @@ -50,7 +50,7 @@ import netsvc vals = {} journal_id = self.default_get(cr, uid, ['journal_id']).get('journal_id',None) - res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), journal_id, 0.0, 1, ttype='receipt') + res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_seagate"), journal_id, 0.0, 1, ttype='receipt', date=False) vals = { 'account_id': ref('account.cash'), 'amount': 30000.0, diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index b47fa46bb7e..3a3e996975f 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -88,15 +88,16 @@ - + + - + - + @@ -134,7 +135,6 @@ - @@ -151,15 +151,16 @@ - + + - + - + @@ -211,7 +212,6 @@ groups="analytic.group_analytic_accounting"/> - @@ -285,17 +285,18 @@ - + + + on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/> - + @@ -348,7 +349,6 @@ - diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index 2800511a8e0..3367b08583b 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -96,11 +96,11 @@ - + + - @@ -222,10 +222,11 @@ - + + - + @@ -248,7 +249,6 @@ -