X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FRP.pm;h=a18452e67687a2fd6dafa9b2b252f59bdd55fcef;hb=78c6fdee686577ce29d3392661bc4d39bc5481a9;hp=358d71e34af756b4eaee9b35393e0e82824340f6;hpb=ab3f3ed87a12c70d9538b1a07fc0e4659dc43d28;p=kivitendo-erp.git

diff --git a/SL/RP.pm b/SL/RP.pm
index 358d71e34..a18452e67 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});
@@ -555,6 +473,9 @@ sub get_accounts_g {
       $inwhere   = " AND (acc.transdate >= $fromdate)";
     } else {
       $where    .= " AND (ac.transdate >= $fromdate)";
+      # hotfix for projectfilter in guv and bwa
+      # fromdate is otherwise ignored if project is selected
+      $prwhere   = " AND (a.transdate  >= $fromdate)";
     }
   }
 
@@ -828,7 +749,6 @@ sub trial_balance {
           $customer_join
           WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) AND ac.ob_transaction
             $dpt_where_without_arapgl
-            $dpt_where
             $customer_where
             $project
           GROUP BY c.accno, c.category, c.description |;
@@ -884,7 +804,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 +843,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 +911,8 @@ sub trial_balance {
   }
   $sth->finish;
 
-  if (! $form->{method} eq "cash") {
-    $sth = prepare_execute_query($form, $dbh, $hotfix_query);
+  if ($form->{method} ne "cash") {  # better eq 'accrual'
+    $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';
@@ -1010,7 +933,6 @@ sub trial_balance {
           $customer_join
           WHERE $where
             $dpt_where_without_arapgl
-            $dpt_where
             $customer_where
             $project
           AND (ac.amount < 0)
@@ -1022,7 +944,6 @@ sub trial_balance {
           $customer_join
           WHERE $where
             $dpt_where_without_arapgl
-            $dpt_where
             $customer_where
             $project
           AND ac.amount > 0
@@ -1033,7 +954,6 @@ sub trial_balance {
          $customer_join
          WHERE $saldowhere
            $dpt_where_without_arapgl
-           $dpt_where
            $customer_where
            $project
          AND c.accno = ? AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL)) AS saldo,
@@ -1044,7 +964,6 @@ sub trial_balance {
          $customer_join
          WHERE $sumwhere
            $dpt_where_without_arapgl
-           $dpt_where
            $customer_where
            $project
          AND ac.amount > 0
@@ -1056,7 +975,6 @@ sub trial_balance {
          $customer_join
          WHERE $sumwhere
            $dpt_where_without_arapgl
-           $dpt_where
            $customer_where
            $project
          AND ac.amount < 0
@@ -1067,7 +985,6 @@ sub trial_balance {
         $customer_join
         WHERE $where
           $dpt_where_without_arapgl
-          $dpt_where
           $customer_where
           $project
         AND c.accno = ?) AS last_transaction
@@ -1144,7 +1061,6 @@ sub trial_balance {
         $customer_join
         WHERE $where
           $dpt_where_without_arapgl
-          $dpt_where
           $customer_where
           $project
         AND c.accno = ?) AS last_transaction
@@ -1350,7 +1266,7 @@ sub aging {
   if ($form->{$ct_id}) {
     $where .= qq| AND (ct.id = | . conv_i($form->{$ct_id}) . qq|)|;
   } elsif ($form->{ $form->{ct} }) {
-    $where .= qq| AND (ct.name ILIKE | . $dbh->quote('%' . $form->{$ct} . '%') . qq|)|;
+    $where .= qq| AND (ct.name ILIKE | . $dbh->quote(like($form->{$ct})) . qq|)|;
   }
 
   my $dpt_join;
@@ -1605,15 +1521,15 @@ sub payments {
   my $invnumber;
   my $reference;
   if ($form->{reference}) {
-    $reference = $dbh->quote('%' . $form->{reference} . '%');
+    $reference = $dbh->quote(like($form->{reference}));
     $invnumber = " AND (a.invnumber LIKE $reference)";
     $reference = " AND (a.reference LIKE $reference)";
   }
   if ($form->{source}) {
-    $where .= " AND (ac.source ILIKE " . $dbh->quote('%' . $form->{source} . '%') . ") ";
+    $where .= " AND (ac.source ILIKE " . $dbh->quote(like($form->{source})) . ") ";
   }
   if ($form->{memo}) {
-    $where .= " AND (ac.memo ILIKE " . $dbh->quote('%' . $form->{memo} . '%') . ") ";
+    $where .= " AND (ac.memo ILIKE " . $dbh->quote(like($form->{memo})) . ") ";
   }
 
   my %sort_columns =  (
@@ -1950,4 +1866,88 @@ sub income_statement {
   }
   $main::lxdebug->leave_sub();
 }
+
+sub erfolgsrechnung {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+  $form->{company} = $::instance_conf->get_company;
+  $form->{address} = $::instance_conf->get_address;
+
+  # wrong user inputs should be handled during users input
+  # e.g.  spaces, tabs, wrong format or wrong dates
+  $form->{fromdate} = "01.01.2000" if !$form->{fromdate};
+  $form->{todate} = $form->current_date(%{$myconfig}) if !$form->{todate};
+
+  my %categories = (I => "ERTRAG", E => "AUFWAND");
+  my $fromdate = conv_dateq($form->{fromdate});
+  my $todate = conv_dateq($form->{todate});
+
+  $form->{total} = 0;
+  foreach my $category (keys %categories) {
+    my %category = (
+      name => $categories{$category},
+      total => 0,
+      accounts => get_accounts_ch($category),
+    );
+    foreach my $account (@{$category{accounts}}) {
+      $account->{total} += ($account->{category} eq $category ? 1 : -1) * get_total_ch($account->{id}, $fromdate, $todate);
+      $category{total} += $account->{total};
+      $account->{total} = $form->format_amount($myconfig, $form->parse_amount($myconfig, $account->{total}), 2);
+    }
+    $form->{total} += $category{total};
+    $category{total} = $form->format_amount($myconfig, $form->parse_amount($myconfig, $category{total}), 2);
+    push(@{$form->{categories}}, \%category);
+  }
+  $form->{total} = $form->format_amount($myconfig, $form->parse_amount($myconfig, $form->{total}), 2);
+
+  $main::lxdebug->leave_sub();
+  return {};
+}
+
+sub get_accounts_ch {
+  $main::lxdebug->enter_sub();
+
+  my ($category) = @_;
+  my ($inclusion);
+
+  if ($category eq 'I') {
+    $inclusion = "AND pos_er = NULL OR pos_er > '0' AND pos_er <= '5'";
+  } elsif ($category eq 'E') {
+    $inclusion = "AND pos_er = NULL OR pos_er >= '6' AND pos_er < '100'";
+  } else {
+    $inclusion = "";
+  }
+
+  my $query = qq|
+    SELECT id, accno, description, category
+    FROM chart
+    WHERE category = ? $inclusion
+    ORDER BY accno
+  |;
+  my $accounts = selectall_hashref_query($::form, $::form->get_standard_dbh, $query, $category);
+
+  $main::lxdebug->leave_sub();
+  return $accounts;
+}
+
+sub get_total_ch {
+  $main::lxdebug->enter_sub();
+
+  my ($chart_id, $fromdate, $todate) = @_;
+  my $total = 0;
+  my $query = qq|
+    SELECT SUM(amount)
+    FROM acc_trans
+    WHERE chart_id = ?
+      AND transdate >= ?
+      AND transdate <= ?
+  |;
+  my $data = selectfirst_hashref_query($::form, $::form->get_standard_dbh, $query, $chart_id, $fromdate, $todate);
+  $total += $data->{sum};
+
+  $main::lxdebug->leave_sub();
+  return $total;
+}
+
 1;