SelfTest false positive vermeiden

[mfinanz.git] / SL / IS.pm

diff --git a/SL/IS.pm b/SL/IS.pm
index 3b90ceaa5811dc023abf9b5af3fd99da50676620..21bf15f74e970b23c12c588eec21b07cea2da448 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -57,6 +57,7 @@ use SL::DB::Tax;
 use SL::DB::TaxZone;
 use SL::TransNumber;
 use SL::DB;
 use SL::DB::TaxZone;
 use SL::TransNumber;
 use SL::DB;

+use SL::Presenter::Part qw(type_abbreviation classification_abbreviation);

 use Data::Dumper;
 
 use strict;
 use Data::Dumper;
 
 use strict;


@@ -2157,7 +2158,7 @@ sub get_customer {
   $ref = selectfirst_hashref_query($form, $dbh, $query, @values);
 
   delete $ref->{salesman_id} if !$ref->{salesman_id};
   $ref = selectfirst_hashref_query($form, $dbh, $query, @values);
 
   delete $ref->{salesman_id} if !$ref->{salesman_id};

-  delete $ref->{payment_id}  if $form->{payment_id};
+  delete $ref->{payment_id}  if !$ref->{payment_id};

 
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
 
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 


@@ -2353,8 +2354,8 @@ sub retrieve_item {
       push @{ $ref->{matches} ||= [] }, $::locale->text('EAN') . ': ' . $ref->{ean};
     }
 
       push @{ $ref->{matches} ||= [] }, $::locale->text('EAN') . ': ' . $ref->{ean};
     }
 

-    $ref->{type_and_classific} = $::request->presenter->type_abbreviation($ref->{part_type}).
-                                 $::request->presenter->classification_abbreviation($ref->{classification_id});
+    $ref->{type_and_classific} = type_abbreviation($ref->{part_type}) .
+                                 classification_abbreviation($ref->{classification_id});

     if (! $ref->{used_for_sale} ) {
       $has_wrong_pclass = PCLASS_NOTFORSALE ;
       next;
     if (! $ref->{used_for_sale} ) {
       $has_wrong_pclass = PCLASS_NOTFORSALE ;
       next;


@@ -2436,7 +2437,6 @@ sub retrieve_item {
     }
 
     $ref->{onhand} *= 1;
     }
 
     $ref->{onhand} *= 1;

-

     push @{ $form->{item_list} }, $ref;
   }
   $sth->finish;
     push @{ $form->{item_list} }, $ref;
   }
   $sth->finish;