X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FRP.pm;h=969e8adfb373fa58e253d9478e4fa6e87d9ba69d;hb=d6d08d5ee343b6552656a9bb7450374897a16e1a;hp=dfb9bc68b833356c04df3fe7b9c3d9549e4edf2b;hpb=dfcefa49d0da88facf307cf40e25ee1a1e39be0c;p=kivitendo-erp.git diff --git a/SL/RP.pm b/SL/RP.pm index dfb9bc68b..969e8adfb 100644 --- a/SL/RP.pm +++ b/SL/RP.pm @@ -58,7 +58,7 @@ sub get_balance_starting_date { my $asofdate = shift; return unless $asofdate; - $asofdate = $::locale->parse_date_to_object(\%::myconfig, $asofdate); + $asofdate = $::locale->parse_date_to_object($asofdate); my $form = $main::form; my $dbh = $::form->get_standard_dbh; @@ -85,19 +85,19 @@ sub get_balance_starting_date { # default. my ($closedto) = selectfirst_array_query($form, $dbh, 'SELECT closedto FROM defaults'); if ($closedto) { - $closedto = $::locale->parse_date_to_object(\%::myconfig, $closedto); + $closedto = $::locale->parse_date_to_object($closedto); $closedto->subtract(years => 1) while ($asofdate - $closedto)->is_negative; $closedto->add(days => 1); }; my ($query, $startdate, $last_ob, $mindate); - $query = qq|select max(transdate) from acc_trans where ob_transaction is true and transdate <= ?|; + $query = qq|select max(transdate) from acc_trans where ob_transaction is true and transdate <= ?|; ($last_ob) = selectrow_query($::form, $dbh, $query, $::locale->format_date(\%::myconfig, $asofdate)); - $last_ob = $::locale->parse_date_to_object(\%::myconfig, $last_ob) if $last_ob; - - $query = qq|select min(transdate) from acc_trans|; + $last_ob = $::locale->parse_date_to_object($last_ob) if $last_ob; + + $query = qq|select min(transdate) from acc_trans|; ($mindate) = selectrow_query($::form, $dbh, $query); - $mindate = $::locale->parse_date_to_object(\%::myconfig, $mindate); + $mindate = $::locale->parse_date_to_object($mindate); # the default method is to use all transactions ($mindate) @@ -132,8 +132,8 @@ sub get_balance_starting_date { return $::locale->format_date(\%::myconfig, $mindate); }; - -}; + +}; sub balance_sheet { $main::lxdebug->enter_sub(); @@ -150,7 +150,7 @@ sub balance_sheet { $form->{period} = $form->{this_period} = conv_dateq($form->{asofdate}); } - # get starting date for calculating balance + # get starting date for calculating balance $form->{this_startdate} = get_balance_starting_date($form->{asofdate}); get_accounts($dbh, $last_period, $form->{this_startdate}, $form->{asofdate}, $form, \@categories);