X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=templates%2Fwebpages%2Foe%2Fform_footer.html;h=fbeb52992a4fb86782db7f2b6e834cce75130129;hb=15b67fd51a4e9d274205f59a9f50c4ce86b5e176;hp=b0ba7fe67f3b9da809fee8729edd52646fcc240e;hpb=0b2ca0abb53db0d372bcc51e8093abb30f2aeea6;p=kivitendo-erp.git
diff --git a/templates/webpages/oe/form_footer.html b/templates/webpages/oe/form_footer.html
index b0ba7fe67..fbeb52992 100644
--- a/templates/webpages/oe/form_footer.html
+++ b/templates/webpages/oe/form_footer.html
@@ -2,6 +2,15 @@
[%- USE HTML %]
[%- USE LxERP %]
[%- USE L %]
+[%- IF is_req_quo || is_pur_ord %]
+ [%- SET allow_invoice=1 %]
+[%- ELSIF is_sales_quo && INSTANCE_CONF.get_allow_sales_invoice_from_sales_quotation %]
+ [%- SET allow_invoice=1 %]
+[%- ELSIF is_sales_ord && INSTANCE_CONF.get_allow_sales_invoice_from_sales_order %]
+ [%- SET allow_invoice=1 %]
+[%- ELSE %]
+ [%- SET allow_invoice=0 %]
+[%- END %]
@@ -27,7 +36,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 %]
@@ -36,6 +49,7 @@
[% L.button_tag("edit_periodic_invoices_config(); return false;", LxERP.t8('Configure')) %]
([% HTML.escape(periodic_invoices_status) %])
[% L.hidden_tag("periodic_invoices_config", periodic_invoices_config) %]
+ ?
[%- END %]
@@ -47,28 +61,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 %]
@@ -76,11 +107,20 @@
[% 'Subtotal' | $T8 %] |
[% LxERP.format_amount(invsubtotal, 2) %] |
+[%- END %]
+[%- IF rounding %]
+
+ [% 'Rounding' | $T8 %] |
+ [% LxERP.format_amount(rounding, 2) %] |
+
[%- END %]
[% tax %]
[% 'Total' | $T8 %] |
- [% LxERP.format_amount(invtotal, 2) %] |
+ [% LxERP.format_amount(invtotal, 2) %]
+
+
+ |
|
@@ -88,59 +128,44 @@
-