From 1450f4e46f2f12a4825153020a6abb8e7634026a Mon Sep 17 00:00:00 2001
From: "G. Richardson" <information@lx-office-hosting.de>
Date: Tue, 24 Jan 2012 22:50:11 +0100
Subject: [PATCH] Bilanz und GuV mit oder ohne SB-Buchungen ausgeben
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Erlaubt es, Bilanz und GuV zum 31.12. zu ziehen, ohne daß die SB-Buchungen die
Konten alle auf 0 setzen. Ersatz für "13. Periode".

Bei Bilanz reine EB-Bilanz zum 1.1. ermöglichen
In diesem Fall wird Auswahl "SB-Buchung" ignoriert.

Was jetzt noch fehlt wäre eine Gegenüberstellung von SB Vorjahr zu EB Folgejahr
in der Bilanz.
---
 SL/RP.pm                          |  9 +++++++++
 locale/de/all                     |  2 ++
 templates/webpages/rp/report.html | 11 ++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/SL/RP.pm b/SL/RP.pm
index f98d47561..abf95beeb 100644
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -211,6 +211,13 @@ sub get_accounts {
 
   $sth->finish;
 
+  # if l_ob is selected l_cb is always ignored
+  if ( $form->{l_ob} ) {
+    $where .= ' AND ob_transaction is true  ' 
+  } elsif ( not $form->{l_cb} ) {
+    $where .= ' AND cb_transaction is false ';
+  };
+
   if ($fromdate) {
     $fromdate = conv_dateq($fromdate);
     if ($form->{method} eq 'cash') {
@@ -464,6 +471,8 @@ sub get_accounts_g {
   my $inwhere = "";
   my $item;
 
+  $where .= ' AND cb_transaction is false ' unless $form->{l_cb};
+
   if ($fromdate) {
     $fromdate = conv_dateq($fromdate);
     if ($form->{method} eq 'cash') {
diff --git a/locale/de/all b/locale/de/all
index b10da890d..8b5a09482 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -311,6 +311,7 @@ $self->{texts} = {
   'Businesses'                  => 'Kunden-/Lieferantentypen',
   'CANCELED'                    => 'Storniert',
   'CB Transaction'              => 'SB-Buchung',
+  'CB Transactions'             => 'SB-Buchungen',
   'CR'                          => 'H',
   'CRM admin'                   => 'Administration',
   'CRM create customers, vendors and contacts' => 'Erfassen (Kunden, Lieferanten, Personen)',
@@ -2227,6 +2228,7 @@ $self->{texts} = {
   'not yet executed'            => 'Noch nicht ausgeführt',
   'number'                      => 'Nummer',
   'oe.pl::search called with unknown type' => 'oe.pl::search mit unbekanntem Typ aufgerufen',
+  'only OB Transactions'        => 'nur EB-Buchungen',
   'open'                        => 'Offen',
   'order'                       => 'Reihenfolge',
   'our vendor number at customer' => 'Unsere Lieferanten-Nr. beim Kunden',
diff --git a/templates/webpages/rp/report.html b/templates/webpages/rp/report.html
index 934bf8912..6f9583ecd 100644
--- a/templates/webpages/rp/report.html
+++ b/templates/webpages/rp/report.html
@@ -60,7 +60,7 @@
 [%- END %]
 [%- BLOCK cash_or_accrual %]
   <tr>
-    <th align=leftt>[% 'Method' | $T8 %]</th>
+    <th align=left>[% 'Method' | $T8 %]</th>
     <td colspan=3>
       [% L.radio_button_tag('method', value='accrual', checked=accrual, label=LxERP.t8('Accrual')) %]
       [% L.radio_button_tag('method', value='cash', checked=cash, label=LxERP.t8('EUR')) %]
@@ -117,6 +117,10 @@
 <table>
 [%- PROCESS customized_report %]
 [%- PROCESS cash_or_accrual %]
+  <tr>
+    <th align=left nowrap>[% 'Include in Report' | $T8 %]</th>
+    <td><input name=l_cb class=checkbox type=checkbox value=Y>&nbsp;[% 'CB Transactions' | $T8 %]</td>
+  </tr>
 [%- END %]
 
 [%- IF is_bwa %]
@@ -153,6 +157,11 @@
     <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 %]
-- 
2.20.1