X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fap%2Fform_header.html;h=2f22a96f2c0334c0c4361ac46ab12ab25300e6db;hb=d1054383fa90478db0424f5dc255d5836bc494d7;hp=878b8636631f056bff73cf8c6423d46f167a178d;hpb=526dad121d0d769b2f1816d108e1c1183f581c12;p=kivitendo-erp.git
diff --git a/templates/webpages/ap/form_header.html b/templates/webpages/ap/form_header.html
index 878b86366..2f22a96f2 100644
--- a/templates/webpages/ap/form_header.html
+++ b/templates/webpages/ap/form_header.html
@@ -1,4 +1,5 @@
[%- USE L %]
+[%- USE P %]
[%- USE HTML %]
[%- USE T8 %]
[%- USE LxERP %][%- USE P -%]
@@ -41,6 +42,8 @@
+[%- P.hidden_tag('convert_from_oe_id', convert_from_oe_id) -%]
+
[% FOREACH i IN [1..paidaccounts] %]
[% temp = "acc_trans_id_"_ i %]
@@ -59,6 +62,10 @@
[%- IF INSTANCE_CONF.get_webdav %]
[% 'WebDAV' | $T8 %]
[%- END %]
+[%- IF id AND INSTANCE_CONF.get_doc_storage %]
+ [% 'Documents' | $T8 %]
+ [% 'Attachments' | $T8 %]
+[%- END %]
[%- IF id %]
[%- IF AUTH.assert('record_links', 1) %]
[% 'Linked Records' | $T8 %]
@@ -78,7 +85,7 @@
[% 'Vendor' | $T8 %]
- [% P.customer_vendor_picker("vendor_id", vendor_id, type="vendor", style="width: 300px") %]
+ [% P.customer_vendor.picker("vendor_id", vendor_id, type="vendor", style="width: 300px", onchange="\$('#update_button').click()") %]
[% L.button_tag("show_vc_details('vendor')", LxERP.t8('Details (one letter abbreviation)')) %]
[% L.hidden_tag("previous_vendor_id", vendor_id) %]
@@ -142,11 +149,11 @@
[% 'Invoice Number' | $T8 %]
-
+ [% L.input_tag("invnumber", invnumber, size="11", readonly=readonly) %]
[% 'Order Number' | $T8 %]
-
+ [% L.input_tag("ordnumber", ordnumber, size="11", readonly=readonly) %]
[% 'Invoice Date' | $T8 %]
@@ -156,10 +163,18 @@
[% 'Due Date' | $T8 %]
[% L.date_tag('duedate', duedate) %]
+
+ [% LxERP.t8('Tax point') %]
+ [% L.date_tag('tax_point', tax_point, id='tax_point') %]
+
+
+ [% 'Delivery Date' | $T8 %]
+ [% L.date_tag('deliverydate', deliverydate) %]
+
[% 'Project Number' | $T8 %]
- [% L.select_tag('globalproject_id', ALL_PROJECTS, with_empty = 1, default = globalproject_id, value_key = 'id', title_key = 'projectnumber', onChange = "document.getElementById('update_button').click();") %]
+ [% P.project.picker('globalproject_id', globalproject_id, onchange="document.getElementById('update_button').click();") %]
@@ -184,7 +199,7 @@
[% SET selected_chart_id = "AP_amount_chart_id_"_ i %]
- [% P.chart_picker("AP_amount_chart_id_" _ i, $selected_chart_id, style="width: 400px", type="AP_amount", class=(initial_focus == 'row_' _ i ? "initial_focus" : "")) %]
+ [% P.chart.picker("AP_amount_chart_id_" _ i, $selected_chart_id, style="width: 400px", type="AP_amount", class=(initial_focus == 'row_' _ i ? "initial_focus" : "")) %]
[% L.hidden_tag("previous_AP_amount_chart_id_" _ i, $selected_chart_id) %]
@@ -201,7 +216,7 @@
[% temp = "project_id_"_ i %]
- [% L.select_tag(temp, ALL_PROJECTS, with_empty = 1, default = loop.last ? globalproject_id : $temp, value_key = 'id', title_key = 'projectnumber') %]
+ [% P.project.picker(temp, loop.last ? globalproject_id : $temp) %]
[% END %]
@@ -213,7 +228,7 @@
- [% P.chart_picker('AP_chart_id', AP_chart_id, style="width: 400px", type="AP") %]
+ [% P.chart.picker('AP_chart_id', AP_chart_id, style="width: 400px", type="AP") %]
[% invtotal | html %]
@@ -223,23 +238,29 @@
-
-
- [% 'Notes' | $T8 %]
-
-
-
-
- [% 'Notes for vendor' | $T8 %]
-
-
-
-
-
+
+
+ [% 'Notes' | $T8 %]
+ [% 'Internal Notes' | $T8 %]
+ [% 'Payment Terms' | $T8 %]
+
+
+
+ [% L.textarea_tag("notes", notes, wrap="soft", rows=textarea_rows, cols=50, readonly=readonly) %]
+
+
+ [% L.textarea_tag("intnotes", intnotes, wrap="soft", rows=textarea_rows, cols=50, readonly=readonly) %]
+
+
+ [% L.select_tag('payment_id', payment_terms, default=payment_id, title_key='description', with_empty=1, style="width: 250px", onchange="kivi.SalesPurchase.set_duedate_on_reference_date_change('invdate')") %]
+
+
+
+ [% UNLESS no_payment_bookings %]
[% 'Payments' | $T8 %]
@@ -296,7 +317,7 @@
[% temp = "paid_"_ i %]
[% IF( changeable ) %]
-
+
[% ELSE %]
[% $temp | html %]
@@ -325,12 +346,13 @@
[% END %]
- [% temp = "AP_paid_"_ i %]
+ [% temp = "AP_paid_"_ i %]
+ [% readonly = "AP_paid_readonly_desc_"_ i %]
[% IF( changeable ) %]
[% L.select_tag(temp, ALL_CHARTS_AP_paid, value_title_sub = \AP_paid_value_title_sub, default = ($temp || accno_arap)) %]
[% ELSE %]
- [% $temp | html %]
+ [% $readonly | html %]
[% END %]
@@ -338,7 +360,7 @@
[% temp = "paid_project_id_"_ i %]
[% IF( changeable ) %]
- [% L.select_tag(temp, ALL_PROJECTS, with_empty = 1, default = $temp, value_key = 'id', title_key = 'projectnumber') %]
+ [% P.project.picker(temp, $temp) %]
[% ELSE %]
[% temp = "label"_ temp %]
@@ -361,6 +383,7 @@
[% LxERP.format_amount(paid_missing, 2) | html %]
+ [% END %]
@@ -374,5 +397,5 @@