X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Forder%2Ftabs%2Fbasic_data.html;h=682162e5fc0653af4e709fe9cbc98196d11c7f25;hb=43e74053df32b26b2e2ec5059bebc60d47be753b;hp=d41e57b6ad07e707d01132a8d6cbc2f6dad4aaf9;hpb=210676724bfbb6aa06d4eaa1768d2474baa16357;p=kivitendo-erp.git
diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index d41e57b6a..682162e5f 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -14,7 +14,10 @@
[% SELF.cv | $T8 %] |
[% SET cv_id = SELF.cv _ '_id' %]
- [% P.customer_vendor.picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv, style='width: 300px') %] |
+
+ [% P.customer_vendor.picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv, style='width: 300px') %]
+ [% P.button_tag("kivi.Order.show_vc_details_dialog()", LxERP.t8("Details (one letter abbreviation)")) %]
+ |
@@ -39,6 +42,8 @@
style='width: 300px') %]
+ [%- PROCESS order/tabs/_business_info_row.html SELF=SELF %]
+
[% 'Steuersatz' | $T8 %] |
[% L.select_tag('order.taxzone_id', SELF.all_taxzones, default=SELF.order.taxzone_id, title_key='description', style='width: 300px', class='recalc') %] |
@@ -108,30 +113,68 @@
[% END %]
+ [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
[% 'Order Number' | $T8 %] |
- [% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11) %] |
+ [% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11, onchange='kivi.Order.set_number_in_title(this)') %] |
+ [%- END -%]
+ [%- IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]
+ [%- SET quo_nr_txt = 'Quotation Number' -%]
+ [%- ELSE -%]
+ [%- SET quo_nr_txt = 'RFQ Number' -%]
+ [%- END -%]
- [% 'Quotation Number' | $T8 %] |
- [% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11) %] |
+ [% 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") -%]
[% 'Customer Order Number' | $T8 %] |
[% L.input_tag('order.cusordnumber', SELF.order.cusordnumber, size = 11) %] |
+ [%- END -%]
+
+ [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+ [%- SET transdate_txt = 'Order Date' -%]
+ [%- ELSIF SELF.type == "sales_quotation" -%]
+ [%- SET transdate_txt = 'Quotation Date' -%]
+ [%- ELSE -%]
+ [%- SET transdate_txt = 'RFQ Date' -%]
+ [%- END -%]
+
+ [% transdate_txt | $T8 %] |
+ [% L.date_tag('order.transdate_as_date', SELF.order.transdate_as_date) %] |
+
+ [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+ [%- SET reqdate_txt = 'Reqdate' -%]
+ [%- ELSIF SELF.type == "sales_quotation" -%]
+ [%- SET reqdate_txt = 'Valid until' -%]
+ [%- ELSE -%]
+ [%- SET reqdate_txt = 'Required by' -%]
+ [%- END -%]
- [% 'Order Date' | $T8 %] |
- [% L.date_tag('order.transdate', SELF.order.transdate) %] |
+ [% reqdate_txt | $T8 %] |
+ [% L.date_tag('order.reqdate_as_date', SELF.order.reqdate_as_date) %] |
+ [%- IF SELF.type == "sales_quotation" -%]
- [% 'Reqdate' | $T8 %] |
- [% L.date_tag('order.reqdate', SELF.order.reqdate) %] |
+ [% 'Order probability' | $T8 %] |
+ [%- L.select_tag('order.order_probability', SELF.order_probabilities, title='title', default=SELF.order.order_probability) %]% |
+
+ [% 'Expected billing date' | $T8 %] |
+ [%- L.date_tag('order.expected_billing_date_as_date', SELF.order.expected_billing_date_sa_date) %] |
+
+ [%- END %]
[% 'Insert Date' | $T8 %] |
@@ -169,6 +212,9 @@
+ [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+
+ [%- END -%]
[%- 'Price Factor' | $T8 %] |
[%- 'Unit' | $T8 %] |
@@ -180,7 +226,7 @@
[%- FOREACH item = SELF.order.items_sorted %]
- [%- PROCESS order/tabs/_row.html ITEM=item ID=item.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) TYPE=SELF.type ALL_PRICE_FACTORS=SELF.all_price_factors %]
[%- END %]
@@ -245,6 +291,27 @@
+ [%- 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 %]
+
|