SelfTest Kosmetik

[mfinanz.git] / SL / RP.pm

diff --git a/SL/RP.pm b/SL/RP.pm
index 47d7db9eed9a405aca31d1b7f7df15a7aea66bbc..479d850308a5b541262c4304623125fa05cc27e9 100644 (file)
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -25,7 +25,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software

-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.

 #======================================================================
 #
 # backend code for reports
 #======================================================================
 #
 # backend code for reports


@@ -36,7 +37,9 @@ package RP;
 
 use SL::DBUtils;
 use Data::Dumper;
 
 use SL::DBUtils;
 use Data::Dumper;

+use SL::DB::Helper::AccountingPeriod qw(get_balance_starting_date);

 use List::Util qw(sum);
 use List::Util qw(sum);

+use SL::DB;

 
 # use warnings;
 use strict;
 
 # use warnings;
 use strict;


@@ -50,94 +53,11 @@ use strict;
 # - proper testing for heading charts
 # - transmission from $form to TMPL realm is not as clear as i'd like
 
 # - 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();
 
 sub balance_sheet {
   $main::lxdebug->enter_sub();
 

+  my ($self) = @_;
+

   my $myconfig = \%main::myconfig;
   my $form     = $main::form;
   my $dbh      = $::form->get_standard_dbh;
   my $myconfig = \%main::myconfig;
   my $form     = $main::form;
   my $dbh      = $::form->get_standard_dbh;


@@ -151,7 +71,7 @@ sub balance_sheet {
   }
 
   # get starting date for calculating balance
   }
 
   # 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);
 
 
   get_accounts($dbh, $last_period, $form->{this_startdate}, $form->{asofdate}, $form, \@categories);
 


@@ -159,7 +79,7 @@ sub balance_sheet {
   if ($form->{compareasofdate}) {
     $last_period = 1;
 
   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});
 
     get_accounts($dbh, $last_period, $form->{last_startdate} , $form->{compareasofdate}, $form, \@categories);
     $form->{last_period} = conv_dateq($form->{compareasofdate});


@@ -555,6 +475,9 @@ sub get_accounts_g {
       $inwhere   = " AND (acc.transdate >= $fromdate)";
     } else {
       $where    .= " AND (ac.transdate >= $fromdate)";
       $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)";

     }
   }
 
     }
   }
 


@@ -739,7 +662,7 @@ sub trial_balance {
 
   my ($self, $myconfig, $form, %options) = @_;
 
 
   my ($self, $myconfig, $form, %options) = @_;
 

-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = SL::DB->client->dbh;

 
   my ($query, $sth, $ref);
   my %balance = ();
 
   my ($query, $sth, $ref);
   my %balance = ();


@@ -828,7 +751,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
           $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 |;
             $customer_where
             $project
           GROUP BY c.accno, c.category, c.description |;


@@ -926,7 +848,7 @@ sub trial_balance {
     # 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
     # 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(get_balance_starting_date($form->{fromdate}));
+    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 >= $fiscal_year_startdate)
     $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 >= $fiscal_year_startdate)


@@ -991,7 +913,7 @@ sub trial_balance {
   }
   $sth->finish;
 
   }
   $sth->finish;
 

