X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fap%2Fform_header.html;h=e3bc2e9c765e07161e95f4113eb9b9ef8e7f089c;hb=51aa7d3ccc53449c3582bae461d567ff2203e964;hp=45dcf332a35f5c0206d5092d5ccf5a5340bb0d01;hpb=0aa885f4f0bb531a7691a641f954ff296ffa04a5;p=kivitendo-erp.git
diff --git a/templates/webpages/ap/form_header.html b/templates/webpages/ap/form_header.html
index 45dcf332a..e3bc2e9c7 100644
--- a/templates/webpages/ap/form_header.html
+++ b/templates/webpages/ap/form_header.html
@@ -18,7 +18,7 @@
-
+
@@ -42,6 +42,8 @@
+[%- P.hidden_tag('convert_from_oe_id', convert_from_oe_id) -%]
+
[% FOREACH i IN [1..paidaccounts] %]
[% temp = "acc_trans_id_"_ i %]
@@ -61,7 +63,7 @@
@@ -83,7 +89,7 @@
[% 'Vendor' | $T8 %] |
- [% P.customer_vendor.picker("vendor_id", vendor_id, type="vendor", style="width: 300px", onchange="\$('#update_button').click()") %]
+ [% P.customer_vendor.picker("vendor_id", vendor_id, type="vendor", style="width: 330px", 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) %]
|
@@ -128,10 +134,14 @@
[% IF ALL_DEPARTMENTS %]
[% 'Department' | $T8 %] |
- [% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1) %] |
+ [% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1, style = "width:334px") %] |
[% END %]
+
+ [% 'Transaction description' | $T8 %] |
+ [% L.input_tag("transaction_description", transaction_description, style="width:330px", "data-validate"=INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : '') %] |
+
|
[% 'Tax Included' | $T8 %] |
@@ -155,16 +165,24 @@
[% 'Invoice Date' | $T8 %] |
- [% L.date_tag('transdate', transdate) %] |
+ [% L.date_tag('transdate', transdate, onchange='kivi.SalesPurchase.set_duedate_on_reference_date_change("transdate")') %] |
[% '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();") %]
|
@@ -197,7 +215,14 @@
- [% temp = "tax_"_ i %][% $temp | html %]
+ [% temp_r = "tax_reverse_"_ i %]
+ [% IF ($temp_r) %]
+ [% $temp_r | html %]
+
+ [% temp_c = "tax_charge_"_ i %][% $temp_c | html %]
+ [% ELSE %]
+ [% temp = "tax_"_ i %][% $temp | html %]
+ [% END %]
|
[% temp = 'selected_taxchart_'_ i %]
@@ -206,7 +231,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 %]
@@ -228,19 +253,24 @@
-
-
- [% '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('transdate')") %]
+ |
+
+
|
@@ -302,7 +332,7 @@
[% temp = "paid_"_ i %]
[% IF( changeable ) %]
-
+
[% ELSE %]
[% $temp | html %]
@@ -331,12 +361,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 %]
|
@@ -344,7 +375,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 %]
@@ -381,5 +412,5 @@
|