X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=templates%2Fwebpages%2Forder%2Ftabs%2Fbasic_data.html;h=c54b8f30ed49c88ed2b8c697467bee30991e9a08;hb=4b1666b74b0fa70077c64144a57526a1d64b4e64;hp=c968a94732b8509f9827c878135c3b3c71225e95;hpb=aacd66960ed7b1f4430c7e623e516e26cad9752d;p=kivitendo-erp.git
diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index c968a9473..c54b8f30e 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,29 @@
| [% L.select_tag('order.taxzone_id', SELF.all_taxzones, default=SELF.order.taxzone_id, title_key='description', style='width: 300px', class='recalc') %] |
+
+ [% 'Currency' | $T8 %] |
+ [% L.select_tag('order.currency_id', SELF.all_currencies, default=SELF.order.currency_id, value_key='id', title_key='name') %] |
+
+
+ [% 'Exchangerate' | $T8 %] |
+ 1 [% SELF.order.currency.name %] =
+
+ [% IF SELF.order.exchangerate %]
+ [% HTML.escape(SELF.order.exchangerate_as_number) %]
+ [% END %]
+
+ [% IF !SELF.order.currency_id || SELF.order.currency_id==INSTANCE_CONF.get_currency_id || SELF.order.exchangerate %]
+ [% L.input_tag('', '', size="15", id='order_exchangerate_as_number', 'data-name'='order.exchangerate_as_number', style='display:none') %]
+ [% ELSE %]
+ [% L.input_tag('order.exchangerate_as_number', 0, size="15") %]
+ [% END %]
+ [% INSTANCE_CONF.default_currency %]
+ [% L.hidden_tag('old_currency_id', SELF.order.currency_id) %]
+ [% L.hidden_tag('old_exchangerate', SELF.order.exchangerate_as_number) %]
+ |
+
+
[%- IF SELF.all_departments.size %]
[% 'Department' | $T8 %] |
@@ -150,7 +173,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 +185,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 +195,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 +210,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')) %]
|
+ [%- IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]
+ [%- SET marge_class = (SELF.order.marge_total < 0) ? 'plus0' : '' -%]
+
+
+
+ [% 'Ertrag' | $T8 %] |
+
+ [%- L.div_tag(SELF.order.marge_total_as_number, id='marge_total_id', class=marge_class) %]
+ |
+
+
+ [% 'Ertrag prozentual' | $T8 %] |
+
+ [%- L.div_tag(LxERP.format_amount(SELF.order.marge_percent, 2), id='marge_percent_id', class=marge_class) %]
+ |
+ [%- L.div_tag('%', id='marge_percent_sign_id', class=marge_class) %] |
+
+
+ |
+ [%- END %]
+
|