X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FRP.pm;h=1875e0c96786ab32332f87b55ff13292e73aa524;hb=9af3ce1ca10555dff25e4762d2eb1e7fa0c1e877;hp=b2fd5e0699f273c76ed908342dc8beebdc389c95;hpb=4249ea44f0c6772c019a6d3fbfcd5fe879556ef6;p=kivitendo-erp.git

diff --git a/SL/RP.pm b/SL/RP.pm
index b2fd5e069..1875e0c96 100644
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -746,7 +746,6 @@ sub trial_balance {
           $customer_join
           WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) AND ac.ob_transaction
             $dpt_where_without_arapgl
-            $dpt_where
             $customer_where
             $project
           GROUP BY c.accno, c.category, c.description |;
@@ -909,7 +908,7 @@ sub trial_balance {
   }
   $sth->finish;
 
-  if (!$form->{method} ne "cash") {
+  if ($form->{method} ne "cash") {  # better eq 'accrual'
     $sth = prepare_execute_query($form, $dbh, $fetch_accounts_before_from);
     while ($ref = $sth->fetchrow_hashref("NAME_lc")) {
       $trb{ $ref->{accno} }{description} = $ref->{description};
@@ -931,7 +930,6 @@ sub trial_balance {
           $customer_join
           WHERE $where
             $dpt_where_without_arapgl
-            $dpt_where
             $customer_where
             $project
           AND (ac.amount < 0)
@@ -943,7 +941,6 @@ sub trial_balance {
           $customer_join
           WHERE $where
             $dpt_where_without_arapgl
-            $dpt_where
             $customer_where
             $project
           AND ac.amount > 0
@@ -954,7 +951,6 @@ sub trial_balance {
          $customer_join
          WHERE $saldowhere
            $dpt_where_without_arapgl
-           $dpt_where
            $customer_where
            $project
          AND c.accno = ? AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL)) AS saldo,
@@ -965,7 +961,6 @@ sub trial_balance {
          $customer_join
          WHERE $sumwhere
            $dpt_where_without_arapgl
-           $dpt_where
            $customer_where
            $project
          AND ac.amount > 0
@@ -977,7 +972,6 @@ sub trial_balance {
          $customer_join
          WHERE $sumwhere
            $dpt_where_without_arapgl
-           $dpt_where
            $customer_where
            $project
          AND ac.amount < 0
@@ -988,7 +982,6 @@ sub trial_balance {
         $customer_join
         WHERE $where
           $dpt_where_without_arapgl
-          $dpt_where
           $customer_where
           $project
         AND c.accno = ?) AS last_transaction
@@ -1065,7 +1058,6 @@ sub trial_balance {
         $customer_join
         WHERE $where
           $dpt_where_without_arapgl
-          $dpt_where
           $customer_where
           $project
         AND c.accno = ?) AS last_transaction
@@ -1871,4 +1863,88 @@ sub income_statement {
   }
   $main::lxdebug->leave_sub();
 }
+
+sub erfolgsrechnung {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+  $form->{company} = $::instance_conf->get_company;
+  $form->{address} = $::instance_conf->get_address;
+
+  # wrong user inputs should be handled during users input
+  # e.g.  spaces, tabs, wrong format or wrong dates
+  $form->{fromdate} = "01.01.2000" if !$form->{fromdate};
+  $form->{todate} = $form->current_date(%{$myconfig}) if !$form->{todate};
+
+  my %categories = (I => "ERTRAG", E => "AUFWAND");
+  my $fromdate = conv_dateq($form->{fromdate});
+  my $todate = conv_dateq($form->{todate});
+
+  $form->{total} = 0;
+  foreach my $category (keys %categories) {
+    my %category = (
+      name => $categories{$category},
+      total => 0,
+      accounts => get_accounts_ch($category),
+    );
+    foreach my $account (@{$category{accounts}}) {
+      $account->{total} += ($account->{category} eq $category ? 1 : -1) * get_total_ch($account->{id}, $fromdate, $todate);
+      $category{total} += $account->{total};
+      $account->{total} = $form->format_amount($myconfig, $form->parse_amount($myconfig, $account->{total}), 2);
+    }
+    $form->{total} += $category{total};
+    $category{total} = $form->format_amount($myconfig, $form->parse_amount($myconfig, $category{total}), 2);
+    push(@{$form->{categories}}, \%category);
+  }
+  $form->{total} = $form->format_amount($myconfig, $form->parse_amount($myconfig, $form->{total}), 2);
+
+  $main::lxdebug->leave_sub();
+  return {};
+}
+
+sub get_accounts_ch {
+  $main::lxdebug->enter_sub();
+
+  my ($category) = @_;
+  my ($inclusion);
+
+  if ($category eq 'I') {
+    $inclusion = "AND pos_er = NULL OR pos_er > '0' AND pos_er <= '5'";
+  } elsif ($category eq 'E') {
+    $inclusion = "AND pos_er = NULL OR pos_er >= '6' AND pos_er < '100'";
+  } else {
+    $inclusion = "";
+  }
+
+  my $query = qq|
+    SELECT id, accno, description, category
+    FROM chart
+    WHERE category = ? $inclusion
+    ORDER BY accno
+  |;
+  my $accounts = selectall_hashref_query($::form, $::form->get_standard_dbh, $query, $category);
+
+  $main::lxdebug->leave_sub();
+  return $accounts;
+}
+
+sub get_total_ch {
+  $main::lxdebug->enter_sub();
+
+  my ($chart_id, $fromdate, $todate) = @_;
+  my $total = 0;
+  my $query = qq|
+    SELECT SUM(amount)
+    FROM acc_trans
+    WHERE chart_id = ?
+      AND transdate >= ?
+      AND transdate <= ?
+  |;
+  my $data = selectfirst_hashref_query($::form, $::form->get_standard_dbh, $query, $chart_id, $fromdate, $todate);
+  $total += $data->{sum};
+
+  $main::lxdebug->leave_sub();
+  return $total;
+}
+
 1;