-  if (!$form->{method} ne "cash") {
+  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};
     $sth = prepare_execute_query($form, $dbh, $fetch_accounts_before_from);
     while ($ref = $sth->fetchrow_hashref("NAME_lc")) {
       $trb{ $ref->{accno} }{description} = $ref->{description};


@@ -1013,7 +935,6 @@ sub trial_balance {
           $customer_join
           WHERE $where
             $dpt_where_without_arapgl
           $customer_join
           WHERE $where
             $dpt_where_without_arapgl

-            $dpt_where

             $customer_where
             $project
           AND (ac.amount < 0)
             $customer_where
             $project
           AND (ac.amount < 0)


@@ -1025,7 +946,6 @@ sub trial_balance {
           $customer_join
           WHERE $where
             $dpt_where_without_arapgl
           $customer_join
           WHERE $where
             $dpt_where_without_arapgl

-            $dpt_where

             $customer_where
             $project
           AND ac.amount > 0
             $customer_where
             $project
           AND ac.amount > 0


@@ -1036,7 +956,6 @@ sub trial_balance {
          $customer_join
          WHERE $saldowhere
            $dpt_where_without_arapgl
          $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,
            $customer_where
            $project
          AND c.accno = ? AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL)) AS saldo,


@@ -1047,7 +966,6 @@ sub trial_balance {
          $customer_join
          WHERE $sumwhere
            $dpt_where_without_arapgl
          $customer_join
          WHERE $sumwhere
            $dpt_where_without_arapgl

-           $dpt_where

            $customer_where
            $project
          AND ac.amount > 0
            $customer_where
            $project
          AND ac.amount > 0


@@ -1059,7 +977,6 @@ sub trial_balance {
          $customer_join
          WHERE $sumwhere
            $dpt_where_without_arapgl
          $customer_join
          WHERE $sumwhere
            $dpt_where_without_arapgl

-           $dpt_where

            $customer_where
            $project
          AND ac.amount < 0
            $customer_where
            $project
          AND ac.amount < 0


@@ -1070,7 +987,6 @@ sub trial_balance {
         $customer_join
         WHERE $where
           $dpt_where_without_arapgl
         $customer_join
         WHERE $where
           $dpt_where_without_arapgl

-          $dpt_where

           $customer_where
           $project
         AND c.accno = ?) AS last_transaction
           $customer_where
           $project
         AND c.accno = ?) AS last_transaction


@@ -1147,7 +1063,6 @@ sub trial_balance {
         $customer_join
         WHERE $where
           $dpt_where_without_arapgl
         $customer_join
         WHERE $where
           $dpt_where_without_arapgl

-          $dpt_where

           $customer_where
           $project
         AND c.accno = ?) AS last_transaction
           $customer_where
           $project
         AND c.accno = ?) AS last_transaction


@@ -1249,8 +1164,6 @@ sub trial_balance {
 
   }
 
 
   }
 

-  $dbh->disconnect;
-

   # debits and credits for headings
   foreach my $accno (@headingaccounts) {
     foreach $ref (@{ $form->{TB} }) {
   # debits and credits for headings
   foreach my $accno (@headingaccounts) {
     foreach $ref (@{ $form->{TB} }) {


@@ -1287,7 +1200,7 @@ sub aging {
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my ($self, $myconfig, $form) = @_;
 
   # connect to database

-  my $dbh     = $form->dbconnect($myconfig);
+  my $dbh     = SL::DB->client->dbh;

 
   my ($invoice, $arap, $buysell, $ct, $ct_id, $ml);
 
 
   my ($invoice, $arap, $buysell, $ct, $ct_id, $ml);
 


@@ -1353,7 +1266,7 @@ sub aging {
   if ($form->{$ct_id}) {
     $where .= qq| AND (ct.id = | . conv_i($form->{$ct_id}) . qq|)|;
   } elsif ($form->{ $form->{ct} }) {
   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;
   }
 
   my $dpt_join;


@@ -1419,9 +1332,6 @@ sub aging {
 
   $sth->finish;
 
 
   $sth->finish;
 

-  # disconnect
-  $dbh->disconnect;
-

   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 


@@ -1430,8 +1340,7 @@ sub get_customer {
 
   my ($self, $myconfig, $form) = @_;
 
 
   my ($self, $myconfig, $form) = @_;
 

-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = SL::DB->client->dbh;

 
   my $ct = $form->{ct} eq "customer" ? "customer" : "vendor";
 
 
   my $ct = $form->{ct} eq "customer" ? "customer" : "vendor";
 


@@ -1441,7 +1350,6 @@ sub get_customer {
        WHERE ct.id = ?|;
   ($form->{ $form->{ct} }, $form->{email}, $form->{cc}, $form->{bcc}) =
     selectrow_query($form, $dbh, $query, $form->{"${ct}_id"});
        WHERE ct.id = ?|;
   ($form->{ $form->{ct} }, $form->{email}, $form->{cc}, $form->{bcc}) =
     selectrow_query($form, $dbh, $query, $form->{"${ct}_id"});

-  $dbh->disconnect;

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -1451,8 +1359,7 @@ sub tax_report {
 
   my ($self, $myconfig, $form) = @_;
 
 
   my ($self, $myconfig, $form) = @_;
 

-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = SL::DB->client->dbh;

 
   my ($null, $department_id) = split /--/, $form->{department};
 
 
   my ($null, $department_id) = split /--/, $form->{department};
 


@@ -1541,8 +1448,6 @@ sub tax_report {
 
   $form->{TR} = selectall_hashref_query($form, $dbh, $query);
 
 
   $form->{TR} = selectall_hashref_query($form, $dbh, $query);
 

-  $dbh->disconnect;
-

   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 


@@ -1552,7 +1457,7 @@ sub paymentaccounts {
   my ($self, $myconfig, $form) = @_;
 
   # connect to database, turn AutoCommit off
   my ($self, $myconfig, $form) = @_;
 
   # connect to database, turn AutoCommit off

-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my $dbh = SL::DB->client->dbh;

 
   my $ARAP = $form->{db} eq "ar" ? "AR" : "AP";
 
 
   my $ARAP = $form->{db} eq "ar" ? "AR" : "AP";
 


@@ -1563,8 +1468,6 @@ sub paymentaccounts {
        WHERE link LIKE '%${ARAP}_paid%'|;
   $form->{PR} = selectall_hashref_query($form, $dbh, $query);
 
        WHERE link LIKE '%${ARAP}_paid%'|;
   $form->{PR} = selectall_hashref_query($form, $dbh, $query);
 

-  $dbh->disconnect;
-

   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 


@@ -1574,7 +1477,7 @@ sub payments {
   my ($self, $myconfig, $form) = @_;
 
   # connect to database, turn AutoCommit off
   my ($self, $myconfig, $form) = @_;
 
   # connect to database, turn AutoCommit off

-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my $dbh = SL::DB->client->dbh;

 
   my $ml = 1;
   my $arap;
 
   my $ml = 1;
   my $arap;


@@ -1608,15 +1511,15 @@ sub payments {
   my $invnumber;
   my $reference;
   if ($form->{reference}) {
   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}) {
     $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}) {
   }
   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 =  (
   }
 
   my %sort_columns =  (


@@ -1695,8 +1598,6 @@ sub payments {
     $sth_details->finish();
   }
 
     $sth_details->finish();
   }
 

-  $dbh->disconnect;
-

   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 


@@ -1705,8 +1606,7 @@ sub bwa {
 
   my ($self, $myconfig, $form) = @_;
 
 
   my ($self, $myconfig, $form) = @_;
 

-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  my $dbh = SL::DB->client->dbh;

 
   my $last_period = 0;
   my $category;
 
   my $last_period = 0;
   my $category;


@@ -1906,7 +1806,6 @@ sub bwa {
     }
 
   }
     }
 
   }

-  $dbh->disconnect;

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -1953,4 +1852,87 @@ sub income_statement {
   }
   $main::lxdebug->leave_sub();
 }
   }
   $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;
+  $form->{fromdate} = DateTime->new(year => 2000, month => 1, day => 1)->to_kivitendo unless $form->{fromdate};
+  $form->{todate} = $form->current_date(%{$myconfig}) unless $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 ('I', 'E') {
+    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 = '1'";
+  } elsif ($category eq 'E') {
+    $inclusion = "AND pos_er = NULL OR pos_er = '6'";
+  } else {
+    $inclusion = "";
+  }
+
+  my $query = qq|
+    SELECT id, accno, description, category
+    FROM chart
+    WHERE category = ? $inclusion
+    ORDER BY accno
+  |;
+  my $accounts = _query($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 <= ?
+  |;
+  $total += _query($query, $chart_id, $fromdate, $todate)->[0]->{sum};
+
+  $main::lxdebug->leave_sub();
+  return $total;
+}
+
+sub _query {return selectall_hashref_query($::form, $::form->get_standard_dbh, @_);}
+

 1;
 1;