Beim CSV-Import die Session-Id der "auftraggebenden" Sitzung verwenden.

[mfinanz.git] / SL / RP.pm

diff --git a/SL/RP.pm b/SL/RP.pm
index 7890ecd8956b0fbfb9def2adb3edff1c15efe844..4a7b0afefdd657b7f1e1de0783a519b4a8eabc81 100644 (file)
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -214,14 +214,14 @@ sub get_accounts {
   # filter for opening and closing bookings
   # if l_ob is selected l_cb is always ignored
   if ( $last_period ) {
-    # ob/cb-settings for "as of" balance
+    # 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 "compared to" balance
+    # ob/cb-settings for "as of" balance
     if ( $form->{l_ob} ) {
       $where .= ' AND ac.ob_transaction is true  '
     } elsif ( not $form->{l_cb} ) {
@@ -516,7 +516,7 @@ sub get_accounts_g {
   if ($form->{method} eq 'cash') {
     $query =
       qq|
-       SELECT SUM( ac.amount * CASE WHEN COALESCE((SELECT amount FROM ar WHERE id = ac.trans_id), 0) != 0 THEN
+       SELECT SUM( ac.amount * CASE WHEN COALESCE((SELECT amount FROM ar a WHERE id = ac.trans_id $dpt_where), 0) != 0 THEN
             /* ar amount is not zero, so we can divide by amount   */
                     (SELECT SUM(acc.amount) * -1
                      FROM acc_trans acc
@@ -531,13 +531,6 @@ sub get_accounts_g {
        FROM acc_trans ac
        LEFT JOIN chart c ON (c.id  = ac.chart_id)
        LEFT JOIN ar      ON (ar.id = ac.trans_id)
-       LEFT JOIN taxkeys tk ON (tk.id = (
-                                  SELECT id FROM taxkeys
-                                  WHERE chart_id = ac.chart_id
-                                  AND startdate <= COALESCE(ar.deliverydate,ar.transdate)
-                                  ORDER BY startdate DESC LIMIT 1
-                                  )
-                                )
       WHERE ac.trans_id IN (SELECT DISTINCT trans_id FROM acc_trans WHERE 1=1 $subwhere)
 
       GROUP BY c.$category
@@ -1238,7 +1231,7 @@ sub aging {
       "duedate", invoice, ${arap}.id, date_part('days', now() - duedate) as overduedays,
       (SELECT $buysell
        FROM exchangerate
-       WHERE (${arap}.curr = exchangerate.curr)
+       WHERE (${arap}.currency_id = exchangerate.currency_id)
          AND (exchangerate.transdate = ${arap}.transdate)) AS exchangerate
     FROM ${arap}, ${ct}
     WHERE ((paid != amount) OR (datepaid > (date $todate) AND datepaid is not null))