X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Forder%2Ftabs%2Fbasic_data.html;h=490f9ac29df197751413a87b0bba3cb2e784e903;hb=844a541e0d8f59644540413f675e8f07cd154cf6;hp=d7b84ff88e78c08fe18bdafee831504d109798b8;hpb=a5038d8dfae7d3a5ad27f1fb4f219b347bb2c91c;p=kivitendo-erp.git
diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index d7b84ff88..490f9ac29 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -51,6 +51,21 @@
+ [%- 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 %]
@@ -149,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 -%]
@@ -160,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") -%]
@@ -186,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" -%]
@@ -205,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 %]
@@ -222,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')) %]