Abteilung bei Lohnbuchhaltung zuordnen, get_first mit richtigen Parameteraufruf

diff --git a/SL/Controller/PayPostingImport.pm b/SL/Controller/PayPostingImport.pm
index a2d103f2f6933f82cce5b82fc7de43dffa7fc580..c8d39091d7d604af37b5e4aad8f42990ee2856c8 100644 (file)
--- a/SL/Controller/PayPostingImport.pm
+++ b/SL/Controller/PayPostingImport.pm
@@ -82,7 +82,7 @@ sub parse_and_import {
       # optional KOST1 - KOST2 ?
       $department_name = $row->[36];
       if ($department_name) {
       # optional KOST1 - KOST2 ?
       $department_name = $row->[36];
       if ($department_name) {

-        $department    = SL::DB::Manager::Department->get_first(description => { like =>  $department_name . '%' });
+        $department    = SL::DB::Manager::Department->get_first(where => [ description => { ilike =>  $department_name . '%' } ]);

       }
 
       my $amount = $::form->parse_amount({ numberformat => '1000,00' }, $row->[0]);
       }
 
       my $amount = $::form->parse_amount({ numberformat => '1000,00' }, $row->[0]);

diff --git a/t/pay_posting_import/datev_import.t b/t/pay_posting_import/datev_import.t
index e11415c8506ea137ef462ee551c17fc9967e08cf..c164046cfd1683a7665388f50b8b0d296a4b7467 100644 (file)
--- a/t/pay_posting_import/datev_import.t
+++ b/t/pay_posting_import/datev_import.t
@@ -50,6 +50,23 @@ foreach my $accno (@charts) {
 }
 
 # and add department (KOST1 description)
 }
 
 # and add department (KOST1 description)

+  SL::DB::Department->new(
+    description => 'Total falsche Abteilung, niemals zuordnen!'
+  )->save;
+
+  SL::DB::Department->new(
+    description => '2. Total falsche Abteilung, niemals zuordnen!'
+  )->save;
+
+  SL::DB::Department->new(
+    description => '3. Total falsche Abteilung, niemals zuordnen!'
+  )->save;
+
+  SL::DB::Department->new(
+    description => 'annahme stelle. Total falsche Abteilung, niemals zuordnen!'
+  )->save;
+
+

   SL::DB::Department->new(
     description => 'Wisavis'
   )->save;
   SL::DB::Department->new(
     description => 'Wisavis'
   )->save;


@@ -73,7 +90,8 @@ foreach my $booking (@{ $gl_bookings }) {
 
   # gl
   is ($current_row->[13], $booking->reference, "Buchungstext correct");
 
   # gl
   is ($current_row->[13], $booking->reference, "Buchungstext correct");

-  if (ref $booking->department eq 'SL::DB::Department') {
+  if ($current_row->[36] eq 'wisavis') {
+    is(ref $booking->department eq 'SL::DB::Department', 1, "Department assigned");

     is ($current_row->[36], 'wisavis', "Department correctly assigned");                # lowercase
     is ('Wisavis', $booking->department->description, "Department correctly assigned"); # upper case
   } else {
     is ($current_row->[36], 'wisavis', "Department correctly assigned");                # lowercase
     is ('Wisavis', $booking->department->description, "Department correctly assigned"); # upper case
   } else {