mirror of
https://github.com/OCA/bank-payment.git
synced 2025-02-02 10:37:31 +02:00
[FIX] npg_bank_account_reconciliation: more size column for detailed_reconciliation.mako
This commit is contained in:
committed by
Sandy Carter
parent
ef6e8add72
commit
cf579665f2
@@ -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:
|
||||
<table style="width:100%;">
|
||||
<tr>
|
||||
<td class="cell left_col first_item important_number_table"
|
||||
colspan="6">
|
||||
<td class="cell first_item important_number_table"
|
||||
colspan="6">
|
||||
${_("Detailed %s account:") % rec.name} ${rec.account_id.code} -
|
||||
${rec.account_id.name}
|
||||
</td>
|
||||
@@ -64,9 +65,13 @@
|
||||
<table style="width:100%;font-size:70%;">
|
||||
<thead>
|
||||
<tr>
|
||||
<td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="line_sum">
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="line_sum col_date">
|
||||
${_("Date")}
|
||||
</td>
|
||||
<td class="line_sum">
|
||||
@@ -84,66 +89,58 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tr>
|
||||
<td class="left_col cell">
|
||||
<td class="left_col cell col_header col_header_first" colspan="5">
|
||||
${_("Beginning Balance")}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
</td>
|
||||
<td class="cell right_col">
|
||||
${formatLang(rec.starting_balance, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell second_line left_col">
|
||||
<td>
|
||||
</td>
|
||||
<td class="cell col_header" colspan="5">
|
||||
${_("Cleared Transactions")}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
</td>
|
||||
<td class="cell right_col">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell third_line left_col">
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
<td class="cell col_header col_header_third" colspan="5">
|
||||
${_("Cheques and Payments")}${" - %s " % int(rec.sum_of_debits_lines)}${_("items")}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="cell right_col">
|
||||
${formatLang(rec.sum_of_debits, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
%for rec_line in [line for line in rec.debit_move_line_ids if line.cleared_bank_account]:
|
||||
<tr>
|
||||
<td class="cell third_line left_col">
|
||||
<td class="cell">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td class="cell">
|
||||
</td>
|
||||
<td class="cell">
|
||||
</td>
|
||||
<td class="col_date">
|
||||
${rec_line.date}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
${rec_line.name}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
${rec_line.ref}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
${rec_line.partner_id.name}
|
||||
</td>
|
||||
<td class="cell right_col">
|
||||
@@ -152,35 +149,35 @@
|
||||
</tr>
|
||||
%endfor
|
||||
<tr>
|
||||
<td class="cell third_line left_col">
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
<td class="cell col_header col_header_third" colspan="5">
|
||||
${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_credits_lines)}${_("items")}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="cell line_sum right_col">
|
||||
${formatLang(-rec.sum_of_credits, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
%for rec_line in [line for line in rec.credit_move_line_ids if line.cleared_bank_account]:
|
||||
<tr>
|
||||
<td class="cell third_line left_col">
|
||||
<td class="cell left_col">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td class="cell left_col">
|
||||
</td>
|
||||
<td class="cell left_col">
|
||||
</td>
|
||||
<td>
|
||||
${rec_line.date}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
${rec_line.name}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
${rec_line.ref}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
${rec_line.partner_id.name}
|
||||
</td>
|
||||
<td class="cell right_col">
|
||||
@@ -189,82 +186,70 @@
|
||||
</tr>
|
||||
%endfor
|
||||
<tr>
|
||||
<td class="cell second_line left_col">
|
||||
<td>
|
||||
</td>
|
||||
<td class="cell col_header" colspan="5">
|
||||
${_("Total Cleared Transactions")}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
</td>
|
||||
<td class="cell right_col line_sum">
|
||||
${formatLang(rec.cleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell left_col">
|
||||
<td class="cell col_header col_header_first" colspan="5">
|
||||
${_("Cleared Balance")}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
</td>
|
||||
<td class="cell important_number_table right_col">
|
||||
${formatLang(rec.cleared_balance + rec.starting_balance, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell second_line left_col">
|
||||
<td>
|
||||
</td>
|
||||
<td class="cell col_header" colspan="5">
|
||||
${_("Uncleared Transactions")}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
</td>
|
||||
<td class="cell right_col">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell third_line left_col">
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
<td class="cell col_header col_header_third" colspan="5">
|
||||
${_("Cheques and Payments")}${" - %s " % int(rec.sum_of_debits_lines_unclear)}${_("items")}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="cell right_col">
|
||||
${formatLang(rec.sum_of_debits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
%for rec_line in [line for line in rec.debit_move_line_ids if not line.cleared_bank_account]:
|
||||
<tr>
|
||||
<td class="cell third_line left_col">
|
||||
<td class="cell left_col">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td class="cell left_col">
|
||||
</td>
|
||||
<td class="cell left_col">
|
||||
</td>
|
||||
<td>
|
||||
${rec_line.date}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
${rec_line.name}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
${rec_line.ref}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
${rec_line.partner_id.name}
|
||||
</td>
|
||||
<td class="cell right_col">
|
||||
@@ -273,35 +258,35 @@
|
||||
</tr>
|
||||
%endfor
|
||||
<tr>
|
||||
<td class="cell third_line left_col">
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
<td class="cell col_header col_header_third" colspan="5">
|
||||
${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_credits_lines_unclear)}${_("items")}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="cell right_col line_sum">
|
||||
${formatLang(-rec.sum_of_credits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
%for rec_line in [line for line in rec.credit_move_line_ids if not line.cleared_bank_account]:
|
||||
<tr>
|
||||
<td class="cell third_line left_col">
|
||||
<td class="cell left_col">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td class="cell left_col">
|
||||
</td>
|
||||
<td class="cell left_col">
|
||||
</td>
|
||||
<td>
|
||||
${rec_line.date}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
${rec_line.name}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
${rec_line.ref}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
${rec_line.partner_id.name}
|
||||
</td>
|
||||
<td class="cell right_col">
|
||||
@@ -310,32 +295,24 @@
|
||||
</tr>
|
||||
%endfor
|
||||
<tr>
|
||||
<td class="cell second_line left_col">
|
||||
<td>
|
||||
</td>
|
||||
<td class="cell col_header" colspan="5">
|
||||
${_("Total Uncleared Transactions")}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
</td>
|
||||
<td class="cell right_col line_sum">
|
||||
${formatLang(rec.uncleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell left_col">
|
||||
<td class="cell col_header col_header_first" colspan="5">
|
||||
${_("Register Balance as of")}${" %s" % formatLang(rec.ending_date, date=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
</td>
|
||||
<td class="col_header">
|
||||
<td>
|
||||
</td>
|
||||
<td class="cell important_number_table right_col">
|
||||
${formatLang(rec.starting_balance + rec.cleared_balance + rec.uncleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
@@ -343,102 +320,6 @@
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<table style="width:100%">
|
||||
<tr>
|
||||
<td class="cell left_col first_item important_number_table"
|
||||
colspan="2">
|
||||
${_("Summary %s account:") % rec.name} ${rec.account_id.code} -
|
||||
${rec.account_id.name}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="left_col cell">
|
||||
${_("Beginning Balance")}
|
||||
</td>
|
||||
<td class="cell right_col_sum">
|
||||
${formatLang(rec.starting_balance, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell second_line left_col">
|
||||
${_("Cleared Transactions")}
|
||||
</td>
|
||||
<td class="cell right_col_sum">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell third_line left_col">
|
||||
${_("Cheques and Payments")}${" - %s " % int(rec.sum_of_debits_lines)}${_("items")}
|
||||
</td>
|
||||
<td class="cell right_col_sum">
|
||||
${formatLang(rec.sum_of_debits, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell third_line left_col">
|
||||
${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_credits_lines)}${_("items")}
|
||||
</td>
|
||||
<td class="cell line_sum right_col_sum">
|
||||
${formatLang(-rec.sum_of_credits, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell second_line left_col">
|
||||
${_("Total Cleared Transactions")}
|
||||
</td>
|
||||
<td class="cell right_col_sum line_sum">
|
||||
${formatLang(rec.cleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell left_col">
|
||||
${_("Cleared Balance")}
|
||||
</td>
|
||||
<td class="cell important_number_table right_col_sum">
|
||||
${formatLang(rec.cleared_balance + rec.starting_balance, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell second_line left_col">
|
||||
${_("Uncleared Transactions")}
|
||||
</td>
|
||||
<td class="cell right_col_sum">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell third_line left_col">
|
||||
${_("Cheques and Payments")}${" - %s " % int(rec.sum_of_debits_lines_unclear)}${_("items")}
|
||||
</td>
|
||||
<td class="cell right_col_sum">
|
||||
${formatLang(rec.sum_of_debits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell third_line left_col">
|
||||
${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_credits_lines_unclear)}${_("items")}
|
||||
</td>
|
||||
<td class="cell right_col_sum line_sum">
|
||||
${formatLang(-rec.sum_of_credits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell second_line left_col">
|
||||
${_("Total Uncleared Transactions")}
|
||||
</td>
|
||||
<td class="cell right_col_sum line_sum">
|
||||
${formatLang(rec.uncleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cell left_col">
|
||||
${_("Register Balance as of")}${" %s" % formatLang(rec.ending_date, date=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
<td class="cell important_number_table right_col_sum">
|
||||
${formatLang(rec.starting_balance + rec.cleared_balance + rec.uncleared_balance, monetary=True, currency_obj=rec.company_id.currency_id)}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
%endfor
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user