Entfernt dpt_trans

[mfinanz.git] / SL / RP.pm

diff --git a/SL/RP.pm b/SL/RP.pm
index 4bb82f2b2a368ec89201dc2eceff60b8f6a0e836..b6661b5ec764f37685a0fdcf84345eab67a860e0 100644 (file)
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -178,7 +178,7 @@ sub get_accounts {
 
   my $query;
   my $dpt_where = '';
 
   my $query;
   my $dpt_where = '';

-  my $dpt_join  = '';
+  my $dpt_where_without_arapgl = '';

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


@@ -235,8 +235,7 @@ sub get_accounts {
   }
 
   if ($department_id) {
   }
 
   if ($department_id) {

-    $dpt_join = qq| JOIN department t ON (a.department_id = t.id) |;
-    $dpt_where = qq| AND (t.id = | . conv_i($department_id, 'NULL') . qq|)|;
+    $dpt_where = qq| AND (a.department_id = | . conv_i($department_id, 'NULL') . qq|)|;

   }
 
   if ($form->{project_id}) {
   }
 
   if ($form->{project_id}) {


@@ -251,7 +250,6 @@ sub get_accounts {
          FROM acc_trans ac
          JOIN chart c ON (c.id = ac.chart_id)
          JOIN ar a ON (a.id = ac.trans_id)
          FROM acc_trans ac
          JOIN chart c ON (c.id = ac.chart_id)
          JOIN ar a ON (a.id = ac.trans_id)

-         $dpt_join

          WHERE $where
            $dpt_where
            $category
          WHERE $where
            $dpt_where
            $category


@@ -272,7 +270,6 @@ sub get_accounts {
          FROM acc_trans ac
          JOIN chart c ON (c.id = ac.chart_id)
          JOIN ap a ON (a.id = ac.trans_id)
          FROM acc_trans ac
          JOIN chart c ON (c.id = ac.chart_id)
          JOIN ap a ON (a.id = ac.trans_id)

-         $dpt_join

          WHERE $where
            $dpt_where
            $category
          WHERE $where
            $dpt_where
            $category


@@ -293,7 +290,6 @@ sub get_accounts {
          FROM acc_trans ac
          JOIN chart c ON (c.id = ac.chart_id)
          JOIN gl a ON (a.id = ac.trans_id)
          FROM acc_trans ac
          JOIN chart c ON (c.id = ac.chart_id)
          JOIN gl a ON (a.id = ac.trans_id)

-         $dpt_join

          WHERE $where
            $glwhere
            $dpt_where
          WHERE $where
            $glwhere
            $dpt_where


@@ -313,7 +309,6 @@ sub get_accounts {
          JOIN ar a ON (a.id = ac.trans_id)
          JOIN parts p ON (ac.parts_id = p.id)
          JOIN chart c on (p.income_accno_id = c.id)
          JOIN ar a ON (a.id = ac.trans_id)
          JOIN parts p ON (ac.parts_id = p.id)
          JOIN chart c on (p.income_accno_id = c.id)

-         $dpt_join

          -- use transdate from subwhere
          WHERE (c.category = 'I')
            $subwhere
          -- use transdate from subwhere
          WHERE (c.category = 'I')
            $subwhere


@@ -336,7 +331,6 @@ sub get_accounts {
          JOIN ap a ON (a.id = ac.trans_id)
          JOIN parts p ON (ac.parts_id = p.id)
          JOIN chart c on (p.expense_accno_id = c.id)
          JOIN ap a ON (a.id = ac.trans_id)
          JOIN parts p ON (ac.parts_id = p.id)
          JOIN chart c on (p.expense_accno_id = c.id)

-         $dpt_join

          WHERE (c.category = 'E')
            $subwhere
            $dpt_where
          WHERE (c.category = 'E')
            $subwhere
            $dpt_where


@@ -354,17 +348,18 @@ sub get_accounts {
 
   } else {                      # if ($form->{method} eq 'cash')
     if ($department_id) {
 
   } else {                      # if ($form->{method} eq 'cash')
     if ($department_id) {

-      $dpt_join = qq| JOIN dpt_trans t ON (t.trans_id = ac.trans_id) |;
-      $dpt_where = qq| AND t.department_id = | . conv_i($department_id);
+      $dpt_where = qq| AND a.department_id = | . conv_i($department_id);
+      $dpt_where_without_arapgl = qq| AND COALESCE((SELECT department_id FROM ar WHERE ar.id=ac.trans_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);

     }
 
     $query = qq|
       SELECT c.accno, sum(ac.amount) AS amount, c.description, c.category
       FROM acc_trans ac
       JOIN chart c ON (c.id = ac.chart_id)
     }
 
     $query = qq|
       SELECT c.accno, sum(ac.amount) AS amount, c.description, c.category
       FROM acc_trans ac
       JOIN chart c ON (c.id = ac.chart_id)

-      $dpt_join

       WHERE $where
       WHERE $where

-        $dpt_where
+        $dpt_where_without_arapgl

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


@@ -379,7 +374,6 @@ sub get_accounts {
       JOIN ar a ON (a.id = ac.trans_id)
       JOIN parts p ON (ac.parts_id = p.id)
       JOIN chart c on (p.income_accno_id = c.id)
       JOIN ar a ON (a.id = ac.trans_id)
       JOIN parts p ON (ac.parts_id = p.id)
       JOIN chart c on (p.income_accno_id = c.id)

-      $dpt_join

       -- use transdate from subwhere
       WHERE (c.category = 'I')
         $subwhere
       -- use transdate from subwhere
       WHERE (c.category = 'I')
         $subwhere


@@ -394,7 +388,6 @@ sub get_accounts {
       JOIN ap a ON (a.id = ac.trans_id)
       JOIN parts p ON (ac.parts_id = p.id)
       JOIN chart c on (p.expense_accno_id = c.id)
       JOIN ap a ON (a.id = ac.trans_id)
       JOIN parts p ON (ac.parts_id = p.id)
       JOIN chart c on (p.expense_accno_id = c.id)

-      $dpt_join

       WHERE (c.category = 'E')
         $subwhere
         $dpt_where
       WHERE (c.category = 'E')
         $subwhere
         $dpt_where


@@ -462,7 +455,7 @@ sub get_accounts_g {
 
   my $query;
   my $dpt_where;
 
   my $query;
   my $dpt_where;

-  my $dpt_join;
+  my $dpt_where_without_arapgl;

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


@@ -494,8 +487,7 @@ sub get_accounts_g {
   }
 
   if ($department_id) {
   }
 
   if ($department_id) {

-    $dpt_join = qq| JOIN department t ON (a.department_id = t.id) |;
-    $dpt_where = qq| AND (t.id = | . conv_i($department_id, 'NULL') . qq|) |;
+    $dpt_where = qq| AND (a.department_id = | . conv_i($department_id, 'NULL') . qq|) |;

   }
 
   if ($form->{project_id}) {
   }
 
   if ($form->{project_id}) {


@@ -522,8 +514,8 @@ sub get_accounts_g {
                      FROM acc_trans acc
                      INNER JOIN chart c ON (acc.chart_id = c.id AND c.link LIKE '%AR_paid%')
                      WHERE 1=1 $inwhere AND acc.trans_id = ac.trans_id)
                      FROM acc_trans acc
                      INNER JOIN chart c ON (acc.chart_id = c.id AND c.link LIKE '%AR_paid%')
                      WHERE 1=1 $inwhere AND acc.trans_id = ac.trans_id)

-                  / (SELECT amount FROM ar WHERE id = ac.trans_id) 
-            ELSE 0 
+                  / (SELECT amount FROM ar WHERE id = ac.trans_id)
+            ELSE 0

             /* ar amount is zero, or we are checking with a non-ar-transaction, so we return 0 in both cases as multiplicator of ac.amount */
             END
                 ) AS amount, c.$category
             /* ar amount is zero, or we are checking with a non-ar-transaction, so we return 0 in both cases as multiplicator of ac.amount */
             END
                 ) AS amount, c.$category


@@ -546,7 +538,6 @@ sub get_accounts_g {
          FROM acc_trans ac
          JOIN chart c ON (c.id = ac.chart_id)
          JOIN ar a ON (a.id = ac.trans_id)
          FROM acc_trans ac
          JOIN chart c ON (c.id = ac.chart_id)
          JOIN ar a ON (a.id = ac.trans_id)

-         $dpt_join

          WHERE $where $dpt_where
            AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AR_paid%') $subwhere)
            $project
          WHERE $where $dpt_where
            AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AR_paid%') $subwhere)
            $project


@@ -558,7 +549,6 @@ sub get_accounts_g {
          FROM acc_trans ac
          JOIN chart c ON (c.id = ac.chart_id)
          JOIN ap a ON (a.id = ac.trans_id)
          FROM acc_trans ac
          JOIN chart c ON (c.id = ac.chart_id)
          JOIN ap a ON (a.id = ac.trans_id)

-         $dpt_join

          WHERE $where $dpt_where
            AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AP_paid%') $subwhere)
            $project
          WHERE $where $dpt_where
            AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AP_paid%') $subwhere)
            $project


@@ -570,7 +560,6 @@ sub get_accounts_g {
          FROM acc_trans ac
          JOIN chart c ON (c.id = ac.chart_id)
          JOIN gl a ON (a.id = ac.trans_id)
          FROM acc_trans ac
          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
            AND NOT ((c.link = 'AR') OR (c.link = 'AP'))
            $project
          WHERE $where $dpt_where $glwhere
            AND NOT ((c.link = 'AR') OR (c.link = 'AP'))
            $project


@@ -586,7 +575,6 @@ sub get_accounts_g {
          JOIN ar a ON (a.id = ac.trans_id)
          JOIN parts p ON (ac.parts_id = p.id)
          JOIN chart c on (p.income_accno_id = c.id)
          JOIN ar a ON (a.id = ac.trans_id)
          JOIN parts p ON (ac.parts_id = p.id)
          JOIN chart c on (p.income_accno_id = c.id)

-         $dpt_join

          WHERE (c.category = 'I') $prwhere $dpt_where
            AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AR_paid%') $subwhere)
            $project
          WHERE (c.category = 'I') $prwhere $dpt_where
            AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AR_paid%') $subwhere)
            $project


@@ -599,7 +587,6 @@ sub get_accounts_g {
          JOIN ap a ON (a.id = ac.trans_id)
          JOIN parts p ON (ac.parts_id = p.id)
          JOIN chart c on (p.expense_accno_id = c.id)
          JOIN ap a ON (a.id = ac.trans_id)
          JOIN parts p ON (ac.parts_id = p.id)
          JOIN chart c on (p.expense_accno_id = c.id)

-         $dpt_join

          WHERE (c.category = 'E') $prwhere $dpt_where
            AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AP_paid%') $subwhere)
          $project
          WHERE (c.category = 'E') $prwhere $dpt_where
            AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AP_paid%') $subwhere)
          $project


@@ -609,17 +596,18 @@ sub get_accounts_g {
 
   } else {                      # if ($form->{method} eq 'cash')
     if ($department_id) {
 
   } else {                      # if ($form->{method} eq 'cash')
     if ($department_id) {

-      $dpt_join = qq| JOIN dpt_trans t ON (t.trans_id = ac.trans_id) |;
-      $dpt_where = qq| AND (t.department_id = | . conv_i($department_id, 'NULL') . qq|) |;
+      $dpt_where = qq| AND (a.department_id = | . conv_i($department_id, 'NULL') . qq|) |;
+      $dpt_where_without_arapgl = qq| AND COALESCE((SELECT department_id FROM ar WHERE ar.id=ac.trans_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);

     }
 
     $query = qq|
         SELECT sum(ac.amount * chart_category_to_sgn(c.category)) AS amount, c.$category
         FROM acc_trans ac
         JOIN chart c ON (c.id = ac.chart_id)
     }
 
     $query = qq|
         SELECT sum(ac.amount * chart_category_to_sgn(c.category)) AS amount, c.$category
         FROM acc_trans ac
         JOIN chart c ON (c.id = ac.chart_id)

-        $dpt_join

         WHERE $where
         WHERE $where

-          $dpt_where
+          $dpt_where_without_arapgl

           $project
         GROUP BY c.$category |;
 
           $project
         GROUP BY c.$category |;
 


@@ -632,7 +620,6 @@ sub get_accounts_g {
         JOIN ar a ON (a.id = ac.trans_id)
         JOIN parts p ON (ac.parts_id = p.id)
         JOIN chart c on (p.income_accno_id = c.id)
         JOIN ar a ON (a.id = ac.trans_id)
         JOIN parts p ON (ac.parts_id = p.id)
         JOIN chart c on (p.income_accno_id = c.id)

-        $dpt_join

         WHERE (c.category = 'I')
           $prwhere
           $dpt_where
         WHERE (c.category = 'I')
           $prwhere
           $dpt_where


@@ -646,7 +633,6 @@ sub get_accounts_g {
         JOIN ap a ON (a.id = ac.trans_id)
         JOIN parts p ON (ac.parts_id = p.id)
         JOIN chart c on (p.expense_accno_id = c.id)
         JOIN ap a ON (a.id = ac.trans_id)
         JOIN parts p ON (ac.parts_id = p.id)
         JOIN chart c on (p.expense_accno_id = c.id)

-        $dpt_join

         WHERE (c.category = 'E')
           $prwhere
           $dpt_where
         WHERE (c.category = 'E')
           $prwhere
           $dpt_where


@@ -687,15 +673,17 @@ sub trial_balance {
   my ($null, $department_id) = split /--/, $form->{department};
   my @headingaccounts = ();
   my $dpt_where;
   my ($null, $department_id) = split /--/, $form->{department};
   my @headingaccounts = ();
   my $dpt_where;

-  my $dpt_join;
+  my $dpt_where_without_arapgl;

   my $project;
 
   my $where    = "1 = 1";
   my $invwhere = $where;
 
   if ($department_id) {
   my $project;
 
   my $where    = "1 = 1";
   my $invwhere = $where;
 
   if ($department_id) {

-    $dpt_join = qq| JOIN dpt_trans t ON (ac.trans_id = t.trans_id) |;
-    $dpt_where = qq| AND (t.department_id = | . conv_i($department_id, 'NULL') . qq|) |;
+    $dpt_where = qq| AND (a.department_id = | . conv_i($department_id, 'NULL') . qq|) |;
+    $dpt_where_without_arapgl = qq| AND COALESCE((SELECT department_id FROM ar WHERE ar.id=ac.trans_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);

   }
 
   # project_id only applies to getting transactions
   }
 
   # project_id only applies to getting transactions


@@ -743,9 +731,8 @@ 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

-                       $dpt_join

                        WHERE (1 = 1)
                        WHERE (1 = 1)

-                         $dpt_where
+                         $dpt_where_without_arapgl

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


@@ -755,9 +742,8 @@ 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)

-          $dpt_join

           WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) AND ac.ob_transaction
           WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) AND ac.ob_transaction

-            $dpt_where
+            $dpt_where_without_arapgl

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


@@ -855,9 +841,8 @@ sub trial_balance {
        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)
        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)

-       $dpt_join

        WHERE $where
        WHERE $where

-         $dpt_where
+         $dpt_where_without_arapgl

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


@@ -872,7 +857,6 @@ sub trial_balance {
       JOIN ar a ON (ac.trans_id = a.id)
       JOIN parts p ON (ac.parts_id = p.id)
       JOIN chart c ON (p.income_accno_id = c.id)
       JOIN ar a ON (ac.trans_id = a.id)
       JOIN parts p ON (ac.parts_id = p.id)
       JOIN chart c ON (p.income_accno_id = c.id)

-      $dpt_join

       WHERE $invwhere
         $dpt_where
         $project
       WHERE $invwhere
         $dpt_where
         $project


@@ -885,7 +869,6 @@ sub trial_balance {
       JOIN ap a ON (ac.trans_id = a.id)
       JOIN parts p ON (ac.parts_id = p.id)
       JOIN chart c ON (p.expense_accno_id = c.id)
       JOIN ap a ON (ac.trans_id = a.id)
       JOIN parts p ON (ac.parts_id = p.id)
       JOIN chart c ON (p.expense_accno_id = c.id)

-      $dpt_join

       WHERE $invwhere
         $dpt_where
         $project
       WHERE $invwhere
         $dpt_where
         $project


@@ -914,9 +897,8 @@ 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)

-          $dpt_join

           WHERE $where
           WHERE $where

-            $dpt_where
+            $dpt_where_without_arapgl

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


@@ -924,27 +906,24 @@ 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)

-          $dpt_join

           WHERE $where
           WHERE $where

-            $dpt_where
+            $dpt_where_without_arapgl

             $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)

-         $dpt_join

          WHERE $saldowhere
          WHERE $saldowhere

-           $dpt_where
+           $dpt_where_without_arapgl

            $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)

-         $dpt_join

          WHERE $sumwhere
          WHERE $sumwhere

-           $dpt_where
+           $dpt_where_without_arapgl

            $project
          AND amount > 0
          AND c.accno = ?) AS sum_credit,
            $project
          AND amount > 0
          AND c.accno = ?) AS sum_credit,


@@ -952,18 +931,16 @@ sub trial_balance {
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)

-         $dpt_join

          WHERE $sumwhere
          WHERE $sumwhere

-           $dpt_where
+           $dpt_where_without_arapgl

            $project
          AND 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)
            $project
          AND 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)

-        $dpt_join

         WHERE $where
         WHERE $where

-          $dpt_where
+          $dpt_where_without_arapgl

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


@@ -981,7 +958,6 @@ sub trial_balance {
            JOIN parts p ON (ac.parts_id = p.id)
            JOIN ap a ON (ac.trans_id = a.id)
            JOIN chart c ON (p.expense_accno_id = c.id)
            JOIN parts p ON (ac.parts_id = p.id)
            JOIN ap a ON (ac.trans_id = a.id)
            JOIN chart c ON (p.expense_accno_id = c.id)

-           $dpt_join

            WHERE $invwhere
              $dpt_where
              $project
            WHERE $invwhere
              $dpt_where
              $project


@@ -992,7 +968,6 @@ sub trial_balance {
            JOIN parts p ON (ac.parts_id = p.id)
            JOIN ar a ON (ac.trans_id = a.id)
            JOIN chart c ON (p.income_accno_id = c.id)
            JOIN parts p ON (ac.parts_id = p.id)
            JOIN ar a ON (ac.trans_id = a.id)
            JOIN chart c ON (p.income_accno_id = c.id)

-           $dpt_join

            WHERE $invwhere
              $dpt_where
              $project
            WHERE $invwhere
              $dpt_where
              $project


@@ -1001,18 +976,16 @@ sub trial_balance {
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)

-         $dpt_join

          WHERE $saldowhere
          WHERE $saldowhere

-           $dpt_where
+           $dpt_where_without_arapgl

            $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)

-         $dpt_join

          WHERE $sumwhere
          WHERE $sumwhere

-           $dpt_where
+           $dpt_where_without_arapgl

            $project
          AND amount > 0
          AND c.accno = ?) AS sum_credit,
            $project
          AND amount > 0
          AND c.accno = ?) AS sum_credit,


@@ -1020,9 +993,8 @@ sub trial_balance {
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
          JOIN chart c ON (ac.chart_id = c.id)

-         $dpt_join

          WHERE $sumwhere
          WHERE $sumwhere

-           $dpt_where
+           $dpt_where_without_arapgl

            $project
          AND amount < 0
          AND c.accno = ?) AS sum_debit,
            $project
          AND amount < 0
          AND c.accno = ?) AS sum_debit,


@@ -1030,9 +1002,8 @@ sub trial_balance {
 
         (SELECT max(ac.transdate) FROM acc_trans ac
         JOIN chart c ON (ac.chart_id = c.id)
 
         (SELECT max(ac.transdate) FROM acc_trans ac
         JOIN chart c ON (ac.chart_id = c.id)

-        $dpt_join

         WHERE $where
         WHERE $where

-          $dpt_where
+          $dpt_where_without_arapgl

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


@@ -1503,12 +1474,10 @@ sub payments {
   }
 
   my ($query, $sth);
   }
 
   my ($query, $sth);

-  my $dpt_join;

   my $where;
 
   if ($form->{department_id}) {
   my $where;
 
   if ($form->{department_id}) {

-    $dpt_join = qq| JOIN dpt_trans t ON (t.trans_id = ac.trans_id) |;
-    $where = qq| AND (t.department_id = | . conv_i($form->{department_id}, 'NULL') . qq|) |;
+    $where = qq| AND (a.department_id = | . conv_i($form->{department_id}, 'NULL') . qq|) |;

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


@@ -1526,7 +1495,7 @@ sub payments {
   if ($form->{reference}) {
     $reference = $dbh->quote('%' . $form->{reference} . '%');
     $invnumber = " AND (a.invnumber LIKE $reference)";
   if ($form->{reference}) {
     $reference = $dbh->quote('%' . $form->{reference} . '%');
     $invnumber = " AND (a.invnumber LIKE $reference)";

-    $reference = " AND (g.reference LIKE $reference)";
+    $reference = " AND (a.reference LIKE $reference)";

   }
   if ($form->{source}) {
     $where .= " AND (ac.source ILIKE " . $dbh->quote('%' . $form->{source} . '%') . ") ";
   }
   if ($form->{source}) {
     $where .= " AND (ac.source ILIKE " . $dbh->quote('%' . $form->{source} . '%') . ") ";


@@ -1543,10 +1512,10 @@ sub payments {
     'memo'         => [ qw(lower_memo)                           ],
     );
   my %lowered_columns =  (
     'memo'         => [ qw(lower_memo)                           ],
     );
   my %lowered_columns =  (

-    'invnumber'       => { 'gl' => 'g.reference',   'arap' => 'a.invnumber', },
+    'invnumber'       => { 'gl' => 'a.reference',   'arap' => 'a.invnumber', },

     'memo'            => { 'gl' => 'ac.memo',       'arap' => 'ac.memo',     },
     'source'          => { 'gl' => 'ac.source',     'arap' => 'ac.source',   },
     'memo'            => { 'gl' => 'ac.memo',       'arap' => 'ac.memo',     },
     'source'          => { 'gl' => 'ac.source',     'arap' => 'ac.source',   },

-    'name'            => { 'gl' => 'g.description', 'arap' => 'c.name',      },
+    'name'            => { 'gl' => 'a.description', 'arap' => 'c.name',      },

     );
 
   my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
     );
 
   my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';


@@ -1573,20 +1542,18 @@ sub payments {
          FROM acc_trans ac
          JOIN $arap a ON (ac.trans_id = a.id)
          JOIN $table c ON (c.id = a.${table}_id)
          FROM acc_trans ac
          JOIN $arap a ON (ac.trans_id = a.id)
          JOIN $table c ON (c.id = a.${table}_id)

-         $dpt_join

          WHERE (ac.chart_id = ?)
            $where
            $invnumber
 
          UNION
 
          WHERE (ac.chart_id = ?)
            $where
            $invnumber
 
          UNION
 

-         SELECT g.description, g.reference, NULL AS ordnumber,
+         SELECT a.description, a.reference, NULL AS ordnumber,

            ac.transdate, ac.amount * $ml AS paid, ac.source,
            ac.transdate, ac.amount * $ml AS paid, ac.source,

-           '0' as invoice, g.id, ac.memo, 'gl' AS module
+           '0' as invoice, a.id, ac.memo, 'gl' AS module

            $columns_for_sorting{gl}
          FROM acc_trans ac
            $columns_for_sorting{gl}
          FROM acc_trans ac

-         JOIN gl g ON (g.id = ac.trans_id)
-         $dpt_join
+         JOIN gl a ON (a.id = ac.trans_id)

          WHERE (ac.chart_id = ?)
            $where
            $reference
          WHERE (ac.chart_id = ?)
            $where
            $reference