X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Forder%2Ftabs%2Fbasic_data.html;h=b7086a8ae0c90172070ec31c6790a69f40f7c16e;hb=47b5e5c83df21577bbfd56d313acbbcf99b8588e;hp=c67981292cda3b3be5f3045a6b978c20f1e25888;hpb=d2d780320b8430a099ebfe013dc81ba9c2b70253;p=kivitendo-erp.git
diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index c67981292..b7086a8ae 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -12,7 +12,7 @@
- [% SELF.cv | $T8 %] |
+ [%- SELF.cv == "customer" ? LxERP.t8('Customer') : LxERP.t8('Vendor') -%] |
[% SET cv_id = SELF.cv _ '_id' %]
[% P.customer_vendor.picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv, style='width: 300px') %]
@@ -31,15 +31,24 @@
style='width: 300px') %] |
-
+
[% 'Shipping Address' | $T8 %] |
- [% L.select_tag('order.shipto_id',
- SELF.order.${SELF.cv}.shipto,
- default=SELF.order.shipto_id,
- title_key='displayable_id',
- value_key='shipto_id',
- with_empty=1,
- style='width: 300px') %] |
+
+
+ [% shiptos = [ { shipto_id => "", displayable_id => LxERP.t8("No/individual shipping address") } ] ;
+ FOREACH s = SELF.order.${SELF.cv}.shipto ;
+ shiptos.push(s) ;
+ END ;
+ L.select_tag('order.shipto_id',
+ shiptos,
+ default=SELF.order.shipto_id,
+ title_key='displayable_id',
+ value_key='shipto_id',
+ with_empty=0,
+ style='width: 300px') %]
+
+ [% L.button_tag("kivi.Order.edit_custom_shipto()", LxERP.t8("Custom shipto")) %]
+ |
[%- PROCESS order/tabs/_business_info_row.html SELF=SELF %]
@@ -49,6 +58,21 @@
[% L.select_tag('order.taxzone_id', SELF.all_taxzones, default=SELF.order.taxzone_id, title_key='description', style='width: 300px', class='recalc') %] |
+ [% SET currency_id = SELF.order.currency_id || INSTANCE_CONF.get_currency_id # use default currency for new order %]
+
+ [% 'Currency' | $T8 %] |
+ [% L.select_tag('order.currency_id', SELF.all_currencies, default=currency_id, value_key='id', title_key='name') %] |
+
+
+ [% 'Exchangerate' | $T8 %] |
+ 1 [% SELF.order.currency.name %] =
+ [% L.input_tag('order.exchangerate_as_null_number', SELF.order.exchangerate_as_null_number, size="15", class="reformat_number_as_null_number numeric") %]
+ [% INSTANCE_CONF.default_currency %]
+ [% L.hidden_tag('old_currency_id', currency_id) %]
+ [% L.hidden_tag('old_exchangerate', SELF.order.exchangerate_as_null_number) %]
+ |
+
+
[%- IF SELF.all_departments.size %]
[% 'Department' | $T8 %] |
@@ -70,7 +94,7 @@
[% 'Transaction description' | $T8 %] |
- [% L.input_tag('order.transaction_description', SELF.order.transaction_description, style='width: 300px') %] |
+ [% L.input_tag('order.transaction_description', SELF.order.transaction_description, 'data-validate'=INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : '', style='width: 300px') %] |
@@ -150,7 +174,7 @@
[%- END -%]
[% transdate_txt | $T8 %] |
- [% L.date_tag('order.transdate', SELF.order.transdate) %] |
+ [% L.date_tag('order.transdate_as_date', SELF.order.transdate_as_date) %] |
[%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
@@ -162,7 +186,7 @@
[%- END -%]
[% reqdate_txt | $T8 %] |
- [% L.date_tag('order.reqdate', SELF.order.reqdate) %] |
+ [% L.date_tag('order.reqdate_as_date', SELF.order.reqdate_as_date) %] |
[%- IF SELF.type == "sales_quotation" -%]
@@ -172,7 +196,7 @@
[% 'Expected billing date' | $T8 %] |
- [%- L.date_tag('order.expected_billing_date', SELF.order.expected_billing_date) %] |
+ [%- L.date_tag('order.expected_billing_date_as_date', SELF.order.expected_billing_date_sa_date) %] |
[%- END %]
@@ -187,15 +211,19 @@
- [%- PROCESS order/tabs/_item_input.html %]
+ [%- PROCESS order/tabs/_item_input.html SELF=SELF %]
[% L.button_tag('kivi.Order.show_multi_items_dialog()', LxERP.t8('Add multiple items')) %]
|