X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/bd3ddb3abf7d621a428b2da42e378324ac417acc..HEAD:/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 383f07554..79aabd8ad 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/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.Order.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, show_details="1",
+                   style='width: 300px') %]
             </td>
           </tr>
 
@@ -31,16 +31,40 @@
                                 style='width: 300px') %]</td>
           </tr>
 
-          <tr id='shipto_row' [%- IF !SELF.order.${SELF.cv}.shipto.size %]style='display:none'[%- END %]>
+          <tr>
             <th align="right">[% 'Shipping Address' | $T8 %]</th>
-            <td>[% L.select_tag('order.shipto_id',
-                                SELF.order.${SELF.cv}.shipto,
-                                default=SELF.order.shipto_id,
-                                title_key='displayable_id',
-                                value_key='shipto_id',
-                                with_empty=1,
-                                style='width: 300px') %]</td>
+            <td>
+              <span id='shipto_selection' [%- IF !SELF.order.${SELF.cv}.shipto.size %]style='display:none'[%- END %]>
+                [% shiptos = [ { shipto_id => "", displayable_id => LxERP.t8("No/individual shipping address") } ] ;
+                   FOREACH s = SELF.order.${SELF.cv}.shipto ;
+                     shiptos.push(s) ;
+                   END ;
+                   L.select_tag('order.shipto_id',
+                                 shiptos,
+                                 default=SELF.order.shipto_id,
+                                 title_key='displayable_id',
+                                 value_key='shipto_id',
+                                 with_empty=0,
+                                 style='width: 300px') %]
+              </span>
+              [% L.button_tag("kivi.Order.edit_custom_shipto()", LxERP.t8("Custom shipto")) %]
+            </td>
+          </tr>
+
+          [%- IF SELF.cv == "customer" %]
+          <tr id="billing_address_row"[% IF !SELF.order.customer.additional_billing_addresses.as_list.size %] style="display:none"[% END %]>
+            <th align="right">[% 'Custom Billing Address' | $T8 %]</th>
+            <td>
+              [% L.select_tag('order.billing_address_id',
+                               SELF.order.customer.additional_billing_addresses,
+                               default=SELF.order.billing_address_id,
+                               title_key='displayable_id',
+                               value_key='id',
+                               with_empty=1,
+                               style='width: 300px') %]
+            </td>
           </tr>
+          [%- END %]
 
           [%- PROCESS order/tabs/_business_info_row.html SELF=SELF %]
 
@@ -50,32 +74,30 @@
           </tr>
 
           [% SET currency_id = SELF.order.currency_id || INSTANCE_CONF.get_currency_id  # use default currency for new order %]
-          [% IF SELF.order.exchangerate %]
-            [% SET exchangerate = SELF.order.exchangerate_as_null_number %]
-          [% END %]
+          [% 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 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> =
-              <span id="exchangerate_text">
-              [% IF exchangerate %]
-                [% HTML.escape(exchangerate) %]
-              [% END %]
-              </span>
-              [% IF currency_id==INSTANCE_CONF.get_currency_id || SELF.order.exchangerate %]
-                [% L.input_tag('order.exchangerate_as_null_number', '', size="15", class="reformat_number numeric", style='display:none', disabled=1) %]
-              [% ELSE %]
-                [% L.input_tag('order.exchangerate_as_null_number', 0, size="15", class="reformat_number numeric") %]
-              [% END %]
+              [% 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', exchangerate) %]
+              [% 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>
+            <td>
+              [% L.select_tag('order.language_id', SELF.all_languages, default=SELF.order.language_id, title_key='description', with_empty=1, style='width:300px') %]
+            </td>
+          </tr>
+[%- END %]
+
 [%- IF SELF.all_departments.size %]
           <tr>
             <th align="right">[% 'Department' | $T8 %]</th>
@@ -97,7 +119,7 @@
 
           <tr>
             <th align="right">[% 'Transaction description' | $T8 %]</th>
-            <td>[% L.input_tag('order.transaction_description', SELF.order.transaction_description, style='width: 300px') %]</td>
+            <td>[% L.input_tag('order.transaction_description', SELF.order.transaction_description, 'data-validate'=INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : '', style='width: 300px') %]</td>
           </tr>
 
           <tr>
@@ -122,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>
 
@@ -136,41 +171,80 @@
             <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>
-            <td>[% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11, onchange='kivi.Order.set_number_in_title(this)') %]</td>
+            <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)') %]
+              [%- ELSIF SELF.order.id %]
+                [% HTML.escape(SELF.order.ordnumber) %]
+                [% L.hidden_tag("order.ordnumber", SELF.order.ordnumber) %]
+              [% ELSE %]
+                [% LxERP.t8("will be set upon saving") %]
+              [%- END %]
+            </td>
           </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' -%]
           [%- 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.Order.set_number_in_title(this)') %]</td>
-            [%- END -%]
+            <td>
+              [%- 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)') %]
+              [%- ELSIF SELF.order.id %]
+                [% HTML.escape(SELF.order.quonumber) %]
+                [% L.hidden_tag("order.quonumber", SELF.order.quonumber) %]
+              [% ELSE %]
+                [% LxERP.t8("will be set upon saving") %]
+              [%- END %]
+            </td>
+          </tr>
+
+          [%- 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" || 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>[% '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' -%]
@@ -180,16 +254,21 @@
             <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' -%]
+          <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>
+          </tr>
+
+          [%- 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_txt = 'Valid until'; SET reqdate_class = '' -%]
           [%- ELSE -%]
-            [%- SET reqdate_txt = 'Required by' -%]
+            [%- SET reqdate_txt = 'Required by'; SET reqdate_class = 'recalc' -%]
           [%- END -%]
           <tr>
             <th width="70%" align="right" nowrap>[% reqdate_txt | $T8 %]</th>
-            <td>[% L.date_tag('order.reqdate_as_date', SELF.order.reqdate_as_date) %]</td>
+            <td>[% L.date_tag('order.reqdate_as_date', SELF.order.reqdate_as_date, class=reqdate_class) %]</td>
           </tr>
 
           [%- IF SELF.type == "sales_quotation" -%]
@@ -199,7 +278,7 @@
           </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_sa_date) %]</td>
+            <td>[%- L.date_tag('order.expected_billing_date_as_date', SELF.order.expected_billing_date_as_date) %]</td>
           </tr>
           [%- END %]
 
@@ -214,9 +293,11 @@
     </tr>
   </table>
 
+  [%- IF order_item_input_position == 0 -%]
   [%- PROCESS order/tabs/_item_input.html SELF=SELF %]
 
-  [% L.button_tag('kivi.Order.show_multi_items_dialog()', LxERP.t8('Add multiple items')) %]
+  [% L.button_tag('kivi.Order.open_multi_items_dialog()', LxERP.t8('Add multiple items')) %]
+  [%- END -%]
 
   <table width="100%">
     <tr>
@@ -255,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>
@@ -272,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>
@@ -334,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>