kivitendo 3.9.2-0.2

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

diff --git a/SL/Controller/Reconciliation.pm b/SL/Controller/Reconciliation.pm
index 9cf25a378ea92a620bcc1647a9e32003d9166cbb..6e9bb2936c85fb6f1a9f24557813d6f454a409a1 100644 (file)
--- a/SL/Controller/Reconciliation.pm
+++ b/SL/Controller/Reconciliation.pm
@@ -30,7 +30,10 @@ sub action_search {
   my ($self) = @_;
 
   $self->setup_search_action_bar;
-  $self->render('reconciliation/search');
+  $self->render('reconciliation/search',
+                title => t8('Reconciliation with bank'),
+               );
+
 }
 
 sub action_reconciliation {
@@ -45,7 +48,8 @@ sub action_reconciliation {
   $self->setup_reconciliation_action_bar;
   $self->render('reconciliation/form',
                 ui_tab => scalar(@{$self->{PROPOSALS}}) > 0?1:0,
-                title => t8('Reconciliation'));
+                title => t8('Reconciliation'),
+               );
 }
 
 sub action_load_overview {
@@ -257,7 +261,7 @@ sub _get_proposals {
       if ($linked_record->to_table eq 'ar') {
         $invoice = SL::DB::Manager::Invoice->find_by(id => $linked_record->to_id);
         #find payments
-        my $payments = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, chart_link => { like => '%AR_paid%' }, transdate => $bt->transdate ]);
+        my $payments = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, chart_id => $bt->local_bank_account->chart_id , transdate => $bt->transdate ]);
         foreach my $payment (@{ $payments }) {
           $check_sum += $payment->amount;
           push @{ $proposal->{BB} }, $payment;
@@ -266,7 +270,7 @@ sub _get_proposals {
       if ($linked_record->to_table eq 'ap') {
         $invoice = SL::DB::Manager::PurchaseInvoice->find_by(id => $linked_record->to_id);
         #find payments
-        my $payments = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, chart_link => { like => '%AP_paid%' }, transdate => $bt->transdate ]);
+        my $payments = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, chart_id => $bt->local_bank_account->chart_id, transdate => $bt->transdate ]);
         foreach my $payment (@{ $payments }) {
           $check_sum += $payment->amount;
           push @{ $proposal->{BB} }, $payment;