CsvImport Aufträge: Variable besser benannt und Kommentar berichtigt.

[kivitendo-erp.git] / SL / Controller / Reconciliation.pm

diff --git a/SL/Controller/Reconciliation.pm b/SL/Controller/Reconciliation.pm
index c6faef1..1bfd390 100644 (file)
--- a/SL/Controller/Reconciliation.pm
+++ b/SL/Controller/Reconciliation.pm
@@ -35,11 +35,14 @@ sub action_search {
 sub action_reconciliation {
   my ($self) = @_;
 
+  $self->_get_proposals;
+
   $self->_get_linked_transactions;
 
   $self->_get_balances;
 
   $self->render('reconciliation/form',
+                ui_tab => scalar(@{$self->{PROPOSALS}}) > 0?1:0,
                 title => t8('Reconciliation'));
 }
 
@@ -338,7 +341,7 @@ sub _get_elements_and_validate {
     push @elements, $bb;
   }
 
-  if ($::form->round_amount($bt_sum + $bb_sum) != 0) {
+  if ($::form->round_amount($bt_sum + $bb_sum, 2) != 0) {
     push @errors, t8('Out of balance!');
   }
 
@@ -406,8 +409,8 @@ sub _filter_to_where {
   }
 
   if ( $self->{bank_account}->reconciliation_starting_date ) {
-    push @bt_where, (transdate => { gt => $self->{bank_account}->reconciliation_starting_date });
-    push @bb_where, (transdate => { gt => $self->{bank_account}->reconciliation_starting_date });
+    push @bt_where, (transdate => { ge => $self->{bank_account}->reconciliation_starting_date });
+    push @bb_where, (transdate => { ge => $self->{bank_account}->reconciliation_starting_date });
   }
 
   # don't try to reconcile opening and closing balance transactions