X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Fis%2Fform_footer_master.html;h=a3d53fd5ab86439392b6f4749c9b33c4e7afde0f;hb=f2354caba6501475fb0f09c8fb1fe970ea430c22;hp=cc1810885100c7881acba34962384da8f0122c46;hpb=b8916e5c2982dd12e0a612252c85f5e1648e162c;p=kivitendo-erp.git
diff --git a/templates/webpages/is/form_footer_master.html b/templates/webpages/is/form_footer_master.html
index cc1810885..a3d53fd5a 100644
--- a/templates/webpages/is/form_footer_master.html
+++ b/templates/webpages/is/form_footer_master.html
@@ -19,20 +19,28 @@
-
-
- $payment
-
-
-
+[%- IF id %]
- [% follow_up_text %]
+
+ [%- LxERP.format_string('There are #1 unfinished follow-ups of which #2 are due. ',
+ follow_ups.size, follow_ups_unfinished) | html
+ %]
+
-
+[%- END %]
@@ -58,27 +66,35 @@
[%- END %]
- $subtotal
+[%#- subtotal %]
+[%- UNLESS taxincluded %]
+
+ Subtotal
+ [% LxERP.format_amount(invsubtotal, 2) %]
+
+[%- END %]
[%# tax %]
[% FOREACH item = taxaccounts_array %]
-[% SET description_ref = item _ 'description' %]
-[% SET rate_ref = item _ 'rate' %]
-[% SET total_ref = item _ 'total' %]
-[% SET netto_ref = item _ 'netto' %]
+[% SET description_ref = item _ '_description' %]
+[% SET rate_ref = item _ '_rate' %]
+[% SET total_ref = item _ '_total' %]
+[% SET netto_ref = item _ '_netto' %]
- Enthaltene [% $description_ref %] [% $rate_ref * 100 %]%
- [% $total_ref %]
+ Enthaltene [% $description_ref | html %] [% $rate_ref * 100 %]%
+ [% LxERP.format_amount($total_ref, 2) %]
+ [%- IF taxincluded %]
Nettobetrag
- [% $netto_ref %]
+ [% LxERP.format_amount($netto_ref, 2) %]
+ [%- END %]
[%- END %]
Total
- [% invtotal %]
+ [% LxERP.format_amount(invtotal, 2) %]
@@ -87,55 +103,21 @@
-[%- IF webdav %]
-
-
-
-
- Dokumente im Webdav-Repository
-
-
-
- Dateiname
- Webdavlink
-
- [%- FOREACH file = WEBDAV %]
-
- [% file.name %]
- [% file.type %]
-
- [%- END %]
-
-
-[% END %]
+[% PROCESS 'webdav/_list_master .html' %]
+[% PROCESS 'is/_payments_master .html' %]
-
-
-
-
-[% IF is_credit_note %]
- Payments
-[% ELSE %]
- Incoming Payments
-[%- END %]
-
-
-
-[%# INCLUDE _payments %]
-
-
-
-
- [% print_options %]
+[% print_options %]
-
+
+
+
[% IF id %]
@@ -149,21 +131,21 @@
-[% IF id && is_credit_note %]
+[% IF id && is_type_credit_note %]
[% END %]
[% IF show_delete %]
[% END %]
- [%- IF invdate > closedto %]
+ [%- UNLESS locked %]
[%- END %]
[% ELSE # no id %]
- [% IF invdate > closedto %]
+ [% UNLESS locked %]