diff --git a/npg_bank_account_reconciliation/report/detailed_reconciliation.mako b/npg_bank_account_reconciliation/report/detailed_reconciliation.mako index d15b2d0d4..f62e574ef 100644 --- a/npg_bank_account_reconciliation/report/detailed_reconciliation.mako +++ b/npg_bank_account_reconciliation/report/detailed_reconciliation.mako @@ -18,24 +18,25 @@ .cell { border:none; } - .left_col { - width:40%; - } .col_header { + font-weight:bold; + width:20px; + } + .col_header_third { + font-style:italic; + } + .col_header_first { + font-size: larger; + } + .col_date { + width:10px; } .right_col_sum { - width:20%; text-align:right; } .right_col { text-align:right; } - .second_line { - padding-left:3em; - } - .third_line { - padding-left:6em; - } .line_sum { border-style:solid; border-width:0px; @@ -54,8 +55,8 @@ %for rec in objects: - @@ -64,9 +65,13 @@
+ ${_("Detailed %s account:") % rec.name} ${rec.account_id.code} - ${rec.account_id.name}
- - + + - - - - - - + - - - - - + + - - - - %for rec_line in [line for line in rec.debit_move_line_ids if line.cleared_bank_account]: - - + + - - - %endfor - + + - - - - %for rec_line in [line for line in rec.credit_move_line_ids if line.cleared_bank_account]: - - + + - - - %endfor - + - - - - - - - - - - + - - - - - + + - - - - %for rec_line in [line for line in rec.debit_move_line_ids if not line.cleared_bank_account]: - - + + - - - %endfor - + + - - - - %for rec_line in [line for line in rec.credit_move_line_ids if not line.cleared_bank_account]: - - + + - - - %endfor - + - - - - - - - - -
+ + + + ${_("Date")} @@ -84,66 +89,58 @@
+ ${_("Beginning Balance")} + - - + ${formatLang(rec.starting_balance, monetary=True, currency_obj=rec.company_id.currency_id)}
+ + ${_("Cleared Transactions")} - - - +
+ + + ${_("Cheques and Payments")}${" - %s " % int(rec.sum_of_debits_lines)}${_("items")} - - - - ${formatLang(rec.sum_of_debits, monetary=True, currency_obj=rec.company_id.currency_id)}
+ + + + ${rec_line.date} + ${rec_line.name} + ${rec_line.ref} + ${rec_line.partner_id.name} @@ -152,35 +149,35 @@
+ + + ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_credits_lines)}${_("items")} - - - - ${formatLang(-rec.sum_of_credits, monetary=True, currency_obj=rec.company_id.currency_id)}
+ + + + ${rec_line.date} + ${rec_line.name} + ${rec_line.ref} + ${rec_line.partner_id.name} @@ -189,82 +186,70 @@
+ + ${_("Total Cleared Transactions")} - - - + ${formatLang(rec.cleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)}
+ ${_("Cleared Balance")} + - - + ${formatLang(rec.cleared_balance + rec.starting_balance, monetary=True, currency_obj=rec.company_id.currency_id)}
+ + ${_("Uncleared Transactions")} - - - +
+ + + ${_("Cheques and Payments")}${" - %s " % int(rec.sum_of_debits_lines_unclear)}${_("items")} - - - - ${formatLang(rec.sum_of_debits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)}
+ + + + ${rec_line.date} + ${rec_line.name} + ${rec_line.ref} + ${rec_line.partner_id.name} @@ -273,35 +258,35 @@
+ + + ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_credits_lines_unclear)}${_("items")} - - - - ${formatLang(-rec.sum_of_credits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)}
+ + + + ${rec_line.date} + ${rec_line.name} + ${rec_line.ref} + ${rec_line.partner_id.name} @@ -310,32 +295,24 @@
+ + ${_("Total Uncleared Transactions")} - - - + ${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 + rec.cleared_balance + rec.uncleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)} @@ -343,102 +320,6 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ${_("Summary %s account:") % rec.name} ${rec.account_id.code} - - ${rec.account_id.name} -
- ${_("Beginning Balance")} - - ${formatLang(rec.starting_balance, monetary=True, currency_obj=rec.company_id.currency_id)} -
- ${_("Cleared Transactions")} - -
- ${_("Cheques and Payments")}${" - %s " % int(rec.sum_of_debits_lines)}${_("items")} - - ${formatLang(rec.sum_of_debits, monetary=True, currency_obj=rec.company_id.currency_id)} -
- ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_credits_lines)}${_("items")} - - ${formatLang(-rec.sum_of_credits, monetary=True, currency_obj=rec.company_id.currency_id)} -
- ${_("Total Cleared Transactions")} - - ${formatLang(rec.cleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)} -
- ${_("Cleared Balance")} - - ${formatLang(rec.cleared_balance + rec.starting_balance, monetary=True, currency_obj=rec.company_id.currency_id)} -
- ${_("Uncleared Transactions")} - -
- ${_("Cheques and Payments")}${" - %s " % int(rec.sum_of_debits_lines_unclear)}${_("items")} - - ${formatLang(rec.sum_of_debits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)} -
- ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_credits_lines_unclear)}${_("items")} - - ${formatLang(-rec.sum_of_credits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)} -
- ${_("Total Uncleared Transactions")} - - ${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 + rec.cleared_balance + rec.uncleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)} -
- %endfor