X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDB%2FHelper%2FAccountingPeriod.pm;h=9be3774e502a2de2f74547908d8638cbe37a8714;hb=a4624332120f499e324cc8300af478a998d1af76;hp=e29d0e5ed4d9e8d49b1bcdb249c3ef638e5a58e6;hpb=5eb836e4c3a624438acea1984639bfafb0d03d94;p=kivitendo-erp.git diff --git a/SL/DB/Helper/AccountingPeriod.pm b/SL/DB/Helper/AccountingPeriod.pm index e29d0e5ed..9be3774e5 100644 --- a/SL/DB/Helper/AccountingPeriod.pm +++ b/SL/DB/Helper/AccountingPeriod.pm @@ -20,9 +20,10 @@ sub get_balance_startdate_method_options { } sub get_balance_starting_date { - my ($self,$asofdate) = @_; + my ($self, $asofdate, $startdate_method) = @_; - $asofdate ||= DateTime->today_local; + $asofdate ||= DateTime->today_local; + $startdate_method ||= $::instance_conf->get_balance_startdate_method; unless ( ref $asofdate eq 'DateTime' ) { $asofdate = $::locale->parse_date_to_object($asofdate); @@ -30,7 +31,6 @@ sub get_balance_starting_date { my $dbh = $::form->get_standard_dbh; - my $startdate_method = $::instance_conf->get_balance_startdate_method; # We could use the following objects to determine the starting date for # calculating the balance from asofdate (the reference date for the balance): @@ -122,7 +122,7 @@ SL::DB::Helper::AccountingPeriod - Helper functions for calculating dates relati Returns an arrayref of translated options for determining the startdate of a balance period or the yearend period. To be used as the options for a dropdown. -=item C +=item C Given a date this method calculates and returns the starting date of the financial period relative to that date, according to the configured @@ -134,6 +134,8 @@ date-parsed. If no argument is passed the current day is assumed as default. +If no startdate method is passed, the default method from defaults is used. + =back =head1 BUGS