X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/4b04c42212bb045a98535fcc16eef4ad81b2dbb6..8fed00544a31df0df4520248b3c5d7fde77ca16d:/templates/webpages/order/tabs/basic_data.html
diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index 64d73eae2..87815bdff 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -14,7 +14,7 @@
[% L.customer_vendor_picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv, style='width: 300px') %] |
-
+
| [% 'Contact Person' | $T8 %] |
[% L.select_tag('order.cp_id',
SELF.order.${SELF.cv}.contacts,
@@ -25,7 +25,7 @@
style='width: 300px') %] |
-
+
| [% 'Shipping Address' | $T8 %] |
[% L.select_tag('order.shipto_id',
SELF.order.${SELF.cv}.shipto,
@@ -38,9 +38,18 @@
|
| [% 'Steuersatz' | $T8 %] |
- [% L.select_tag('order.taxzone_id', SELF.all_taxzones, default=SELF.order.taxzone_id, title_key='description', style='width: 300px') %] |
+ [% L.select_tag('order.taxzone_id', SELF.all_taxzones, default=SELF.order.taxzone_id, title_key='description', style='width: 300px', class='recalc') %] |
+[%- IF SELF.all_departments.size %]
+
+ | [% 'Department' | $T8 %] |
+
+ [% L.select_tag('order.department_id', SELF.all_departments, default=SELF.order.department_id, title_key='description', with_empty=1, style='width:300px') %]
+ |
+
+[%- END %]
+
| [% 'Shipping Point' | $T8 %] |
[% L.input_tag('order.shippingpoint', SELF.order.shippingpoint, style='width: 300px') %] |
@@ -56,6 +65,11 @@
[% L.input_tag('order.transaction_description', SELF.order.transaction_description, style='width: 300px') %] |
+
+ | [% 'Project Number' | $T8 %] |
+ [% L.project_picker('order.globalproject_id', SELF.order.globalproject_id, style='width: 300px') %] |
+
+
@@ -79,8 +93,8 @@
[% IF SELF.cv == 'customer' %]
| [% 'Salesman' | $T8 %] |
- [% L.select_tag('order.employee_id',
- SELF.all_employees,
+ | [% L.select_tag('order.salesman_id',
+ SELF.all_salesmen,
default=(SELF.order.salesman_id ? SELF.order.salesman_id : SELF.current_employee_id),
title_key='safe_name') %] |
@@ -107,13 +121,13 @@
- | [% 'Insert Date' | $T8 %] |
- [% SELF.order.itime_as_date %] |
+ [% 'Reqdate' | $T8 %] |
+ [% L.date_tag('order.reqdate', SELF.order.reqdate) %] |
- | [% 'Project Number' | $T8 %] |
- [%- L.select_tag('order.globalproject_id', SELF.all_projects, default=SELF.order.globalproject_id, title_key='projectnumber', with_empty = 1) %] |
+ [% 'Insert Date' | $T8 %] |
+ [% SELF.order.itime_as_date %] |
@@ -124,11 +138,13 @@
[%- PROCESS order/tabs/_item_input.html %]
+ [% L.button_tag('show_multi_items_dialog()', LxERP.t8('Add multiple items')) %]
+
|
- |
|
- [% L.textarea_tag('order.notes', SELF.order.notes, wrap="soft", style="width: 350px; height: 150px;", class="texteditor") %]
+ [% L.textarea_tag('order.notes', SELF.order.notes, wrap="soft", style="width: 350px; height: 150px", class="texteditor") %]
|
- [% L.textarea_tag('order.intnotes', SELF.order.intnotes, wrap="soft", style="width: 350px; height: 150px;") %]
+ [% L.textarea_tag('order.intnotes', SELF.order.intnotes, wrap="soft", style="width: 350px; height: 150px") %]
|
@@ -189,7 +206,7 @@
default = SELF.order.payment_id,
with_empty = 1,
title_key = 'description',
- style = 'width: 250px;') %]
+ style = 'width: 250px') %]
| [% 'Delivery Terms' | $T8 %] |
@@ -198,28 +215,34 @@
default = SELF.order.delivery_term_id,
with_empty = 1,
title_key = 'description',
- style = 'width: 250px;') %]
+ style = 'width: 250px') %]
- [%- IF NOT taxincluded %]
-
+
+ |
+
+ [% L.yes_no_tag('order.taxincluded', SELF.order.taxincluded, class='recalc') %]
+ |
+
+
+
| [%- 'Subtotal' | $T8 %] |
[%- L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %]
|
- [%- END %]
[%- FOREACH tax = SELF.taxes %]
- [%- PROCESS order/tabs/_tax_row.html TAX=tax %]
+ [%- PROCESS order/tabs/_tax_row.html TAX=tax TAXINCLUDED=SELF.order.taxincluded %]
[%- END %]
| [%- 'Total' | $T8 %] |
[%- L.div_tag(SELF.order.amount_as_number, id='amount_id') %]
+ |
|
@@ -229,10 +252,6 @@
-
- |
-
-
@@ -242,14 +261,41 @@