X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCA.pm;h=4604f13e3a6009485a83e0ebcb3984cd4a8ac7d1;hb=af59820cb06ba396ba10ecd88f43a92c331a6066;hp=0c2a24f3730156e523d947b4df7674d5352b08eb;hpb=bd34eaeac9e09277148172dc634c0cd71bff91a8;p=kivitendo-erp.git

diff --git a/SL/CA.pm b/SL/CA.pm
index 0c2a24f37..4604f13e3 100644
--- a/SL/CA.pm
+++ b/SL/CA.pm
@@ -180,6 +180,15 @@ sub all_transactions {
     $project = qq| AND ac.project_id = ? |;
     @project_values = (conv_i($form->{project_id}));
   }
+  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}') |;
+  }
 
   if ($form->{accno}) {
 
@@ -188,57 +197,48 @@ sub all_transactions {
     ($form->{category}) = selectrow_query($form, $dbh, $query, $form->{accno});
 
     if ($form->{fromdate}) {
-      # get beginning balance
+      # get beginning balances
       $query =
-        qq|SELECT SUM(ac.amount) | .
-        qq|FROM acc_trans ac | .
-        qq|JOIN chart c ON (ac.chart_id = c.id) | .
-        $dpt_join .
-        qq|WHERE c.accno = ? | .
-        qq|AND ac.transdate < ? | .
-        $dpt_where .
-        $project;
-      @values = ($form->{accno}, conv_date($form->{fromdate}),
-                 @department_values, @project_values);
-
-      if ($form->{project_id}) {
-        $query .=
-          qq|UNION | .
-
-          qq|SELECT SUM(ac.qty * ac.sellprice) | .
-          qq|FROM invoice ac | .
-          qq|JOIN ar a ON (ac.trans_id = a.id) | .
-          qq|JOIN parts p ON (ac.parts_id = p.id) | .
-          qq|JOIN chart c ON (p.income_accno_id = c.id) | .
-          $dpt_join .
-          qq|WHERE c.accno = ? | .
-          qq|  AND a.transdate < ? | .
-          qq|  AND c.category = 'I' | .
-          $dpt_where .
-          $project .
-
-          qq|UNION | .
-
-          qq|SELECT SUM(ac.qty * ac.sellprice) | .
-          qq|FROM invoice ac | .
-          qq|JOIN ap a ON (ac.trans_id = a.id) | .
-          qq|JOIN parts p ON (ac.parts_id = p.id) | .
-          qq|JOIN chart c ON (p.expense_accno_id = c.id) | .
-          $dpt_join .
-          qq|WHERE c.accno = ? | .
-          qq|  AND a.transdate < ? | .
-          qq|  AND c.category = 'E' | .
-          $dpt_where .
-          $project;
-
-        push(@values,
-             $form->{accno}, conv_date($form->{transdate}),
-             @department_values, @project_values,
-             $form->{accno}, conv_date($form->{transdate}),
-             @department_values, @project_values);
-      }
-
-      ($form->{balance}) = selectrow_query($form, $dbh, $query, @values);
+        qq|SELECT SUM(ac.amount) AS amount
+            FROM acc_trans ac
+            JOIN chart c ON (ac.chart_id = c.id)
+            $dpt_join
+            WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) AND ac.ob_transaction 
+              $dpt_where
+              $project
+            AND c.accno = ? $acc_cash_where|;
+    
+      ($form->{beginning_balance}) = selectrow_query($form, $dbh, $query, $form->{fromdate}, $form->{accno});
+
+      # get last transaction date
+      my $todate = ($form->{todate}) ? " AND ac.transdate <= '$form->{todate}' " : "";
+      $query = qq|SELECT max(ac.transdate) FROM acc_trans ac LEFT JOIN chart c ON (ac.chart_id = c.id)WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) $todate AND c.accno = ?  $acc_cash_where|;
+      ($form->{last_transaction}) = selectrow_query($form, $dbh, $query, $form->{fromdate}, $form->{accno});
+
+      # get old saldo
+      $query = qq|SELECT sum(ac.amount) FROM acc_trans ac LEFT JOIN chart c ON (ac.chart_id = c.id)WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) AND ac.transdate < ? AND c.accno = ?  $acc_cash_where|;
+      ($form->{saldo_old}) = selectrow_query($form, $dbh, $query, $form->{fromdate}, $form->{fromdate}, $form->{accno});
+
+      #get old balance
+      $query = qq|SELECT sum(ac.amount) FROM acc_trans ac LEFT JOIN chart c ON (ac.chart_id = c.id)WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) AND ac.transdate < ? AND c.accno = ? AND ac.amount < 0 AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL)  $acc_cash_where|;
+      ($form->{old_balance_debit}) = selectrow_query($form, $dbh, $query, $form->{fromdate}, $form->{fromdate}, $form->{accno});
+
+      $query = qq|SELECT sum(ac.amount) FROM acc_trans ac LEFT JOIN chart c ON (ac.chart_id = c.id)WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) AND ac.transdate < ? AND c.accno = ? AND ac.amount > 0 AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL)  $acc_cash_where|;
+      ($form->{old_balance_credit}) = selectrow_query($form, $dbh, $query, $form->{fromdate}, $form->{fromdate}, $form->{accno});
+
+      # get current saldo
+      my $todate = ($form->{todate} ne "") ? " AND ac.transdate <= '$form->{todate}' " : "";
+      $query = qq|SELECT sum(ac.amount) FROM acc_trans ac LEFT JOIN chart c ON (ac.chart_id = c.id)WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) $todate AND c.accno = ?  $acc_cash_where|;
+      ($form->{saldo_new}) = selectrow_query($form, $dbh, $query, $form->{fromdate}, $form->{accno});
+
+      #get current balance
+      my $todate = ($form->{todate} ne "") ? " AND ac.transdate <= '$form->{todate}' " : "";
+      $query = qq|SELECT sum(ac.amount) FROM acc_trans ac LEFT JOIN chart c ON (ac.chart_id = c.id)WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) $todate AND c.accno = ? AND ac.amount < 0 AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL)  $acc_cash_where|;
+      ($form->{current_balance_debit}) = selectrow_query($form, $dbh, $query, $form->{fromdate}, $form->{accno});
+
+      my $todate = ($form->{todate} ne "") ? " AND ac.transdate <= '$form->{todate}' " : "";
+      $query = qq|SELECT sum(ac.amount) FROM acc_trans ac LEFT JOIN chart c ON (ac.chart_id = c.id)WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) $todate AND c.accno = ? AND ac.amount > 0 AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL)  $acc_cash_where|;
+      ($form->{current_balance_credit}) = selectrow_query($form, $dbh, $query, $form->{fromdate}, $form->{accno});
     }
   }
 
