Order: POD aufgeräumt, reformatiert, Bugs notiert.

[mfinanz.git] / SL / Controller / BankTransaction.pm

diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index bbe4edf2c58bd7e5913e51036fabe96368d6193a..d018930fc01639759a5fabc6d15b93ff73ce27d7 100644 (file)
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -23,6 +23,7 @@ use SL::DB::AccTransaction;
 use SL::DB::Tax;
 use SL::DB::Draft;
 use SL::DB::BankAccount;
 use SL::DB::Tax;
 use SL::DB::Draft;
 use SL::DB::BankAccount;

+use SL::DBUtils qw(like);

 use SL::Presenter;
 use List::Util qw(max);
 
 use SL::Presenter;
 use List::Util qw(max);
 


@@ -78,9 +79,10 @@ sub action_list {
   push @where, (transdate => { lt => $todate })   if ($todate);
   my $bank_account = SL::DB::Manager::BankAccount->find_by( id => $::form->{filter}{bank_account} );
   # bank_transactions no younger than starting date,
   push @where, (transdate => { lt => $todate })   if ($todate);
   my $bank_account = SL::DB::Manager::BankAccount->find_by( id => $::form->{filter}{bank_account} );
   # bank_transactions no younger than starting date,

+  # including starting date (same search behaviour as fromdate)

   # but OPEN invoices to be matched may be from before
   if ( $bank_account->reconciliation_starting_date ) {
   # but OPEN invoices to be matched may be from before
   if ( $bank_account->reconciliation_starting_date ) {

-    push @where, (transdate => { gt => $bank_account->reconciliation_starting_date });
+    push @where, (transdate => { ge => $bank_account->reconciliation_starting_date });

   };
 
   my $bank_transactions = SL::DB::Manager::BankTransaction->get_all(where => [ amount => {ne => \'invoice_amount'},
   };
 
   my $bank_transactions = SL::DB::Manager::BankTransaction->get_all(where => [ amount => {ne => \'invoice_amount'},


@@ -277,8 +279,8 @@ sub action_ajax_add_list {
   my @where_purchase = (amount => { ne => \'paid' });
 
   if ($::form->{invnumber}) {
   my @where_purchase = (amount => { ne => \'paid' });
 
   if ($::form->{invnumber}) {

-    push @where_sale,     (invnumber => { ilike => '%' . $::form->{invnumber} . '%'});
-    push @where_purchase, (invnumber => { ilike => '%' . $::form->{invnumber} . '%'});
+    push @where_sale,     (invnumber => { ilike => like($::form->{invnumber})});
+    push @where_purchase, (invnumber => { ilike => like($::form->{invnumber})});

   }
 
   if ($::form->{amount}) {
   }
 
   if ($::form->{amount}) {


@@ -287,13 +289,13 @@ sub action_ajax_add_list {
   }
 
   if ($::form->{vcnumber}) {
   }
 
   if ($::form->{vcnumber}) {

-    push @where_sale,     ('customer.customernumber' => { ilike => '%' . $::form->{vcnumber} . '%'});
-    push @where_purchase, ('vendor.vendornumber'     => { ilike => '%' . $::form->{vcnumber} . '%'});
+    push @where_sale,     ('customer.customernumber' => { ilike => like($::form->{vcnumber})});
+    push @where_purchase, ('vendor.vendornumber'     => { ilike => like($::form->{vcnumber})});

   }
 
   if ($::form->{vcname}) {
   }
 
   if ($::form->{vcname}) {

-    push @where_sale,     ('customer.name' => { ilike => '%' . $::form->{vcname} . '%'});
-    push @where_purchase, ('vendor.name'   => { ilike => '%' . $::form->{vcname} . '%'});
+    push @where_sale,     ('customer.name' => { ilike => like($::form->{vcname})});
+    push @where_purchase, ('vendor.name'   => { ilike => like($::form->{vcname})});

   }
 
   if ($::form->{transdatefrom}) {
   }
 
   if ($::form->{transdatefrom}) {