X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/ab3f3ed87a12c70d9538b1a07fc0e4659dc43d28..d679bb5b866e0336fb3df96a28cb58de349c9cb0:/SL/RP.pm

diff --git a/SL/RP.pm b/SL/RP.pm
index 358d71e34..e8e07e0ce 100644
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -36,6 +36,7 @@ package RP;
 
 use SL::DBUtils;
 use Data::Dumper;
+use SL::DB::Helper::AccountingPeriod qw(get_balance_starting_date);
 use List::Util qw(sum);
 
 # use warnings;
@@ -50,94 +51,11 @@ use strict;
 # - proper testing for heading charts
 # - transmission from $form to TMPL realm is not as clear as i'd like
 
-sub get_balance_starting_date {
-
-  # determine date from which the balance is calculated. The method is
-  # configured in the client configuration.
-
-  my $asofdate = shift;
-  return unless $asofdate;
-
-  $asofdate = $::locale->parse_date_to_object($asofdate);
-
-  my $form = $main::form;
-  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):
-  # * start_of_year - 1.1., no deviating fiscal year supported
-  # * closed_to - all transactions since the books were last closed
-  # * last_ob - all transactions since last opening balance transaction (usually 1.1.)
-  # * mindate - all transactions in database
-
-  my $start_of_year = $asofdate->clone();
-  $start_of_year->set_day(1);
-  $start_of_year->set_month(1);
-
-  # closedto assumes that we only close the books at the end of a fiscal year,
-  # never during the fiscal year. If this assumption is valid closedto should
-  # also work for deviating fiscal years. But as the trial balance (SuSa)
-  # doesn't yet deal with deviating fiscal years, and is useful to also close
-  # the books after a month has been exported via DATEV, so this method of
-  # determining the starting date isn't recommended and has been removed as
-  # default.
-  my ($closedto) = selectfirst_array_query($form, $dbh, 'SELECT closedto FROM defaults');
-  if ($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 <= ?|;
-  ($last_ob) = selectrow_query($::form, $dbh, $query, $::locale->format_date(\%::myconfig, $asofdate));
-  $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($mindate);
-
-  # the default method is to use all transactions ($mindate)
-
-  if ( $startdate_method eq 'closed_to' and $closedto ) {
-    # if no closedto is configured use default
-    return $::locale->format_date(\%::myconfig, $closedto);
-
-  } elsif ( $startdate_method eq 'start_of_year' ) {
-
-    return $::locale->format_date(\%::myconfig, $start_of_year);
-
-  } elsif ( $startdate_method eq 'all_transactions' ) {
-
-    return $::locale->format_date(\%::myconfig, $mindate);
-
-  } elsif ( $startdate_method eq 'last_ob_or_all_transactions' and $last_ob ) {
-    # use default if there are no ob transactions
-
-    return $::locale->format_date(\%::myconfig, $last_ob);
-
-  } elsif ( $startdate_method eq 'last_ob_or_start_of_year' ) {
-
-    if ( $last_ob ) {
-      return $::locale->format_date(\%::myconfig, $last_ob);
-    } else {
-      return $::locale->format_date(\%::myconfig, $start_of_year);
-    };
-
-  } else {
-    # default action, also used for closedto and last_ob_or_all_transactions if
-    # there are no valid dates
-
-    return $::locale->format_date(\%::myconfig, $mindate);
-  };
-
-};
-
 sub balance_sheet {
   $main::lxdebug->enter_sub();
 
+  my ($self) = @_;
+
   my $myconfig = \%main::myconfig;
   my $form     = $main::form;
   my $dbh      = $::form->get_standard_dbh;
@@ -151,7 +69,7 @@ sub balance_sheet {
   }
 
   # get starting date for calculating balance
-  $form->{this_startdate} = get_balance_starting_date($form->{asofdate});
+  $form->{this_startdate} = $self->get_balance_starting_date($form->{asofdate});
 
   get_accounts($dbh, $last_period, $form->{this_startdate}, $form->{asofdate}, $form, \@categories);
 
@@ -159,7 +77,7 @@ sub balance_sheet {
   if ($form->{compareasofdate}) {
     $last_period = 1;
 
-    $form->{last_startdate} = get_balance_starting_date($form->{compareasofdate});
+    $form->{last_startdate} = $self->get_balance_starting_date($form->{compareasofdate});
 
     get_accounts($dbh, $last_period, $form->{last_startdate} , $form->{compareasofdate}, $form, \@categories);
     $form->{last_period} = conv_dateq($form->{compareasofdate});
@@ -884,7 +802,7 @@ sub trial_balance {
   my $glwhere       = '';
   my $glsumwhere    = '';
   my $tofrom;
-  my ($fromdate, $todate, $hotfix_query);
+  my ($fromdate, $todate, $fetch_accounts_before_from);
 
   if ($form->{fromdate} || $form->{todate}) {
     if ($form->{fromdate}) {
@@ -923,10 +841,13 @@ sub trial_balance {
     $sumwhere .= $glsumwhere . " AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL)";
 
     # get all entries before fromdate, which are not yet fetched
-    # TODO dpt_where_without_arapgl and project
-    $hotfix_query = qq|SELECT c.accno, c.description, c.category, SUM(ac.amount) AS amount
+    # TODO dpt_where_without_arapgl and project - project calculation seems bogus anyway
+    # TODO use fiscal_year_startdate for the whole trial balance
+    #      anyway, if the last booking is in a deviating fiscal year, this already improves the query
+    my $fiscal_year_startdate = conv_dateq($self->get_balance_starting_date($form->{fromdate}));
+    $fetch_accounts_before_from = qq|SELECT c.accno, c.description, c.category, SUM(ac.amount) AS amount
                        FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) WHERE 1 = 1 AND (ac.transdate <= $fromdate)
-                        AND (ac.transdate >= (SELECT date_trunc('YEAR', | . $fromdate . qq|::date)))
+                       AND (ac.transdate >= $fiscal_year_startdate)
                        AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL)
                        AND c.accno NOT IN (SELECT c.accno FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) WHERE 1 = 1 AND (ac.transdate >= $fromdate) AND (ac.transdate <= $todate)
                        AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL))
@@ -988,8 +909,8 @@ sub trial_balance {
   }
   $sth->finish;
 
-  if (! $form->{method} eq "cash") {
-    $sth = prepare_execute_query($form, $dbh, $hotfix_query);
+  if (!$form->{method} ne "cash") {
+    $sth = prepare_execute_query($form, $dbh, $fetch_accounts_before_from);
     while ($ref = $sth->fetchrow_hashref("NAME_lc")) {
       $trb{ $ref->{accno} }{description} = $ref->{description};
       $trb{ $ref->{accno} }{charttype}   = 'A';
@@ -1950,4 +1871,34 @@ sub income_statement {
   }
   $main::lxdebug->leave_sub();
 }
+
+sub income_statement_ch {
+
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  my $last_period  = 0;
+
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  get_accounts_ch($dbh, $last_period, $form->{fromdate}, $form->{todate}, $form);
+
+   $main::lxdebug->leave_sub();
+}
+
+
+ sub get_accounts_ch {
+  $main::lxdebug->enter_sub();
+
+  my $query =
+    qq|SELECT c.accno, c.description
+       FROM chart c
+       ORDER BY c.accno|;
+
+   $main::lxdebug->leave_sub();
+}
+
 1;