X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/d6f17d11b9affd401e97c3e79360aa20afb59f1d..eeb5375ee7727c956cc357cc8f90b19d1bfe80b9:/templates/webpages/part/_basic_data.html

diff --git a/templates/webpages/part/_basic_data.html b/templates/webpages/part/_basic_data.html
index fca9bb79e..77351e159 100644
--- a/templates/webpages/part/_basic_data.html
+++ b/templates/webpages/part/_basic_data.html
@@ -19,7 +19,7 @@
             <table id="ic3">
              <tr>
               <th align="right">[% 'Part Number' | $T8 %]</th>
-              <td>[% L.input_tag("part.partnumber", SELF.part.partnumber, size=40, class="initial_focus") %]</td>
+              <td>[% L.input_tag("part.partnumber", SELF.part.partnumber, size=40, class="initial_focus", "data-validate"="trimmed_whitespaces") %]</td>
              </tr>
              <tr>
               <th align="right">[% 'Part Classification' | $T8 %]</th>
@@ -28,12 +28,16 @@
              <tr>
               <th align="right">[% 'Part Description' | $T8 %]</th>
               <td>
-               [% L.areainput_tag("part.description", SELF.part.description, size=40) %]</td>
+               [% L.areainput_tag("part.description", SELF.part.description, size=40) %]
               </td>
              </tr>
              <tr>
                <th align="right">[% 'EAN-Code' | $T8 %]</th>
-               <td>[% L.input_tag("part.ean", SELF.part.ean, size=40) %]</td>
+               <td>[% L.input_tag("part.ean", SELF.part.ean, size=40, "data-validate"="trimmed_whitespaces") %]</td>
+             </tr>
+             <tr>
+               <th align="right">[% 'Tariff Code' | $T8 %]</th>
+               <td>[% L.input_tag("part.tariff_code", SELF.part.tariff_code, size=40, "data-validate"="trimmed_whitespaces") %]</td>
              </tr>
              <tr>
               [%- IF SELF.all_partsgroups.size %]
@@ -75,6 +79,18 @@
                  <textarea id="part.formel" name="part.formel" rows="[% HTML.escape(notes_rows) %]" cols="30" wrap="soft" class="tooltipster-html" title="[% 'The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br>' | $T8 %]">[% HTML.escape(SELF.part.formel) %]</textarea>
                </td>
              </tr>
+             [% IF CUSTOM_VARIABLES_FIRST_TAB %]
+              <tr><td>[% 'Unchecked custom variables will not appear in orders and invoices.' | $T8 %]</td></tr>
+               [%- FOREACH var = CUSTOM_VARIABLES_FIRST_TAB %]
+               <tr>
+                <td align="left" valign="top">[% var.VALID_BOX %]
+                [%- IF !var.partsgroup_filtered %]
+                  [% HTML.escape(var.description) %]
+                [%- END %]
+               </tr>
+               <tr><td>[% var.HTML_CODE %]</td></tr>
+               [%- END %]
+             [% END %]
             </table>
            </td>
           </tr>
@@ -84,35 +100,52 @@
         <td>
          <table id="ic5">
           <tr>
-           <th align="right" nowrap="true">[% 'Updated' | $T8 %]</th>
+           <th align="right" nowrap="true">[% 'Price updated' | $T8 %]</th>
            <td>
-           [% SELF.part.priceupdate.to_kivitendo | html %]
+           [% SELF.part.last_price_update.valid_from.to_kivitendo | html %]
            </td>
           </tr>
 
           <tr>
            <th align="right" nowrap="true">[% 'List Price' | $T8 %]</th>
-           <td>[% L.input_tag("part.listprice_as_number", SELF.part.listprice_as_number, size=11 class='reformat_number numeric') %]</td>
+           <td>
+            [% IF (AUTH.assert('part_service_assembly_edit_prices', 'may_fail')) %]
+             [% L.input_tag("part.listprice_as_number", SELF.part.listprice_as_number, size=11 class='reformat_number numeric') %]</td>
+            [% ELSE %]
+             <span class="numeric">[% SELF.part.listprice_as_number %]</span>
+            [% END %]
           </tr>
 
           <tr  >
            <th align="right" nowrap="true">[% 'Sell Price' | $T8 %]</th>
