From: G. Richardson <information@kivitendo-premium.de>
Date: Wed, 24 Apr 2013 09:59:24 +0000 (+0200)
Subject: Bilanz-Bericht: eigene EB/SB-Filter für Gegenüberstellung
X-Git-Tag: release-3.1.0beta1~472
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=6c9c012e74984b7992fc4bad93c58960744f16d2;p=kivitendo-erp.git

Bilanz-Bericht: eigene EB/SB-Filter für Gegenüberstellung

Jetzt kann man sowohl die Bilanz zum Stichtag, als auch zum
Gegenüberstellungstag, mit Filtern für EB- und SB-Buchungen ziehen.

Ein nützlicher Vergleich ist z.B.:

Zum Stand: 31.12.2012   (keine Haken gesetzt)
Gegenüberstellen zu: 01.01.2013   Haken bei: "nur EB-Buchungen"

um zu sehen ob alle Salden korrekt übertragen worden sind.
---

diff --git a/SL/RP.pm b/SL/RP.pm
index 1afd180e3..7890ecd89 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 "as of" 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
+    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') {
diff --git a/templates/webpages/rp/report.html b/templates/webpages/rp/report.html
index 753bc80b5..daeaf46c9 100644
--- a/templates/webpages/rp/report.html
+++ b/templates/webpages/rp/report.html
@@ -137,8 +137,14 @@
   <tr>
     <th align=right>[% 'as at' | $T8 %]</th>
     <td> [% L.date_tag('asofdate', asofdate) %]</td>
+    <td><input name=l_cb class=checkbox type=checkbox value=Y>&nbsp;[% 'CB Transactions' | $T8 %]</td>
+    <td><input name=l_ob class=checkbox type=checkbox value=Y>&nbsp;[% 'only OB Transactions' | $T8 %]</td>
+  </tr>
+  </tr>
     <th align=right nowrap>[% 'Compare to' | $T8 %]</th>
     <td>[% L.date_tag('compareasofdate', compareasofdate) %]</td>
+    <td><input name=l_cb_compared class=checkbox type=checkbox value=Y>&nbsp;[% 'CB Transactions' | $T8 %]</td>
+    <td><input name=l_ob_compared class=checkbox type=checkbox value=Y>&nbsp;[% 'only OB Transactions' | $T8 %]</td>
   </tr>
   <tr>
     <th align=right>[% 'Decimalplaces' | $T8 %]</th>
@@ -153,11 +159,6 @@
     <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;[% 'Subtotal' | $T8 %]
     <input name=l_accno class=checkbox type=checkbox value=Y>&nbsp;[% 'Account Number' | $T8 %]</td>
   </tr>
-  <tr>
-    <th></th>
-    <td><input name=l_cb class=checkbox type=checkbox value=Y>&nbsp;[% 'CB Transactions' | $T8 %]
-    <input name=l_ob class=checkbox type=checkbox value=Y>&nbsp;[% 'only OB Transactions' | $T8 %]</td>
-  </tr>
 [%- END %]
 
 [%- IF is_trial_balance %]