X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/f04e9769b7015b54a3d3ceb87072cc31579c5470..12eafc00a9cbd2c24fbbd6a7415e5ecb97ef02b7:/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 7783b7c33..bf4c5bf80 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -79,8 +79,8 @@
           [% IF SELF.cv == 'customer' %]
           <tr>
             <th align="right">[% 'Salesman' | $T8 %]</th>
-            <td>[% L.select_tag('order.employee_id',
-              SELF.all_employees,
+            <td>[% 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') %]</td>
           </tr>
@@ -205,21 +205,27 @@
 
             <td align="right">
               <table>
-                [%- IF NOT taxincluded %]
-                <tr>
+                <tr id="taxincluded_row_id" [%- IF !SELF.taxes.size %]style="display:none"[%- END %]>
+                  <td align=right colspan="2">
+                    <label for="order.taxincluded"><b>[% 'Tax Included' | $T8 %]</b></label>
+                    [% L.yes_no_tag('order.taxincluded', SELF.order.taxincluded, class='recalc') %]
+                  </td>
+                </tr>
+
+                <tr id="subtotal_row_id" [%- IF SELF.order.taxincluded %]style="display:none"[%- END %]>
                   <th align="right">[%- 'Subtotal' | $T8 %]</th>
                   <td align="right">
                     [%- L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %]
                   </td>
                 </tr>
-                [%- 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 %]
                 <tr id="amount_row_id">
                   <th align="right">[%- 'Total' | $T8 %]</th>
                   <td align="right">
                     [%- L.div_tag(SELF.order.amount_as_number, id='amount_id') %]
+                  </td>
                 </tr>
               </table>
             </td>
@@ -271,7 +277,7 @@ function recalc_amounts_and_taxes() {
 
 function redisplay_linetotals(data) {
   $('.row_entry [name="linetotal"]').each(function(idx, elt) {
-    $(elt).html(data[idx]);    
+    $(elt).html(data[idx]);
   });
 }