X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/d2d780320b8430a099ebfe013dc81ba9c2b70253..0956f2d427fe43c70fca245bc55ce85423b76ce8:/templates/webpages/order/tabs/basic_data.html
diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index c67981292..21377fef4 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') %]
@@ -49,6 +49,33 @@
| [% 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 %]
+ [% 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 %]
+ [% INSTANCE_CONF.default_currency %]
+ [% L.hidden_tag('old_currency_id', currency_id) %]
+ [% L.hidden_tag('old_exchangerate', exchangerate) %]
+ |
+
+
[%- IF SELF.all_departments.size %]
| [% 'Department' | $T8 %] |
@@ -150,7 +177,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 +189,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 +199,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 +214,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')) %]
|