From: Martin Helmling mh@waldpark.octosoft.eu <martin.helmling@octosoft.eu>
Date: Tue, 23 Feb 2016 08:41:36 +0000 (+0100)
Subject: Textanpassung und Saubere Linie bei Multiselect
X-Git-Tag: release-3.4.1~405
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a14368a23b433e316abe5a1bc00e30a516b7a37e;p=kivitendo-erp.git

Textanpassung und Saubere Linie bei Multiselect

Im Artikelselektor bei Multiselect besseren Titel, je nachdem ob multiselect an ist oder nicht.
Auch die horizontale Linie über alle Spalten,
wenn long_description in der Mandanntenkonfig gesetzt ist.
---

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 89eb6a2d4..c3ab47e28 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -503,7 +503,9 @@ sub select_item {
   _check_io_auth();
 
   my $previous_form = $::auth->save_form_in_session(form => $::form);
-  $::form->{title}  = $::locale->text('Select from one of the items below');
+  $::form->{title}  = $::myconfig{item_multiselect} ?
+      $::locale->text('Set count for one or more of the items to select them'):
+      $::locale->text('Select from one of the items below');
   $::form->header;
 
   my @item_list = map {
diff --git a/locale/de/all b/locale/de/all
index fa9c71fb8..c97e2d289 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -2414,6 +2414,7 @@ $self->{texts} = {
   'Service, assembly or part'   => 'Dienstleistung, Erzeugnis oder Ware',
   'Services'                    => 'Dienstleistungen',
   'Set (set to)'                => 'Setze',
+  'Set count for one or more of the items to select them' => 'Zum Selektieren bitte Menge für einen oder mehrere Artikel setzen',
   'Set eMail text'              => 'E-Mail Text eingeben',
   'Set to paid missing'         => 'Fehlbetrag setzen',
   'Settings'                    => 'Einstellungen',
diff --git a/templates/webpages/io/select_item.html b/templates/webpages/io/select_item.html
index f57648680..668b2e94b 100644
--- a/templates/webpages/io/select_item.html
+++ b/templates/webpages/io/select_item.html
@@ -1,4 +1,5 @@
 [% USE LxERP %][% USE HTML %][% USE L %][% USE P %]
+[% SET COLS = 8 %]
 <h1>[% title %]</h1>
 
  <form method="post" action="[% HTML.escape(script) %]">
@@ -13,11 +14,13 @@
     <th>[% LxERP.t8('Number') %]</th>
     <th>[% LxERP.t8('Part Description') %]</th>
     [%- IF INSTANCE_CONF.get_show_longdescription_select_item %]
+      [% SET COLS = COLS + 1 %]
       <th>[% LxERP.t8('Long Description') %]</th>
     [%- END %]
     <th>[% LxERP.t8('Other Matches') %]</th>
     <th>[% LxERP.t8('Price') %]</th>
     [%- IF IS_PURCHASE %]
+      [% SET COLS = COLS + 1 %]
      <th>[% LxERP.t8('ROP') %]</th>
     [%- END %]
     <th>[% LxERP.t8('Qty') %]</th>
@@ -46,7 +49,7 @@
    </tr>
    [%- END %]
 
-   <tr><td colspan="8"><hr size="3" noshade></td></tr>
+   <tr><td colspan="[% COLS %]"><hr size="3" noshade></td></tr>
   </table>
 
   [% L.hidden_tag('select_item_mode', MODE) %]