From 8faf4749b1e489ef0bff46ede77a7e5cac3873c5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20B=C3=BCren?= <jan@kivitendo-premium.de>
Date: Mon, 20 Jan 2014 16:10:01 +0100
Subject: [PATCH] Mandantenkonfiguration -> Lager Kosmetik und genauerer
 Hinweistext

---
 locale/de/all                                 |  4 +--
 .../webpages/client_config/_warehouse.html    | 36 ++++++++++---------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/locale/de/all b/locale/de/all
index ac67a872c..7ead6bf95 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -666,7 +666,7 @@ $self->{texts} = {
   'Default Transfer'            => 'Ein- / Auslagern über Standardlagerplätze',
   'Default Transfer Out always succeed. The current part onhand is ignored and the inventory can have negative stocks (not recommended).' => 'Auslagern über Standardlagerplatz funktioniert immer (verfügbare Menge wird nicht geprüft). Die Lagerbewegung wird auf den unten konfigurierten Lagerplatz gebucht (nicht empfohlen).',
   'Default Transfer Out with negative inventory' => 'Standard-Auslagern ohne Prüfung auf Bestand',
-  'Default Transfer with Master Bin' => 'Standardlagerplatz für Lagerbewegungen verwenden, falls keiner für die Ware explizit definiert wurde',
+  'Default Transfer with Master Bin' => 'Standardlagerplatz für Lagerbewegungen verwenden, falls keiner in Stammdaten definiert',
   'Default Warehouse'           => 'Standard-Lager',
   'Default Warehouse with ignoring on hand' => 'Standardlager für Auslagern ohne Prüfung auf Bestand',
   'Default buchungsgruppe'      => 'Standardbuchungsgruppe',
@@ -1920,7 +1920,7 @@ $self->{texts} = {
   'Show Filter'                 => 'Filter zeigen',
   'Show Salesman'               => 'Verkäufer anzeigen',
   'Show TODO list'              => 'Aufgabenliste anzeigen',
-  'Show Transfer via default'   => 'Ein- / Auslagern über Standardlagerplatz anzeigen',
+  'Show Transfer via default'   => 'Ein- / Auslagern über Standardlagerplatz anzeigen (zusätzlicher Knopf in Beleg Lieferschein)',
   'Show administration link'    => 'Link zur Administration anzeigen',
   'Show all parts'              => 'Alle Artikel anzeigen',
   'Show by default'             => 'Standardm&auml;&szlig;ig anzeigen',
diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html
index 87ff83589..938b2328e 100644
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -9,7 +9,22 @@
    <td>
     [% LxERP.t8('Show Transfer via default') %]<br>
    </td>
+  </tr>
+   <td align="right" nowrap="true">[% LxERP.t8('Default Warehouse') %]</td>
+   <td>
+    [% L.select_tag('defaults.warehouse_id', SELF.all_warehouses, id='warehouse_id', with_empty=1, default=SELF.defaults.warehouse_id, title_key='description',
+                    onchange="warehouse_selected(this.selectedIndex == 0 ? -1 : warehouses[this.selectedIndex - 1].id, -1)") %]
+   </td>
+   <td>
+    [% LxERP.t8('This is the default bin for parts') %]<br>
+    [% LxERP.t8('If configured this bin will be preselected for all new parts. Also this bin will be used as the master default bin, if default transfer out with master bin is activated.') %]<br>
+   </td>
+  </tr>
+  <tr>
+   <td align="right" nowrap="true">[% LxERP.t8('Default Bin') %]</td>
+   <td>[% L.select_tag('defaults.bin_id', [], id='bin_id', with_empty=1) %]</td>
   </tr>
+  <tr>
   <tr>
    <td align="right">[% LxERP.t8('Default Transfer with Master Bin') %]</td>
    <td>
@@ -19,6 +34,7 @@
     [% LxERP.t8('Use master default bin for Default Transfer, if no default bin for the part is configured') %]<br>
    </td>
   </tr>
+  <tr><td colspan="3"><hr /></td></tr>
   <tr>
    <td align="right">[% LxERP.t8('Default Transfer Out with negative inventory') %]</td>
    <td>
@@ -29,23 +45,7 @@
    </td>
   </tr>
 
-  <tr> </tr>
-  <tr>
-   <td align="right" nowrap="true">[% LxERP.t8('Default Warehouse') %]</td>
-   <td>
-    [% L.select_tag('defaults.warehouse_id', SELF.all_warehouses, id='warehouse_id', with_empty=1, default=SELF.defaults.warehouse_id, title_key='description',
-                    onchange="warehouse_selected(this.selectedIndex == 0 ? -1 : warehouses[this.selectedIndex - 1].id, -1)") %]
-   </td>
-   <td>
-    [% LxERP.t8('This is the default bin for parts') %]<br>
-    [% LxERP.t8('If configured this bin will be preselected for all new parts. Also this bin will be used as the master default bin, if default transfer out with master bin is activated.') %]<br>
-   </td>
-  </tr>
-  <tr>
-   <td align="right" nowrap="true">[% LxERP.t8('Default Bin') %]</td>
-   <td>[% L.select_tag('defaults.bin_id', [], id='bin_id', with_empty=1) %]</td>
-  </tr>
-  <tr>
+ <tr>
    <td align="right" nowrap="true">[% LxERP.t8('Default Warehouse with ignoring on hand') %]</td>
    <td>
     [% L.select_tag('defaults.warehouse_id_ignore_onhand', SELF.all_warehouses, id='warehouse_id_ignore_onhand', with_empty=1, default=SELF.defaults.warehouse_id_ignore_onhand, title_key='description',
@@ -60,6 +60,8 @@
    <td align="right" nowrap="true">[% LxERP.t8('Default Bin with ignoring onhand') %]</td>
    <td>[% L.select_tag('defaults.bin_id_ignore_onhand', [], id='bin_id_ignore_onhand', with_empty=1) %]</td>
   </tr>
+  <tr><td colspan="3"><hr /></td></tr>
+  <tr>
   <tr>
    <td align="right">[% LxERP.t8('Show Bestbefore') %]</td>
    <td>
-- 
2.20.1