Auftrags-Controller: Kosmetik

[mfinanz.git] / SL / RP.pm

diff --git a/SL/RP.pm b/SL/RP.pm
index 095f7581cf034fcbce0b0e329410a061bd84f1c3..b2fd5e0699f273c76ed908342dc8beebdc389c95 100644 (file)
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -36,6 +36,7 @@ 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 warnings;
 use List::Util qw(sum);
 
 # use warnings;


@@ -50,19 +51,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_openbalance_date {
-  my ($closedto, $target) = map { $::locale->parse_date_to_object(\%::myconfig, $_) } @_;
-
-  return unless $closedto;
-
-  $closedto->subtract(years => 1) while ($target - $closedto)->is_negative;
-  $closedto->add(days => 1);
-  return $::locale->format_date(\%::myconfig, $closedto);
-}
-

 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;


@@ -75,21 +68,18 @@ sub balance_sheet {
     $form->{period} = $form->{this_period} = conv_dateq($form->{asofdate});
   }
 
     $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 starting date for calculating balance
+  $form->{this_startdate} = $self->get_balance_starting_date($form->{asofdate});

 
 

-  # get date of last opening balance
-  my $startdate = get_openbalance_date($closedto, $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;
 
 
   # if there are any compare dates
   if ($form->{compareasofdate}) {
     $last_period = 1;
 

-    $startdate = get_openbalance_date($closedto, $form->{compareasofdate});
+    $form->{last_startdate} = $self->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});
   }
 
     $form->{last_period} = conv_dateq($form->{compareasofdate});
   }
 


@@ -516,7 +506,7 @@ sub get_accounts_g {
   if ($form->{method} eq 'cash') {
     $query =
       qq|
   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
             /* ar amount is not zero, so we can divide by amount   */
                     (SELECT SUM(acc.amount) * -1
                      FROM acc_trans acc


@@ -531,13 +521,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)
        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
       WHERE ac.trans_id IN (SELECT DISTINCT trans_id FROM acc_trans WHERE 1=1 $subwhere)
 
       GROUP BY c.$category


@@ -683,6 +666,7 @@ sub trial_balance {
   my @headingaccounts = ();
   my $dpt_where;
   my $dpt_where_without_arapgl;
   my @headingaccounts = ();
   my $dpt_where;
   my $dpt_where_without_arapgl;

+  my ($customer_where, $customer_join, $customer_no_union);

   my $project;
 
   my $where    = "1 = 1";
   my $project;
 
   my $where    = "1 = 1";


@@ -694,6 +678,11 @@ sub trial_balance {
                                                  (SELECT department_id FROM gl WHERE gl.id=ac.trans_id),
                                                  (SELECT department_id FROM ap WHERE ap.id=ac.trans_id)) = | . conv_i($department_id);
   }
                                                  (SELECT department_id FROM gl WHERE gl.id=ac.trans_id),
                                                  (SELECT department_id FROM ap WHERE ap.id=ac.trans_id)) = | . conv_i($department_id);
   }

+  if ($form->{customer_id}) {
+    $customer_join     = qq| JOIN ar a ON (ac.trans_id = a.id) |;
+    $customer_where    = qq| AND (a.customer_id = | . conv_i($form->{customer_id}, 'NULL') . qq|) |;
+    $customer_no_union = qq| AND 1=0 |;
+  }

 
   # project_id only applies to getting transactions
   # it has nothing to do with a trial balance
 
   # project_id only applies to getting transactions
   # it has nothing to do with a trial balance


@@ -740,8 +729,11 @@ sub trial_balance {
       my $min_max = $prefix eq 'from' ? 'min' : 'max';
       $query      = qq|SELECT ${min_max}(transdate)
                        FROM acc_trans ac
       my $min_max = $prefix eq 'from' ? 'min' : 'max';
       $query      = qq|SELECT ${min_max}(transdate)
                        FROM acc_trans ac

+                       $customer_join

                        WHERE (1 = 1)
                          $dpt_where_without_arapgl
                        WHERE (1 = 1)
                          $dpt_where_without_arapgl

+                         $dpt_where
+                         $customer_where

                          $project|;
       ($form->{"${prefix}date"}) = selectfirst_array_query($form, $dbh, $query);
     }
                          $project|;
       ($form->{"${prefix}date"}) = selectfirst_array_query($form, $dbh, $query);
     }


