X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/4b04c42212bb045a98535fcc16eef4ad81b2dbb6..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 64d73eae2..bf4c5bf80 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -14,7 +14,7 @@
             <td>[% L.customer_vendor_picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv, style='width: 300px') %]</td>
           </tr>
 
-          <tr id='cp_row' [%- IF !SELF.order.${SELF.cv}.contacts.size %]style='display:none;'[%- END %]>
+          <tr id='cp_row' [%- IF !SELF.order.${SELF.cv}.contacts.size %]style='display:none'[%- END %]>
             <th align="right">[% 'Contact Person' | $T8 %]</th>
             <td>[% L.select_tag('order.cp_id',
                                 SELF.order.${SELF.cv}.contacts,
@@ -25,7 +25,7 @@
                                 style='width: 300px') %]</td>
           </tr>
 
-          <tr id='shipto_row' [%- IF !SELF.order.${SELF.cv}.shipto.size %]style='display:none;'[%- END %]>
+          <tr id='shipto_row' [%- IF !SELF.order.${SELF.cv}.shipto.size %]style='display:none'[%- END %]>
             <th align="right">[% 'Shipping Address' | $T8 %]</th>
             <td>[% L.select_tag('order.shipto_id',
                                 SELF.order.${SELF.cv}.shipto,
@@ -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>
@@ -128,7 +128,7 @@
     <tr>
       <td>
 
-        <div id="row_table_scroll_id" style="overflow-y: auto; height: 45vh;">
+        <div id="row_table_scroll_id" style="overflow-y: auto; height: 25vh">
           <table id="row_table_id" width="100%">
             <thead>
               <tr class="listheading">
@@ -171,10 +171,10 @@
                 </tr>
                 <tr valign="top">
                   <td>
-                    [% L.textarea_tag('order.notes', SELF.order.notes, wrap="soft", style="width: 350px; height: 150px;", class="texteditor") %]
+                    [% L.textarea_tag('order.notes', SELF.order.notes, wrap="soft", style="width: 350px; height: 150px", class="texteditor") %]
                   </td>
                   <td>
-                    [% L.textarea_tag('order.intnotes', SELF.order.intnotes, wrap="soft", style="width: 350px; height: 150px;") %]
+                    [% L.textarea_tag('order.intnotes', SELF.order.intnotes, wrap="soft", style="width: 350px; height: 150px") %]
                   </td>
                 </tr>
               </table>
@@ -189,7 +189,7 @@
                                       default = SELF.order.payment_id,
                                       with_empty = 1,
                                       title_key = 'description',
-                                      style = 'width: 250px;') %]</td>
+                                      style = 'width: 250px') %]</td>
                 </tr>
                 <tr>
                   <th align="right">[% 'Delivery Terms' | $T8 %]</th>
@@ -198,28 +198,34 @@
                                       default = SELF.order.delivery_term_id,
                                       with_empty = 1,
                                       title_key = 'description',
-                                      style = 'width: 250px;') %]</td>
+                                      style = 'width: 250px') %]</td>
                 </tr>
               </table>
             </td>
 
             <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>
@@ -229,10 +235,6 @@
       </td>
     </tr>
 
-    <tr>
-      <td><hl></td>
-    </tr>
-
   </table>
 
 </div>
@@ -275,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]);
   });
 }