X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Forder%2Ftabs%2F_row.html;h=f000ba6fdd0d63f03a194dae8b08f4fc17fb2ce2;hb=0aa885f4f0bb531a7691a641f954ff296ffa04a5;hp=bfd14cc3f6af88547217ddc9b698451c542d5f4d;hpb=ed04f337a0e565a3d0621a10bd273298e33c7fa1;p=kivitendo-erp.git

diff --git a/templates/webpages/order/tabs/_row.html b/templates/webpages/order/tabs/_row.html
index bfd14cc3f..f000ba6fd 100644
--- a/templates/webpages/order/tabs/_row.html
+++ b/templates/webpages/order/tabs/_row.html
@@ -2,11 +2,18 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
+[%- USE P %]
 
-<tbody class="row_entry">
-
-  <tr class="listrow0">
-    <td style='display:none'>
+<tbody class="row_entry listrow"[%- IF MYCONFIG.show_form_details -%] data-expanded="1"[%- END -%]>
+  <tr>
+    <td align="center">
+      [%- IF MYCONFIG.show_form_details %]
+        [% L.img_tag(src="image/collapse.svg",
+                     alt=LxERP.t8('Hide details'), title=LxERP.t8('Hide details'), class="expand") %]
+      [%- ELSE %]
+        [% L.img_tag(src="image/expand.svg",
+                     alt=LxERP.t8('Show details'), title=LxERP.t8('Show details'), class="expand") %]
+      [%- END %]
       [% L.hidden_tag("orderitem_ids[+]", ID) %]
       [% L.hidden_tag("order.orderitems[+].id", ITEM.id, id='item_' _ ID) %]
       [% L.hidden_tag("order.orderitems[].parts_id", ITEM.parts_id) %]
@@ -20,7 +27,7 @@
       <img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]" class="dragdrop">
     </td>
     <td align="center">
-      [%- L.button_tag("delete_order_item_row(this)",
+      [%- L.button_tag("kivi.Order.delete_order_item_row(this)",
                        LxERP.t8("X"),
                        confirm=LxERP.t8("Are you sure?")) %]
     </td>
@@ -28,10 +35,14 @@
       <div name="partnumber">[% HTML.escape(ITEM.part.partnumber) %]</div>
     </td>
     <td>
-      [% L.input_tag("order.orderitems[].description",
+      <div name="partclassification">[% ITEM.part.presenter.typeclass_abbreviation %]</div>
+    </td>
+    <td>
+      [% L.areainput_tag("order.orderitems[].description",
                      ITEM.description,
+                     size='40',
                      style='width: 300px') %]
-      [%- L.button_tag("show_longdescription_dialog(this)", LxERP.t8("L")) %]
+      [%- L.button_tag("kivi.Order.show_longdescription_dialog(this)", LxERP.t8("L")) %]
     </td>
     <td>
       [%- L.input_tag("order.orderitems[].qty_as_number",
@@ -40,10 +51,12 @@
                       class="recalc reformat_number numeric") %]
     </td>
     <td>
-      [%- L.input_tag("order.orderitems[].price_factor",
-                      ITEM.price_factor,
-                      size = 5,
-                      class="recalc numeric") %]
+      [%- L.select_tag("order.orderitems[].price_factor_id",
+                       ALL_PRICE_FACTORS,
+                       default = ITEM.price_factor_id,
+                       title_key = 'description',
+                       with_empty = 1,
+                       class="recalc") %]
     </td>
     <td nowrap>
       [%- L.select_tag("order.orderitems[].unit",
@@ -54,7 +67,7 @@
                       class = 'unitselect') %]
     </td>
     <td>
-      [%- L.button_tag("price_chooser_item_row(this)",
+      [%- L.button_tag("kivi.Order.price_chooser_item_row(this)",
                        ITEM.active_price_source.source_description _ ' | ' _ ITEM.active_discount_source.source_description,
                        name = "price_chooser_button") %]
     </td>
@@ -98,29 +111,17 @@
 
   </tr>
 
-  <tr class="listrow1" style="display:none">
+  <tr [%- IF !MYCONFIG.show_form_details -%]style="display:none"[%- END -%]>
     <td colspan="100%">
-      <table>
-        <tr class="listrow1">
-          [%- SET n = 0 %]
-          [%- FOREACH var = ITEM.cvars_by_config %]
-            [%- NEXT UNLESS (var.config.processed_flags.editable && ITEM.part.cvar_by_name(var.config.name).is_valid) %]
-            [%- SET n = n + 1 %]
-            <th>
-              [% var.config.description %]
-            </th>
-            <td>
-              [% L.hidden_tag('order.orderitems[].custom_variables[+].config_id', var.config.id) %]
-              [% L.hidden_tag('order.orderitems[].custom_variables[].id', var.id) %]
-              [% L.hidden_tag('order.orderitems[].custom_variables[].sub_module', var.sub_module) %]
-              [% INCLUDE 'common/render_cvar_input.html' var_name='order.orderitems[].custom_variables[].unparsed_value' %]
-            </td>
-            [%- IF (n % (MYCONFIG.form_cvars_nr_cols || 3)) == 0 %]
-              </tr><tr class="listrow1">
-            [%- END %]
-          [%- END %]
-        </tr>
-      </table>
+      [%- IF MYCONFIG.show_form_details %]
+        <div name="second_row" data-loaded="1">
+          [%- PROCESS order/tabs/_second_row.html ITEM=ITEM %]
+        </div>
+      [%- ELSE %]
+        <div name="second_row">
+          [%- LxERP.t8("Loading...") %]
+        </div>
+      [%- END %]
     </td>
   </tr>