projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auftrags-Controller: Drucken und E-Mail
[kivitendo-erp.git]
/
templates
/
webpages
/
sepa
/
bank_transfer_edit.html
diff --git
a/templates/webpages/sepa/bank_transfer_edit.html
b/templates/webpages/sepa/bank_transfer_edit.html
index
b8f209d
..
1519503
100644
(file)
--- a/
templates/webpages/sepa/bank_transfer_edit.html
+++ b/
templates/webpages/sepa/bank_transfer_edit.html
@@
-11,8
+11,7
@@
[% SET arap = 'ar' %]
[% SET iris = 'is' %]
[%- END %]
[% SET arap = 'ar' %]
[% SET iris = 'is' %]
[%- END %]
-
- <p><div class="listtop">[% title %]: [% HTML.escape(export.ids.join(', ')) %]</div></p>
+<h1>[% title %]: [% HTML.escape(export.ids.join(', ')) %]</h1>
<form action="sepa.pl" method="post">
<input type="hidden" name="action" value="dispatcher">
<form action="sepa.pl" method="post">
<input type="hidden" name="action" value="dispatcher">
@@
-33,6
+32,11
@@
<th class="listheading" colspan="2">[% 'Source bank account' | $T8 %]</th>
[%- END %]
<th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
<th class="listheading" colspan="2">[% 'Source bank account' | $T8 %]</th>
[%- END %]
<th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
+ <th class="listheading" align="right">[% 'Skonto amount' | $T8 %]</th>
+ <th class="listheading" align="right">[% 'Payment type' | $T8 %]</th>
+ [% IF vc == 'customer' %]
+ <th class="listheading" align="right">[% 'Mandator ID' | $T8 %]</th>
+ [%- END %]
<th class="listheading">[% 'Reference' | $T8 %]</th>
<th class="listheading" align="right">[% 'Requested execution date' | $T8 %]</th>
<th class="listheading" align="right">[% 'Execution date' | $T8 %]</th>
<th class="listheading">[% 'Reference' | $T8 %]</th>
<th class="listheading" align="right">[% 'Requested execution date' | $T8 %]</th>
<th class="listheading" align="right">[% 'Execution date' | $T8 %]</th>
@@
-44,7
+48,7
@@
<th class="listheading">[% 'IBAN' | $T8 %]</th>
<th class="listheading">[% 'BIC' | $T8 %]</th>
[%- IF show_post_payments_button %]
<th class="listheading">[% 'IBAN' | $T8 %]</th>
<th class="listheading">[% 'BIC' | $T8 %]</th>
[%- IF show_post_payments_button %]
- <th class="listheading" colspan="
3
"> </th>
+ <th class="listheading" colspan="
[% IF vc == 'customer' %]6[% ELSE %]5[% END %]
"> </th>
<th class="listheading">
[% L.date_tag('set_all_execution_date', '', onchange='set_all_execution_date_fields(this);') %]
</th>
<th class="listheading">
[% L.date_tag('set_all_execution_date', '', onchange='set_all_execution_date_fields(this);') %]
</th>
@@
-73,6
+77,11
@@
<td>[% HTML.escape(item.vc_iban) %]</td>
<td>[% HTML.escape(item.vc_bic) %]</td>
<td align="right">[% HTML.escape(LxERP.format_amount(item.amount, 2)) %]</td>
<td>[% HTML.escape(item.vc_iban) %]</td>
<td>[% HTML.escape(item.vc_bic) %]</td>
<td align="right">[% HTML.escape(LxERP.format_amount(item.amount, 2)) %]</td>
+ <td align="right">[% HTML.escape(LxERP.format_amount(item.skonto_amount, 2)) %]</td>
+ <td align="right">[% item.payment_type | $T8 %]</td>
+ [% IF vc == 'customer' %]
+ <td>[% HTML.escape(item.mandator_id) %]</td>
+ [%- END %]
<td>[% HTML.escape(item.reference) %]</td>
<td align="right">[% HTML.escape(item.requested_execution_date) %]</td>
<td align="right" nowrap>
<td>[% HTML.escape(item.reference) %]</td>
<td align="right">[% HTML.escape(item.requested_execution_date) %]</td>
<td align="right" nowrap>
@@
-112,6
+121,13
@@
</script>
[%- ELSE %]
</script>
[%- ELSE %]
+ [%- SET has_executed = 0;
+ FOREACH item = export.items;
+ IF item.executed;
+ SET has_executed = 1;
+ END ;
+ END ;
+ IF has_executed %]
<p>
<input type="submit" class="submit" name="action_bank_transfer_payment_list_as_pdf" value="[% 'Payment list as PDF' | $T8 %]">
</p>
<p>
<input type="submit" class="submit" name="action_bank_transfer_payment_list_as_pdf" value="[% 'Payment list as PDF' | $T8 %]">
</p>
@@
-123,6
+139,7
@@
[%- END %]
[%- END %]
[%- END %]
[%- END %]
[%- END %]
[%- END %]
+ [% END %]
<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
</form>
<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
</form>