X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/ff159a4d47b9a2d10744dcfc23da2c63605c8a32..eeb5375ee7727c956cc357cc8f90b19d1bfe80b9:/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 431490204..79aabd8ad 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -15,9 +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.Order.show_vc_details_dialog()", LxERP.t8("Details (one letter abbreviation)")) %]
-              [% P.link_tag(SELF.url_for(controller='CustomerVendor', action='edit', 'id'=SELF.order.$cv_id, 'db'=SELF.cv), LxERP.t8('Edit'), target="_blank", title=LxERP.t8('Open in new window')) %]
+              [% P.customer_vendor.picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv, show_details="1",
+                   style='width: 300px') %]
             </td>
           </tr>
 
@@ -75,14 +74,15 @@
           </tr>
 
           [% SET currency_id = SELF.order.currency_id || INSTANCE_CONF.get_currency_id  # use default currency for new order %]
+          [% SET show_exchangerate = (SELF.order.currency_id !=INSTANCE_CONF.get_currency_id) %]
           <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 %]>
+          <tr id="exchangerate_settings" [%- IF !show_exchangerate %]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") %]
+              [% L.input_tag('order.exchangerate_as_null_number', SELF.order.exchangerate_as_null_number, 'data-validate'=show_exchangerate ? 'required' : '', 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) %]
@@ -144,11 +144,24 @@
             </td>
           </tr>
 
+          [%- IF SELF.all_statuses.size %]
+          <tr>
+            <th align="right">[% 'Status' | $T8 %]</th>
+            <td>[% L.select_tag('order.order_status_id',
+              SELF.all_statuses,
+              default=SELF.order.order_status_id,
+              with_empty=1,
+              style='width:100%',
+              title_key='name') %]</td>
+          </tr>
+          [%- END -%]
+
           <tr>
             <th align="right">[% 'Employee' | $T8 %]</th>
             <td>[% L.select_tag('order.employee_id',
               SELF.all_employees,
               default=(SELF.order.employee_id ? SELF.order.employee_id : SELF.current_employee_id),
+              style='width:100%',
               title_key='safe_name') %]</td>
           </tr>
 
@@ -158,13 +171,14 @@
             <td>[% L.select_tag('order.salesman_id',
               SELF.all_salesmen,
               default=(SELF.order.salesman_id ? SELF.order.salesman_id : SELF.current_employee_id),
+              style='width:100%',
               title_key='safe_name') %]</td>
           </tr>
           [% END %]
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+          [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
           <tr>
-            <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
+            <th width="70%" align="right" nowrap>[% IF SELF.type == "purchase_order_confirmation" %][% 'Order Confirmation Number' | $T8 %][% ELSE %][% 'Order Number' | $T8 %][% END %]</th>
             <td>
               [%- IF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
                 [% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11, onchange='kivi.Order.set_number_in_title(this)') %]
@@ -178,7 +192,20 @@
           </tr>
           [%- END -%]
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]
+          [% IF SELF.type == "purchase_order_confirmation" %]
+          <tr>
+            <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
+            [%-
+              numbers = [];
+              FOREACH p = SELF.order.preceding_purchase_orders();
+                numbers.push(HTML.escape(p.ordnumber));
+              END;
+              %]
+            <td>[% numbers.join(', ') %]</td>
+          </tr>
+          [% END %]
+
+          [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "sales_quotation" || SELF.type == "purchase_quotation_intake") -%]
             [%- SET quo_nr_txt = 'Quotation Number' -%]
           [%- ELSE -%]
             [%- SET quo_nr_txt = 'RFQ Number' -%]
@@ -186,7 +213,7 @@
           <tr>
             <th width="70%" align="right" nowrap>[% quo_nr_txt | $T8 %]</th>
             <td>
