X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Foe%2Fform_footer.html;h=7c72a452e52eb150f6260a7abfc800aaafa40262;hb=8faf4749b1e489ef0bff46ede77a7e5cac3873c5;hp=b0ba7fe67f3b9da809fee8729edd52646fcc240e;hpb=3a94f4d2dd9a835d4a7007e1b999ea00b3c4e1cd;p=kivitendo-erp.git
diff --git a/templates/webpages/oe/form_footer.html b/templates/webpages/oe/form_footer.html
index b0ba7fe67..7c72a452e 100644
--- a/templates/webpages/oe/form_footer.html
+++ b/templates/webpages/oe/form_footer.html
@@ -27,7 +27,11 @@
label_key = 'description',
show_empty = 1 -%]
-
+
+
+ [% 'Delivery Terms' | $T8 %] |
+ [% L.select_tag('delivery_term_id', ALL_DELIVERY_TERMS, default = delivery_term_id, with_empty = 1, title_key = 'description', style = 'width: 250px') %] |
+
[%- IF is_sales_ord %]
@@ -47,28 +51,45 @@
[%- END %]
+ [%- IF show_weight %]
+
+
+
+ [% 'Total weight' | $T8 %] |
+
+ [% LxERP.format_amount(totalweight, 3) %] [% HTML.escape(weightunit) %]
+ |
+
+
+ |
+ [%- END %]
[%- IF is_sales %]
[% 'Ertrag' | $T8 %] |
- [% LxERP.format_amount(marge_total, 2) %] |
+
+ [% LxERP.format_amount(marge_total, 2) %]
+
+ |
[% 'Ertrag prozentual' | $T8 %] |
- [% LxERP.format_amount(marge_percent, 2) %] |
+
+ [% LxERP.format_amount(marge_percent, 2) %]
+
+ |
% |
-
-
-
|
[%- END %]
+
[%- IF taxaccounts %]
- [% 'Tax Included' | $T8 %]
+
+ [% 'Tax Included' | $T8 %]
[%- END %]
[%- IF NOT taxincluded %]
@@ -80,7 +101,10 @@
[% tax %]
[% 'Total' | $T8 %] |
- [% LxERP.format_amount(invtotal, 2) %] |
+ [% LxERP.format_amount(invtotal, 2) %]
+
+
+ |
|
@@ -88,43 +112,18 @@
-
-
-
-
|
-
+
-[%- IF webdav %]
-
- Dokumente im Webdav-Repository |
-
-
-
-
-
- Dateiname |
- Webdavlink |
-
- [%- FOREACH file = WEBDAV %]
-
- [% HTML.escape(file.name) %] |
- [% HTML.escape(file.type) %] |
-
- [%- END %]
-
- |
-
-
-
|
-
-[%- END %]
+
+[%- PROCESS 'webdav/_list.html' %]
+
+ [%- LxERP.t8("Loading...") %]
+
+
-
-
- [% print_options %]
- |
-
-
+
+
+[% print_options %]
[% label_edit %]
@@ -140,7 +139,10 @@
[% label_workflow %]
-
+
+ [%- UNLESS (is_sales_ord && !INSTANCE_CONF.get_sales_order_show_delete) || (is_pur_ord && !INSTANCE_CONF.get_purchase_order_show_delete) %]
+ [% L.submit_tag('action_delete', LxERP.t8('Delete'), confirm=LxERP.t8('Are you sure?')) %]
+ [%- END %]
[%- IF is_sales_quo %]
@@ -150,7 +152,7 @@
[%- END %]
- [%- IF is_sales_ord || is_pur_ord && !delivered%]
+ [%- IF is_sales_ord || is_pur_ord %]
[%- END %]
@@ -172,7 +174,7 @@
-
+
[% IF vc == 'customer' %]
[% ELSE %]
@@ -180,6 +182,3 @@
[% END %]
-
-