From 3a476fccc8266949ab9f0eef383fdf1f2739ae94 Mon Sep 17 00:00:00 2001
From: Thomas Heck <theck@linet-services.de>
Date: Mon, 12 May 2014 13:41:32 +0200
Subject: [PATCH] =?utf8?q?Focusposition=20nach=20Erneuern=20w=C3=A4hlbar?=
 =?utf8?q?=20gemacht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/DB/AuthUser.pm                      |  6 ++++--
 locale/de/all                          |  5 +++++
 templates/webpages/am/config.html      | 22 +++++++++++++++++---
 templates/webpages/oe/sales_order.html | 28 ++++++++++++++++++--------
 4 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/SL/DB/AuthUser.pm b/SL/DB/AuthUser.pm
index 72df0b03e..a12796685 100644
--- a/SL/DB/AuthUser.pm
+++ b/SL/DB/AuthUser.pm
@@ -8,8 +8,10 @@ use SL::DB::MetaSetup::AuthUser;
 use SL::DB::Manager::AuthUser;
 use SL::DB::Helper::Util;
 
-use constant CONFIG_VARS => qw(copies countrycode dateformat timeformat default_media default_printer_id email favorites fax hide_cvar_search_options mandatory_departments menustyle name
-                               numberformat show_form_details signature stylesheet taxincluded_checked tel template_format vclimit);
+use constant CONFIG_VARS => qw(copies countrycode dateformat timeformat default_media default_printer_id
+                               email favorites fax hide_cvar_search_options mandatory_departments menustyle name
+                               numberformat show_form_details signature stylesheet taxincluded_checked tel
+                               template_format vclimit focus_position);
 
 __PACKAGE__->meta->add_relationship(
   groups => {
diff --git a/locale/de/all b/locale/de/all
index c3274c752..5f664bc8e 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -1083,6 +1083,7 @@ $self->{texts} = {
   'First 20 Lines'              => 'Nur erste 20 Datensätze',
   'Fix transaction'             => 'Buchung korrigieren',
   'Fix transactions'            => 'Buchungen korrigieren',
+  'Focus position after update' => 'Kursor-Position nach Erneuern',
   'Folgekonto'                  => 'Folgekonto',
   'Follow-Up'                   => 'Wiedervorlage',
   'Follow-Up Date'              => 'Wiedervorlagedatum',
@@ -1345,6 +1346,8 @@ $self->{texts} = {
   'Last modification'           => 'Letzte Änderung',
   'Last opening balance or all transactions' => 'Letzte Eröffnungsbuchung oder alle Buchungen',
   'Last opening balance or start of year' => 'Letzte Eröffnungsbuchung oder Jahresanfang',
+  'Last row, description'       => 'Letzte Zeile, Artikelbeschreibung',
+  'Last row, partnumber'        => 'Letzte Zeile, Nummer',
   'Last run at'                 => 'Letzte Ausführung um',
   'Lastcost'                    => 'Einkaufspreis',
   'Lastcost (with X being a number)' => 'Einkaufspreis (X ist eine fortlaufende Zahl)',
@@ -1479,6 +1482,8 @@ $self->{texts} = {
   'New invoice'                 => 'Neue Rechnung',
   'New name'                    => 'Neuer Name',
   'New part'                    => 'Neue Ware',
+  'New row, description'        => 'Neue Zeile, Artikelbeschreibung',
+  'New row, partnumber'         => 'Neue Zeile, Nummer',
   'New sales order'             => 'Neuer Auftrag',
   'New service'                 => 'Neue Dienstleistung',
   'New shipto'                  => 'Neue Lieferadresse',
diff --git a/templates/webpages/am/config.html b/templates/webpages/am/config.html
index bbc111300..27a91ad5f 100644
--- a/templates/webpages/am/config.html
+++ b/templates/webpages/am/config.html
@@ -37,11 +37,11 @@
       <th align="right">[% 'E-mail' | $T8 %]</th>
       <td><input name="email" size="30" value="[% HTML.escape(myconfig_email) %]"></td>
      </tr>
-     
+
      <tr valign="top">
       <th align="right">[% 'Signature' | $T8 %]</th>
       <td><textarea id="signature" name="signature" class="toggletextarea" rows="5" cols="50">[% HTML.escape(myconfig_signature) %] </textarea>
-         <span id="full_signature" class="toggletextarea"> <textarea readonly name="full_signature" rows="10" cols="50" >[% HTML.escape(full_signature) %]</textarea> </span> 
+         <span id="full_signature" class="toggletextarea"> <textarea readonly name="full_signature" rows="10" cols="50" >[% HTML.escape(full_signature) %]</textarea> </span>
          <a href="#" class="togglelink">[% 'Check full signature' | $T8 %]</a>
          <a href="#" id="edit_signature" class="togglelink">[% 'Edit user signature' | $T8 %]</a>
           </td> </tr>
@@ -62,6 +62,22 @@
         </td>
       </tr>
 
+      <tr>
+        <th align="right">[% 'Focus position after update' | $T8 %]</th>
+        <td>
+          [% L.select_tag(
+            'focus_position',
+            [
+              ['new_description', LxERP.t8('New row, description')],
+              ['new_partnumber', LxERP.t8('New row, partnumber')],
+              ['last_description', LxERP.t8('Last row, description')],
+              ['last_partnumber', LxERP.t8('Last row, partnumber')],
+            ],
+            default => myconfig_focus_position)
+          %]
+        </td>
+      </tr>
+
     </table>
    </div>
 
@@ -222,7 +238,7 @@
  </form>
 
  <script type="text/javascript">
-  <!-- 
+  <!--
 $(function() {
   $("#full_signature").toggle();
   $("#edit_signature").toggle();
diff --git a/templates/webpages/oe/sales_order.html b/templates/webpages/oe/sales_order.html
index 1c301080f..d96740a59 100644
--- a/templates/webpages/oe/sales_order.html
+++ b/templates/webpages/oe/sales_order.html
@@ -1,5 +1,6 @@
 [%- USE T8 %]
 [%- USE HTML %]
+
 [%- PROCESS 'amcvar/render_inputs_block.html' %]
 <tr>
  <td>
@@ -21,7 +22,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 %]
@@ -49,12 +50,23 @@
 [%- 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>
-- 
2.20.1