X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/ff159a4d47b9a2d10744dcfc23da2c63605c8a32..eeb5375ee7727c956cc357cc8f90b19d1bfe80b9:/SL/Controller/Reconciliation.pm diff --git a/SL/Controller/Reconciliation.pm b/SL/Controller/Reconciliation.pm index 9cf25a378..6e9bb2936 100644 --- 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;