X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Forder%2Ftabs%2Fbasic_data.html;h=490f9ac29df197751413a87b0bba3cb2e784e903;hb=844a541e0d8f59644540413f675e8f07cd154cf6;hp=cad409f97b96c1d66e3751c584efa683df348cf2;hpb=4db13ebb44454523e8fab2d1cfa034e28a059ec0;p=kivitendo-erp.git
diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index cad409f97..490f9ac29 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -31,17 +31,41 @@
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")) %]
+ |
+ [%- IF SELF.cv == "customer" %]
+
+ [% 'Custom Billing Address' | $T8 %] |
+
+ [% L.select_tag('order.billing_address_id',
+ SELF.order.customer.additional_billing_addresses,
+ default=SELF.order.billing_address_id,
+ title_key='displayable_id',
+ value_key='id',
+ with_empty=1,
+ style='width: 300px') %]
+ |
+
+ [%- END %]
+
[%- PROCESS order/tabs/_business_info_row.html SELF=SELF %]
@@ -49,6 +73,30 @@
[% 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_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 %] |
@@ -70,7 +118,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') %] |
@@ -116,7 +164,16 @@
[%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
[% 'Order Number' | $T8 %] |
- [% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11, onchange='kivi.Order.set_number_in_title(this)') %] |
+
+ [%- IF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
+ [% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11, onchange='kivi.Order.set_number_in_title(this)') %]
+ [%- ELSIF SELF.order.id %]
+ [% HTML.escape(SELF.order.ordnumber) %]
+ [% L.hidden_tag("order.ordnumber", SELF.order.ordnumber) %]
+ [% ELSE %]
+ [% LxERP.t8("will be set upon saving") %]
+ [%- END %]
+ |
[%- END -%]
@@ -127,11 +184,18 @@
[%- END -%]
[% quo_nr_txt | $T8 %] |
- [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
- [% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11) %] |
- [%- ELSE -%]
- [% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11, onchange='kivi.Order.set_number_in_title(this)') %] |
- [%- END -%]
+
+ [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+ [% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11) %]
+ [%- ELSIF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
+ [% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11, onchange='kivi.Order.set_number_in_title(this)') %]
+ [%- ELSIF SELF.order.id %]
+ [% HTML.escape(SELF.order.quonumber) %]
+ [% L.hidden_tag("order.quonumber", SELF.order.quonumber) %]
+ [% ELSE %]
+ [% LxERP.t8("will be set upon saving") %]
+ [%- END %]
+ |
[%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
@@ -153,16 +217,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" -%]
@@ -172,7 +241,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 %]
@@ -189,7 +258,7 @@
[%- PROCESS order/tabs/_item_input.html SELF=SELF %]
- [% L.button_tag('kivi.Order.show_multi_items_dialog()', LxERP.t8('Add multiple items')) %]
+ [% L.button_tag('kivi.Order.open_multi_items_dialog()', LxERP.t8('Add multiple items')) %]
@@ -213,13 +282,25 @@
[%- 'position' | $T8 %] |
|
|
-
-
-
+ [%- IF SELF.show_update_button -%]
+
+ [%- L.img_tag(src="image/rotate_cw.svg",
+ alt=LxERP.t8('Update from master data'),
+ title= LxERP.t8('Update from master data'),
+ onclick="if (!confirm('" _ LxERP.t8("Are you sure to update all positions from master data?") _ "')) return false; kivi.Order.update_all_rows_from_master_data();",
+ id='update_from_master') %]
+ |
+ [%- END %]
+
+ [%- IF SELF.search_cvpartnumber -%]
+
+ [%- END -%]
+
+
[%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
-
+
[%- END -%]
-
+
[%- 'Price Factor' | $T8 %] |
[%- 'Unit' | $T8 %] |
[%- 'Price Source' | $T8 %] |
@@ -230,7 +311,7 @@
[%- FOREACH item = SELF.order.items_sorted %]
- [%- PROCESS order/tabs/_row.html ITEM=item ID=(item.id||item.new_fake_id) TYPE=SELF.type ALL_PRICE_FACTORS=SELF.all_price_factors %]
+ [%- PROCESS order/tabs/_row.html ITEM=item ID=(item.id||item.new_fake_id) -%]
[%- END %]