Merge branch 'master' of github.com:kivitendo/kivitendo-erp

diff --git a/SL/IR.pm b/SL/IR.pm
index b0aa134..55987af 100644 (file)
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -1285,9 +1285,9 @@ sub retrieve_item {
     qq|SELECT
          p.id, p.partnumber, p.description, p.lastcost AS sellprice, p.listprice,
          p.unit, p.assembly, p.onhand, p.formel,
-         p.not_discountable,
+         p.notes AS partnotes, p.notes AS longdescription, p.not_discountable,
          p.inventory_accno_id, p.price_factor_id,
-         p.ean, p.notes,
+         p.ean,
 
          pfac.factor AS price_factor,
 

diff --git a/templates/webpages/io/select_item.html b/templates/webpages/io/select_item.html
index cbefece..f576486 100644 (file)
--- a/templates/webpages/io/select_item.html
+++ b/templates/webpages/io/select_item.html
@@ -1,4 +1,4 @@
-[% USE LxERP %][% USE HTML %][% USE L %]
+[% USE LxERP %][% USE HTML %][% USE L %][% USE P %]
 <h1>[% title %]</h1>
 
  <form method="post" action="[% HTML.escape(script) %]">
@@ -34,8 +34,7 @@
     <td>[% HTML.escape(item.partnumber) %]</td>
     <td>[% HTML.escape(item.description) %]</td>
     [%- IF INSTANCE_CONF.get_show_longdescription_select_item %]
-      [% USE P %]
-      <td>[% P.restricted_html(item.notes) %]</td>
+      <td>[% P.restricted_html(item.longdescription) %]</td>
     [%- END %]
     <td>[% HTML.escape(item.matches).join('<br>') %]</td>
     <td align="right">[% LxERP.format_amount(item.display_sellprice, 2) %]</td>