Unterstützung für zellenübergreifende Überschriften im PDF-Export des ReportGenerator...

[mfinanz.git] / SL / IR.pm

diff --git a/SL/IR.pm b/SL/IR.pm
index b0aa13430e1ea1aa47246943a90246d2076d077e..e2f65753c537e31f367e3c9343af00943787f0d4 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,
 
@@ -1344,7 +1344,7 @@ sub retrieve_item {
       push @{ $ref->{matches} ||= [] }, $::locale->text('Model') . ': ' . join ', ', map { $_->{model} } @{ $mm_by_id{$ref->{id}} };
     }
 
-    if ($ref->{ean} eq $::form->{"partnumber_$i"}) {
+    if (($::form->{"partnumber_$i"} ne '') && ($ref->{ean} eq $::form->{"partnumber_$i"})) {
       push @{ $ref->{matches} ||= [] }, $::locale->text('EAN') . ': ' . $ref->{ean};
     }