diff --git a/account_banking_reconciliation/report/summary_reconciliation.mako b/account_banking_reconciliation/report/summary_reconciliation.mako index 85e641851..4af5f1da8 100644 --- a/account_banking_reconciliation/report/summary_reconciliation.mako +++ b/account_banking_reconciliation/report/summary_reconciliation.mako @@ -19,7 +19,6 @@ } .left_col { - width:40%; } .col_header { @@ -61,8 +60,9 @@ %for rec in objects: + <% cols = 3 if rec.multi_currency else 2 %> @@ -71,9 +71,11 @@ - + %if rec.multi_currency: + + %endif @@ -91,9 +93,11 @@ - + %if rec.multi_currency: + + %endif @@ -102,9 +106,11 @@ - + %if rec.multi_currency: + + %endif @@ -113,9 +119,11 @@ - + %if rec.multi_currency: + + %endif @@ -124,9 +132,11 @@ - + %if rec.multi_currency: + + %endif @@ -144,9 +154,11 @@ - + %if rec.multi_currency: + + %endif @@ -155,9 +167,11 @@ - + %if rec.multi_currency: + + %endif @@ -166,9 +180,11 @@ - + %if rec.multi_currency: + + %endif @@ -177,9 +193,11 @@ - + %if rec.multi_currency: + + %endif
+ colspan="${cols}"> ${_("Summary account:")} ${rec.account_id.code} - ${rec.account_id.name} ${_("Beginning Balance")} - ${formatLang(rec.starting_balance_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} - + ${formatLang(rec.starting_balance_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(rec.starting_balance, monetary=True, currency_obj=rec.company_id.currency_id)} ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_debits_lines)}${_("items")} - ${formatLang(rec.sum_of_debits_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} - + ${formatLang(rec.sum_of_debits_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(rec.sum_of_debits, monetary=True, currency_obj=rec.company_id.currency_id)} ${_("Cheques and Debits")}${" - %s " % int(rec.sum_of_credits_lines)}${_("items")} - ${formatLang(-rec.sum_of_credits_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} - + ${formatLang(-rec.sum_of_credits_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(-rec.sum_of_credits, monetary=True, currency_obj=rec.company_id.currency_id)} ${_("Total Cleared Transactions")} - ${formatLang(rec.cleared_balance_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} - + ${formatLang(rec.cleared_balance_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(rec.cleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)} ${_("Cleared Balance")} - ${formatLang(rec.cleared_balance_in_currency + rec.starting_balance_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} - + ${formatLang(rec.cleared_balance_in_currency + rec.starting_balance_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(rec.cleared_balance + rec.starting_balance, monetary=True, currency_obj=rec.company_id.currency_id)} ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_debits_lines_unclear)}${_("items")} - ${formatLang(rec.sum_of_debits_unclear_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} - + ${formatLang(rec.sum_of_debits_unclear_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(rec.sum_of_debits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)} ${_("Cheques and Debits")}${" - %s " % int(rec.sum_of_credits_lines_unclear)}${_("items")} - ${formatLang(-rec.sum_of_credits_unclear_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} - + ${formatLang(-rec.sum_of_credits_unclear_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(-rec.sum_of_credits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)} ${_("Total Uncleared Transactions")} - ${formatLang(rec.uncleared_balance_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} - + ${formatLang(rec.uncleared_balance_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(rec.uncleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)} ${_("Register Balance as of")}${" %s" % formatLang(rec.ending_date, date=True, currency_obj=rec.company_id.currency_id)} - ${formatLang(rec.starting_balance_in_currency + rec.cleared_balance_in_currency + rec.uncleared_balance_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} - + ${formatLang(rec.starting_balance_in_currency + rec.cleared_balance_in_currency + rec.uncleared_balance_in_currency, monetary=True, currency_obj=rec.company_id.currency_id)} + ${formatLang(rec.starting_balance + rec.cleared_balance + rec.uncleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)}