Revision 88d162cc
Von Martin Helmling martin.helmling@octosoft.eu vor mehr als 7 Jahren hinzugefügt
| templates/webpages/bank_transactions/tabs/all.html | ||
|---|---|---|
| 1 | 1 |
[%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE T8 -%] |
| 2 | 2 |
|
| 3 | 3 |
[% SET debug=1 %] |
| 4 |
<form method="post" id="list_form"> |
|
| 5 |
[% L.hidden_tag('filter.bank_account', FORM.filter.bank_account) %]
|
|
| 6 |
[% L.hidden_tag('filter.fromdate', FORM.filter.fromdate) %]
|
|
| 7 |
[% L.hidden_tag('filter.todate', FORM.filter.todate) %]
|
|
| 8 |
[% L.hidden_tag('action', 'BankTransaction/dispatch') %]
|
|
| 9 |
[% L.hidden_tag('ui_tab', ui_tab) %]
|
|
| 4 | 10 |
|
| 5 | 11 |
<table id="bt_list"> |
| 6 | 12 |
<thead> |
| ... | ... | |
| 45 | 51 |
[% END %] |
| 46 | 52 |
</th> |
| 47 | 53 |
<th>[% 'Purpose' | $T8 %]</th> |
| 54 |
<th>[% 'Type' | $T8 %]</th> |
|
| 48 | 55 |
<th>[% IF FORM.sort_by == 'remote_account_number'%] |
| 49 | 56 |
<a href="controller.pl?action=BankTransaction/list&filter.bank_account=[% bank_account.id %]&sort_by=remote_account_number&sort_dir=[% 1 - FORM.sort_dir %]" class="sort_link"> |
| 50 | 57 |
[% 'Remote account number' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a> |
| ... | ... | |
| 86 | 93 |
[% FOREACH prop = bt.proposals %] |
| 87 | 94 |
<div name='[% prop.id %]'> |
| 88 | 95 |
<a href=# onclick="add_invoices('[% bt.id %]', '[% prop.id %]', '[% HTML.escape(prop.invnumber) %]');"
|
| 89 |
title="<table><tr><th></th><th>[% 'Suggested invoice' | $T8 %][% IF !prop.is_sales %] ([% 'AP' | $T8 %])[% END %]</th><th>[% 'Bank transaction' | $T8 %]</th></tr><tr><th>[% 'Amount' | $T8 %]</th><td>[% LxERP.format_amount(prop.amount, 2) %] ([% 'open' | $T8 %]: [% LxERP.format_amount(prop.open_amount, 2) %])</td><td>[% LxERP.format_amount(bt.amount, 2) %]</td></tr>[% IF prop.skonto_date %]<tr><th>[% 'Payment terms' | $T8 %]</th><td>[% LxERP.format_amount(prop.amount_less_skonto, 2) %] [% 'until' | $T8 %] [% HTML.escape(prop.skonto_date.to_kivitendo) %] ([% prop.percent_skonto * 100 %] %)</td><td></td></tr>[% END %]<tr><th>[% 'Customer/Vendor' | $T8 %]</th><td>[% HTML.escape(prop.customer.displayable_name) %][% HTML.escape(prop.vendor.displayable_name) %]</td><td>[% HTML.escape(bt.remote_name) %]</td></tr><tr><th>[% 'Invoice Date' | $T8 %]</th><td>[% HTML.escape(prop.transdate_as_date) %]</td><td>[% HTML.escape(bt.transdate_as_date) %] ([% HTML.escape(bt.transdate.utc_rd_days - prop.transdate.utc_rd_days) %])</td></tr><tr><th>[% 'Invoice Number' | $T8 %]</th><td>[% HTML.escape(prop.invnumber) %]</td><td>[% HTML.escape(bt.purpose) %]</td></tr></table>" |
|
| 96 |
title="<table><tr><th></th><th>[% 'Suggested invoice' | $T8 %][% IF !prop.is_sales %] ([% 'AP' | $T8 %])[% END %]</th><th>[% 'Bank transaction' | $T8 %]</th></tr><tr><th>[% 'Amount' | $T8 %]</th><td>[% LxERP.format_amount(prop.amount, 2) %] ([% 'open' | $T8 %]: [% LxERP.format_amount(prop.open_amount, 2) %])</td><td>[% LxERP.format_amount(bt.absamount, 2) %]</td></tr>[% IF prop.skonto_date %]<tr><th>[% 'Payment terms' | $T8 %]</th><td>[% LxERP.format_amount(prop.amount_less_skonto, 2) %] [% 'until' | $T8 %] [% HTML.escape(prop.skonto_date.to_kivitendo) %] ([% prop.percent_skonto * 100 %] %)</td><td></td></tr>[% END %]<tr><th>[% 'Customer/Vendor' | $T8 %]</th><td>[% HTML.escape(prop.customer.displayable_name) %][% HTML.escape(prop.vendor.displayable_name) %]</td><td>[% HTML.escape(bt.remote_name) %]</td></tr><tr><th>[% 'Invoice Date' | $T8 %]</th><td>[% HTML.escape(prop.transdate_as_date) %]</td><td>[% HTML.escape(bt.transdate_as_date) %] ([% HTML.escape(bt.transdate.utc_rd_days - prop.transdate.utc_rd_days) %])</td></tr><tr><th>[% 'Invoice Number' | $T8 %]</th><td>[% HTML.escape(prop.invnumber) %]</td><td>[% HTML.escape(bt.purpose) %]</td></tr></table>"
|
|
| 90 | 97 |
class="[% IF bt.agreement >= 5 %]green[% ELSIF bt.agreement < 5 and bt.agreement >= 3 %]orange[% ELSE %]red[% END %] tooltipster-html">←[% HTML.escape(prop.invnumber)%]</a></div> |
| 91 | 98 |
[% END %] |
| 92 | 99 |
</td> |
| ... | ... | |
| 95 | 102 |
<td align=right>[% bt.invoice_amount_as_number %]</td> |
| 96 | 103 |
<td>[% HTML.escape(bt.remote_name) %]</td> |
| 97 | 104 |
<td>[% HTML.escape(bt.purpose) %]</td> |
| 105 |
<td>[% HTML.escape(bt.transactiontext) %]</td> |
|
| 98 | 106 |
<td>[% HTML.escape(bt.remote_account_number) %]</td> |
| 99 | 107 |
<td>[% HTML.escape(bt.remote_bank_code) %]</td> |
| 100 | 108 |
<td align=right>[% bt.valutadate_as_date %]</td> |
| ... | ... | |
| 103 | 111 |
[%- END %] |
| 104 | 112 |
</tbody> |
| 105 | 113 |
</table> |
| 114 |
[% L.submit_tag('action_save_invoices', LxERP.t8('Save invoices')) %]
|
|
| 115 |
|
|
| 116 |
</form> |
|
Auch abrufbar als: Unified diff
Bankimport: Behandlung von Sammelüberweisungen
Generell werden die SEPA Export-Items aus der Punktebewertung herausgenommn,
dafür wird eine exaktere Prüfung auch mittels des Transaktionstyps ermittelt.
Dadurch werden auch Sammellastschriften/Überweisungen erkannt.
Setzen von Skontotyp, kein Prüfen der Sepaitems mehr in >get_agreement_with_invoice