X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FRP.pm;h=969e8adfb373fa58e253d9478e4fa6e87d9ba69d;hb=d6d08d5ee343b6552656a9bb7450374897a16e1a;hp=7890ecd8956b0fbfb9def2adb3edff1c15efe844;hpb=6c9c012e74984b7992fc4bad93c58960744f16d2;p=kivitendo-erp.git

diff --git a/SL/RP.pm b/SL/RP.pm
index 7890ecd89..969e8adfb 100644
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -50,15 +50,90 @@ use strict;
 # - proper testing for heading charts
 # - transmission from $form to TMPL realm is not as clear as i'd like
 
-sub get_openbalance_date {
-  my ($closedto, $target) = map { $::locale->parse_date_to_object(\%::myconfig, $_) } @_;
+sub get_balance_starting_date {
 
-  return unless $closedto;
+  # determine date from which the balance is calculated. The method is
+  # configured in the client configuration.
 
-  $closedto->subtract(years => 1) while ($target - $closedto)->is_negative;
-  $closedto->add(days => 1);
-  return $::locale->format_date(\%::myconfig, $closedto);
-}
+  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();
@@ -75,21 +150,18 @@ sub balance_sheet {
     $form->{period} = $form->{this_period} = conv_dateq($form->{asofdate});
   }
 
-  # get end of financial year and convert to Date format
-  my ($closedto) = selectfirst_array_query($form, $dbh, 'SELECT closedto FROM defaults');
-
-  # get date of last opening balance
-  my $startdate = get_openbalance_date($closedto, $form->{asofdate});
+  # get starting date for calculating balance
+  $form->{this_startdate} = get_balance_starting_date($form->{asofdate});
 
-  get_accounts($dbh, $last_period, $startdate, $form->{asofdate}, $form, \@categories);
+  get_accounts($dbh, $last_period, $form->{this_startdate}, $form->{asofdate}, $form, \@categories);
 
   # if there are any compare dates
   if ($form->{compareasofdate}) {
     $last_period = 1;
 
-    $startdate = get_openbalance_date($closedto, $form->{compareasofdate});
+    $form->{last_startdate} = get_balance_starting_date($form->{compareasofdate});
 
-    get_accounts($dbh, $last_period, $startdate, $form->{compareasofdate}, $form, \@categories);
+    get_accounts($dbh, $last_period, $form->{last_startdate} , $form->{compareasofdate}, $form, \@categories);
     $form->{last_period} = conv_dateq($form->{compareasofdate});
   }
 
@@ -214,14 +286,14 @@ sub get_accounts {
   # filter for opening and closing bookings
   # if l_ob is selected l_cb is always ignored
   if ( $last_period ) {
-    # ob/cb-settings for "as of" balance
+    # ob/cb-settings for "compared to" balance
     if ( $form->{l_ob_compared} ) {
       $where .= ' AND ac.ob_transaction is true  '
     } elsif ( not $form->{l_cb_compared} ) {
       $where .= ' AND ac.cb_transaction is false ';
     };
   } else {
-    # ob/cb-settings for "compared to" balance
+    # ob/cb-settings for "as of" balance
     if ( $form->{l_ob} ) {
       $where .= ' AND ac.ob_transaction is true  '
     } elsif ( not $form->{l_cb} ) {
@@ -516,7 +588,7 @@ sub get_accounts_g {
   if ($form->{method} eq 'cash') {
     $query =
       qq|
-       SELECT SUM( ac.amount * CASE WHEN COALESCE((SELECT amount FROM ar WHERE id = ac.trans_id), 0) != 0 THEN
+       SELECT SUM( ac.amount * CASE WHEN COALESCE((SELECT amount FROM ar a WHERE id = ac.trans_id $dpt_where), 0) != 0 THEN
             /* ar amount is not zero, so we can divide by amount   */
                     (SELECT SUM(acc.amount) * -1
                      FROM acc_trans acc
@@ -531,13 +603,6 @@ sub get_accounts_g {
        FROM acc_trans ac
        LEFT JOIN chart c ON (c.id  = ac.chart_id)
        LEFT JOIN ar      ON (ar.id = ac.trans_id)
-       LEFT JOIN taxkeys tk ON (tk.id = (
-                                  SELECT id FROM taxkeys
-                                  WHERE chart_id = ac.chart_id
-                                  AND startdate <= COALESCE(ar.deliverydate,ar.transdate)
-                                  ORDER BY startdate DESC LIMIT 1
-                                  )
-                                )
       WHERE ac.trans_id IN (SELECT DISTINCT trans_id FROM acc_trans WHERE 1=1 $subwhere)
 
       GROUP BY c.$category
@@ -1238,7 +1303,7 @@ sub aging {
       "duedate", invoice, ${arap}.id, date_part('days', now() - duedate) as overduedays,
       (SELECT $buysell
        FROM exchangerate
-       WHERE (${arap}.curr = exchangerate.curr)
+       WHERE (${arap}.currency_id = exchangerate.currency_id)
          AND (exchangerate.transdate = ${arap}.transdate)) AS exchangerate
     FROM ${arap}, ${ct}
     WHERE ((paid != amount) OR (datepaid > (date $todate) AND datepaid is not null))