io/select_item um optional part.notes erweitert

Standard: Konfigurierbar in Mandatenkonfiguration. Entsprechend Flag
für parse_template usw.
Einziger nicht optionaler Punkt:  p.notes wird zusätzlich als Column in
retrieve_items geholt, kann ggf. auch noch optional geholt werden

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 8b8dbe5..49628af 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -94,6 +94,7 @@ __PACKAGE__->meta->columns(
   sepa_creditor_id                          => { type => 'text' },
   servicenumber                             => { type => 'text' },
   show_bestbefore                           => { type => 'boolean', default => 'false' },
+  show_longdescription_select_item          => { type => 'boolean', default => 'false' },
   show_weight                               => { type => 'boolean', default => 'false', not_null => 1 },
   signature                                 => { type => 'text' },
   sonumber                                  => { type => 'text' },

diff --git a/SL/IS.pm b/SL/IS.pm
index dfa3f1b..f94efa1 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -2232,7 +2232,7 @@ sub retrieve_item {
     qq|SELECT
          p.id, p.partnumber, p.description, p.sellprice,
          p.listprice, p.inventory_accno_id, p.lastcost,
-         p.ean,
+         p.ean, p.notes,
 
          c1.accno AS inventory_accno,
          c1.new_chart_id AS inventory_new_chart,

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 26fb98e..3d3d94c 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -520,6 +520,7 @@ sub select_item {
                                                          ITEM_LIST       => \@item_list,
                                                          IS_ASSEMBLY     => $mode eq 'IC',
                                                          IS_PURCHASE     => $mode eq 'IS',
+                                                         SHOW_NOTES      => $::instance_conf->get_show_longdescription_select_item(),
                                                          PRE_ENTERED_QTY => $pre_entered_qty, });
 
   $main::lxdebug->leave_sub();

diff --git a/doc/changelog b/doc/changelog
index 952b527..a7a57ff 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -51,6 +51,8 @@ Kleinere neue Features und Detailverbesserungen:
 
   - Projekte können automatisch beim Speichern eines Verkaufsauftrags angelegt werden.
 
+  - Langtext kann in der Auswahlliste bei mehreren Treffern im Positionsbeleg  zusätzlich angezeigt werden.
+
 2015-08-20 - Release 3.3
 
 Größere neue Features:

diff --git a/locale/de/all b/locale/de/all
index 7905bc2..1cdc139 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2352,6 +2352,7 @@ $self->{texts} = {
   'Sections'                    => 'Abschnitte',
   'Sections that are not assigned to any of the items above will be added as new positions.' => 'Abschnitte, die keiner der oben aufgeführten Positionen zugeordnet sind, werden als neue Positionen ergänzt.',
   'Select'                      => 'auswählen',
+  'Select Mulit-Item Options'   => 'Multi-Treffer Auswahlliste',
   'Select a Customer'           => 'Endkunde auswählen',
   'Select a customer'           => 'Einen Kunden auswählen',
   'Select a part'               => 'Artikel auswählen',
@@ -2451,6 +2452,7 @@ $self->{texts} = {
   'Show old dunnings'           => 'Alte Mahnungen anzeigen',
   'Show overdue sales quotations and requests for quotations...' => 'Überfällige Angebote und Preisanfragen anzeigen...',
   'Show parts'                  => 'Artikel anzeigen',
+  'Show parts longdescription (notes) in select list' => 'Langtext in Auswahlliste bei mehreren Treffern im Stammdaten-Bestand anzeigen',
   'Show requirement spec'       => 'Pflichtenheft anzeigen',
   'Show requirement spec template' => 'Pflichtenheftvorlage anzeigen',
   'Show sales letters report'   => 'Verkaufsbrief anzeigen',

diff --git a/sql/Pg-upgrade2/defaults_show_longdescription_select_item.sql b/sql/Pg-upgrade2/defaults_show_longdescription_select_item.sql
new file mode 100644 (file)
index 0000000..3bb03e3
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_show_longdescription_select_item.sql
@@ -0,0 +1,4 @@
+-- @tag: defaults_show_longdescription_select_item
+-- @description: Mandantenkonfiguration: Optional Langtext in Auswahlliste bei Artikelauswahl anzeigen
+-- @depends: release_3_3_0
+ALTER TABLE defaults ADD COLUMN show_longdescription_select_item    boolean DEFAULT FALSE;

diff --git a/templates/webpages/client_config/_features.html b/templates/webpages/client_config/_features.html
index 90a2a94..5dad4e9 100644 (file)
--- a/templates/webpages/client_config/_features.html
+++ b/templates/webpages/client_config/_features.html
@@ -162,6 +162,11 @@
    <td align="right">[% LxERP.t8('Project Status') %]</td>
    <td>[% L.select_tag('defaults.project_status_id', SELF.all_project_statuses, default=SELF.defaults.project_status_id, title_key='description', with_empty=0, style="width: 200px") %]</td>
   </tr>
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("Select Mulit-Item Options") %]</td></tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Show parts longdescription (notes) in select list') %]</td>
+   <td>[% L.yes_no_tag('defaults.show_longdescription_select_item', SELF.defaults.show_longdescription_select_item) %]</td>
+  </tr>
 
  </table>
 </div>

diff --git a/templates/webpages/io/select_item.html b/templates/webpages/io/select_item.html
index 11dfbf6..566b1a1 100644 (file)
--- a/templates/webpages/io/select_item.html
+++ b/templates/webpages/io/select_item.html
@@ -12,6 +12,9 @@
     [%- END %]
     <th>[% LxERP.t8('Number') %]</th>
     <th>[% LxERP.t8('Part Description') %]</th>
+    [%- IF SHOW_NOTES %]
+      <th>[% LxERP.t8('Long Description') %]</th>
+    [%- END %]
     <th>[% LxERP.t8('Other Matches') %]</th>
     <th>[% LxERP.t8('Price') %]</th>
     [%- IF IS_PURCHASE %]
@@ -30,6 +33,10 @@
     [%- END %]
     <td>[% HTML.escape(item.partnumber) %]</td>
     <td>[% HTML.escape(item.description) %]</td>
+    [%- IF SHOW_NOTES %]
+      [% USE P %]
+      <td>[% P.restricted_html(item.notes) %]</td>
+    [%- END %]
     <td>[% HTML.escape(item.matches).join('<br>') %]</td>
     <td align="right">[% LxERP.format_amount(item.display_sellprice, 2) %]</td>
     [%- IF IS_PURCHASE %]