@@ -78,7 +89,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: 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) %]
@@ -123,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 %]
@@ -142,24 +157,32 @@
[% '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 %]
- [% 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();") %]
@@ -184,7 +207,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) %]
@@ -192,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 %]
@@ -201,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 %]
@@ -213,7 +243,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 +253,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('transdate')") %]
+
+
+
+ [% UNLESS no_payment_bookings %]
[% 'Payments' | $T8 %]
@@ -296,7 +332,7 @@
[% temp = "paid_"_ i %]
[% IF( changeable ) %]
-
+
[% ELSE %]
[% $temp | html %]
@@ -325,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 %]
@@ -338,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 %]
@@ -361,6 +398,7 @@
[% LxERP.format_amount(paid_missing, 2) | html %]
+ [% END %]