X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/5c859d6455cd282a69bc354bd270efb87e1b8760..b231d037:/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 11a71fb62..c74019a63 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -39,6 +39,8 @@
                                 style='width: 300px') %]</td>
           </tr>
 
+          [%- PROCESS 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>
@@ -108,31 +110,69 @@
           </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) %]</td>
+            <td>[% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11, onchange='kivi.Order.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>[% 'Quotation Number' | $T8 %]</th>
-            <td>[% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11) %]</td>
+            <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 -%]
           </tr>
 
+          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
           <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") -%]
+            [%- 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>[% 'Order Date' | $T8 %]</th>
+            <th width="70%" align="right" nowrap>[% transdate_txt | $T8 %]</th>
             <td>[% L.date_tag('order.transdate', SELF.order.transdate) %]</td>
           </tr>
 
+          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+            [%- SET reqdate_txt = 'Reqdate' -%]
+          [%- ELSIF SELF.type == "sales_quotation" -%]
+            [%- SET reqdate_txt = 'Valid until' -%]
+          [%- ELSE -%]
+            [%- SET reqdate_txt = 'Required by' -%]
+          [%- END -%]
           <tr>
-            <th width="70%" align="right" nowrap>[% 'Reqdate' | $T8 %]</th>
+            <th width="70%" align="right" nowrap>[% reqdate_txt | $T8 %]</th>
             <td>[% L.date_tag('order.reqdate', SELF.order.reqdate) %]</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', SELF.order.expected_billing_date) %]</td>
+          </tr>
+          [%- END %]
+
           <tr>
             <th width="70%" align="right" nowrap>[% 'Insert Date' | $T8 %]</th>
             <td>[% SELF.order.itime_as_date %]</td>
@@ -235,7 +275,7 @@
                 </tr>
                 [%- IF SELF.type == "sales_order" %]
                 <tr>
-                  <th align="right">[%- 'Periodic Invoices' | T8 %]</th>
+                  <th align="right">[%- 'Periodic Invoices' | $T8 %]</th>
                   <td>[% L.button_tag('kivi.Order.show_periodic_invoices_config_dialog()', LxERP.t8('Configure')) %]
                     (<span id='periodic_invoices_status'>[%- SELF.periodic_invoices_status -%]</span>)
                     <a href="doc/html/ch03.html#features.periodic-invoices.variables" target="_blank">?</a>