-              [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+              [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
                 [% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11) %]
               [%- ELSIF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
                 [% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11, onchange='kivi.Order.set_number_in_title(this)') %]
@@ -199,16 +226,25 @@
             </td>
           </tr>
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+          [%- IF (SELF.type == "purchase_order_confirmation") -%]
+          <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 -%]
+
+          [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
           <tr>
             <th width="70%" align="right" nowrap>[% 'Customer Order Number' | $T8 %]</th>
             <td>[% L.input_tag('order.cusordnumber', SELF.order.cusordnumber, size = 11) %]</td>
           </tr>
           [%- END -%]
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+          [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
             [%- SET transdate_txt = 'Order Date' -%]
-          [%- ELSIF SELF.type == "sales_quotation" -%]
+          [%- ELSIF SELF.type == "purchase_order_confirmation" -%]
+            [%- SET transdate_txt = 'Confirmation Date' -%]
+          [%- ELSIF (SELF.type == "sales_quotation" || SELF.type == "purchase_quotation_intake") -%]
             [%- SET transdate_txt = 'Quotation Date' -%]
           [%- ELSE -%]
             [%- SET transdate_txt = 'RFQ Date' -%]
@@ -223,7 +259,7 @@
             <td>[% L.date_tag('order.tax_point_as_date', SELF.order.tax_point_as_date, class="recalc") %]</td>
           </tr>
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+          [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
             [%- SET reqdate_txt = 'Reqdate'; SET reqdate_class = 'recalc' -%]
           [%- ELSIF SELF.type == "sales_quotation" -%]
             [%- SET reqdate_txt = 'Valid until'; SET reqdate_class = '' -%]
@@ -257,9 +293,11 @@
     </tr>
   </table>
 
+  [%- IF order_item_input_position == 0 -%]
   [%- PROCESS order/tabs/_item_input.html SELF=SELF %]
 
   [% L.button_tag('kivi.Order.open_multi_items_dialog()', LxERP.t8('Add multiple items')) %]
+  [%- END -%]
 
   <table width="100%">
     <tr>
@@ -298,7 +336,7 @@
                 [%- END -%]
                 <th id="partclass_header_id"    class="listheading" nowrap width="2">[%- 'Type'  | $T8 %]</th>
                 <th id="description_header_id"  class="listheading" nowrap           ><a href='#' onClick='javascript:kivi.Order.reorder_items("description")'>[%- 'Description' | $T8 %]</a></th>
-                [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+                [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
                 <th id="shipped_qty_header_id"  class="listheading" nowrap width="5" ><a href='#' onClick='javascript:kivi.Order.reorder_items("shipped_qty")'>[%- 'Delivered'   | $T8 %]</a></th>
                 [%- END -%]
                 <th id="qty_header_id"          class="listheading" nowrap width="5" ><a href='#' onClick='javascript:kivi.Order.reorder_items("qty")'>        [%- 'Qty'         | $T8 %]</a></th>
@@ -315,13 +353,23 @@
               [%- PROCESS order/tabs/_row.html ITEM=item ID=(item.id||item.new_fake_id)  -%]
             [%- END %]
 
+            <tbody id="row_table_footer" class="listrow">
+            [% IF order_item_input_position == 1 %]
+              [%- PROCESS order/tabs/_item_below_input.html SELF=SELF %]
+            [%- END -%]
+            </tbody>
+
           </table>
+          [% IF order_item_input_position == 1 %]
+            [% L.button_tag('kivi.Order.open_multi_items_dialog()', LxERP.t8('Add multiple items')) %]
+          [%- END -%]
         </div>
-
       </td>
     </tr>
 
     <tr>
+      <td>
+      </td>
     </tr>
 
     <tr>
@@ -377,8 +425,8 @@
               </table>
             </td>
 
-            [%- IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]
-            [%- SET marge_class = (SELF.order.marge_total < 0) ? 'plus0' : '' -%]
+            [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]
+            [%- SET marge_class = ((SELF.order.marge_total || 0) < 0) ? 'plus0' : '' -%]
             <td>
               <table>
                 <tr>