@@ -751,8 +743,11 @@ sub trial_balance {
       qq|SELECT c.accno, c.category, SUM(ac.amount) AS amount, c.description
           FROM acc_trans ac
           LEFT JOIN chart c ON (ac.chart_id = c.id)
       qq|SELECT c.accno, c.category, SUM(ac.amount) AS amount, c.description
           FROM acc_trans ac
           LEFT JOIN chart c ON (ac.chart_id = c.id)

+          $customer_join

           WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) AND ac.ob_transaction
             $dpt_where_without_arapgl
           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 |;
 
             $project
           GROUP BY c.accno, c.category, c.description |;
 


@@ -807,7 +802,7 @@ sub trial_balance {
   my $glwhere       = '';
   my $glsumwhere    = '';
   my $tofrom;
   my $glwhere       = '';
   my $glsumwhere    = '';
   my $tofrom;

-  my ($fromdate, $todate);
+  my ($fromdate, $todate, $fetch_accounts_before_from);

 
   if ($form->{fromdate} || $form->{todate}) {
     if ($form->{fromdate}) {
 
   if ($form->{fromdate} || $form->{todate}) {
     if ($form->{fromdate}) {


@@ -844,12 +839,26 @@ sub trial_balance {
     $where .= $tofrom . " AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL)";
     $saldowhere .= $glsaldowhere . " AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL)";
     $sumwhere .= $glsumwhere . " AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL)";
     $where .= $tofrom . " AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL)";
     $saldowhere .= $glsaldowhere . " AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL)";
     $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 - 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 >= $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))
+                       GROUP BY c.accno, c.description, c.category ORDER BY accno|;

   }
 
   $query = 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)
   }
 
   $query = 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)

+       $customer_join

        WHERE $where
          $dpt_where_without_arapgl
          $project
        WHERE $where
          $dpt_where_without_arapgl
          $project


@@ -868,6 +877,7 @@ sub trial_balance {
       JOIN chart c ON (p.income_accno_id = c.id)
       WHERE $invwhere
         $dpt_where
       JOIN chart c ON (p.income_accno_id = c.id)
       WHERE $invwhere
         $dpt_where

+        $customer_where

         $project
       GROUP BY c.accno, c.description, c.category
 
         $project
       GROUP BY c.accno, c.description, c.category
 


@@ -880,6 +890,7 @@ sub trial_balance {
       JOIN chart c ON (p.expense_accno_id = c.id)
       WHERE $invwhere
         $dpt_where
       JOIN chart c ON (p.expense_accno_id = c.id)
       WHERE $invwhere
         $dpt_where

+        $customer_no_union

         $project
       GROUP BY c.accno, c.description, c.category
       |;
         $project
       GROUP BY c.accno, c.description, c.category
       |;


@@ -898,6 +909,17 @@ sub trial_balance {
   }
   $sth->finish;
 
   }
   $sth->finish;
 

+  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';
+      $trb{ $ref->{accno} }{category}    = $ref->{category};
+      $trb{ $ref->{accno} }{amount} += $ref->{amount};
+    }
+    $sth->finish;
+  }
+

   # prepare query for each account
   my ($q_drcr, $drcr, $q_project_drcr, $project_drcr);
 
   # prepare query for each account
   my ($q_drcr, $drcr, $q_project_drcr, $project_drcr);
 


@@ -906,8 +928,11 @@ sub trial_balance {
          (SELECT SUM(ac.amount) * -1
           FROM acc_trans ac
           JOIN chart c ON (c.id = ac.chart_id)
          (SELECT SUM(ac.amount) * -1
           FROM acc_trans ac
           JOIN chart c ON (c.id = ac.chart_id)

+          $customer_join

           WHERE $where
             $dpt_where_without_arapgl
           WHERE $where
             $dpt_where_without_arapgl

+            $dpt_where
+            $customer_where

             $project
           AND (ac.amount < 0)
           AND (c.accno = ?)) AS debit,
             $project
           AND (ac.amount < 0)
           AND (c.accno = ?)) AS debit,


@@ -915,41 +940,56 @@ sub trial_balance {
          (SELECT SUM(ac.amount)
           FROM acc_trans ac
           JOIN chart c ON (c.id = ac.chart_id)
          (SELECT SUM(ac.amount)
           FROM acc_trans ac
           JOIN chart c ON (c.id = ac.chart_id)

+          $customer_join

           WHERE $where
             $dpt_where_without_arapgl
           WHERE $where
             $dpt_where_without_arapgl

+            $dpt_where
+            $customer_where

             $project
           AND ac.amount > 0
           AND c.accno = ?) AS credit,
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)
             $project
           AND ac.amount > 0
           AND c.accno = ?) AS credit,
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)

