X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/9d8c5c5f47d00b42c90c47c4a483b9f5155667b1..a819e20cbfcbfb99eb5a34a5f15e22c58d61fdc9:/SL/RP.pm

diff --git a/SL/RP.pm b/SL/RP.pm
index 859296f2e..8ea8f4f7e 100644
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -37,8 +37,8 @@ package RP;
 use SL::DBUtils;
 use Data::Dumper;
 use List::Util qw(sum);
-use strict;
-use warnings;
+# use strict;
+# use warnings;
 
 
 # new implementation of balance sheet
@@ -700,6 +700,7 @@ sub trial_balance {
       if ($ref->{amount} != 0 || $form->{all_accounts}) {
         $trb{ $ref->{accno} }{description} = $ref->{description};
         $trb{ $ref->{accno} }{charttype}   = 'A';
+        $trb{ $ref->{accno} }{beginning_balance} = $ref->{amount};
 
         if ($ref->{amount} > 0) {
           $trb{ $ref->{accno} }{haben_eb}   = $ref->{amount};
@@ -941,7 +942,7 @@ sub trial_balance {
          WHERE $saldowhere
            $dpt_where
            $project
-         AND c.accno = ?) AS saldo,
+         AND c.accno = ? AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL)) AS saldo,
 
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
@@ -1009,7 +1010,7 @@ sub trial_balance {
          WHERE $saldowhere
            $dpt_where
            $project
-         AND c.accno = ?) AS saldo,
+         AND c.accno = ? AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL)) AS saldo,
 
         (SELECT SUM(ac.amount)
          FROM acc_trans ac
@@ -1052,7 +1053,7 @@ sub trial_balance {
 
     $ref->{accno} = $accno;
     map { $ref->{$_} = $trb{$accno}{$_} }
-      qw(description category charttype amount soll_eb haben_eb);
+      qw(description category charttype amount soll_eb haben_eb beginning_balance);
 
     $ref->{balance} = $form->round_amount($balance{ $ref->{accno} }, 2);
 
@@ -1100,7 +1101,21 @@ sub trial_balance {
 
       $ref->{debit}  = $form->round_amount($ref->{debit},  2);
       $ref->{credit} = $form->round_amount($ref->{credit}, 2);
-      $ref->{haben_saldo}  = $form->round_amount($ref->{haben_saldo},  2);
+
+      if ($ref->{haben_saldo} != 0) {
+        $ref->{haben_saldo}  = $ref->{haben_saldo} + $ref->{beginning_balance};
+        if ($ref->{haben_saldo} < 0) {
+          $ref->{soll_saldo} = $form->round_amount(($ref->{haben_saldo} *- 1), 2);
+          $ref->{haben_saldo} = 0;
+        }
+      } elsif ($ref->{soll_saldo} != 0) {
+        $ref->{soll_saldo} = $ref->{soll_saldo} - $ref->{beginning_balance};
+        if ($ref->{soll_saldo} < 0) {
+          $ref->{haben_saldo} = $form->round_amount(($ref->{haben_saldo} * -1), 2);
+          $ref->{soll_saldo} = 0;
+        }
+     }
+      $ref->{haben_saldo} = $form->round_amount($ref->{haben_saldo}, 2);
       $ref->{soll_saldo} = $form->round_amount($ref->{soll_saldo}, 2);
       $ref->{haben_kumuliert}  = $form->round_amount($ref->{haben_kumuliert},  2);
       $ref->{soll_kumuliert} = $form->round_amount($ref->{soll_kumuliert}, 2);
@@ -1630,7 +1645,7 @@ sub bwa {
   }
 
   my @periods        = qw(jetzt kumm);
-  my @gesamtleistung = qw(1 2 3);
+  my @gesamtleistung = qw(1 3);
   my @gesamtkosten   = qw (10 11 12 13 14 15 16 17 18 19 20);
   my @ergebnisse     =
     qw (rohertrag betriebrohertrag betriebsergebnis neutraleraufwand neutralerertrag ergebnisvorsteuern ergebnis gesamtleistung gesamtkosten);
@@ -1653,6 +1668,8 @@ sub bwa {
     foreach my $item (@gesamtleistung) {
       $form->{ "$key" . "gesamtleistung" } += $form->{$item}{$key};
     }
+    $form->{ "$key" . "gesamtleistung" } -= $form->{2}{$key};
+
     foreach my $item (@gesamtkosten) {
       $form->{ "$key" . "gesamtkosten" } += $form->{$item}{$key};
     }
@@ -1905,28 +1922,20 @@ sub income_statement {
 
   $form->{decimalplaces} *= 1;
 
-  foreach my $item (@categories_einnahmen) {
-    $form->{$item} = 0;
-  }
-  foreach my $item (@categories_ausgaben) {
-    $form->{$item} = 0;
-  }
 
-  foreach my $item (@ergebnisse) {
-    $form->{$item} = 0;
-  }
 
   &get_accounts_g($dbh, $last_period, $form->{fromdate}, $form->{todate},
                   $form, "pos_eur");
 
+
   foreach my $item (@categories_einnahmen) {
     $form->{"eur${item}"} =
-      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2));
+      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2),2);
     $form->{"sumeura"} += $form->{$item};
   }
   foreach my $item (@categories_ausgaben) {
     $form->{"eur${item}"} =
-      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2));
+      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2),2);
     $form->{"sumeurb"} += $form->{$item};
   }
 
@@ -1934,7 +1943,7 @@ sub income_statement {
 
   foreach my $item (@ergebnisse) {
     $form->{$item} =
-      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2));
+      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2),2);
   }
   $main::lxdebug->leave_sub();
 }