X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fis%2Fform_footer.html;h=1a9a393346e471f06792c4079afa45d0b7372ca2;hb=4ce378dcdff892ab7aa0124873ebb29206539184;hp=966eafe1ba9c0153d292e7bd471494dd79c658a7;hpb=1085fcebcf6bb39790162b89f3a9e59d00446d00;p=kivitendo-erp.git
diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index 966eafe1b..1a9a39334 100644
--- a/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@ -1,6 +1,7 @@
[%- USE T8 %]
[%- USE HTML %]
[%- USE LxERP %]
+[%- USE L %][%- USE P -%]
@@ -10,25 +11,44 @@
[% 'Notes (will appear on hard copy)' | $T8 %]
[% 'Internal Notes' | $T8 %]
- [% 'Payment Terms' | $T8 %]
+ [% 'Payment / Delivery Options' | $T8 %]
-
+ [% L.textarea_tag("notes", notes, wrap="soft", style="width: 350px; height: 150px", class="texteditor") %]
- [%- INCLUDE 'generic/multibox.html'
- name = 'payment_id',
- style = 'width: 250px',
- DATA = payment_terms,
- id_key = 'id',
- label_key = 'description',
- show_empty = 1
- allow_textbox = 0 -%]
-
+
+
+ [% 'Payment Terms' | $T8 %]
+
+ [%- INCLUDE 'generic/multibox.html'
+ name = 'payment_id',
+ style = 'width: 250px',
+ DATA = payment_terms,
+ id_key = 'id',
+ label_key = 'description',
+ show_empty = 1
+ allow_textbox = 0 -%]
+
+
+
+
+ [% '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') %]
+
+
+
+ [% 'direct debit' | $T8 %]
+
+ [%- L.checkbox_tag('direct_debit', 'checked', direct_debit) %]
+
+
+
[%- IF id && follow_ups.size %]
@@ -40,6 +60,18 @@
[%- END %]
+[%- IF show_weight %]
+
+
+
+ [% 'Total weight' | $T8 %]
+
+ [% LxERP.format_amount(totalweight) %] [% HTML.escape(weightunit) %]
+
+
+
+
+[%- END %]
@@ -60,7 +92,8 @@
[%- IF taxaccounts %]
-
+
+
[% 'Tax Included' | $T8 %]
@@ -74,6 +107,13 @@
[%- END %]
+[%- IF rounding %]
+
+ [% 'Rounding' | $T8 %]
+ [% LxERP.format_amount(rounding, 2) %]
+
+[%- END %]
+
[%# tax %]
[% FOREACH item = taxaccounts_array %]
[% SET description_ref = item _ '_description' %]
@@ -91,7 +131,6 @@
[%- END %]
[%- END %]
-
[% 'Total' | $T8 %]
[% LxERP.format_amount(invtotal, 2) %]
@@ -103,65 +142,63 @@
-[% PROCESS 'webdav/_list.html' %]
-
[% PROCESS 'is/_payments.html' %]
-
-
-
-
-
-
-[% print_options %]
-
-
+
+[% PROCESS 'webdav/_list.html' %]
+
+ [% LxERP.t8('Loading...') %]
+
+
+
+[% print_options %]
[% IF id %]
-
-
+
+
[% IF show_storno %]
-
+ [% L.submit_tag("action", LxERP.t8("Storno"), "data-require-transaction-description"=INSTANCE_CONF.get_require_transaction_description_ps, confirm=LxERP.t8('Do you really want to cancel this invoice?')) %]
[% END %]
-
+
[% IF id && !is_type_credit_note %]
-
+
[% END %]
-[% IF show_delete %]
+[% IF show_delete && !storno %]
-
+
[% END %]
-
- [%- UNLESS locked %]
-
- [%- END %]
-
+
[% ELSE # no id %]
[% UNLESS locked %]
-
-
-
-
+
+
+
+
[%- END %]
[% END # id %]
[% IF id %]
[%#- button for saving history %]
-
+
+ [% IF INSTANCE_CONF.get_is_show_mark_as_paid %]
+
+ [% END %]
+ [% END %]
-
+ [% IF callback %]
+ [% 'back' | $T8 %]
[% END %]
@@ -171,7 +208,6 @@
-
-