-           <td>[% L.input_tag("part.sellprice_as_number", SELF.part.sellprice_as_number, size=11, class='reformat_number numeric') %] [% IF (SELF.part.is_assortment or SELF.part.is_assembly) %] (<span id="items_sellprice_sum_basic">[% LxERP.format_amount(SELF.part.items_sellprice_sum, 2) %]</span>) [% END %]</td>
+           <td>
+            [% IF (AUTH.assert('part_service_assembly_edit_prices', 'may_fail')) %]
+             [% L.input_tag("part.sellprice_as_number", SELF.part.sellprice_as_number, size=11, class='reformat_number numeric') %]
+             [% IF (SELF.part.is_assortment or SELF.part.is_assembly) %] (<span id="items_sellprice_sum_basic">[% LxERP.format_amount(SELF.part.items_sellprice_sum, 2) %]</span>) [% END %]
+            [% ELSE %]
+             <span class="numeric">[% SELF.part.sellprice_as_number %]</span>
+            [% END %]
+           </td>
           </tr>
-
-          [%- UNLESS SELF.part.is_assembly %]
           <tr>
            <th align="right" nowrap="true">[% 'Last Cost' | $T8 %]</th>
-           <td>[% L.input_tag("part.lastcost_as_number", SELF.part.lastcost_as_number, size=11 class='reformat_number numeric') %]
-           [% IF SELF.part.is_assortment %] (<span id="items_lastcost_sum_basic">[% LxERP.format_amount(SELF.part.items_lastcost_sum, 2) %]</span>) [% END %]</td>
+           <td>
+            [%- UNLESS SELF.part.is_assembly %]
+             [% IF (AUTH.assert('part_service_assembly_edit_prices', 'may_fail')) %]
+              [% L.input_tag("part.lastcost_as_number", SELF.part.lastcost_as_number, size=11 class='reformat_number numeric') %]
+             [% ELSE %]
+              <span class="numeric">[% SELF.part.lastcost_as_number %]</span>
+            [% END %]
+            [%- END %]
+            [% IF SELF.part.is_assortment || SELF.part.is_assembly %] (<span id="items_lastcost_sum_basic">[% LxERP.format_amount(SELF.part.items_lastcost_sum, 2) %]</span>) [% END %]
+           </td>
           </tr>
-          [%- END %]
 
           [%- IF SELF.all_price_factors.size %]
           <tr>
            <th align="right">[% 'Price Factor' | $T8 %]</th>
            <td>
-            [%- L.select_tag('part.price_factor_id', SELF.all_price_factors, default=SELF.part.price_factor_id, title_key='description', value_key='id', with_empty=1) %]</td>
+            [%- L.select_tag('part.price_factor_id', SELF.all_price_factors, default=SELF.part.price_factor_id, title_key='description', value_key='id', with_empty=1) %]
            </td>
           </tr>
           [%- END %]
