Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[mfinanz.git] / templates / webpages / delivery_order / tabs / basic_data.html

diff --git a/templates/webpages/delivery_order/tabs/basic_data.html b/templates/webpages/delivery_order/tabs/basic_data.html
index ed2f753c9c526388c773b01cf7fd1429db2123b9..f4c052bfc192f553f9054f5249db6e46b0e0b4a2 100644 (file)
--- a/templates/webpages/delivery_order/tabs/basic_data.html
+++ b/templates/webpages/delivery_order/tabs/basic_data.html
@@ -98,29 +98,7 @@
         <table>
 
           <tr>
-            <td colspan="2" align="center">
-              [%- IF SELF.order.id %]
-                [%- IF SELF.order.delivered %]
-                  [%- IF is_customer %]
-                  [% 'transferred out' | $T8 %]
-                  [%- ELSE %]
-                  [% 'transferred in' | $T8 %]
-                  [%- END %]
-                [%- ELSE %]
-                  [%- IF is_customer %]
-                  [% 'not transferred out yet' | $T8 %]
-                  [%- ELSE %]
-                  [% 'not transferred in yet' | $T8 %]
-                  [%- END %]
-                [%- END %]
-               ;
-                [%- IF SEF.order.closed %]
-                  [% 'Closed' | $T8 %]
-                [%- ELSE %]
-                  [% 'Open' | $T8 %]
-                [%- END %]
-              [%- END %]
-            </td>
+            <td colspan="2" align="center" id="data-status-line">[% SELF.order.presenter.status_line %]</td>
           </tr>
 
           <tr>
@@ -222,6 +200,12 @@
                 [%- END -%]
                 <th id="qty_header_id"          class="listheading" nowrap width="5" ><a href='#' onClick='javascript:kivi.DeliveryOrder.reorder_items("qty")'>        [%- 'Qty'         | $T8 %]</a></th>
                 <th class="listheading" nowrap width="5" >[%- 'Unit'         | $T8 %] </th>
+                [% IF in_out == 'in' %]
+                <th class="listheading" nowrap width="5" >[%- 'Transfer To Stock' | $T8 %] </th>
+                [% END %]
+                [% IF in_out == 'out' %]
+                <th class="listheading" nowrap width="5" >[%- 'Release From Stock' | $T8 %] </th>
+                [% END %]
               </tr>
             </thead>