X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Foe%2Fform_footer.html;h=6f510d5eae950c78755febe444abcd910e9743cb;hb=cae9317b1c04e96efef964c549e7db41af782f37;hp=b0ba7fe67f3b9da809fee8729edd52646fcc240e;hpb=92331b8e3417f4a28db17f7af1b8154e985c4da1;p=kivitendo-erp.git
diff --git a/templates/webpages/oe/form_footer.html b/templates/webpages/oe/form_footer.html
index b0ba7fe67..6f510d5ea 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 %]
@@ -18,16 +27,12 @@
[% 'Payment Terms' | $T8 %] |
-
- [%- INCLUDE 'generic/multibox.html'
- name = 'payment_id',
- style = 'width: 250px',
- DATA = ALL_PAYMENTS,
- id_key = 'id',
- label_key = 'description',
- show_empty = 1 -%]
- |
-
+ [% L.select_tag('payment_id', ALL_PAYMENTS, default = payment_id, title_key = 'description', with_empty = 1, style="width: 250px") %] |
+
+
+ [% '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 +41,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 +53,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 %]
@@ -78,9 +101,18 @@
[%- END %]
[% tax %]
+[%- IF rounding %]
+
+ [% 'Rounding' | $T8 %] |
+ [% LxERP.format_amount(rounding, 2) %] |
+
+[%- END %]
[% 'Total' | $T8 %] |
- [% LxERP.format_amount(invtotal, 2) %] |
+ [% LxERP.format_amount(invtotal, 2) %]
+
+
+ |
|
@@ -88,98 +120,36 @@
-