+         $customer_join

          WHERE $saldowhere
            $dpt_where_without_arapgl
          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,
 
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)
            $project
          AND c.accno = ? AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL)) AS saldo,
 
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)

+         $customer_join

          WHERE $sumwhere
            $dpt_where_without_arapgl
          WHERE $sumwhere
            $dpt_where_without_arapgl

+           $dpt_where
+           $customer_where

            $project
            $project

-         AND amount > 0
+         AND ac.amount > 0

          AND c.accno = ?) AS sum_credit,
 
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)
          AND c.accno = ?) AS sum_credit,
 
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)

+         $customer_join

          WHERE $sumwhere
            $dpt_where_without_arapgl
          WHERE $sumwhere
            $dpt_where_without_arapgl

+           $dpt_where
+           $customer_where

            $project
            $project

-         AND amount < 0
+         AND ac.amount < 0

          AND c.accno = ?) AS sum_debit,
 
         (SELECT max(ac.transdate) FROM acc_trans ac
         JOIN chart c ON (ac.chart_id = c.id)
          AND c.accno = ?) AS sum_debit,
 
         (SELECT max(ac.transdate) FROM acc_trans ac
         JOIN chart c ON (ac.chart_id = c.id)

+        $customer_join

         WHERE $where
           $dpt_where_without_arapgl
         WHERE $where
           $dpt_where_without_arapgl

+          $dpt_where
+          $customer_where

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


@@ -969,6 +1009,7 @@ sub trial_balance {
            JOIN chart c ON (p.expense_accno_id = c.id)
            WHERE $invwhere
              $dpt_where
            JOIN chart c ON (p.expense_accno_id = c.id)
            WHERE $invwhere
              $dpt_where

+             $customer_no_union

              $project
            AND c.accno = ?) AS debit,
 
              $project
            AND c.accno = ?) AS debit,
 


@@ -979,40 +1020,53 @@ sub trial_balance {
            JOIN chart c ON (p.income_accno_id = c.id)
            WHERE $invwhere
              $dpt_where
            JOIN chart c ON (p.income_accno_id = c.id)
            WHERE $invwhere
              $dpt_where

+             $customer_where

              $project
            AND c.accno = ?) AS credit,
 
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)
              $project
            AND c.accno = ?) AS credit,
 
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)

+         $customer_join

          WHERE $saldowhere
            $dpt_where_without_arapgl
          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,
 
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)
            $project
          AND c.accno = ? AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL)) AS saldo,
 
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)

+         $customer_join

          WHERE $sumwhere
            $dpt_where_without_arapgl
          WHERE $sumwhere
            $dpt_where_without_arapgl

+           $dpt_where
+           $customer_where

            $project
            $project

-         AND amount > 0
+         AND ac.amount > 0

          AND c.accno = ?) AS sum_credit,
 
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)
          AND c.accno = ?) AS sum_credit,
 
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)

+         $customer_join

          WHERE $sumwhere
          WHERE $sumwhere

+           $dpt_where

            $dpt_where_without_arapgl
            $dpt_where_without_arapgl

+           $customer_where

            $project
            $project

-         AND amount < 0
+         AND ac.amount < 0

          AND c.accno = ?) AS sum_debit,
 
 
         (SELECT max(ac.transdate) FROM acc_trans ac
         JOIN chart c ON (ac.chart_id = c.id)
          AND c.accno = ?) AS sum_debit,
 
 
         (SELECT max(ac.transdate) FROM acc_trans ac
         JOIN chart c ON (ac.chart_id = c.id)

+        $customer_join

         WHERE $where
           $dpt_where_without_arapgl
         WHERE $where
           $dpt_where_without_arapgl

+          $dpt_where
+          $customer_where

           $project
         AND c.accno = ?) AS last_transaction
  |;
           $project
         AND c.accno = ?) AS last_transaction
  |;