X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Foe%2Fsales_order.html;h=76587d742e8bc025b3752ba05d0aae959576be46;hb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44;hp=1c301080f5181f55c1deb429c25b67a1c58ccdc3;hpb=08e4ce1ef5caa3f7007d8c97e9e97ef83378b19a;p=kivitendo-erp.git

diff --git a/templates/webpages/oe/sales_order.html b/templates/webpages/oe/sales_order.html
index 1c301080f..76587d742 100644
--- a/templates/webpages/oe/sales_order.html
+++ b/templates/webpages/oe/sales_order.html
@@ -1,16 +1,21 @@
 [%- USE T8 %]
 [%- USE HTML %]
+[%- USE L %]
+[%- USE LxERP %]
 [%- PROCESS 'amcvar/render_inputs_block.html' %]
 <tr>
  <td>
-  <input type="button" id="cb_show_details" name="show_details_button" value='[% 'Show details' | $T8 %]'>
+  <input type="button" id="cb_show_details" name="show_details_button" value='[% 'Show details' | $T8 %]'[% IF  show_details %] style="display:none"[% END %]>
+  <input type="button" id="cb_hide_details" name="hide_details_button" value='[% 'Hide details' | $T8 %]'[% IF !show_details %] style="display:none"[% END %]>
   <script type="text/javascript">
-   $('#cb_show_details').click(function(){ $('[id^="row2"]').toggle();
-                                           if ( $('[id^="row2"]').is(":visible") ) {
-                                            $("[name='show_details']").val(1);
-                                           } else {
-                                            $("[name='show_details']").val(0);
-                                           }});
+   $('#cb_show_details,#cb_hide_details').click(function(){
+     $('[id^="row2"],#cb_show_details,#cb_hide_details').toggle();
+     if ( $('[id^="row2"]').is(":visible") ) {
+      $("[name='show_details']").val(1);
+     } else {
+      $("[name='show_details']").val(0);
+     }}
+   );
   </script>
   <table id='display_row' width="100%">
    <tr class="listheading">
@@ -21,7 +26,7 @@
 [%- END %]
    </tr>
 [%- FOREACH row = ROWS %]
-     <tr valign="top" class="[% IF row.error %]error_message[% ELSE %]listrow[% loop.count % 2 %][% END %]">
+     <tr valign="top" class="row [% IF row.error %]error_message[% ELSE %]listrow[% loop.count % 2 %][% END %]">
  [%- FOREACH row1 = row.ROW1 %]
       <td[% IF row1.align %] align="[% row1.align %]"[% END %][% IF row1.nowrap %] nowrap[% END %]>[% row1.value %]</td>
  [%- END %]
@@ -35,26 +40,64 @@
      </tr>
      <tr class="listrow[% loop.count % 2 %]" id="row2.[% loop.count %]" [% UNLESS show_details %]style="display:none;"[% END %]>
       <td colspan="[% row.colspan %]">
+
+ [%# render all row2 entries except cvars  %]
  [%- FOREACH row2 = row.ROW2 %]
-   [%- IF row2.line_break %]<br>[%- END %]
-   [%- IF row2.cvar %]
-     [% row2.description %]
-     [% PROCESS cvar_inputs cvar = row2.render_options %]
-   [%- ELSE %]
+   [%- IF !row2.cvar %]
      [% row2.value %]
    [%- END %]
  [%- END %]
+
+ [%# process editable cvars  %]
+ <table class='row2-cvars-table'>
+   <tr>
+   [%- FOREACH row2 = row.ROW2 %]
+     [%- SET show = ((row2.render_options.var.flag_editable || !row2.render_options.hide_non_editable ) && row2.render_options.valid && !row2.render_options.partsgroup_filtered) %]
+     [%- IF row2.cvar && show %]
+       [%- IF row2.line_break %]
+         </tr><tr>
+       [%- END %]
+     <th>
+       [% row2.description %]
+     </th>
+     <td>
+       [% PROCESS cvar_inputs cvar = row2.render_options %]
+     </td>
+     [%- END %]
+   [%- END %]
+   </tr>
+ </table>
+
+ [%# process non editable cvars extra to not disturb the table layout (this will be hidden inputs) %]
+ [%- FOREACH row2 = row.ROW2 %]
+   [%- SET hide = (!row2.render_options.var.flag_editable && row2.render_options.hide_non_editable) %]
+   [%- IF row2.cvar && hide %]
+     [% PROCESS cvar_inputs cvar = row2.render_options %]
+   [%- END %]
+ [%- END %]
+
       </td>
      </tr>
 [%- END %]
 
   </table>
- </td>
-</tr>
-<tr style='display:none'>
- <td>
-<script type='text/javascript'>
-  $(document).ready( function(){ $('#display_row tr:gt(1) input[name*="description"]').focus() });
-</script>
+
+  <script type='text/javascript'>
+    $(function() {
+      setTimeout(function(){
+        [% SWITCH( myconfig_focus_position ) %]
+          [% CASE 'last_partnumber' %]
+            $('#display_row tr.row:gt(-3):lt(-1) input[name*="partnumber"]').focus();
+          [% CASE 'last_description' %]
+            $('#display_row tr.row:gt(-3):lt(-1) input[name*="description"]').focus();
+          [% CASE 'new_partnumber' %]
+            $('#display_row tr:gt(1) input[name*="partnumber"]').focus();
+          [% CASE DEFAULT %]
+            $('#display_row tr:gt(1) input[name*="description"]').focus();
+        [% END %]
+      }, 1);
+    });
+  </script>
+
  </td>
 </tr>