diff --git a/account_banking_reconciliation/report/detailed_reconciliation.mako b/account_banking_reconciliation/report/detailed_reconciliation.mako index 6af634d13..764ca5a24 100644 --- a/account_banking_reconciliation/report/detailed_reconciliation.mako +++ b/account_banking_reconciliation/report/detailed_reconciliation.mako @@ -4,47 +4,62 @@ @@ -116,8 +135,10 @@ - - ${formatLang(rec.starting_balance, monetary=True, currency_obj=rec.company_id.currency_id)} + + ${formatLang(rec.multi_currency and rec.starting_balance_in_currency or rec.starting_balance, + monetary=True, + currency_obj=rec.multi_currency and rec.account_id.currency_id or rec.company_id.currency_id)} @@ -139,8 +160,10 @@ ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_debits_lines)}${_("items")} - - ${formatLang(rec.sum_of_debits, monetary=True, currency_obj=rec.company_id.currency_id)} + + ${formatLang(rec.multi_currency and rec.sum_of_debits_in_currency or rec.sum_of_debits, + monetary=True, + currency_obj=rec.multi_currency and rec.account_id.currency_id or rec.company_id.currency_id)} %for rec_line in [line for line in rec.debit_move_line_ids if line.cleared_bank_account]: @@ -163,7 +186,9 @@ - ${formatLang(rec_line.amount, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(rec.multi_currency and rec_line.amount_in_currency or rec_line.amount, + monetary=True, + currency_obj=rec.multi_currency and rec_line.currency_id or rec.company_id.currency_id)} %endfor @@ -175,8 +200,10 @@ ${_("Cheques and Debits")}${" - %s " % int(rec.sum_of_credits_lines)}${_("items")} - - ${formatLang(-rec.sum_of_credits, monetary=True, currency_obj=rec.company_id.currency_id)} + + ${formatLang(rec.multi_currency and rec.sum_of_credits_in_currency or rec.sum_of_credits, + monetary=True, + currency_obj=rec.multi_currency and rec.account_id.currency_id or rec.company_id.currency_id)} %for rec_line in [line for line in rec.credit_move_line_ids if line.cleared_bank_account]: @@ -199,7 +226,9 @@ - ${formatLang(rec_line.amount, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(rec.multi_currency and rec_line.amount_in_currency or rec_line.amount, + monetary=True, + currency_obj=rec.multi_currency and rec_line.currency_id or rec.company_id.currency_id)} %endfor @@ -212,7 +241,9 @@ - ${formatLang(rec.cleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(rec.multi_currency and rec.cleared_balance_in_currency or rec.cleared_balance, + monetary=True, + currency_obj=rec.multi_currency and rec.account_id.currency_id or rec.company_id.currency_id)} @@ -224,7 +255,9 @@ - ${formatLang(rec.cleared_balance + rec.starting_balance, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(rec.multi_currency and (rec.cleared_balance_in_currency + rec.starting_balance_in_currency) or (rec.cleared_balance + rec.starting_balance), + monetary=True, + currency_obj=rec.multi_currency and rec.account_id.currency_id or rec.company_id.currency_id)} @@ -246,8 +279,10 @@ ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_debits_lines_unclear)}${_("items")} - - ${formatLang(rec.sum_of_debits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)} + + ${formatLang(rec.multi_currency and rec.sum_of_debits_unclear_in_currency or rec.sum_of_debits_unclear, + monetary=True, + currency_obj=rec.multi_currency and rec.account_id.currency_id or rec.company_id.currency_id)} %for rec_line in [line for line in rec.debit_move_line_ids if not line.cleared_bank_account]: @@ -270,7 +305,9 @@ - ${formatLang(rec_line.amount, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(rec.multi_currency and rec_line.amount_in_currency or rec_line.amount, + monetary=True, + currency_obj=rec.multi_currency and rec_line.currency_id or rec.company_id.currency_id)} %endfor @@ -282,8 +319,10 @@ ${_("Cheques and Debits")}${" - %s " % int(rec.sum_of_credits_lines_unclear)}${_("items")} - - ${formatLang(-rec.sum_of_credits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)} + + ${formatLang(rec.multi_currency and rec.sum_of_credits_unclear_in_currency or rec.sum_of_credits_unclear, + monetary=True, + currency_obj=rec.multi_currency and rec.account_id.currency_id or rec.company_id.currency_id)} %for rec_line in [line for line in rec.credit_move_line_ids if not line.cleared_bank_account]: @@ -306,7 +345,9 @@ - ${formatLang(rec_line.amount, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(rec.multi_currency and rec_line.amount_in_currency or rec_line.amount, + monetary=True, + currency_obj=rec.multi_currency and rec_line.currency_id or rec.company_id.currency_id)} %endfor @@ -319,17 +360,21 @@ - ${formatLang(rec.uncleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(rec.multi_currency and rec.uncleared_balance_in_currency or rec.uncleared_balance, + monetary=True, + currency_obj=rec.multi_currency and rec.account_id.currency_id or rec.company_id.currency_id)} - ${_("Register Balance as of")}${" %s" % formatLang(rec.ending_date, date=True, currency_obj=rec.company_id.currency_id)} + ${_("Register Balance as of")}${" %s" % formatLang(rec.ending_date, date=True)} - ${formatLang(rec.starting_balance + rec.cleared_balance + rec.uncleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(rec.multi_currency and (rec.starting_balance_in_currency + rec.cleared_balance_in_currency + rec.uncleared_balance_in_currency) or (rec.starting_balance + rec.cleared_balance + rec.uncleared_balance), + monetary=True, + currency_obj=rec.multi_currency and rec.account_id.currency_id or rec.company_id.currency_id)}