X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/7f67694fd1e839a24dc80ff456e9271c78008d81..c25fdc227a49e304313d4a89d97e1be70c910319:/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 f100a5f2c..e02c498ba 100644 --- a/templates/webpages/order/tabs/basic_data.html +++ b/templates/webpages/order/tabs/basic_data.html @@ -38,7 +38,7 @@ [% 'Steuersatz' | $T8 %] - [% L.select_tag('order.taxzone_id', SELF.all_taxzones, default=SELF.order.taxzone_id, title_key='description', style='width: 300px') %] + [% L.select_tag('order.taxzone_id', SELF.all_taxzones, default=SELF.order.taxzone_id, title_key='description', style='width: 300px', class='recalc') %] @@ -79,8 +79,8 @@ [% IF SELF.cv == 'customer' %] [% 'Salesman' | $T8 %] - [% L.select_tag('order.employee_id', - SELF.all_employees, + [% L.select_tag('order.salesman_id', + SELF.all_salesmen, default=(SELF.order.salesman_id ? SELF.order.salesman_id : SELF.current_employee_id), title_key='safe_name') %] @@ -140,6 +140,7 @@ [%- 'Qty' | $T8 %] [%- 'Price Factor' | $T8 %] [%- 'Unit' | $T8 %] + [%- 'Price Source' | $T8 %] [%- 'Price' | $T8 %] [%- 'Discount' | $T8 %] [%- 'Extended' | $T8 %] @@ -147,7 +148,7 @@ [%- FOREACH item = SELF.order.items_sorted %] - [%- PROCESS order/tabs/_row.html ITEM=item %] + [%- PROCESS order/tabs/_row.html ITEM=item ID=item.id %] [%- END %] @@ -205,16 +206,21 @@ - [%- IF NOT taxincluded %] - + + + + + - [%- END %] [%- FOREACH tax = SELF.taxes %] - [%- PROCESS order/tabs/_tax_row.html TAX=tax %] + [%- PROCESS order/tabs/_tax_row.html TAX=tax TAXINCLUDED=SELF.order.taxincluded %] [%- END %] @@ -239,14 +245,15 @@
+ + [% L.yes_no_tag('order.taxincluded', SELF.order.taxincluded, class='recalc') %] +
[%- 'Subtotal' | $T8 %] [%- L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %]
[%- 'Total' | $T8 %]