X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Forder%2Ftabs%2Fbasic_data.html;h=05a663c1c0b7b6158c1ceb56314c8396024959df;hb=f70c8fa479417e7c20108a23c18c0c6e5e683c6a;hp=21377fef44b53a463b562060189d83468d21f9c9;hpb=0956f2d427fe43c70fca245bc55ce85423b76ce8;p=kivitendo-erp.git
diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index 21377fef4..05a663c1c 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -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 %]
@@ -50,32 +59,29 @@
[% SET currency_id = SELF.order.currency_id || INSTANCE_CONF.get_currency_id # use default currency for new order %]
- [% IF SELF.order.exchangerate %]
- [% SET exchangerate = SELF.order.exchangerate_as_null_number %]
- [% END %]
[% '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 %] =
-
- [% IF exchangerate %]
- [% HTML.escape(exchangerate) %]
- [% END %]
-
- [% IF currency_id==INSTANCE_CONF.get_currency_id || SELF.order.exchangerate %]
- [% L.input_tag('order.exchangerate_as_null_number', '', size="15", style='display:none', disabled=1) %]
- [% ELSE %]
- [% L.input_tag('order.exchangerate_as_null_number', 0, size="15") %]
- [% END %]
+ [% 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', exchangerate) %]
+ [% L.hidden_tag('old_exchangerate', SELF.order.exchangerate_as_null_number) %]
|
+[%- IF SELF.all_languages.size %]
+
+ [% 'Language' | $T8 %] |
+
+ [% L.select_tag('order.language_id', SELF.all_languages, default=SELF.order.language_id, title_key='description', with_empty=1, style='width:300px') %]
+ |
+
+[%- END %]
+
[%- IF SELF.all_departments.size %]
[% 'Department' | $T8 %] |
@@ -97,7 +103,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') %] |
@@ -180,16 +186,21 @@
[% L.date_tag('order.transdate_as_date', SELF.order.transdate_as_date) %] |
+
+ [% 'Tax point' | $T8 %] |
+ [% L.date_tag('order.tax_point_as_date', SELF.order.tax_point_as_date, class="recalc") %] |
+
+
[%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
- [%- SET reqdate_txt = 'Reqdate' -%]
+ [%- SET reqdate_txt = 'Reqdate'; SET reqdate_class = 'recalc' -%]
[%- ELSIF SELF.type == "sales_quotation" -%]
- [%- SET reqdate_txt = 'Valid until' -%]
+ [%- SET reqdate_txt = 'Valid until'; SET reqdate_class = '' -%]
[%- ELSE -%]
- [%- SET reqdate_txt = 'Required by' -%]
+ [%- SET reqdate_txt = 'Required by'; SET reqdate_class = 'recalc' -%]
[%- END -%]
[% reqdate_txt | $T8 %] |
- [% L.date_tag('order.reqdate_as_date', SELF.order.reqdate_as_date) %] |
+ [% L.date_tag('order.reqdate_as_date', SELF.order.reqdate_as_date, class=reqdate_class) %] |
[%- IF SELF.type == "sales_quotation" -%]
@@ -199,7 +210,7 @@
[% 'Expected billing date' | $T8 %] |
- [%- L.date_tag('order.expected_billing_date_as_date', SELF.order.expected_billing_date_sa_date) %] |
+ [%- L.date_tag('order.expected_billing_date_as_date', SELF.order.expected_billing_date_as_date) %] |
[%- END %]