X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Forder%2Ftabs%2Fbasic_data.html;h=ea9710ba4993e79a137923ae65779d98cd25e561;hb=e00e4846bca73f9856d19e41805264b9ecb18af2;hp=f3cd724b840fa313cc2718c54b6175fa7eb22c11;hpb=0601f32f9e782b0b93235bf7fc1e95c698163e60;p=kivitendo-erp.git
diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index f3cd724b8..ea9710ba4 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -11,7 +11,7 @@
[% SELF.cv | $T8 %] |
[% SET cv_id = SELF.cv _ '_id' %]
- [% L.customer_vendor_picker('order.cv_id', SELF.order.$cv_id, type=SELF.cv, style='width: 300px') %] |
+ [% L.customer_vendor_picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv, style='width: 300px') %] |
@@ -76,6 +76,16 @@
title_key='safe_name') %]
+ [% IF SELF.cv == 'customer' %]
+
+ [% 'Salesman' | $T8 %] |
+ [% L.select_tag('order.employee_id',
+ SELF.all_employees,
+ default=(SELF.order.salesman_id ? SELF.order.salesman_id : SELF.current_employee_id),
+ title_key='safe_name') %] |
+
+ [% END %]
+
[% 'Order Number' | $T8 %] |
[% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11) %] |
@@ -102,43 +112,43 @@
+ [%- PROCESS order/tabs/_item_input.html %]
+
-
-
-
- |
- |
- |
- [%- 'Part' | $T8 %] |
- [%- 'Qty' | $T8 %] |
- [%- 'Price Factor' | $T8 %] |
- [%- 'Unit' | $T8 %] |
- [%- 'Price' | $T8 %] |
- [%- 'Discount' | $T8 %] |
- [%- 'Extended' | $T8 %] |
-
-
-
-
- [%- FOREACH item = SELF.order.items_sorted %]
- [%- PROCESS order/tabs/_row.html ITEM=item %]
- [%- END %]
- [%- IF !SELF.order.items.size %]
- [%- PROCESS order/tabs/_row.html ITEM='' %]
- [%- END %]
-
-
- |
-
+
-
+
- [%- L.button_tag('add_order_item_row()', LxERP.t8("Add Row")) -%] |
@@ -147,18 +157,18 @@
[%- IF NOT taxincluded %]
[%- 'Subtotal' | $T8 %] |
- [%- SELF.order.netamount_as_number %] |
+
+ [%- L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %]
+ |
[%- END %]
[%- FOREACH tax = SELF.taxes %]
-
- [%- tax.tax.description %] [% tax.tax.rate_as_percent %]% |
- [%- LxERP.format_amount(tax.amount, 2, 0) %] |
-
+ [%- PROCESS order/tabs/_tax_row.html TAX=tax %]
[%- END %]
-
+
[%- 'Total' | $T8 %] |
- [%- SELF.order.amount_as_number %] |
+
+ [%- L.div_tag(SELF.order.amount_as_number, id='amount_id') %]
|
@@ -178,55 +188,51 @@