X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/ec440a833155673f0ca453a8ed3079dd78a54fab..HEAD:/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 15cc83af4..698a07868 100644
--- a/templates/webpages/delivery_order/tabs/basic_data.html
+++ b/templates/webpages/delivery_order/tabs/basic_data.html
@@ -15,8 +15,8 @@
             <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') %]
-              [% P.button_tag("kivi.DeliveryOrder.show_vc_details_dialog()", LxERP.t8("Details (one letter abbreviation)")) %]
+              [% P.customer_vendor.picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv, style='width: 300px',
+                   show_details="1") %]
             </td>
           </tr>
 
@@ -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>
@@ -151,6 +129,24 @@
             <td>[% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11) %]</td>
           </tr>
 
+          [%- IF SELF.type == 'purchase_delivery_order' %]
+          <tr>
+            <th width="70%" align="right" nowrap>[% 'Order Confirmation Number' | $T8 %]</th>
+            [%-
+              numbers = [];
+              FOREACH p = SELF.order.preceding_purchase_order_confirmations();
+                numbers.push(HTML.escape(p.ordnumber));
+              END;
+            %]
+            <td>[% numbers.join(', ') %]</td>
+          </tr>
+
+          <tr>
+            <th width="70%" align="right" nowrap>[% 'Vendor Confirmation Number' | $T8 %]</th>
+            <td>[% L.input_tag('order.vendor_confirmation_number', SELF.order.vendor_confirmation_number, size = 11) %]</td>
+          </tr>
+          [%- END %]
+
           <tr>
             <th width="70%" align="right" nowrap>[% IF SELF.type_data.properties('is_customer') %][% 'Customer Order Number' | $T8 %][% ELSE %][% 'Vendor Order Number' | $T8 %][% END %]</th>
             <td>[% L.input_tag('order.cusordnumber', SELF.order.cusordnumber, size = 11) %]</td>
@@ -222,6 +218,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 +291,10 @@
 
   </table>
 
+  [% L.hidden_tag('order.currency_id', SELF.order.currency_id) %]
+  [% L.hidden_tag('order.taxzone_id', SELF.order.taxzone_id) %]
+  [% L.hidden_tag('order.taxincluded', SELF.order.taxincluded) %]
+
 </div>
 
 [% L.sortable_element('#row_table_id') %]