X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FRP.pm;h=ebc0dd68881e82a484dc3dd227aa638c71b15e1f;hb=6ac037ceaeb565f385267b2f8794e28e7ce50af8;hp=33912bae5f3c32d238e2382daa7eb78d3aec1c6a;hpb=596c6378c4d1a9b8815310d2481aed3ed066eed4;p=kivitendo-erp.git

diff --git a/SL/RP.pm b/SL/RP.pm
index 33912bae5..ebc0dd688 100644
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -1,4 +1,4 @@
-###=====================================================================
+#=====================================================================
 # LX-Office ERP
 # Copyright (C) 2004
 # Based on SQL-Ledger Version 2.1.9
@@ -36,14 +36,25 @@ package RP;
 
 use SL::DBUtils;
 use Data::Dumper;
+use List::Util qw(sum);
+use strict;
+use warnings;
+
 
+# new implementation of balance sheet
+# readme!
+#
+# stuff missing from the original implementation:
+# - bold stuff
+# - subdescription
+# - proper testing for heading charts
+# - transmission from $form to TMPL realm is not as clear as i'd like
 sub balance_sheet {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  my $myconfig = \%main::myconfig;
+  my $form     = $main::form;
+  my $dbh      = $form->get_standard_dbh($myconfig);
 
   my $last_period = 0;
   my @categories  = qw(A C L Q);
@@ -53,261 +64,91 @@ sub balance_sheet {
     $form->{period} = $form->{this_period} = conv_dateq($form->{asofdate});
   }
 
-  $form->{decimalplaces} *= 1;
-
-  &get_accounts($dbh, $last_period, "", $form->{asofdate}, $form,
-                \@categories);
+  get_accounts($dbh, $last_period, "", $form->{asofdate}, $form, \@categories);
 
   # if there are any compare dates
   if ($form->{compareasofdate}) {
-
     $last_period = 1;
-    &get_accounts($dbh, $last_period, "", $form->{compareasofdate},
-                  $form, \@categories);
-
+    get_accounts($dbh, $last_period, "", $form->{compareasofdate}, $form, \@categories);
     $form->{last_period} = conv_dateq($form->{compareasofdate});
-
   }
 
-  # disconnect
-  $dbh->disconnect;
-
   # now we got $form->{A}{accno}{ }    assets
   # and $form->{L}{accno}{ }           liabilities
   # and $form->{Q}{accno}{ }           equity
   # build asset accounts
 
-  my $str;
-  my $key;
-
-  my %account = (
-                 'A' => { 'label'  => 'asset',
-                          'labels' => 'assets',
-                          'ml'     => -1
-                 },
-                 'L' => { 'label'  => 'liability',
-                          'labels' => 'liabilities',
-                          'ml'     => 1
-                 },
-                 'Q' => { 'label'  => 'equity',
-                          'labels' => 'equity',
-                          'ml'     => 1
-                 });
+  my %account = ('A' => { 'ml'     => -1 },
+                 'L' => { 'ml'     =>  1 },
+                 'Q' => { 'ml'     =>  1 });
+
+  my $TMPL_DATA = {};
 
   foreach my $category (grep { !/C/ } @categories) {
 
-    foreach $key (sort keys %{ $form->{$category} }) {
+    $TMPL_DATA->{$category} = [];
+    my $ml  = $account{$category}{ml};
 
-      $str = ($form->{l_heading}) ? $form->{padding} : "";
+    foreach my $key (sort keys %{ $form->{$category} }) {
 
-      if ($form->{$category}{$key}{charttype} eq "A") {
-        $str .=
-          ($form->{l_accno})
-          ? "$form->{$category}{$key}{accno} - $form->{$category}{$key}{description}"
-          : "$form->{$category}{$key}{description}";
-      }
-      if ($form->{$category}{$key}{charttype} eq "H") {
-        if ($account{$category}{subtotal} && $form->{l_subtotal}) {
-          $dash = "- ";
-          push(@{ $form->{"$account{$category}{label}_account"} },
-               "$str$form->{bold}$account{$category}{subdescription}$form->{endbold}"
-          );
-          push(@{ $form->{"$account{$category}{label}_this_period"} },
-               $form->format_amount(
-                        $myconfig,
-                        $account{$category}{subthis} * $account{$category}{ml},
-                        $form->{decimalplaces}, $dash
-               ));
+      my $row = { %{ $form->{$category}{$key} } };
 
-          if ($last_period) {
-            push(@{ $form->{"$account{$category}{label}_last_period"} },
-                 $form->format_amount(
-                        $myconfig,
-                        $account{$category}{sublast} * $account{$category}{ml},
-                        $form->{decimalplaces}, $dash
-                 ));
-          }
+      # if charttype "heading" - calculate this entry, start a new batch of charts belonging to this heading and skip the rest bo the loop
+      # header charts are not real charts. start a sub aggregation with them, but don't calculate anything with them
+      if ($row->{charttype} eq "H") {
+        if ($account{$category}{subtotal} && $form->{l_subtotal}) {
+          $row->{subdescription} = $account{$category}{subdescription};
+          $row->{this}           = $account{$category}{subthis} * $ml;                   # format: $dec, $dash
+          $row->{last}           = $account{$category}{sublast} * $ml if $last_period;   # format: $dec, $dash
         }
 
-        $str =
-          "$form->{bold}$form->{$category}{$key}{description}$form->{endbold}";
-
-        $account{$category}{subthis}        = $form->{$category}{$key}{this};
-        $account{$category}{sublast}        = $form->{$category}{$key}{last};
-        $account{$category}{subdescription} =
-          $form->{$category}{$key}{description};
+        $row->{subheader} = 1;
+        $account{$category}{subthis}        = $row->{this};
+        $account{$category}{sublast}        = $row->{last};
+        $account{$category}{subdescription} = $row->{description};
         $account{$category}{subtotal} = 1;
 
-        $form->{$category}{$key}{this} = 0;
-        $form->{$category}{$key}{last} = 0;
+        $row->{this} = 0;
+        $row->{last} = 0;
 
         next unless $form->{l_heading};
-
-        $dash = " ";
       }
 
-      # push description onto array
-      push(@{ $form->{"$account{$category}{label}_account"} }, $str);
-
-      if ($form->{$category}{$key}{charttype} eq 'A') {
-        $form->{"total_$account{$category}{labels}_this_period"} +=
-          $form->{$category}{$key}{this} * $account{$category}{ml};
-        $dash = "- ";
+      for my $period (qw(this last)) {
+        next if ($period eq 'last' && !$last_period);
+        # only add assets
+        $row->{$period}                    *= $ml;
+        $form->{total}{$category}{$period} += $row->{$period};      #      if ($row->{charttype} eq 'A') {   # why??
       }
 
-      push(@{ $form->{"$account{$category}{label}_this_period"} },
-           $form->format_amount(
-                      $myconfig,
-                      $form->{$category}{$key}{this} * $account{$category}{ml},
-                      $form->{decimalplaces}, $dash
-           ));
+      push @{ $TMPL_DATA->{$category} }, $row;
+    } # foreach
 
-      if ($last_period) {
-        $form->{"total_$account{$category}{labels}_last_period"} +=
-          $form->{$category}{$key}{last} * $account{$category}{ml};
-
-        push(@{ $form->{"$account{$category}{label}_last_period"} },
-             $form->format_amount(
-                      $myconfig,
-                      $form->{$category}{$key}{last} * $account{$category}{ml},
-                      $form->{decimalplaces}, $dash
-             ));
-      }
-    }
-
-    $str = ($form->{l_heading}) ? $form->{padding} : "";
+    # resolve heading/subtotal
     if ($account{$category}{subtotal} && $form->{l_subtotal}) {
-      push(@{ $form->{"$account{$category}{label}_account"} },
-           "$str$form->{bold}$account{$category}{subdescription}$form->{endbold}"
-      );
-      push(@{ $form->{"$account{$category}{label}_this_period"} },
-           $form->format_amount(
-                        $myconfig,
-                        $account{$category}{subthis} * $account{$category}{ml},
-                        $form->{decimalplaces}, $dash
-           ));
-
-      if ($last_period) {
-        push(@{ $form->{"$account{$category}{label}_last_period"} },
-             $form->format_amount(
-                        $myconfig,
-                        $account{$category}{sublast} * $account{$category}{ml},
-                        $form->{decimalplaces}, $dash
-             ));
-      }
+      $TMPL_DATA->{$category}[-1]{subdescription} = $account{$category}{subdescription};
+      $TMPL_DATA->{$category}[-1]{this}           = $account{$category}{subthis} * $ml;                   # format: $dec, $dash
+      $TMPL_DATA->{$category}[-1]{last}           = $account{$category}{sublast} * $ml if $last_period;   # format: $dec, $dash
     }
 
+    $TMPL_DATA->{total}{$category}{this} = sum map { $_->{this} } @{ $TMPL_DATA->{$category} };
+    $TMPL_DATA->{total}{$category}{last} = sum map { $_->{last} } @{ $TMPL_DATA->{$category} };
   }
 
-  # totals for assets, liabilities
-  $form->{total_assets_this_period} =
-    $form->round_amount($form->{total_assets_this_period},
-                        $form->{decimalplaces});
-  $form->{total_liabilities_this_period} =
-    $form->round_amount($form->{total_liabilities_this_period},
-                        $form->{decimalplaces});
-  $form->{total_equity_this_period} =
-    $form->round_amount($form->{total_equity_this_period},
-                        $form->{decimalplaces});
-
-  # calculate earnings
-  $form->{earnings_this_period} =
-    $form->{total_assets_this_period} -
-    $form->{total_liabilities_this_period} - $form->{total_equity_this_period};
-
-  push(@{ $form->{equity_this_period} },
-       $form->format_amount($myconfig,
-                            $form->{earnings_this_period},
-                            $form->{decimalplaces}, "- "
-       ));
-
-  $form->{total_equity_this_period} =
-    $form->round_amount(
-             $form->{total_equity_this_period} + $form->{earnings_this_period},
-             $form->{decimalplaces});
-
-  # add liability + equity
-  $form->{total_this_period} =
-    $form->format_amount(
-    $myconfig,
-    $form->{total_liabilities_this_period} + $form->{total_equity_this_period},
-    $form->{decimalplaces},
-    "- ");
-
-  if ($last_period) {
-
-    # totals for assets, liabilities
-    $form->{total_assets_last_period} =
-      $form->round_amount($form->{total_assets_last_period},
-                          $form->{decimalplaces});
-    $form->{total_liabilities_last_period} =
-      $form->round_amount($form->{total_liabilities_last_period},
-                          $form->{decimalplaces});
-    $form->{total_equity_last_period} =
-      $form->round_amount($form->{total_equity_last_period},
-                          $form->{decimalplaces});
-
-    # calculate retained earnings
-    $form->{earnings_last_period} =
-      $form->{total_assets_last_period} -
-      $form->{total_liabilities_last_period} -
-      $form->{total_equity_last_period};
-
-    push(@{ $form->{equity_last_period} },
-         $form->format_amount($myconfig,
-                              $form->{earnings_last_period},
-                              $form->{decimalplaces}, "- "
-         ));
-
-    $form->{total_equity_last_period} =
-      $form->round_amount(
-             $form->{total_equity_last_period} + $form->{earnings_last_period},
-             $form->{decimalplaces});
-
-    # add liability + equity
-    $form->{total_last_period} =
-      $form->format_amount($myconfig,
-                           $form->{total_liabilities_last_period} +
-                             $form->{total_equity_last_period},
-                           $form->{decimalplaces},
-                           "- ");
+  for my $period (qw(this last)) {
+    next if ($period eq 'last' && !$last_period);
 
+    $form->{E}{$period}             = $form->{total}{A}{$period} - $form->{total}{L}{$period} - $form->{total}{Q}{$period};
+    $form->{total}{Q}{$period}     += $form->{E}{$period};
+    $TMPL_DATA->{total}{Q}{$period} = $form->{total}{Q}{$period};
+    $TMPL_DATA->{total}{$period}    = $form->{total}{L}{$period} + $form->{total}{Q}{$period};
   }
 
-  $form->{total_liabilities_last_period} =
-    $form->format_amount($myconfig,
-                         $form->{total_liabilities_last_period},
-                         $form->{decimalplaces}, "- ")
-    if ($form->{total_liabilities_last_period} != 0);
-
-  $form->{total_equity_last_period} =
-    $form->format_amount($myconfig,
-                         $form->{total_equity_last_period},
-                         $form->{decimalplaces}, "- ")
-    if ($form->{total_equity_last_period} != 0);
-
-  $form->{total_assets_last_period} =
-    $form->format_amount($myconfig,
-                         $form->{total_assets_last_period},
-                         $form->{decimalplaces}, "- ")
-    if ($form->{total_assets_last_period} != 0);
-
-  $form->{total_assets_this_period} =
-    $form->format_amount($myconfig,
-                         $form->{total_assets_this_period},
-                         $form->{decimalplaces}, "- ");
-
-  $form->{total_liabilities_this_period} =
-    $form->format_amount($myconfig,
-                         $form->{total_liabilities_this_period},
-                         $form->{decimalplaces}, "- ");
-
-  $form->{total_equity_this_period} =
-    $form->format_amount($myconfig,
-                         $form->{total_equity_this_period},
-                         $form->{decimalplaces}, "- ");
+  push @{ $TMPL_DATA->{Q} }, $form->{E};
 
   $main::lxdebug->leave_sub();
+
+  return $TMPL_DATA;
 }
 
 sub get_accounts {
@@ -318,14 +159,15 @@ sub get_accounts {
   my ($null, $department_id) = split /--/, $form->{department};
 
   my $query;
-  my $dpt_where;
-  my $dpt_join;
-  my $project;
-  my $where    = "1 = 1";
-  my $glwhere  = "";
-  my $subwhere = "";
+  my $dpt_where = '';
+  my $dpt_join  = '';
+  my $project   = '';
+  my $where     = "1 = 1";
+  my $glwhere   = "";
+  my $subwhere  = "";
   my $item;
   my $sth;
+  my $dec = $form->{decimalplaces};
 
   my $category = qq| AND (| . join(" OR ", map({ "(c.category = " . $dbh->quote($_) . ")" } @{$categories})) . qq|) |;
 
@@ -340,7 +182,7 @@ sub get_accounts {
   $sth = prepare_execute_query($form, $dbh, $query);
 
   my @headingaccounts = ();
-  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
     $form->{ $ref->{category} }{ $ref->{accno} }{description} =
       "$ref->{description}";
     $form->{ $ref->{category} }{ $ref->{accno} }{charttype} = "H";
@@ -536,9 +378,9 @@ sub get_accounts {
   my $accno;
   my $ref;
 
-  my $sth = prepare_execute_query($form, $dbh, $query);
+  $sth = prepare_execute_query($form, $dbh, $query);
 
-  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while ($ref = $sth->fetchrow_hashref("NAME_lc")) {
 
     if ($ref->{category} eq 'C') {
       $ref->{category} = 'A';
@@ -556,8 +398,7 @@ sub get_accounts {
     }
 
     $form->{ $ref->{category} }{ $ref->{accno} }{accno}       = $ref->{accno};
-    $form->{ $ref->{category} }{ $ref->{accno} }{description} =
-      $ref->{description};
+    $form->{ $ref->{category} }{ $ref->{accno} }{description} = $ref->{description};
     $form->{ $ref->{category} }{ $ref->{accno} }{charttype} = "A";
 
     if ($last_period) {
@@ -571,12 +412,8 @@ sub get_accounts {
   # remove accounts with zero balance
   foreach $category (@{$categories}) {
     foreach $accno (keys %{ $form->{$category} }) {
-      $form->{$category}{$accno}{last} =
-        $form->round_amount($form->{$category}{$accno}{last},
-                            $form->{decimalplaces});
-      $form->{$category}{$accno}{this} =
-        $form->round_amount($form->{$category}{$accno}{this},
-                            $form->{decimalplaces});
+      $form->{$category}{$accno}{last} = $form->round_amount($form->{$category}{$accno}{last}, $dec);
+      $form->{$category}{$accno}{this} = $form->round_amount($form->{$category}{$accno}{this}, $dec);
 
       delete $form->{$category}{$accno}
         if (   $form->{$category}{$accno}{this} == 0
@@ -609,7 +446,7 @@ sub get_accounts_g {
     if ($form->{method} eq 'cash') {
       $subwhere .= " AND (transdate    >= $fromdate)";
       $glwhere   = " AND (ac.transdate >= $fromdate)";
-      $prwhere   = " AND (ar.transdate >= $fromdate)";
+      $prwhere   = " AND (a.transdate  >= $fromdate)";
     } else {
       $where    .= " AND (ac.transdate >= $fromdate)";
     }
@@ -619,7 +456,7 @@ sub get_accounts_g {
     $todate = conv_dateq($todate);
     $subwhere   .= " AND (transdate    <= $todate)";
     $where      .= " AND (ac.transdate <= $todate)";
-    $prwhere    .= " AND (ar.transdate <= $todate)";
+    $prwhere    .= " AND (a.transdate  <= $todate)";
   }
 
   if ($department_id) {
@@ -642,7 +479,7 @@ sub get_accounts_g {
          WHERE $where $dpt_where
            AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AR_paid%') $subwhere)
            $project
-         GROUP BY c.$category 
+         GROUP BY c.$category
 
          UNION
 
@@ -654,7 +491,7 @@ sub get_accounts_g {
          WHERE $where $dpt_where
            AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AP_paid%') $subwhere)
            $project
-         GROUP BY c.$category 
+         GROUP BY c.$category
 
          UNION
 
@@ -663,16 +500,14 @@ sub get_accounts_g {
          JOIN chart c ON (c.id = ac.chart_id)
          JOIN gl a ON (a.id = ac.trans_id)
          $dpt_join
-         WHERE $where $dpt_where $glwhere 
+         WHERE $where $dpt_where $glwhere
            AND NOT ((c.link = 'AR') OR (c.link = 'AP'))
            $project
-
-         $project_union
-        GROUP BY c.$category 
+         GROUP BY c.$category
         |;
 
     if ($form->{project_id}) {
-      $project_union = qq|
+      $query .= qq|
          UNION
 
          SELECT SUM(ac.sellprice * ac.qty * chart_category_to_sgn(c.category)) AS amount, c.$category
@@ -684,7 +519,7 @@ sub get_accounts_g {
          WHERE (c.category = 'I') $prwhere $dpt_where
            AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AR_paid%') $subwhere)
            $project
-         GROUP BY c.$category 
+         GROUP BY c.$category
 
          UNION
 
@@ -697,7 +532,7 @@ sub get_accounts_g {
          WHERE (c.category = 'E') $prwhere $dpt_where
            AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AP_paid%') $subwhere)
          $project
-         GROUP BY c.$category 
+         GROUP BY c.$category
          |;
     }
 
@@ -755,7 +590,7 @@ sub get_accounts_g {
 
   my $sth = prepare_execute_query($form, $dbh, $query);
 
-  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while ($ref = $sth->fetchrow_hashref("NAME_lc")) {
     if ($category eq "pos_bwa") {
       if ($last_period) {
         $form->{ $ref->{$category} }{kumm} += $ref->{amount};
@@ -803,30 +638,39 @@ sub trial_balance {
     $project = qq| AND (ac.project_id = | . conv_i($form->{project_id}, 'NULL') . qq|) |;
   }
 
+  my $acc_cash_where = "";
+#  my $ar_cash_where = "";
+#  my $ap_cash_where = "";
+
+
+  if ($form->{method} eq "cash") {
+    $acc_cash_where = qq| AND (ac.trans_id IN (SELECT id FROM ar WHERE datepaid>='$form->{fromdate}' AND datepaid<='$form->{todate}' UNION SELECT id FROM ap WHERE datepaid>='$form->{fromdate}' AND datepaid<='$form->{todate}' UNION SELECT id FROM gl WHERE transdate>='$form->{fromdate}' AND transdate<='$form->{todate}')) |;
+#    $ar_ap_cash_where = qq| AND (a.datepaid>='$form->{fromdate}' AND a.datepaid<='$form->{todate}') |;
+  }
+
   # get beginning balances
   $query =
     qq|SELECT c.accno, c.category, SUM(ac.amount) AS amount, c.description
         FROM acc_trans ac
-        JOIN chart c ON (ac.chart_id = c.id)
+        LEFT JOIN chart c ON (ac.chart_id = c.id)
         $dpt_join
-        WHERE (ac.transdate < (select date_trunc('year', ?::date)))
+        WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) AND ac.ob_transaction $acc_cash_where
           $dpt_where
           $project
         GROUP BY c.accno, c.category, c.description |;
 
   $sth = prepare_execute_query($form, $dbh, $query, $form->{fromdate});
 
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
 
     if ($ref->{amount} != 0 || $form->{all_accounts}) {
       $trb{ $ref->{accno} }{description} = $ref->{description};
       $trb{ $ref->{accno} }{charttype}   = 'A';
-      if ($ref->{category} ne "I" &&  $ref->{category} ne "E") {
-        if ($ref->{amount} > 0) {
-          $trb{ $ref->{accno} }{haben_eb}   = $ref->{amount};
-        } else {
-          $trb{ $ref->{accno} }{soll_eb}   = $ref->{amount} * -1;
-        }
+
+      if ($ref->{amount} > 0) {
+        $trb{ $ref->{accno} }{haben_eb}   = $ref->{amount};
+      } else {
+        $trb{ $ref->{accno} }{soll_eb}   = $ref->{amount} * -1;
       }
       $trb{ $ref->{accno} }{category}    = $ref->{category};
     }
@@ -844,7 +688,7 @@ sub trial_balance {
 
   $sth = prepare_execute_query($form, $dbh, $query);
 
-  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while ($ref = $sth->fetchrow_hashref("NAME_lc")) {
     $trb{ $ref->{accno} }{description} = $ref->{description};
     $trb{ $ref->{accno} }{charttype}   = 'H';
     $trb{ $ref->{accno} }{category}    = $ref->{category};
@@ -855,32 +699,39 @@ sub trial_balance {
   $sth->finish;
 
   $where = " 1 = 1 ";
-  $saldowhere = " 1 = 1 ";
-  $sumwhere = " 1 = 1 ";
+  my $saldowhere    = " 1 = 1 ";
+  my $sumwhere      = " 1 = 1 ";
+  my $subwhere      = '';
+  my $sumsubwhere   = '';
+  my $saldosubwhere = '';
+  my $glsaldowhere  = '';
+  my $glsubwhere    = '';
+  my $glwhere       = '';
+  my $glsumwhere    = '';
   my $tofrom;
 
   if ($form->{fromdate} || $form->{todate}) {
     if ($form->{fromdate}) {
       my $fromdate = conv_dateq($form->{fromdate});
-      $tofrom   .= " AND (ac.transdate >= $fromdate)";
-      $subwhere .= " AND (transdate >= $fromdate)";
-      $sumsubwhere .= " AND (transdate >= (select date_trunc('year', date $fromdate))) ";
-      $saldosubwhere .= " AND (((c.category='I' OR c.category='E') AND transdate>=(select date_trunc('year', date $fromdate))) OR (c.category NOT IN ('I', 'E'))) ";
-      $invwhere .= " AND (a.transdate >= $fromdate)";
-      $glsaldowhere .= " AND (((c.category='I' OR c.category='E') AND ac.transdate>=(select date_trunc('year', date $fromdate))) OR (c.category NOT IN ('I', 'E'))) ";
-      $glwhere = " AND (ac.transdate >= $fromdate)";
-      $glsumwhere = " AND (ac.transdate >= (select date_trunc('year', date $fromdate))) ";
+      $tofrom        .= " AND (ac.transdate >= $fromdate)";
+      $subwhere      .= " AND (transdate >= $fromdate)";
+      $sumsubwhere   .= " AND (transdate >= (select date_trunc('year', date $fromdate))) ";
+      $saldosubwhere .= " AND transdate>=(select date_trunc('year', date $fromdate))  ";
+      $invwhere      .= " AND (a.transdate >= $fromdate)";
+      $glsaldowhere  .= " AND ac.transdate>=(select date_trunc('year', date $fromdate)) ";
+      $glwhere        = " AND (ac.transdate >= $fromdate)";
+      $glsumwhere     = " AND (ac.transdate >= (select date_trunc('year', date $fromdate))) ";
     }
     if ($form->{todate}) {
       my $todate = conv_dateq($form->{todate});
-      $tofrom   .= " AND (ac.transdate <= $todate)";
-      $invwhere .= " AND (a.transdate <= $todate)";
+      $tofrom        .= " AND (ac.transdate <= $todate)";
+      $invwhere      .= " AND (a.transdate <= $todate)";
       $saldosubwhere .= " AND (transdate <= $todate)";
-      $sumsubwhere .= " AND (transdate <= $todate)";
-      $subwhere .= " AND (transdate <= $todate)";
-      $glwhere  .= " AND (ac.transdate <= $todate)";
-      $glsumwhere .= " AND (ac.transdate <= $todate) ";
-      $glsaldowhere .= " AND (ac.transdate <= $todate) ";
+      $sumsubwhere   .= " AND (transdate <= $todate)";
+      $subwhere      .= " AND (transdate <= $todate)";
+      $glwhere       .= " AND (ac.transdate <= $todate)";
+      $glsumwhere    .= " AND (ac.transdate <= $todate) ";
+      $glsaldowhere  .= " AND (ac.transdate <= $todate) ";
    }
   }
 
@@ -911,7 +762,7 @@ sub trial_balance {
                (ac.trans_id in (SELECT id from gl)
                 $glwhere)
               )|;
-    $saldowhere .=       
+    $saldowhere .=
 qq| AND ((ac.trans_id IN (SELECT id from ar) AND
                 ac.trans_id IN
                   (
@@ -937,7 +788,7 @@ qq| AND ((ac.trans_id IN (SELECT id from ar) AND
                (ac.trans_id in (SELECT id from gl)
                 $glsaldowhere)
               )|;
-    $sumwhere .=       
+    $sumwhere .=
 qq| AND ((ac.trans_id IN (SELECT id from ar) AND
                 ac.trans_id IN
                   (
@@ -965,9 +816,9 @@ qq| AND ((ac.trans_id IN (SELECT id from ar) AND
               )|;
 
   } else {
-    $where .= $tofrom;
-    $saldowhere .= $glsaldowhere;
-    $sumwhere .= $glsumwhere;
+    $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)";
   }
 
   $query = qq|
@@ -1017,7 +868,7 @@ qq| AND ((ac.trans_id IN (SELECT id from ar) AND
   $sth = prepare_execute_query($form, $dbh, $query);
 
   # calculate the debit and credit in the period
-  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while ($ref = $sth->fetchrow_hashref("NAME_lc")) {
     $trb{ $ref->{accno} }{description} = $ref->{description};
     $trb{ $ref->{accno} }{charttype}   = 'A';
     $trb{ $ref->{accno} }{category}    = $ref->{category};
@@ -1159,6 +1010,7 @@ qq| AND ((ac.trans_id IN (SELECT id from ar) AND
     $project_drcr = prepare_query($form, $dbh, $q_project_drcr);
   }
 
+
   my ($debit, $credit, $saldo, $soll_saldo, $haben_saldo,$soll_kummuliert, $haben_kummuliert, $last_transaction);
 
   foreach my $accno (sort keys %trb) {
@@ -1175,7 +1027,8 @@ qq| AND ((ac.trans_id IN (SELECT id from ar) AND
       # get DR/CR
       do_statement($form, $drcr, $q_drcr, $ref->{accno}, $ref->{accno}, $ref->{accno}, $ref->{accno}, $ref->{accno}, $ref->{accno});
 
-      ($debit, $credit, $saldo, $haben_saldo, $soll_saldo, $soll_kumuliert, $haben_kumuliert) = (0, 0, 0, 0, 0, 0, 0);
+      ($debit, $credit, $saldo, $haben_saldo, $soll_saldo) = (0, 0, 0, 0, 0);
+      my ($soll_kumuliert, $haben_kumuliert) = (0, 0);
       $last_transaction = "";
       while (($debit, $credit, $saldo, $haben_kumuliert, $soll_kumuliert, $last_transaction) = $drcr->fetchrow_array) {
         $ref->{debit}  += $debit;
@@ -1220,6 +1073,7 @@ qq| AND ((ac.trans_id IN (SELECT id from ar) AND
     }
 
     # add subtotal
+    my @accno;
     @accno = grep { $_ le "$ref->{accno}" } @headingaccounts;
     $accno = pop @accno;
     if ($accno) {
@@ -1238,7 +1092,7 @@ qq| AND ((ac.trans_id IN (SELECT id from ar) AND
   $dbh->disconnect;
 
   # debits and credits for headings
-  foreach $accno (@headingaccounts) {
+  foreach my $accno (@headingaccounts) {
     foreach $ref (@{ $form->{TB} }) {
       if ($accno eq $ref->{accno}) {
         $ref->{debit}  = $trb{$accno}{debit};
@@ -1274,23 +1128,28 @@ sub aging {
   # connect to database
   my $dbh     = $form->dbconnect($myconfig);
 
-  my ($invoice, $arap, $buysell, $ct, $ct_id);
+  my ($invoice, $arap, $buysell, $ct, $ct_id, $ml);
 
   if ($form->{ct} eq "customer") {
     $invoice = "is";
     $arap = "ar";
     $buysell = "buy";
     $ct = "customer";
+    $ml = -1;
   } else {
     $invoice = "ir";
     $arap = "ap";
     $buysell = "sell";
     $ct = "vendor";
+    $ml = 1;
   }
   $ct_id = "${ct}_id";
 
   $form->{todate} = $form->current_date($myconfig) unless ($form->{todate});
   my $todate = conv_dateq($form->{todate});
+  my $fromdate = conv_dateq($form->{fromdate});
+
+  my $fromwhere = ($form->{fromdate} ne "") ? " AND (transdate >= (date $fromdate)) " : "";
 
   my $where = " 1 = 1 ";
   my ($name, $null);
@@ -1303,7 +1162,7 @@ sub aging {
 
   my $dpt_join;
   if ($form->{department}) {
-    ($null, $department_id) = split /--/, $form->{department};
+    my ($null, $department_id) = split /--/, $form->{department};
     $dpt_join = qq| JOIN department d ON (a.department_id = d.id) |;
     $where .= qq| AND (a.department_id = | . conv_i($department_id, 'NULL') . qq|)|;
   }
@@ -1315,84 +1174,18 @@ sub aging {
       street, zipcode, city, country, contact, email,
       phone as customerphone, fax as customerfax, ${ct}number,
       "invnumber", "transdate",
-      (amount - paid) as "c0", 0.00 as "c30", 0.00 as "c60", 0.00 as "c90",
-      "duedate", invoice, ${arap}.id,
-      (SELECT $buysell
-       FROM exchangerate
-       WHERE (${arap}.curr = exchangerate.curr)
-         AND (exchangerate.transdate = ${arap}.transdate)) AS exchangerate
-    FROM ${arap}, ${ct}
-    WHERE (paid != amount)
-      AND (${arap}.storno IS FALSE)
-      AND (${arap}.${ct}_id = ${ct}.id)
-      AND (${ct}.id = ?)
-      AND (transdate <= (date $todate - interval '0 days'))
-      AND (transdate >= (date $todate - interval '30 days'))
-
-    UNION
-
-    -- between 31-60 days
-
-    SELECT ${ct}.id AS ctid, ${ct}.name,
-      street, zipcode, city, country, contact, email,
-      phone as customerphone, fax as customerfax, ${ct}number,
-      "invnumber", "transdate",
-      0.00 as "c0", (amount - paid) as "c30", 0.00 as "c60", 0.00 as "c90",
-      "duedate", invoice, ${arap}.id,
-      (SELECT $buysell
-       FROM exchangerate
-       WHERE (${arap}.curr = exchangerate.curr)
-         AND (exchangerate.transdate = ${arap}.transdate)) AS exchangerate
-    FROM ${arap}, ${ct}
-    WHERE (paid != amount)
-      AND (${arap}.storno IS FALSE)
-      AND (${arap}.${ct}_id = ${ct}.id)
-      AND (${ct}.id = ?)
-      AND (transdate < (date $todate - interval '30 days'))
-      AND (transdate >= (date $todate - interval '60 days'))
-
-    UNION
-
-    -- between 61-90 days
-
-    SELECT ${ct}.id AS ctid, ${ct}.name,
-      street, zipcode, city, country, contact, email,
-      phone as customerphone, fax as customerfax, ${ct}number,
-      "invnumber", "transdate",
-      0.00 as "c0", 0.00 as "c30", (amount - paid) as "c60", 0.00 as "c90",
+      (amount - COALESCE((SELECT sum(amount)*$ml FROM acc_trans LEFT JOIN chart ON (acc_trans.chart_id=chart.id) WHERE link ilike '%paid%' AND acc_trans.trans_id=${arap}.id AND acc_trans.transdate <= (date $todate)),0)) as "open", "amount",
       "duedate", invoice, ${arap}.id,
       (SELECT $buysell
        FROM exchangerate
        WHERE (${arap}.curr = exchangerate.curr)
          AND (exchangerate.transdate = ${arap}.transdate)) AS exchangerate
     FROM ${arap}, ${ct}
-    WHERE (paid != amount)
+    WHERE ((paid != amount) OR (datepaid > (date $todate) AND datepaid is not null))
       AND (${arap}.storno IS FALSE)
       AND (${arap}.${ct}_id = ${ct}.id)
       AND (${ct}.id = ?)
-      AND (transdate < (date $todate - interval '60 days'))
-      AND (transdate >= (date $todate - interval '90 days'))
-
-    UNION
-
-    -- over 90 days
-
-    SELECT ${ct}.id AS ctid, ${ct}.name,
-      street, zipcode, city, country, contact, email,
-      phone as customerphone, fax as customerfax, ${ct}number,
-      "invnumber", "transdate",
-      0.00 as "c0", 0.00 as "c30", 0.00 as "c60", (amount - paid) as "c90",
-      "duedate", invoice, ${arap}.id,
-      (SELECT $buysell
-       FROM exchangerate
-       WHERE (${arap}.curr = exchangerate.curr)
-       AND (exchangerate.transdate = ${arap}.transdate)) AS exchangerate
-    FROM ${arap}, ${ct}
-    WHERE (paid != amount)
-      AND (${arap}.storno IS FALSE)
-      AND (${arap}.${ct}_id = ${ct}.id)
-      AND (${ct}.id = ?)
-      AND (transdate < (date $todate - interval '90 days'))
+      AND (transdate <= (date $todate) $fromwhere )
 
     ORDER BY ctid, transdate, invnumber |;
 
@@ -1405,8 +1198,8 @@ sub aging {
        $dpt_join
        WHERE $where
          AND (a.${ct_id} = ct.id)
-         AND (a.paid != a.amount)
-         AND (a.transdate <= $todate)
+         AND ((a.paid != a.amount) OR ((a.datepaid > $todate) AND (datepaid is NOT NULL)))
+         AND (a.transdate <= $todate $fromwhere)
        ORDER BY ct.name|;
 
   my $sth = prepare_execute_query($form, $dbh, $query);
@@ -1414,9 +1207,9 @@ sub aging {
   $form->{AG} = [];
   # for each company that has some stuff outstanding
   while (my ($id) = $sth->fetchrow_array) {
-    do_statement($form, $sth_details, $q_details, $id, $id, $id, $id);
+    do_statement($form, $sth_details, $q_details, $id);
 
-    while (my $ref = $sth_details->fetchrow_hashref(NAME_lc)) {
+    while (my $ref = $sth_details->fetchrow_hashref("NAME_lc")) {
       $ref->{module} = ($ref->{invoice}) ? $invoice : $arap;
       $ref->{exchangerate} = 1 unless $ref->{exchangerate};
       push @{ $form->{AG} }, $ref;
@@ -1542,6 +1335,7 @@ sub tax_report {
   my $sortorder = join ', ', $form->sort_columns(qw(transdate invnumber name));
   $sortorder = $form->{sort} if ($form->{sort} && grep({ $_ eq $form->{sort} } qw(id transdate invnumber name netamount tax)));
 
+  my $query = '';
   if ($form->{report} !~ /nontaxable/) {
     $query =
       qq|SELECT a.id, '0' AS invoice, $transdate AS transdate, a.invnumber, n.name, a.netamount,
@@ -1641,6 +1435,7 @@ sub payments {
 
   my $ml = 1;
   my $arap;
+  my $table;
   if ($form->{db} eq 'ar') {
     $table = 'customer';
     $ml = -1;
@@ -1683,16 +1478,41 @@ sub payments {
     $where .= " AND (ac.memo ILIKE " . $dbh->quote('%' . $form->{memo} . '%') . ") ";
   }
 
-  my $sortorder = join(', ', qw(name invnumber ordnumber transdate source));
-  $sortorder = $form->{sort} if ($form->{sort} && grep({ $_ eq $form->{sort} } qw(transdate invnumber name source memo)));
+  my %sort_columns =  (
+    'transdate'    => [ qw(transdate lower_invnumber lower_name) ],
+    'invnumber'    => [ qw(lower_invnumber lower_name transdate) ],
+    'name'         => [ qw(lower_name transdate)                 ],
+    'source'       => [ qw(lower_source)                         ],
+    'memo'         => [ qw(lower_memo)                           ],
+    );
+  my %lowered_columns =  (
+    'invnumber'       => { 'gl' => 'g.reference',   'arap' => 'a.invnumber', },
+    'memo'            => { 'gl' => 'ac.memo',       'arap' => 'ac.memo',     },
+    'source'          => { 'gl' => 'ac.source',     'arap' => 'ac.source',   },
+    'name'            => { 'gl' => 'g.description', 'arap' => 'c.name',      },
+    );
+
+  my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
+  my $sortkey   = $sort_columns{$form->{sort}} ? $form->{sort} : 'transdate';
+  my $sortorder = join ', ', map { "$_ $sortdir" } @{ $sort_columns{$sortkey} };
+
+
+  my %columns_for_sorting = ( 'gl' => '', 'arap' => '', );
+  foreach my $spec (@{ $sort_columns{$sortkey} }) {
+    next if ($spec !~ m/^lower_(.*)$/);
+
+    my $column = $1;
+    map { $columns_for_sorting{$_} .= sprintf(', lower(%s) AS lower_%s', $lowered_columns{$column}->{$_}, $column) } qw(gl arap);
+  }
 
   $query = qq|SELECT id, accno, description FROM chart WHERE accno = ?|;
-  my $sth = prepare_query($form, $dbh, $query);
+  $sth = prepare_query($form, $dbh, $query);
 
   my $q_details =
       qq|SELECT c.name, a.invnumber, a.ordnumber,
            ac.transdate, ac.amount * $ml AS paid, ac.source,
            a.invoice, a.id, ac.memo, '${arap}' AS module
+           $columns_for_sorting{arap}
          FROM acc_trans ac
          JOIN $arap a ON (ac.trans_id = a.id)
          JOIN $table c ON (c.id = a.${table}_id)
@@ -1706,6 +1526,7 @@ sub payments {
          SELECT g.description, g.reference, NULL AS ordnumber,
            ac.transdate, ac.amount * $ml AS paid, ac.source,
            '0' as invoice, g.id, ac.memo, 'gl' AS module
+           $columns_for_sorting{gl}
          FROM acc_trans ac
          JOIN gl g ON (g.id = ac.trans_id)
          $dpt_join
@@ -1758,6 +1579,7 @@ sub bwa {
   &get_accounts_g($dbh, $last_period, $form->{fromdate}, $form->{todate}, $form, "pos_bwa");
 
   # if there are any compare dates
+  my $year;
   if ($form->{fromdate} || $form->{todate}) {
     $last_period = 1;
     if ($form->{fromdate}) {
@@ -1767,18 +1589,18 @@ sub bwa {
       $form->{todate} =~ /[0-9]*\.[0-9]*\.([0-9]*)/;
       $year = $1;
     }
-    $kummfromdate = $form->{comparefromdate};
-    $kummtodate   = $form->{comparetodate};
+    my $kummfromdate = $form->{comparefromdate};
+    my $kummtodate   = $form->{comparetodate};
     &get_accounts_g($dbh, $last_period, $kummfromdate, $kummtodate, $form, "pos_bwa");
   }
 
-  @periods        = qw(jetzt kumm);
-  @gesamtleistung = qw(1 2 3);
-  @gesamtkosten   = qw (10 11 12 13 14 15 16 17 18 19 20);
-  @ergebnisse     =
+  my @periods        = qw(jetzt kumm);
+  my @gesamtleistung = qw(1 2 3);
+  my @gesamtkosten   = qw (10 11 12 13 14 15 16 17 18 19 20);
+  my @ergebnisse     =
     qw (rohertrag betriebrohertrag betriebsergebnis neutraleraufwand neutralerertrag ergebnisvorsteuern ergebnis gesamtleistung gesamtkosten);
 
-  foreach $key (@periods) {
+  foreach my $key (@periods) {
     $form->{ "$key" . "gesamtleistung" } = 0;
     $form->{ "$key" . "gesamtkosten" }   = 0;
 
@@ -1793,10 +1615,10 @@ sub bwa {
                                '0');
       }
     }
-    foreach $item (@gesamtleistung) {
+    foreach my $item (@gesamtleistung) {
       $form->{ "$key" . "gesamtleistung" } += $form->{$item}{$key};
     }
-    foreach $item (@gesamtkosten) {
+    foreach my $item (@gesamtkosten) {
       $form->{ "$key" . "gesamtkosten" } += $form->{$item}{$key};
     }
     $form->{ "$key" . "rohertrag" } =
@@ -1833,7 +1655,7 @@ sub bwa {
                                '0');
         }
       }
-      foreach $item (@ergebnisse) {
+      foreach my $item (@ergebnisse) {
         $form->{ "$key" . "gl" . "$item" } =
           $form->format_amount($myconfig,
                                $form->round_amount(
@@ -1862,7 +1684,7 @@ sub bwa {
                                  '0');
         }
       }
-      foreach $item (@ergebnisse) {
+      foreach my $item (@ergebnisse) {
         $form->{ "$key" . "gk" . "$item" } =
           $form->format_amount($myconfig,
                                $form->round_amount(
@@ -1890,7 +1712,7 @@ sub bwa {
                         '0');
         }
       }
-      foreach $item (@ergebnisse) {
+      foreach my $item (@ergebnisse) {
         $form->{ "$key" . "pk" . "$item" } =
           $form->format_amount($myconfig,
                                $form->round_amount(
@@ -1918,7 +1740,7 @@ sub bwa {
                          '0');
         }
       }
-      foreach $item (@ergebnisse) {
+      foreach my $item (@ergebnisse) {
         $form->{ "$key" . "auf" . "$item" } =
           $form->format_amount($myconfig,
                                $form->round_amount(
@@ -1932,7 +1754,7 @@ sub bwa {
       }
     }
 
-    foreach $item (@ergebnisse) {
+    foreach my $item (@ergebnisse) {
       $form->{ "$key" . "$item" } =
         $form->format_amount($myconfig,
                              $form->round_amount($form->{ "$key" . "$item" },
@@ -1962,10 +1784,10 @@ sub ustva {
   my @categories_euro = qw(48 51 86 91 97 93 94);
   $form->{decimalplaces} *= 1;
 
-  foreach $item (@categories_cent) {
+  foreach my $item (@categories_cent) {
     $form->{"$item"} = 0;
   }
-  foreach $item (@categories_euro) {
+  foreach my $item (@categories_euro) {
     $form->{"$item"} = 0;
   }
 
@@ -2014,13 +1836,13 @@ sub ustva {
   $form->{"65"} = $form->{"43"} - $form->{"66"};
   $form->{"67"} = $form->{"43"} - $form->{"66"};
 
-  foreach $item (@categories_cent) {
+  foreach my $item (@categories_cent) {
     $form->{$item} =
       $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2),
                            2, '0');
   }
 
-  foreach $item (@categories_euro) {
+  foreach my $item (@categories_euro) {
     $form->{$item} =
       $form->format_amount($myconfig, $form->round_amount($form->{$item}, 0),
                            0, '0');
@@ -2048,26 +1870,26 @@ sub income_statement {
 
   $form->{decimalplaces} *= 1;
 
-  foreach $item (@categories_einnahmen) {
+  foreach my $item (@categories_einnahmen) {
     $form->{$item} = 0;
   }
-  foreach $item (@categories_ausgaben) {
+  foreach my $item (@categories_ausgaben) {
     $form->{$item} = 0;
   }
 
-  foreach $item (@ergebnisse) {
+  foreach my $item (@ergebnisse) {
     $form->{$item} = 0;
   }
 
   &get_accounts_g($dbh, $last_period, $form->{fromdate}, $form->{todate},
                   $form, "pos_eur");
 
-  foreach $item (@categories_einnahmen) {
+  foreach my $item (@categories_einnahmen) {
     $form->{"eur${item}"} =
       $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2));
     $form->{"sumeura"} += $form->{$item};
   }
-  foreach $item (@categories_ausgaben) {
+  foreach my $item (@categories_ausgaben) {
     $form->{"eur${item}"} =
       $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2));
     $form->{"sumeurb"} += $form->{$item};
@@ -2075,7 +1897,7 @@ sub income_statement {
 
   $form->{"guvsumme"} = $form->{"sumeura"} - $form->{"sumeurb"};
 
-  foreach $item (@ergebnisse) {
+  foreach my $item (@ergebnisse) {
     $form->{$item} =
       $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2));
   }