X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FRP.pm;h=65cb3029529ed9e4f1b205dc8a593eccd9bd0406;hb=f5c9c5eba0aed77f5cebe2e5cee5c7f3743b579e;hp=37b1109b7d8b13cb106f5eea23a9f7c96f4dc389;hpb=f3548f890e3ec8e06d5a03bc76117d3649aa652a;p=kivitendo-erp.git

diff --git a/SL/RP.pm b/SL/RP.pm
index 37b1109b7..65cb30295 100644
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -211,13 +211,25 @@ sub get_accounts {
 
   $sth->finish;
 
+  # filter for opening and closing bookings
   # if l_ob is selected l_cb is always ignored
-  if ( $form->{l_ob} ) {
-    $where .= ' AND ac.ob_transaction is true  '
-  } elsif ( not $form->{l_cb} ) {
-    $where .= ' AND ac.cb_transaction is false ';
+  if ( $last_period ) {
+    # ob/cb-settings for "compared to" balance
+    if ( $form->{l_ob_compared} ) {
+      $where .= ' AND ac.ob_transaction is true  '
+    } elsif ( not $form->{l_cb_compared} ) {
+      $where .= ' AND ac.cb_transaction is false ';
+    };
+  } else {
+    # ob/cb-settings for "as of" balance
+    if ( $form->{l_ob} ) {
+      $where .= ' AND ac.ob_transaction is true  '
+    } elsif ( not $form->{l_cb} ) {
+      $where .= ' AND ac.cb_transaction is false ';
+    };
   };
 
+
   if ($fromdate) {
     $fromdate = conv_dateq($fromdate);
     if ($form->{method} eq 'cash') {
@@ -257,8 +269,7 @@ sub get_accounts {
              (
                SELECT trans_id
                FROM acc_trans a
-               JOIN chart c ON (a.chart_id = c.id)
-               WHERE (link LIKE '%AR_paid%')
+               WHERE (a.chart_link LIKE '%AR_paid%')
                $subwhere
              )
            $project
@@ -277,8 +288,7 @@ sub get_accounts {
              (
                SELECT trans_id
                FROM acc_trans a
-               JOIN chart c ON (a.chart_id = c.id)
-               WHERE (link LIKE '%AP_paid%')
+               WHERE (a.chart_link LIKE '%AP_paid%')
                $subwhere
              )
            $project
@@ -294,7 +304,7 @@ sub get_accounts {
            $glwhere
            $dpt_where
            $category
-             AND NOT ((c.link = 'AR') OR (c.link = 'AP'))
+             AND NOT ((ac.chart_link = 'AR') OR (ac.chart_link = 'AP'))
            $project
          GROUP BY c.accno, c.description, c.category |;
 
@@ -317,8 +327,7 @@ sub get_accounts {
              (
                SELECT trans_id
                FROM acc_trans a
-               JOIN chart c ON (a.chart_id = c.id)
-               WHERE (link LIKE '%AR_paid%')
+               WHERE (a.chart_link LIKE '%AR_paid%')
                $subwhere
              )
            $project
@@ -338,8 +347,7 @@ sub get_accounts {
              (
                SELECT trans_id
                FROM acc_trans a
-               JOIN chart c ON (a.chart_id = c.id)
-               WHERE link LIKE '%AP_paid%'
+               WHERE a.chart_link LIKE '%AP_paid%'
                $subwhere
              )
            $project
@@ -512,8 +520,9 @@ sub get_accounts_g {
             /* ar amount is not zero, so we can divide by amount   */
                     (SELECT SUM(acc.amount) * -1
                      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)
+                     WHERE 1=1 $inwhere
+                     AND acc.trans_id = ac.trans_id
+                     AND acc.chart_link LIKE '%AR_paid%')
                   / (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 */
@@ -539,7 +548,7 @@ sub get_accounts_g {
          JOIN chart c ON (c.id = ac.chart_id)
          JOIN ar a ON (a.id = ac.trans_id)
          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)
+           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a WHERE (a.chart_link LIKE '%AR_paid%') $subwhere)
            $project
          GROUP BY c.$category
 */
@@ -550,7 +559,7 @@ sub get_accounts_g {
          JOIN chart c ON (c.id = ac.chart_id)
          JOIN ap a ON (a.id = ac.trans_id)
          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)
+           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a WHERE (a.chart_link LIKE '%AP_paid%') $subwhere)
            $project
          GROUP BY c.$category
 
@@ -561,7 +570,7 @@ sub get_accounts_g {
          JOIN chart c ON (c.id = ac.chart_id)
          JOIN gl a ON (a.id = ac.trans_id)
          WHERE $where $dpt_where $glwhere
-           AND NOT ((c.link = 'AR') OR (c.link = 'AP'))
+           AND NOT ((ac.chart_link = 'AR') OR (ac.chart_link = 'AP'))
            $project
          GROUP BY c.$category
         |;
@@ -576,7 +585,7 @@ sub get_accounts_g {
          JOIN parts p ON (ac.parts_id = p.id)
          JOIN chart c on (p.income_accno_id = c.id)
          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)
+           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a WHERE (a.chart_link LIKE '%AR_paid%') $subwhere)
            $project
          GROUP BY c.$category
 
@@ -588,7 +597,7 @@ sub get_accounts_g {
          JOIN parts p ON (ac.parts_id = p.id)
          JOIN chart c on (p.expense_accno_id = c.id)
          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)
+           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a WHERE (a.chart_link LIKE '%AP_paid%') $subwhere)
          $project
          GROUP BY c.$category
          |;
@@ -1167,10 +1176,12 @@ sub aging {
   # mit entsprechender altersstrukturliste (s.a. Bug 1842)
   # eine neue variable an der oberfläche eingeführt, somit ist
   # todate == freier zeitrau und fordate == stichtag
+  # duedate_where == nur fällige rechnungen anzeigen
 
-  my ($review_of_aging_list, $todate, $fromdate, $fromwhere, $fordate);
+  my ($review_of_aging_list, $todate, $fromdate, $fromwhere, $fordate,
+      $duedate_where);
 
-  if ($form->{reporttype} eq 'custom') {  # altersstrukturliste
+  if ($form->{reporttype} eq 'custom') {  # altersstrukturliste, nur fällige
 
     # explizit rausschmeissen was man für diesen bericht nicht braucht
     delete $form->{fromdate};
@@ -1193,7 +1204,8 @@ sub aging {
         $review_of_aging_list = " AND $form->{review_of_aging_list} < (date $fordate) - duedate";
       }
     }
-  } else {  # freier zeitraum OHNE review_of_aging_list
+    $duedate_where = " AND (date $fordate) - duedate >= 0 ";
+  } else {  # freier zeitraum, nur rechnungsdatum und OHNE review_of_aging_list
     $form->{todate}  = $form->current_date($myconfig) unless ($form->{todate});
     $todate = conv_dateq($form->{todate});
     $fromdate = conv_dateq($form->{fromdate});
@@ -1222,7 +1234,7 @@ sub aging {
       street, zipcode, city, country, contact, email,
       phone as customerphone, fax as customerfax, ${ct}number,
       "invnumber", "transdate",
-      (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",
+      (amount - COALESCE((SELECT sum(amount)*$ml FROM acc_trans WHERE chart_link ilike '%paid%' AND acc_trans.trans_id=${arap}.id AND acc_trans.transdate <= (date $todate)),0)) as "open", "amount",
       "duedate", invoice, ${arap}.id, date_part('days', now() - duedate) as overduedays,
       (SELECT $buysell
        FROM exchangerate
@@ -1236,6 +1248,7 @@ sub aging {
       AND (${ct}.id = ?)
       AND (transdate <= (date $todate) $fromwhere )
       $review_of_aging_list
+      $duedate_where
     ORDER BY ctid, transdate, invnumber |;
 
   my $sth_details = prepare_query($form, $dbh, $q_details);
@@ -1347,8 +1360,7 @@ sub tax_report {
         (
           SELECT trans_id
           FROM acc_trans a
-          JOIN chart c ON (a.chart_id = c.id)
-          WHERE (link LIKE '%${ARAP}_paid%')
+          WHERE (a.chart_link LIKE '%${ARAP}_paid%')
           AND (transdate <= $todate)
         )
       |;