@@ -107,13 +107,6 @@
[%- END %]
-[%- IF rounding %]
-
-
[% 'Rounding' | $T8 %]
-
[% LxERP.format_amount(rounding, 2) %]
-
-[%- END %]
-
[%# tax %]
[% FOREACH item = taxaccounts_array %]
[% SET description_ref = item _ '_description' %]
@@ -131,6 +124,14 @@
[%- END %]
[%- END %]
+
+[%- IF rounding %]
+
+
[% 'Rounding' | $T8 %]
+
[% LxERP.format_amount(rounding, 2) %]
+
+[%- END %]
+
[% 'Total' | $T8 %]
[% LxERP.format_amount(invtotal, 2) %]
@@ -141,8 +142,9 @@
-
-[% PROCESS 'is/_payments.html' %]
+[% IF is_type_normal_invoice OR is_type_credit_note %]
+ [% PROCESS 'is/_payments.html' %]
+[% END %]
[% PROCESS 'webdav/_list.html' %]
@@ -151,68 +153,32 @@
-
-
-
[% print_options %]
-
-
-
-
- [% IF id %]
-
-
-
-
-[% IF show_storno %]
- [% L.submit_tag("action_storno", 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 %]
-
-
+
+
+[% P.hidden_tag('draft_id', draft_id) %]
+[% P.hidden_tag('draft_description', draft_description) %]
+
+
-[% IF id && !is_type_credit_note %]
-
-[% END %]
-[% IF show_delete && (!storno || storno_id) %]
- [% L.submit_tag("action_delete", LxERP.t8("Delete"), confirm=LxERP.t8('Do you really want to delete this invoice?')) %]
-[% END %]
-[% IF show_delete && !storno %]
-
-[% END %]
-
-
+[%- IF INSTANCE_CONF.get_create_qrbill_invoices <= 0 %]
+
+[%- END %]
- [% ELSE # no id %]
- [% UNLESS locked %]
-
-
-
-
-
-
- [% L.button_tag('kivi.Draft.popup("is", "invoice", "' _ draft_id _ '", "' _ draft_description _ '")', LxERP.t8('Drafts')) %]
- [%- END %]
- [% END # id %]
+
+ [%- PROCESS 'common/_ship_to_dialog.html' cvars=shipto_cvars %]
+
- [% IF id %]
- [%#- button for saving history %]
-
- [% IF INSTANCE_CONF.get_is_show_mark_as_paid %]
-
- [% END %]
- [% END %]
+
- [% IF callback %]
- [% 'back' | $T8 %]
- [% END %]
+