Merge branch 'master' of ssh://lx-office/~/lx-office-erp

Conflicts:
	doc/changelog

diff --git a/doc/changelog b/doc/changelog
index 59a0479..b86f40e 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -158,10 +158,10 @@
 
   Liste gefixter Bugs aus dem Bugtracker:
 
-  922 940 1024 1025 1028 1030 1031 1034 1035 1037 1040 1043 1044 1046
-  1051 1055 1057 1058 1072 1073 1077 1081 1082 1095 1098 1100 1101
-  1108 1110 1118 1125 1127 1130 1133 1136 1138 1147 1150 1151 1155
-  1164 1177 1186 1188 1190 1191 1199 1201
+  922 940 1024 1025 1028 1030 1031 1034 1035 1037 1040 1043 1044 1046 1051 1055
+  1057 1058 1072 1073 1077 1081 1082 1095 1098 1100 1101 1108 1110 1118 1125
+  1127 1130 1133 1135 1136 1138 1146 1147 1150 1151 1155 1164 1173 1177 1186
+  1188 1190 1191 1195 1199 1201
 
 
 2009-06-02 - Version 2.6.0

diff --git a/locale/de/all b/locale/de/all
index 93ae1ce..12b937f 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1420,7 +1420,7 @@ $self->{texts} = {
   'Show TODO list'              => 'Aufgabenliste anzeigen',
   'Show by default'             => 'Standardmäßig anzeigen',
   'Show custom variable search inputs' => 'Suchoptionen für Benutzerdefinierte Variablen verstecken',
-  'Show details'                => 'Details anzeigen',
+  'Show details'                => 'Detailsanzeige',
   'Show follow ups...'          => 'Zeige Wiedervorlagen...',
   'Show old dunnings'           => 'Alte Mahnungen anzeigen',
   'Show overdue sales quotations and requests for quotations...' => 'Überfällige Angebote und Preisanfragen anzeigen...',

diff --git a/locale/de/gl b/locale/de/gl
index bc4d9ed..f0143aa 100644 (file)
--- a/locale/de/gl
+++ b/locale/de/gl
@@ -208,7 +208,7 @@ $self->{texts} = {
   'Select a vendor'             => 'Einen Lieferanten auswählen',
   'Sep'                         => 'Sep',
   'September'                   => 'September',
-  'Show details'                => 'Details anzeigen',
+  'Show details'                => 'Detailsanzeige',
   'Skip'                        => 'Überspringen',
   'Source'                      => 'Beleg',
   'Storno'                      => 'Storno',

diff --git a/templates/webpages/dunning/search_de.html b/templates/webpages/dunning/search_de.html
index 9ad0dd8..d715c15 100644 (file)
--- a/templates/webpages/dunning/search_de.html
+++ b/templates/webpages/dunning/search_de.html
@@ -28,7 +28,7 @@
 
       [% IF SHOW_DUNNING_LEVELS %]
        <tr>
-        <th align="right" nowrap>Nächste Mahnstufe</th>
+        <th align="right" nowrap>Mahnlevel</th>
         <td colspan="3">
          <select name="dunning_level">
           <option value=""></option>

diff --git a/templates/webpages/dunning/search_master.html b/templates/webpages/dunning/search_master.html
index 20ebb91..c2b1b3a 100644 (file)
--- a/templates/webpages/dunning/search_master.html
+++ b/templates/webpages/dunning/search_master.html
@@ -28,7 +28,7 @@
 
       [% IF SHOW_DUNNING_LEVELS %]
        <tr>
-        <th align="right" nowrap><translate>Next Dunning Level</translate></th>
+        <th align="right" nowrap><translate>Dunning Level</translate></th>
         <td colspan="3">
          <select name="dunning_level">
           <option value=""></option>

diff --git a/templates/webpages/generic/multibox.html b/templates/webpages/generic/multibox.html
index 7225b03..ccb87cb 100644 (file)
--- a/templates/webpages/generic/multibox.html
+++ b/templates/webpages/generic/multibox.html
@@ -62,7 +62,7 @@
   <option value=""></option>
   [%- END %]
   [%- FOREACH row = DATA %]
-  <option value="[% row.id %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.label) %]</option>
+  <option value="[% row.id | html %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.label) %]</option>
   [%- END %]
 </select>
 [%- END %]

diff --git a/templates/webpages/oe/sales_order_de.html b/templates/webpages/oe/sales_order_de.html
index 2e5eb1c..1cd3a42 100644 (file)
--- a/templates/webpages/oe/sales_order_de.html
+++ b/templates/webpages/oe/sales_order_de.html
@@ -1,8 +1,7 @@
 [% USE HTML %]
 <tr>
  <td>
-  <input type="checkbox" id="cb_show_details" name="show_details" [%- IF show_details %] checked[% END %]>
-  <label for="cb_show_details">Details anzeigen</label><br>
+  <input type="button" id="cb_show_details" name="show_details" value='Detailsanzeige'>
   <script type="text/javascript">
    $('#cb_show_details').click(function(){ $('[id$="row2"]').toggle() });
   </script>

diff --git a/templates/webpages/oe/sales_order_master.html b/templates/webpages/oe/sales_order_master.html
index b9caef4..6072564 100644 (file)
--- a/templates/webpages/oe/sales_order_master.html
+++ b/templates/webpages/oe/sales_order_master.html
@@ -1,8 +1,7 @@
 [% USE HTML %]
 <tr>
  <td>
-  <input type="checkbox" id="cb_show_details" name="show_details" [%- IF show_details %] checked[% END %]>
-  <label for="cb_show_details"><translate>Show details</translate></label><br>
+  <input type="button" id="cb_show_details" name="show_details" value='<translate>Show details</translate>'>
   <script type="text/javascript">
    $('#cb_show_details').click(function(){ $('[id$="row2"]').toggle() });
   </script>