date error in mapping

[mfinanz.git] / SL / mebil / Mapping.pm

diff --git a/SL/mebil/Mapping.pm b/SL/mebil/Mapping.pm
index 5ff100147b9590e6215d8332cee842c55fe3cfcf..7bef2260dab4aa2883371dc2602eac7c060644e6 100644 (file)
--- a/SL/mebil/Mapping.pm
+++ b/SL/mebil/Mapping.pm
@@ -34,7 +34,7 @@ sub calc_mapping {
                        $sql = "SELECT SUM(ac.amount) AS saldo
                                                FROM acc_trans ac 
                                                JOIN chart c ON (c.id = ac.chart_id) 
                        $sql = "SELECT SUM(ac.amount) AS saldo
                                                FROM acc_trans ac 
                                                JOIN chart c ON (c.id = ac.chart_id) 

-                                               WHERE (ac.transdate <= '31.12.$year') 
+                                               WHERE (ac.transdate <= TO_DATE('31.12.$year','dd.mm.yyyy')) 

                                                AND (c.accno = '$mapping->{fromacc}') ";
                        my $result = SL::DBUtils::selectall_hashref_query($self->{error_channel}, $self->{dbh}, $sql);          
                        $fromacc{$mapping->{fromacc}} = $result->[0]->{saldo};
                                                AND (c.accno = '$mapping->{fromacc}') ";
                        my $result = SL::DBUtils::selectall_hashref_query($self->{error_channel}, $self->{dbh}, $sql);          
                        $fromacc{$mapping->{fromacc}} = $result->[0]->{saldo};


@@ -45,7 +45,7 @@ sub calc_mapping {
                        $sql = "SELECT SUM(ac.amount)* -1 AS saldo
                                                FROM acc_trans ac 
                                                JOIN chart c ON (c.id = ac.chart_id) 
                        $sql = "SELECT SUM(ac.amount)* -1 AS saldo
                                                FROM acc_trans ac 
                                                JOIN chart c ON (c.id = ac.chart_id) 

-                                               WHERE (ac.transdate <= '31.12.$year') 
+                                               WHERE (ac.transdate <= TO_DATE('31.12.$year','dd.mm.yyyy')) 

                                                AND (c.accno = '$mapping->{fromacc}') ";
                        my @result = SL::DBUtils::selectfirst_array_query($self->{error_channel}, $self->{dbh}, $sql);          
                        $fromacc{$mapping->{fromacc}} = $result[0];
                                                AND (c.accno = '$mapping->{fromacc}') ";
                        my @result = SL::DBUtils::selectfirst_array_query($self->{error_channel}, $self->{dbh}, $sql);          
                        $fromacc{$mapping->{fromacc}} = $result[0];


@@ -106,7 +106,7 @@ sub rule2sql {
        my $values = "";
        my $invert = "";
        my $start = "";
        my $values = "";
        my $invert = "";
        my $start = "";

-       my $end = "AND (ac.transdate <= '31.12.$year')";
+       my $end = "AND (ac.transdate <= TO_DATE('31.12.$year','dd.mm.yyyy'))";

        my $py = $year - 1;
        
        # parse rule
        my $py = $year - 1;
        
        # parse rule


@@ -133,12 +133,12 @@ sub rule2sql {
                        $invert = "* (-1)";
                }
                elsif ($1 eq "START") {
                        $invert = "* (-1)";
                }
                elsif ($1 eq "START") {

-                       $start = "AND (ac.transdate >= '01.01.$2')";
+                       $start = "AND (ac.transdate >= TO_DATE('01.01.$2','dd.mm.yyyy'))";

                        $start =~ s/YEAR/$year/;
                        $start =~ s/PY/$py/;
                }
                elsif ($1 eq "END") {
                        $start =~ s/YEAR/$year/;
                        $start =~ s/PY/$py/;
                }
                elsif ($1 eq "END") {

-                       $end = "AND (ac.transdate <= '31.12.$2')";
+                       $end = "AND (ac.transdate <= TO_DATE('31.12.$2','dd.mm.yyyy'))";

                        $end =~ s/YEAR/$year/;
                        $end =~ s/PY/$py/;
                }
                        $end =~ s/YEAR/$year/;
                        $end =~ s/PY/$py/;
                }