From 88bfacbfaf2061150ebfc3ad4fa0190c5c6dc1f7 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 26 Jun 2014 09:32:56 +0200
Subject: [PATCH] Verkauf: leeren Eintrag in Lieferadressendropdown klarer
 benennen
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Angezeigt wird nun »Keine/individuelle Lieferadresse«, um es den
Benutzern klarer zu machen, dass die über den Button »Lieferadresse«
eingetragene Lieferadresse greift.
---
 locale/de/all                          | 1 +
 templates/webpages/do/form_header.html | 3 ++-
 templates/webpages/is/form_header.html | 3 ++-
 templates/webpages/oe/form_header.html | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/locale/de/all b/locale/de/all
index 4d6c3c4c4..9d354c0fe 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -1574,6 +1574,7 @@ $self->{texts} = {
   'No vendor has been selected yet.' => 'Es wurde noch kein Lieferant ausgewählt.',
   'No warehouse has been created yet or the quantity of the bins is not configured yet.' => 'Es wurde noch kein Lager angelegt, bzw. die dazugehörigen Lagerplätze sind noch nicht konfiguriert.',
   'No.'                         => 'Position',
+  'No/individual shipping address' => 'Keine/individuelle Lieferadresse',
   'None'                        => 'Kein',
   'Normal users cannot log in.' => 'Normale Benutzer können sich nicht anmelden.',
   'Normalize Customer / Vendor names' => 'Normalisierung Kunden- / Lieferantennamen',
diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
index 4d2a0ab20..99c8ebede 100644
--- a/templates/webpages/do/form_header.html
+++ b/templates/webpages/do/form_header.html
@@ -166,7 +166,8 @@
           [%- END %]
 
           [%- ELSE %]
-            [% L.select_tag('shipto_id', ALL_SHIPTO, default = shipto_id, value_key = 'shipto_id', title_key = 'displayable_id', with_empty = 1, class = 'fixed_width') %]
+            [% shiptos = [ [ "", LxERP.t8("No/individual shipping address") ] ] ;
+               L.select_tag('shipto_id', shiptos.import(ALL_SHIPTO), default=shipto_id, value_key='shipto_id', title_key='displayable_id', style='width: 250px') %]
           [%- END %]
          </td>
         </tr>
diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html
index 0fa1066e2..5fa5bb105 100644
--- a/templates/webpages/is/form_header.html
+++ b/templates/webpages/is/form_header.html
@@ -77,7 +77,8 @@
         <tr>
           <th align="right">[% 'Shipping Address' | $T8 %]</th>
           <td>
-            [% L.select_tag('shipto_id', ALL_SHIPTO, default = shipto_id, value_key = 'shipto_id', title_key = 'displayable_id', with_empty = 1, style='width: 250px', onChange = "document.getElementById('update_button').click();") %]
+            [% shiptos = [ [ "", LxERP.t8("No/individual shipping address") ] ] ;
+               L.select_tag('shipto_id', shiptos.import(ALL_SHIPTO), default=shipto_id, value_key='shipto_id', title_key='displayable_id', style='width: 250px') %]
           </td>
         </tr>
 [%- END %]
diff --git a/templates/webpages/oe/form_header.html b/templates/webpages/oe/form_header.html
index 3419fa6be..e01734932 100644
--- a/templates/webpages/oe/form_header.html
+++ b/templates/webpages/oe/form_header.html
@@ -79,7 +79,8 @@
                   <tr>
                     <th align="right">[% 'Shipping Address' | $T8 %]</th>
                     <td>
-                      [% L.select_tag('shipto_id', ALL_SHIPTO, default=shipto_id, value_key='shipto_id', title_key='displayable_id', with_empty=1, style='width: 250px', onChange="document.getElementById('update_button').click();") %]
+                      [% shiptos = [ [ "", LxERP.t8("No/individual shipping address") ] ] ;
+                         L.select_tag('shipto_id', shiptos.import(ALL_SHIPTO), default=shipto_id, value_key='shipto_id', title_key='displayable_id', style='width: 250px') %]
                     </td>
                   </tr>
 [%- END %]
-- 
2.20.1