@@ -121,7 +154,7 @@
            <th align="right" nowrap="true">[% 'Unit' | $T8 %]</th>
            <td>
             [%- IF !SELF.part.id or SELF.part.orphaned # same logic as unit_changable %]
-            [%- L.select_tag('part.unit', SELF.all_units, default=SELF.part.unit, title_key='name', value_key='name') %]</td>
+            [%- L.select_tag('part.unit', SELF.all_units, default=SELF.part.unit, title_key='name', value_key='name') %]
             [%- ELSE %]
             [% L.hidden_tag('part.unit', SELF.part.unit) %] [% HTML.escape(SELF.part.unit) %]
             [%- END %]
@@ -133,7 +166,7 @@
            <th align="right" nowrap="true">[% 'Weight' | $T8 %]</th>
            <td>
             [%- IF SELF.part.is_assembly %]
-              [% LxERP.format_amount(SELF.part.weight) %]
+              <span id="items_weight_sum_basic">[% LxERP.format_amount(SELF.part.weight) %]</span>
             [% ELSE %]
               [% L.input_tag('part.weight_as_number', SELF.part.weight_as_number, size=10, class='reformat_number numeric') %]
             [% END %]
@@ -148,6 +181,10 @@
            <th align="right" nowrap="true">[% 'ROP' | $T8 %]</th>
            <td>[% L.input_tag("part.rop_as_number", SELF.part.rop_as_number, size=10, class="reformat_number numeric") %]</td>
           </tr>
+          <tr>
+           <th align="right" nowrap="true">[% 'Order Size' | $T8 %]</th>
+           <td>[% L.input_tag("part.order_qty_as_number", SELF.part.order_qty_as_number, size=10, class="numeric") %]</td>
+          </tr>
           [% IF SELF.all_warehouses.size %]
           <tr>
            <th align="right" nowrap="true">[% 'Default Warehouse' | $T8 %]</th>
@@ -160,7 +197,7 @@
            <td>
             <span id='bin'>
             [% IF SELF.part.warehouse.id %]
-            [% L.select_tag('part.bin_id', SELF.part.warehouse.bins, default=SELF.part.bin.id, title_key='description') %]
+            [% L.select_tag('part.bin_id', SELF.part.warehouse.bins_sorted_naturally, default=SELF.part.bin.id, title_key='description', with_empty=0) %]
             [%- END %]
             </span>
            </td>
@@ -178,6 +215,10 @@
            <th align="right" nowrap><label for="not_discountable">[% 'Not Discountable' | $T8 %]</label></th>
            <td>[% L.checkbox_tag('part.not_discountable', checked = SELF.part.not_discountable, for_submit=1) %]</td>
           </tr>
+          <tr>
+           <th align="right" nowrap="true"><label for="order_locked">[% 'Do not order anymore' | $T8 %]</label></th>
+           <td>[% L.checkbox_tag('part.order_locked', checked = SELF.part.order_locked, for_submit=1) %]</td>
+          </tr>
         [%- IF SELF.part.id %]
           <tr>
            <th align="right" nowrap="true"><label for="obsolete">[% 'Obsolete' | $T8 %]</label></th>
@@ -207,30 +248,24 @@
       <table id="ic6">
        <tr>
         <th align="right" nowrap>[% 'Image' | $T8 %]</th>
-        <td>[% L.input_tag("part.image", SELF.part.image, size=40) %]</td>
+        <td>[% L.input_tag("part.image", SELF.part.image, size=40, "data-validate"="trimmed_whitespaces") %]</td>
         <th align="right" nowrap>[% 'Microfiche' | $T8 %]</th>
-        <td>[% L.input_tag("part.microfiche", SELF.part.microfiche, size=20) %]</td>
+        <td>[% L.input_tag("part.microfiche", SELF.part.microfiche, size=20, "data-validate"="trimmed_whitespaces") %]</td>
        </tr>
        <tr>
         <th align="right" nowrap>[% 'Drawing' | $T8 %]</th>
-        <td>[% L.input_tag("part.drawing", SELF.part.drawing, size=40) %]</td>
+        <td>[% L.input_tag("part.drawing", SELF.part.drawing, size=40, "data-validate"="trimmed_whitespaces") %]</td>
        </tr>
       </table>
      </td>
     </tr>
 
-<div id="pricegroups">
  [% PROCESS 'part/_pricegroup_prices.html' %]
-</div>
-
-<div id="customerprices">
  [% PROCESS 'part/_customerprices.html' %]
-</div>
 [%- UNLESS SELF.part.is_assembly %]
-<div id="makemodel">
  [% PROCESS 'part/_makemodel.html' %]
-</div>
 [% END %]
+ [% PROCESS 'part/_businessmodels.html' %]
 
   <tr>
     <td><hr size="3" noshade></td>