@@ -247,7 +247,7 @@ sub all_transactions {
   @values = ();
 
   foreach my $id (@id) {
-
+    
     # NOTE: Postgres is really picky about the order of implicit CROSS
     #  JOINs with ',' if you alias the tables and want to use the
     #  alias later in another JOIN.  the alias you want to use has to
@@ -258,37 +258,42 @@ sub all_transactions {
     #  JOIN ... that also works.
 
     # get all transactions
-    $query .=
-      $union .
-      qq|SELECT a.id, a.reference, a.description, ac.transdate, | .
-      qq|  $false AS invoice, ac.amount, 'gl' as module | .
+    $query =
+      qq|SELECT a.id, a.reference, a.description, ac.transdate, ac.chart_id, | .
+      qq|  $false AS invoice, ac.amount, 'gl' as module, | .
+      qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo, ac.source || ' ' || ac.memo AS memo § .
       qq|FROM acc_trans ac, gl a | .
       $dpt_join .
       qq|WHERE | . $where . $dpt_where . $project .
       qq|  AND ac.chart_id = ? | .
-      qq|  AND ac.trans_id = a.id | .
+      qq| AND ac.trans_id = a.id | .
+      qq| AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) | .
 
-      qq|UNION | .
+      qq|UNION ALL | .
 
-      qq|SELECT a.id, a.invnumber, c.name, ac.transdate, | .
-      qq|  a.invoice, ac.amount, 'ar' as module | .
+      qq|SELECT a.id, a.invnumber, c.name, ac.transdate, ac.chart_id, | .
+      qq|  a.invoice, ac.amount, 'ar' as module, | .
+      qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo, ac.source || ' ' || ac.memo AS memo  § . 
       qq|FROM acc_trans ac, customer c, ar a | .
       $dpt_join .
       qq|WHERE | . $where . $dpt_where . $project .
-      qq|  AND ac.chart_id = ? | .
-      qq|  AND ac.trans_id = a.id | .
-      qq|  AND a.customer_id = c.id | .
+      qq| AND ac.chart_id = ? | .
+      qq| AND ac.trans_id = a.id | .
+      qq| AND a.customer_id = c.id | .
+      qq| AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) $ar_ap_cash_where| .
 
-      qq|UNION | .
+      qq|UNION ALL | .
 
-      qq|SELECT a.id, a.invnumber, v.name, ac.transdate, | .
-      qq|  a.invoice, ac.amount, 'ap' as module | .
+      qq|SELECT a.id, a.invnumber, v.name, ac.transdate, ac.chart_id, | .
+      qq|  a.invoice, ac.amount, 'ap' as module, | .
+      qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo, ac.source || ' ' || ac.memo AS memo  § .
       qq|FROM acc_trans ac, vendor v, ap a | .
       $dpt_join .
       qq|WHERE | . $where . $dpt_where . $project .
-      qq|  AND ac.chart_id = ? | .
-      qq|  AND ac.trans_id = a.id | .
-      qq|  AND a.vendor_id = v.id |;
+      qq| AND ac.chart_id = ? | .
+      qq| AND ac.trans_id = a.id | .
+      qq| AND a.vendor_id = v.id |;
+      qq| AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) $ar_ap_cash_where| .
 
     push(@values,
          @where_values, @department_values, @project_values, $id,
@@ -306,7 +311,8 @@ sub all_transactions {
         qq|UNION ALL | .
 
         qq|SELECT a.id, a.invnumber, c.name, a.transdate, | .
-        qq|  a.invoice, ac.qty * ac.sellprice AS sellprice, 'ar' as module | .
+        qq|  a.invoice, ac.qty * ac.sellprice AS sellprice, 'ar' as module, | .
+        qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo § .
         qq|FROM ar a | .
         qq|JOIN invoice ac ON (ac.trans_id = a.id) | .
         qq|JOIN parts p ON (ac.parts_id = p.id) | .
@@ -317,11 +323,12 @@ sub all_transactions {
         $todate_where .
         $dpt_where .
         $project .
-
+        $ar_ap_cash_where .
         qq|UNION ALL | .
 
         qq|SELECT a.id, a.invnumber, v.name, a.transdate, | .
-        qq|  a.invoice, ac.qty * ac.sellprice AS sellprice, 'ap' as module | .
+        qq|  a.invoice, ac.qty * ac.sellprice AS sellprice, 'ap' as module, | .
+        qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo § .
         qq|FROM ap a | .
         qq|JOIN invoice ac ON (ac.trans_id = a.id) | .
         qq|JOIN parts p ON (ac.parts_id = p.id) | .
@@ -331,8 +338,8 @@ sub all_transactions {
         $fromdate_where .
         $todate_where .
         $dpt_where .
-        $project;
-
+        $project .
+        $ar_ap_cash_where;
       push(@values,
            $id, @department_values, @project_values,
            $id, @department_values, @project_values);
@@ -345,9 +352,18 @@ sub all_transactions {
     $union = qq|UNION ALL|;
   }
 
-  $query .= qq|ORDER BY | . $sortorder;
+  my $sort = grep({ $form->{sort} eq $_ } qw(transdate reference description)) ? $form->{sort} : 'transdate';
+
+  $query .= qq|ORDER BY $sort|;
   $sth = prepare_execute_query($form, $dbh, $query, @values);
 
+  #get detail information for each transaction
+  $trans_query =
+        qq|SELECT accno, | .
+        qq|amount, transdate FROM acc_trans LEFT JOIN chart ON (chart_id=chart.id) WHERE | .
+        qq|trans_id = ? AND sign(amount) <> sign(?) AND chart_id <> ? AND transdate = ?|;
+  my $trans_sth = $dbh->prepare($trans_query);
+
   $form->{CA} = [];
   while (my $ca = $sth->fetchrow_hashref(NAME_lc)) {
     # ap
@@ -368,6 +384,28 @@ sub all_transactions {
       $ca->{debit}  = 0;
     }
 
+    ($ca->{ustkonto},$ca->{ustrate}) = split /--/, $ca->{taxinfo};
+
+    #get detail information for this transaction
+    $trans_sth->execute($ca->{id}, $ca->{amount}, $ca->{chart_id}, $ca->{transdate}) ||
+    $form->dberror($trans_query . " (" . join(", ", $ca->{id}) . ")");
+    while (my $trans = $trans_sth->fetchrow_hashref(NAME_lc)) {
+      if (($ca->{transdate} eq $trans->{transdate}) && ($ca->{amount} * $trans->{amount} < 0)) {
+        if ($trans->{amount} < 0) {
+          $trans->{debit}  = $trans->{amount} * -1;
+          $trans->{credit} = 0;
+        } else {
+          $trans->{credit} = $trans->{amount};
+          $trans->{debit}  = 0;
+        } 
+        push(@{ $ca->{GEGENKONTO} }, $trans);
+      } else {
+        next;
+      }
+    }
+
+    $ca->{index} = join "--", map { $ca->{$_} } qw(id reference description transdate);
+#     $ca->{index} = $ca->{$form->{sort}};
     push(@{ $form->{CA} }, $ca);
 
   }