DeliveryOrder: ein/auslagern in basic-data auf type data gemappt

[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 15cc83af46566f7fff23adcf2f30821ed393531c..4e0a8ceb09ae8f0acc660dad1a9c6279bef3d305 100644 (file)
--- a/templates/webpages/delivery_order/tabs/basic_data.html
+++ b/templates/webpages/delivery_order/tabs/basic_data.html
@@ -101,13 +101,13 @@
             <td colspan="2" align="center">
               [%- IF SELF.order.id %]
                 [%- IF SELF.order.delivered %]
-                  [%- IF is_customer %]
+                  [%- IF SELF.type_data.transfer == 'out' %]
                   [% 'transferred out' | $T8 %]
                   [%- ELSE %]
                   [% 'transferred in' | $T8 %]
                   [%- END %]
                 [%- ELSE %]
-                  [%- IF is_customer %]
+                  [%- IF SELF.type_data.transfer == 'out' %]
                   [% 'not transferred out yet' | $T8 %]
                   [%- ELSE %]
                   [% 'not transferred in yet' | $T8 %]
@@ -222,6 +222,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>
 
@@ -289,6 +295,8 @@
 
   </table>
 
+  [% L.hidden_tag('order.taxzone_id', SELF.order.taxzone_id) %]
+
 </div>
 
 [% L.sortable_element('#row_table_id') %]