X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Fis%2Fform_header.html;h=5e76f88d7a28bc178bd7336350bb11cff0fa2257;hb=11e509315cee0449974caa6d681fa26e730bbeca;hp=c65878f48a77b8fe04e1654e092a3af30e78d293;hpb=6f77f9ef21dbea687c49b41052e9cc3381cd000d;p=kivitendo-erp.git
diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html
index c65878f48..5e76f88d7 100644
--- a/templates/webpages/is/form_header.html
+++ b/templates/webpages/is/form_header.html
@@ -19,12 +19,13 @@
+
@@ -34,7 +35,12 @@
[% 'WebDAV' | $T8 %]
[%- END %]
[%- IF id %]
+ [%- IF AUTH.assert('record_links', 1) %]
[% 'Linked Records' | $T8 %]
+ [%- END %]
+ [%- IF AUTH.assert('invoice_edit', 1) %]
+
[% LxERP.t8('Transactions') %]
+ [%- END %]
[%- END %]
@@ -59,7 +65,7 @@
allow_textbox = 1,
onChange = "document.getElementById('update_button').click();" -%]
-
+
@@ -77,7 +83,8 @@
[% 'Shipping Address' | $T8 %] |
- [% L.select_tag('shipto_id', ALL_SHIPTO, default = shipto_id, value_key = 'shipto_id', title_key = 'displayable_id', with_empty = 1, style='width: 250px', onChange = "document.getElementById('update_button').click();") %]
+ [% shiptos = [ [ "", LxERP.t8("No/individual shipping address") ] ] ;
+ L.select_tag('shipto_id', shiptos.import(ALL_SHIPTO), default=shipto_id, value_key='shipto_id', title_key='displayable_id', style='width: 250px') %]
|
[%- END %]
@@ -88,11 +95,32 @@
[% LxERP.format_amount(creditremaining,0 ,'0') %]
-[%- IF max_dunning_level %]
+[%- IF max_dunning_level || dunning_description %]
+
+ [% LxERP.t8("Dunning status") %] |
+
+ [% IF dunning_description %]
+ [% LxERP.t8("This invoice's dunning level: #1", dunning_description) %]
+ [% IF max_dunning_level %] [% END %]
+ [% END %]
+ [% IF max_dunning_level %]
+
+ [% LxERP.t8("Customer's current maximum dunning level: #1", max_dunning_level) %]
+
+ [% LxERP.t8("Dunned open amount: #1", LxERP.format_amount(dunning_amount, 2)) %]
+
+ [% END %]
+ |
+
+[%- END %]
+[%- IF invoice_obj.sepa_exports.as_list.size %]
- [% 'Max. Dunning Level' | $T8 %]: |
+ [% LxERP.t8("SEPA exports") %] |
- [% max_dunning_level %]; [% 'Dunning Amount' | $T8 %]: [% LxERP.format_amount(dunning_amount,2) %]
+ [% FOREACH export = invoice_obj.sepa_exports.as_list %]
+ [% HTML.escape(export.id) %]
+ [% UNLESS loop.last %], [% END %]
+ [% END %]
|
[%- END %]
@@ -112,7 +140,7 @@
[% 'Steuersatz' | $T8 %] |
- [% L.select_tag('taxzone_id', ALL_TAXZONES, default = taxzone_id, title_key = 'description', disabled = (id ? 1 : 0), style='width: 250px', onchange = "document.getElementById('update_button').click();") %]
+ [% L.select_tag('taxzone_id', ( id ? ALL_TAXZONES : ALL_ACTIVE_TAXZONES) , default = taxzone_id, title_key = 'description', disabled = (id ? 1 : 0), style='width: 250px', onchange = "document.getElementById('update_button').click();") %]
[%- IF id %]
[%- END %]
@@ -136,6 +164,8 @@
|
+
+
|
[%- IF show_exchangerate %]
@@ -160,7 +190,7 @@
[% 'Transaction description' | $T8 %] |
- |
+ |
@@ -192,7 +222,7 @@
[% 'Credit Note Date' | $T8 %] |
- [% L.date_tag('invdate', invdate, onchange='set_duedate()') %] |
+ [% L.date_tag('invdate', invdate, onchange='kivi.SalesPurchase.set_duedate_on_reference_date_change("invdate")') %] |
[%- ELSE %]
@@ -201,11 +231,14 @@
[% 'Invoice Date' | $T8 %] |
- [% L.date_tag('invdate', invdate, onchange='set_duedate()') %] |
+ [% L.date_tag('invdate', invdate, onchange='kivi.SalesPurchase.set_duedate_on_reference_date_change("invdate")') %] |
[% 'Due Date' | $T8 %] |
- [% L.date_tag('duedate', duedate) %] |
+
+ [% L.date_tag('duedate', duedate) %]
+ [% HTML.escape(duedate) %]
+ |
[% 'Delivery Order Number' | $T8 %] |
@@ -261,25 +294,14 @@
[% IF resubmit && is_format_html %]
window.open('about:blank','Beleg');
document.invoice.target = 'Beleg';
- document.invoice.submit();
+ $('#action_print').click();
[% ELSIF resubmit %]
- document.invoice.submit();
+ $('#action_print').click();
[% ELSIF creditwarning != '' %]
alert('[% 'Credit Limit exceeded!!!' | $T8 %]');
[% ELSE %]
[% END %]
});
- function set_duedate() {
- $.ajax({
- url: 'is.pl?action=set_duedate',
- data: {
- invdate: $('#invdate').val(),
- payment_id: $('#payment_id').val(),
- },
- dataType: 'text',
- success: function (data) { $('#duedate').val(data); }
- })
- }
//-->