X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/03d66bba7bc816a9cc1e0dbbb09fa36f039e77d4..825883e4f5b2df7e971fdc27fb290c41fc05f8be:/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 8e4776ca6..7966271a4 100644
--- 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">
@@ -291,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 %]>