X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/9103645c7ebcc220d06cd2fa794895ae99dcbf2f..ec440a833155673f0ca453a8ed3079dd78a54fab:/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 1f53f895d..15cc83af4 100644
--- a/templates/webpages/delivery_order/tabs/basic_data.html
+++ b/templates/webpages/delivery_order/tabs/basic_data.html
@@ -53,26 +53,6 @@
 
           [%- PROCESS delivery_order/tabs/_business_info_row.html SELF=SELF %]
 
-          <tr>
-            <th align="right">[% 'Steuersatz' | $T8 %]</th>
-            <td>[% L.select_tag('order.taxzone_id', SELF.all_taxzones, default=SELF.order.taxzone_id, title_key='description', style='width: 300px', class='recalc') %]</td>
-          </tr>
-
-          [% SET currency_id = SELF.order.currency_id || INSTANCE_CONF.get_currency_id  # use default currency for new order %]
-          <tr id="currency_settings">
-            <th align="right">[% 'Currency' | $T8 %]</th>
-            <td>[% L.select_tag('order.currency_id', SELF.all_currencies, default=currency_id, value_key='id', title_key='name') %]</td>
-          </tr>
-          <tr id="exchangerate_settings" [%- IF SELF.order.currency_id==INSTANCE_CONF.get_currency_id %]style='display:none'[%- END %]>
-            <th align="right">[% 'Exchangerate' | $T8 %]</th>
-            <td> 1 <span id="currency_name">[% SELF.order.currency.name %]</span> =
-              [% L.input_tag('order.exchangerate_as_null_number', SELF.order.exchangerate_as_null_number, size="15", class="reformat_number_as_null_number numeric") %]
-              [% INSTANCE_CONF.default_currency %]
-              [% L.hidden_tag('old_currency_id', currency_id) %]
-              [% L.hidden_tag('old_exchangerate', SELF.order.exchangerate_as_null_number) %]
-            </td>
-          </tr>
-
 [%- IF SELF.all_languages.size %]
           <tr>
             <th align="right">[% 'Language' | $T8 %]</th>
@@ -120,10 +100,25 @@
           <tr>
             <td colspan="2" align="center">
               [%- IF SELF.order.id %]
-                <label for="order.delivered">[% 'Delivery Order(s) for full qty created' | $T8 %]</label>
-                [% L.yes_no_tag('order.delivered', SELF.order.delivered) %]
-                <label for="order.closed">[% 'Closed' | $T8 %]</label>
-                [% L.yes_no_tag('order.closed', SELF.order.closed) %]
+                [%- 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>
           </tr>
@@ -146,79 +141,35 @@
           </tr>
           [% END %]
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
           <tr>
-            <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
-            <td>[% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11, onchange='kivi.DeliveryOrder.set_number_in_title(this)') %]</td>
+            <th width="70%" align="right" nowrap>[% 'Delivery Order Number' | $T8 %]</th>
+            <td>[% L.input_tag('order.donumber', SELF.order.donumber, size = 11, onchange='kivi.DeliveryOrder.set_number_in_title(this)') %]</td>
           </tr>
-          [%- END -%]
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]
-            [%- SET quo_nr_txt = 'Quotation Number' -%]
-          [%- ELSE -%]
-            [%- SET quo_nr_txt = 'RFQ Number' -%]
-          [%- END -%]
           <tr>
-            <th width="70%" align="right" nowrap>[% quo_nr_txt | $T8 %]</th>
-            [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
-              <td>[% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11) %]</td>
-            [%- ELSE -%]
-              <td>[% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11, onchange='kivi.DeliveryOrder.set_number_in_title(this)') %]</td>
-            [%- END -%]
+            <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
+            <td>[% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11) %]</td>
           </tr>
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
           <tr>
-            <th width="70%" align="right" nowrap>[% 'Customer Order Number' | $T8 %]</th>
+            <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>
           </tr>
-          [%- END -%]
-
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
-            [%- SET transdate_txt = 'Order Date' -%]
-          [%- ELSIF SELF.type == "sales_quotation" -%]
-            [%- SET transdate_txt = 'Quotation Date' -%]
-          [%- ELSE -%]
-            [%- SET transdate_txt = 'RFQ Date' -%]
-          [%- END -%]
-          <tr>
-            <th width="70%" align="right" nowrap>[% transdate_txt | $T8 %]</th>
-            <td>[% L.date_tag('order.transdate_as_date', SELF.order.transdate_as_date) %]</td>
-          </tr>
 
           <tr>
-            <th width="70%" align="right" nowrap>[% 'Tax point' | $T8 %]</th>
-            <td>[% L.date_tag('order.tax_point_as_date', SELF.order.tax_point_as_date, class="recalc") %]</td>
+            <th width="70%" align="right" nowrap>[% 'Delivery Order Date' | $T8 %]</th>
+            <td>[% L.date_tag('order.transdate_as_date', SELF.order.transdate_as_date) %]</td>
           </tr>
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
-            [%- SET reqdate_txt = 'Reqdate'; SET reqdate_class = 'recalc' -%]
-          [%- ELSIF SELF.type == "sales_quotation" -%]
-            [%- SET reqdate_txt = 'Valid until'; SET reqdate_class = '' -%]
-          [%- ELSE -%]
-            [%- SET reqdate_txt = 'Required by'; SET reqdate_class = 'recalc' -%]
-          [%- END -%]
           <tr>
-            <th width="70%" align="right" nowrap>[% reqdate_txt | $T8 %]</th>
+            <th width="70%" align="right" nowrap>[% 'Reqdate' | $T8 %]</th>
             <td>[% L.date_tag('order.reqdate_as_date', SELF.order.reqdate_as_date, class=reqdate_class) %]</td>
           </tr>
 
-          [%- IF SELF.type == "sales_quotation" -%]
-          <tr>
-            <th width="70%" align="right" nowrap>[% 'Order probability' | $T8 %]</th>
-            <td>[%- L.select_tag('order.order_probability', SELF.order_probabilities, title='title', default=SELF.order.order_probability) %]%</td>
-          </tr>
-          <tr>
-            <th width="70%" align="right" nowrap>[% 'Expected billing date' | $T8 %]</th>
-            <td>[%- L.date_tag('order.expected_billing_date_as_date', SELF.order.expected_billing_date_as_date) %]</td>
-          </tr>
-          [%- END %]
-
           <tr>
             <th width="70%" align="right" nowrap>[% 'Insert Date' | $T8 %]</th>
             <td>[% SELF.order.itime_as_date %]</td>
           </tr>
-
         </table>
 
       </td>
@@ -270,11 +221,7 @@
                 <th id="shipped_qty_header_id"  class="listheading" nowrap width="5" ><a href='#' onClick='javascript:kivi.DeliveryOrder.reorder_items("shipped_qty")'>[%- 'Delivered'   | $T8 %]</a></th>
                 [%- 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" >[%- 'Price Factor' | $T8 %] </th>
                 <th class="listheading" nowrap width="5" >[%- 'Unit'         | $T8 %] </th>
-                <th id="sellprice_header_id"   class="listheading" nowrap width="15" ><a href='#' onClick='javascript:kivi.DeliveryOrder.reorder_items("sellprice")'> [%- 'Price'       | $T8 %]</a></th>
-                <th id="discount_header_id"    class="listheading" nowrap width="15" ><a href='#' onClick='javascript:kivi.DeliveryOrder.reorder_items("discount")'>  [%- 'Discount'    | $T8 %]</a></th>
-                <th class="listheading" nowrap width="10">[%- 'Extended'     | $T8 %] </th>
               </tr>
             </thead>