X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=templates%2Fwebpages%2Foe%2Fform_header.html;h=6a88139e001e5e5f8999786742d919d7a5be666f;hb=15b67fd51a4e9d274205f59a9f50c4ce86b5e176;hp=014663f8fcf132861b1c456abcf77f6b3c3b0ca5;hpb=6f77f9ef21dbea687c49b41052e9cc3381cd000d;p=kivitendo-erp.git
diff --git a/templates/webpages/oe/form_header.html b/templates/webpages/oe/form_header.html
index 014663f8f..6a88139e0 100644
--- a/templates/webpages/oe/form_header.html
+++ b/templates/webpages/oe/form_header.html
@@ -19,11 +19,13 @@
[%- END %]
+
+
[% title %]
@@ -79,7 +81,8 @@
[% 'Shipping Address' | $T8 %] |
- [% L.select_tag('shipto_id', ALL_SHIPTO, default=shipto_id, value_key='shipto_id', title_key='displayable_id', with_empty=1, style='width: 250px', onChange="document.getElementById('update_button').click();") %]
+ [% shiptos = [ [ "", LxERP.t8("No/individual shipping address") ] ] ;
+ L.select_tag('shipto_id', shiptos.import(ALL_SHIPTO), default=shipto_id, value_key='shipto_id', title_key='displayable_id', style='width: 250px') %]
|
[%- END %]
@@ -107,7 +110,7 @@
[% 'Steuersatz' | $T8 %] |
- [% L.select_tag('taxzone_id', ALL_TAXZONES, default=taxzone_id, title_key='description', style='width: 250px') %]
+ [% L.select_tag('taxzone_id', ( id ? ALL_TAXZONES : ALL_ACTIVE_TAXZONES), default=taxzone_id, title_key='description', style='width: 250px') %]
|
[%- IF ALL_DEPARTMENTS %]
@@ -146,7 +149,7 @@
[% 'Transaction description' | $T8 %] |
- |
+ |
[%- IF show_delivery_customer %]
@@ -231,12 +234,32 @@
[% L.date_tag('reqdate', reqdate, id='reqdate') %]
+ [%- IF is_sales_ord %]
+
+ [% 'Insert Date' | $T8 %] |
+ [% oe_obj.itime_as_date %] |
+
+ [%- END %]
[% 'Project Number' | $T8 %] |
[%- L.select_tag('globalproject_id', ALL_PROJECTS, title_key='projectnumber', default=globalproject_id, with_empty='1', onChange="document.getElementById('update_button').click();") %]
|
+[%- IF type == 'sales_quotation' %]
+
+ [% 'Order probability' | $T8 %] |
+
+ [%- L.select_tag('order_probability', ORDER_PROBABILITIES, title='title', default=order_probability) %]%
+ |
+
+
+ [% 'Expected billing date' | $T8 %] |
+
+ [%- L.date_tag('expected_billing_date', expected_billing_date 'BL') %]
+ |
+
+[%- END %]