Auftrags-Controller: Einstellungen/Höhe des Scrollbereichs berücksichtigen …

[mfinanz.git] / 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 c968a94732b8509f9827c878135c3b3c71225e95..7966271a412847926e9d06234581ed856d2bb322 100644 (file)
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -12,7 +12,7 @@
       <td>
         <table width="100%">
           <tr>
-            <th align="right">[% SELF.cv | $T8 %]</th>
+            <th align="right">[%- SELF.cv == "customer" ? LxERP.t8('Customer') : LxERP.t8('Vendor') -%]</th>
             [% SET cv_id = SELF.cv _ '_id' %]
             <td>
               [% P.customer_vendor.picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv, style='width: 300px') %]
@@ -150,7 +150,7 @@
           [%- END -%]
           <tr>
             <th width="70%" align="right" nowrap>[% transdate_txt | $T8 %]</th>
-            <td>[% L.date_tag('order.transdate', SELF.order.transdate) %]</td>
+            <td>[% L.date_tag('order.transdate_as_date', SELF.order.transdate_as_date) %]</td>
           </tr>
 
           [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
@@ -162,7 +162,7 @@
           [%- END -%]
           <tr>
             <th width="70%" align="right" nowrap>[% reqdate_txt | $T8 %]</th>
-            <td>[% L.date_tag('order.reqdate', SELF.order.reqdate) %]</td>
+            <td>[% L.date_tag('order.reqdate_as_date', SELF.order.reqdate_as_date) %]</td>
           </tr>
 
           [%- IF SELF.type == "sales_quotation" -%]
@@ -172,7 +172,7 @@
           </tr>
           <tr>
             <th width="70%" align="right" nowrap>[% 'Expected billing date' | $T8 %]</th>
-            <td>[%- L.date_tag('order.expected_billing_date', SELF.order.expected_billing_date) %]</td>
+            <td>[%- L.date_tag('order.expected_billing_date_as_date', SELF.order.expected_billing_date_sa_date) %]</td>
           </tr>
           [%- END %]
 
@@ -194,8 +194,12 @@
   <table width="100%">
     <tr>
       <td>
-
-        <div id="row_table_scroll_id" style="overflow-y: auto; height: 25vh">
+        [%- IF SELF.positions_scrollbar_height -%]
+          [%- SET scroll_style = 'style="overflow-y: auto; height:' _ SELF.positions_scrollbar_height _ 'vh;"' -%]
+        [%- ELSE -%]
+          [%- SET scroll_style = '' -%]
+        [%- END -%]
+        <div id="row_table_scroll_id" [%- scroll_style -%]>
           <table id="row_table_id" width="100%">
             <thead>
               <tr class="listheading">
@@ -212,6 +216,9 @@
                 <th id="partnumber_header_id"  class="listheading" nowrap width="15"><a href='#' onClick='javascript:kivi.Order.reorder_items("partnumber")'> [%- 'Partnumber'  | $T8 %]</a></th>
                 <th id="partclass_header_id"   class="listheading" nowrap width="2">[%- 'Type'  | $T8 %]</th>
                 <th id="description_header_id" class="listheading" nowrap           ><a href='#' onClick='javascript:kivi.Order.reorder_items("description")'>[%- 'Description' | $T8 %]</a></th>
+                [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+                <th id="shipped_qty_header_id" class="listheading" nowrap width="5" ><a href='#' onClick='javascript:kivi.Order.reorder_items("shipped_qty")'>[%- 'Delivered'   | $T8 %]</a></th>
+                [%- END -%]
                 <th id="qty_header_id"         class="listheading" nowrap width="5" ><a href='#' onClick='javascript:kivi.Order.reorder_items("qty")'>        [%- 'Qty'         | $T8 %]</a></th>
                 <th class="listheading" nowrap width="5" >[%- 'Price Factor' | $T8 %] </th>
                 <th class="listheading" nowrap width="5" >[%- 'Unit'         | $T8 %] </th>
@@ -223,7 +230,7 @@
             </thead>
 
             [%- 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 %]
 
           </table>
@@ -288,6 +295,27 @@
               </table>
             </td>
 
+            [%- IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]
+            [%- SET marge_class = (SELF.order.marge_total < 0) ? 'plus0' : '' -%]
+            <td>
+              <table>
+                <tr>
+                  <th  align="left">[% 'Ertrag' | $T8 %]</th>
+                  <td align="right">
+                    [%- L.div_tag(SELF.order.marge_total_as_number, id='marge_total_id', class=marge_class) %]
+                  </td>
+                </tr>
+                <tr>
+                  <th  align="left">[% 'Ertrag prozentual' | $T8 %]</th>
+                  <td align="right">
+                    [%- L.div_tag(LxERP.format_amount(SELF.order.marge_percent, 2), id='marge_percent_id', class=marge_class) %]
+                  </td>
+                  <td>[%- L.div_tag('%', id='marge_percent_sign_id', class=marge_class) %]</td>
+                </tr>
+              </table>
+            </td>
+            [%- END %]
+
             <td align="right">
               <table>
                 <tr id="taxincluded_row_id" [%- IF !SELF.taxes.size %]style="display:none"[%- END %]>