diff options
Diffstat (limited to 'addons/account/static/src/xml/account_bank_statement_reconciliation.xml')
| -rw-r--r-- | addons/account/static/src/xml/account_bank_statement_reconciliation.xml | 84 |
1 files changed, 34 insertions, 50 deletions
diff --git a/addons/account/static/src/xml/account_bank_statement_reconciliation.xml b/addons/account/static/src/xml/account_bank_statement_reconciliation.xml index 83680f005e3..4e32d97eceb 100644 --- a/addons/account/static/src/xml/account_bank_statement_reconciliation.xml +++ b/addons/account/static/src/xml/account_bank_statement_reconciliation.xml @@ -53,22 +53,21 @@ <table class="accounting_view"> <caption> <button class="button_ok"></button> - <span class="partner_name"><t t-if="line.partner_id"><t t-esc="line.partner_name"/></t></span> + <span t-if="! line.has_no_partner" class="partner_name"><t t-esc="line.partner_name"/></span> <div class="change_partner_container oe_form"></div> </caption> <tbody class="tbody_initial_line"> <tr class="initial_line"> - <td><span class="toggle_match glyphicon glyphicon-cog"></span></td> - <td><t t-esc="line.account_code"/></td> - <td><t t-esc="line.date"/></td> - <td><t t-if="!line.partner_id"><t t-if="line.partner_name"><t t-esc="line.partner_name"/>: </t></t> - <t t-esc="line.name"/> + <td class="cell_action"><span class="toggle_match glyphicon glyphicon-cog"></span></td> + <td class="cell_account_code"><t t-esc="line.account_code"/></td> + <td class="cell_due_date"><t t-esc="line.date"/></td> + <td class="cell_label"><t t-if="line.name" t-esc="line.name"/> <t t-if="line.amount_currency_str"> (<t t-esc="line.amount_currency_str"/>)</t></td> - <td><t t-if="line.amount > 0"> + <td class="cell_debit"><t t-if="line.amount > 0"> <t t-esc="line.amount_str"/></t></td> - <td><t t-if="line.amount < 0"> + <td class="cell_credit"><t t-if="line.amount < 0"> <t t-esc="line.amount_str"/></t></td> - <td><span class="line_info_button glyphicon glyphicon-info-sign" t-att-data-content="line.q_popover"></span></td> + <td class="cell_info_popover"><span class="line_info_button glyphicon glyphicon-info-sign" t-att-data-content="line.q_popover"></span></td> </tr> </tbody> <tbody class="tbody_matched_lines"></tbody> @@ -115,7 +114,7 @@ <t t-name="bank_statement_reconciliation_line_details"> <table class='details'> <tr><td>Date</td><td><t t-esc="line.date"/></td></tr> - <tr><td>Partner</td><td><t t-esc="line.partner_name"/></td></tr> + <tr t-if="line.partner_name"><td>Partner</td><td><t t-esc="line.partner_name"/></td></tr> <tr t-if="line.ref"><td>Transaction</td><td><t t-esc="line.ref"/></td></tr> <tr><td>Description</td><td><t t-esc="line.name"/></td></tr> <tr><td>Amount</td><td><t t-esc="line.amount_str"/><t t-if="line.amount_currency_str"> (<t t-esc="line.amount_currency_str"/>)</t></td></tr> @@ -123,40 +122,26 @@ </table> </t> - <t t-name="bank_statement_reconciliation_move_line"> <tr class="mv_line" t-att-data-lineid="line.id" t-att-data-selected="selected"> - <td><span class="glyphicon glyphicon-add-remove"></span></td> - <td><t t-esc="line.account_code"/></td> - <td><t t-esc="line.q_due_date"/></td> - <td class="js_qlabel"><t t-esc="line.q_label"/></td> - - <td><t t-if="line.debit !== 0"> - <t t-if="line.propose_partial_reconcile" t-call="icon_do_partial_reconciliation"></t> - <t t-if="line.partial_reconcile" t-call="icon_undo_partial_reconciliation"></t> - <t t-esc="line.debit_str"/> - </t></td> - <td><t t-if="line.credit !== 0"> - <t t-if="line.propose_partial_reconcile"><t t-call="icon_do_partial_reconciliation" /></t> - <t t-if="line.partial_reconcile"><t t-call="icon_undo_partial_reconciliation" /></t> - <t t-esc="line.credit_str"/> - </t></td> - <td><span class="line_info_button glyphicon glyphicon-info-sign" t-att-data-content="line.q_popover"></span></td> + <td class="cell_action"><span class="glyphicon glyphicon-add-remove"></span></td> + <td class="cell_account_code" t-if="line.account_code"><t t-esc="line.account_code"/></td> + <td class="cell_due_date"><t t-esc="line.q_due_date"/></td> + <td class="cell_label js_qlabel"><t t-esc="line.q_label"/></td> + <td class="cell_debit"><t t-if="line.debit !== 0"><t t-if="line.propose_partial_reconcile" t-call="icon_do_partial_reconciliation"></t><t t-if="line.partial_reconcile" t-call="icon_undo_partial_reconciliation"></t><t t-esc="line.debit_str"/></t></td> + <td class="cell_credit"><t t-if="line.credit !== 0"><t t-if="line.propose_partial_reconcile"><t t-call="icon_do_partial_reconciliation" /></t><t t-if="line.partial_reconcile"><t t-call="icon_undo_partial_reconciliation" /></t><t t-esc="line.credit_str"/></t></td> + <td class="cell_info_popover"><span class="line_info_button glyphicon glyphicon-info-sign" t-att-data-content="line.q_popover"></span></td> </tr> </t> - <t t-name="icon_do_partial_reconciliation"> - <i class="do_partial_reconcile_button fa fa-exclamation-triangle" data-content="This move's amount is higher than the transaction's amount. Click to do a partial reconciliation"></i> - </t> + <t t-name="icon_do_partial_reconciliation"><i class="do_partial_reconcile_button fa fa-exclamation-triangle" data-content="This move's amount is higher than the transaction's amount. Click to do a partial reconciliation"></i></t> - <t t-name="icon_undo_partial_reconciliation"> - <i class="undo_partial_reconcile_button fa fa-exclamation-triangle" data-content="Undo the partial reconciliation."></i> - </t> + <t t-name="icon_undo_partial_reconciliation"><i class="undo_partial_reconcile_button fa fa-exclamation-triangle" data-content="Undo the partial reconciliation."></i></t> <t t-name="bank_statement_reconciliation_move_line_details"> <table class='details'> - <tr><td>ID</td><td><t t-esc="line.id"/></td></tr> - <tr><td>Account</td><td><t t-esc="line.account_code"/> <t t-esc="line.account_name"/></td></tr> + <tr><td>id</td><td><t t-esc="line.id" /></td></tr> + <tr t-if="line.account_code"><td>Account</td><td><t t-esc="line.account_code"/> <t t-esc="line.account_name"/></td></tr> <tr><td>Journal</td><td><t t-esc="line.journal_name"/></td></tr> <tr><td>Period</td><td><t t-esc="line.period_name"/></td></tr> <tr><td>Date</td><td><t t-esc="line.date"/></td></tr> @@ -168,28 +153,27 @@ </table> </t> - <t t-name="bank_statement_reconciliation_created_line"> <tr class="created_line" t-att-data-lineid="line.id"> - <td><t t-if="! line.no_remove_action"><span class="line_remove_button glyphicon glyphicon-remove"></span></t></td> - <td><t t-esc="line.account_num"/></td> - <td></td> - <td><t t-esc="line.label"/></td> - <td><t t-if="line.amount < 0"><t t-esc="line.amount_str"/></t></td> - <td><t t-if="line.amount > 0"><t t-esc="line.amount_str"/></t></td> - <td></td> + <td class="cell_action"><t t-if="! line.no_remove_action"><span class="line_remove_button glyphicon glyphicon-remove"></span></t></td> + <td class="cell_account_code"><t t-esc="line.account_num"/></td> + <td class="cell_due_date"></td> + <td class="cell_label"><t t-esc="line.label"/></td> + <td class="cell_debit"><t t-if="line.amount < 0"><t t-esc="line.amount_str"/></t></td> + <td class="cell_credit"><t t-if="line.amount > 0"><t t-esc="line.amount_str"/></t></td> + <td class="cell_info_popover"></td> </tr> </t> <t t-name="bank_statement_reconciliation_line_open_balance"> <tr class="line_open_balance"> - <td><span class="toggle_create glyphicon glyphicon-play"></span></td> - <td><t t-esc="account_code"/></td> - <td></td> - <td class="js_open_balance">Open balance</td> - <td><t t-esc="debit"/></td> - <td><t t-esc="credit"/></td> - <td></td> + <td class="cell_action"><span class="toggle_create glyphicon glyphicon-play"></span></td> + <td class="cell_account_code"><t t-esc="account_code"/></td> + <td class="cell_due_date"></td> + <td class="cell_label js_open_balance">Open balance</td> + <td class="cell_debit"><t t-esc="debit"/></td> + <td class="cell_credit"><t t-esc="credit"/></td> + <td class="cell_info_popover"></td> </tr> </t> </templates> |