-###=====================================================================
+#=====================================================================
# LX-Office ERP
# Copyright (C) 2004
# Based on SQL-Ledger Version 2.1.9
use SL::DBUtils;
use Data::Dumper;
+use List::Util qw(sum);
+
+# use warnings;
+use strict;
+
+# new implementation of balance sheet
+# readme!
+#
+# stuff missing from the original implementation:
+# - bold stuff
+# - subdescription
+# - proper testing for heading charts
+# - transmission from $form to TMPL realm is not as clear as i'd like
+
+sub get_openbalance_date {
+ my ($closedto, $target) = map { $::locale->parse_date_to_object(\%::myconfig, $_) } @_;
+
+ return unless $closedto;
+
+ $closedto->subtract(years => 1) while ($target - $closedto)->is_negative;
+ $closedto->add(days => 1);
+ return $::locale->format_date(\%::myconfig, $closedto);
+}
sub balance_sheet {
$main::lxdebug->enter_sub();
- my ($self, $myconfig, $form) = @_;
-
- # connect to database
- my $dbh = $form->dbconnect($myconfig);
+ my $myconfig = \%main::myconfig;
+ my $form = $main::form;
+ my $dbh = $::form->get_standard_dbh;
my $last_period = 0;
my @categories = qw(A C L Q);
$form->{period} = $form->{this_period} = conv_dateq($form->{asofdate});
}
- $form->{decimalplaces} *= 1;
+ # get end of financial year and convert to Date format
+ my ($closedto) = selectfirst_array_query($form, $dbh, 'SELECT closedto FROM defaults');
+
+ # get date of last opening balance
+ my $startdate = get_openbalance_date($closedto, $form->{asofdate});
- &get_accounts($dbh, $last_period, "", $form->{asofdate}, $form,
- \@categories);
+ get_accounts($dbh, $last_period, $startdate, $form->{asofdate}, $form, \@categories);
# if there are any compare dates
if ($form->{compareasofdate}) {
-
$last_period = 1;
- &get_accounts($dbh, $last_period, "", $form->{compareasofdate},
- $form, \@categories);
- $form->{last_period} = conv_dateq($form->{compareasofdate});
+ $startdate = get_openbalance_date($closedto, $form->{compareasofdate});
+ get_accounts($dbh, $last_period, $startdate, $form->{compareasofdate}, $form, \@categories);
+ $form->{last_period} = conv_dateq($form->{compareasofdate});
}
- # disconnect
- $dbh->disconnect;
-
# now we got $form->{A}{accno}{ } assets
# and $form->{L}{accno}{ } liabilities
# and $form->{Q}{accno}{ } equity
# build asset accounts
- my $str;
- my $key;
-
- my %account = (
- 'A' => { 'label' => 'asset',
- 'labels' => 'assets',
- 'ml' => -1
- },
- 'L' => { 'label' => 'liability',
- 'labels' => 'liabilities',
- 'ml' => 1
- },
- 'Q' => { 'label' => 'equity',
- 'labels' => 'equity',
- 'ml' => 1
- });
+ my %account = ('A' => { 'ml' => -1 },
+ 'L' => { 'ml' => 1 },
+ 'Q' => { 'ml' => 1 });
+
+ my $TMPL_DATA = {};
foreach my $category (grep { !/C/ } @categories) {
- foreach $key (sort keys %{ $form->{$category} }) {
+ $TMPL_DATA->{$category} = [];
+ my $ml = $account{$category}{ml};
- $str = ($form->{l_heading}) ? $form->{padding} : "";
+ foreach my $key (sort keys %{ $form->{$category} }) {
- if ($form->{$category}{$key}{charttype} eq "A") {
- $str .=
- ($form->{l_accno})
- ? "$form->{$category}{$key}{accno} - $form->{$category}{$key}{description}"
- : "$form->{$category}{$key}{description}";
- }
- if ($form->{$category}{$key}{charttype} eq "H") {
- if ($account{$category}{subtotal} && $form->{l_subtotal}) {
- $dash = "- ";
- push(@{ $form->{"$account{$category}{label}_account"} },
- "$str$form->{bold}$account{$category}{subdescription}$form->{endbold}"
- );
- push(@{ $form->{"$account{$category}{label}_this_period"} },
- $form->format_amount(
- $myconfig,
- $account{$category}{subthis} * $account{$category}{ml},
- $form->{decimalplaces}, $dash
- ));
+ my $row = { %{ $form->{$category}{$key} } };
- if ($last_period) {
- push(@{ $form->{"$account{$category}{label}_last_period"} },
- $form->format_amount(
- $myconfig,
- $account{$category}{sublast} * $account{$category}{ml},
- $form->{decimalplaces}, $dash
- ));
- }
+ # if charttype "heading" - calculate this entry, start a new batch of charts belonging to this heading and skip the rest bo the loop
+ # header charts are not real charts. start a sub aggregation with them, but don't calculate anything with them
+ if ($row->{charttype} eq "H") {
+ if ($account{$category}{subtotal} && $form->{l_subtotal}) {
+ $row->{subdescription} = $account{$category}{subdescription};
+ $row->{this} = $account{$category}{subthis} * $ml; # format: $dec, $dash
+ $row->{last} = $account{$category}{sublast} * $ml if $last_period; # format: $dec, $dash
}
- $str =
- "$form->{bold}$form->{$category}{$key}{description}$form->{endbold}";
-
- $account{$category}{subthis} = $form->{$category}{$key}{this};
- $account{$category}{sublast} = $form->{$category}{$key}{last};
- $account{$category}{subdescription} =
- $form->{$category}{$key}{description};
+ $row->{subheader} = 1;
+ $account{$category}{subthis} = $row->{this};
+ $account{$category}{sublast} = $row->{last};
+ $account{$category}{subdescription} = $row->{description};
$account{$category}{subtotal} = 1;
- $form->{$category}{$key}{this} = 0;
- $form->{$category}{$key}{last} = 0;
+ $row->{this} = 0;
+ $row->{last} = 0;
next unless $form->{l_heading};
-
- $dash = " ";
}
- # push description onto array
- push(@{ $form->{"$account{$category}{label}_account"} }, $str);
-
- if ($form->{$category}{$key}{charttype} eq 'A') {
- $form->{"total_$account{$category}{labels}_this_period"} +=
- $form->{$category}{$key}{this} * $account{$category}{ml};
- $dash = "- ";
+ for my $period (qw(this last)) {
+ next if ($period eq 'last' && !$last_period);
+ # only add assets
+ $row->{$period} *= $ml;
}
- push(@{ $form->{"$account{$category}{label}_this_period"} },
- $form->format_amount(
- $myconfig,
- $form->{$category}{$key}{this} * $account{$category}{ml},
- $form->{decimalplaces}, $dash
- ));
-
- if ($last_period) {
- $form->{"total_$account{$category}{labels}_last_period"} +=
- $form->{$category}{$key}{last} * $account{$category}{ml};
-
- push(@{ $form->{"$account{$category}{label}_last_period"} },
- $form->format_amount(
- $myconfig,
- $form->{$category}{$key}{last} * $account{$category}{ml},
- $form->{decimalplaces}, $dash
- ));
- }
- }
+ push @{ $TMPL_DATA->{$category} }, $row;
+ } # foreach
- $str = ($form->{l_heading}) ? $form->{padding} : "";
+ # resolve heading/subtotal
if ($account{$category}{subtotal} && $form->{l_subtotal}) {
- push(@{ $form->{"$account{$category}{label}_account"} },
- "$str$form->{bold}$account{$category}{subdescription}$form->{endbold}"
- );
- push(@{ $form->{"$account{$category}{label}_this_period"} },
- $form->format_amount(
- $myconfig,
- $account{$category}{subthis} * $account{$category}{ml},
- $form->{decimalplaces}, $dash
- ));
-
- if ($last_period) {
- push(@{ $form->{"$account{$category}{label}_last_period"} },
- $form->format_amount(
- $myconfig,
- $account{$category}{sublast} * $account{$category}{ml},
- $form->{decimalplaces}, $dash
- ));
- }
+ $TMPL_DATA->{$category}[-1]{subdescription} = $account{$category}{subdescription};
+ $TMPL_DATA->{$category}[-1]{this} = $account{$category}{subthis} * $ml; # format: $dec, $dash
+ $TMPL_DATA->{$category}[-1]{last} = $account{$category}{sublast} * $ml if $last_period; # format: $dec, $dash
}
+ $TMPL_DATA->{total}{$category}{this} = sum map { $_->{this} } @{ $TMPL_DATA->{$category} };
+ $TMPL_DATA->{total}{$category}{last} = sum map { $_->{last} } @{ $TMPL_DATA->{$category} };
}
- # totals for assets, liabilities
- $form->{total_assets_this_period} =
- $form->round_amount($form->{total_assets_this_period},
- $form->{decimalplaces});
- $form->{total_liabilities_this_period} =
- $form->round_amount($form->{total_liabilities_this_period},
- $form->{decimalplaces});
- $form->{total_equity_this_period} =
- $form->round_amount($form->{total_equity_this_period},
- $form->{decimalplaces});
-
- # calculate earnings
- $form->{earnings_this_period} =
- $form->{total_assets_this_period} -
- $form->{total_liabilities_this_period} - $form->{total_equity_this_period};
-
- push(@{ $form->{equity_this_period} },
- $form->format_amount($myconfig,
- $form->{earnings_this_period},
- $form->{decimalplaces}, "- "
- ));
-
- $form->{total_equity_this_period} =
- $form->round_amount(
- $form->{total_equity_this_period} + $form->{earnings_this_period},
- $form->{decimalplaces});
-
- # add liability + equity
- $form->{total_this_period} =
- $form->format_amount(
- $myconfig,
- $form->{total_liabilities_this_period} + $form->{total_equity_this_period},
- $form->{decimalplaces},
- "- ");
-
- if ($last_period) {
-
- # totals for assets, liabilities
- $form->{total_assets_last_period} =
- $form->round_amount($form->{total_assets_last_period},
- $form->{decimalplaces});
- $form->{total_liabilities_last_period} =
- $form->round_amount($form->{total_liabilities_last_period},
- $form->{decimalplaces});
- $form->{total_equity_last_period} =
- $form->round_amount($form->{total_equity_last_period},
- $form->{decimalplaces});
-
- # calculate retained earnings
- $form->{earnings_last_period} =
- $form->{total_assets_last_period} -
- $form->{total_liabilities_last_period} -
- $form->{total_equity_last_period};
-
- push(@{ $form->{equity_last_period} },
- $form->format_amount($myconfig,
- $form->{earnings_last_period},
- $form->{decimalplaces}, "- "
- ));
-
- $form->{total_equity_last_period} =
- $form->round_amount(
- $form->{total_equity_last_period} + $form->{earnings_last_period},
- $form->{decimalplaces});
-
- # add liability + equity
- $form->{total_last_period} =
- $form->format_amount($myconfig,
- $form->{total_liabilities_last_period} +
- $form->{total_equity_last_period},
- $form->{decimalplaces},
- "- ");
+ for my $period (qw(this last)) {
+ next if ($period eq 'last' && !$last_period);
+ $form->{E}{$period} = $TMPL_DATA->{total}{A}{$period} - $TMPL_DATA->{total}{L}{$period} - $TMPL_DATA->{total}{Q}{$period};
+ $TMPL_DATA->{total}{Q}{$period} += $form->{E}{$period};
+ $TMPL_DATA->{total}{$period} = $TMPL_DATA->{total}{L}{$period} + $TMPL_DATA->{total}{Q}{$period};
}
-
- $form->{total_liabilities_last_period} =
- $form->format_amount($myconfig,
- $form->{total_liabilities_last_period},
- $form->{decimalplaces}, "- ")
- if ($form->{total_liabilities_last_period} != 0);
-
- $form->{total_equity_last_period} =
- $form->format_amount($myconfig,
- $form->{total_equity_last_period},
- $form->{decimalplaces}, "- ")
- if ($form->{total_equity_last_period} != 0);
-
- $form->{total_assets_last_period} =
- $form->format_amount($myconfig,
- $form->{total_assets_last_period},
- $form->{decimalplaces}, "- ")
- if ($form->{total_assets_last_period} != 0);
-
- $form->{total_assets_this_period} =
- $form->format_amount($myconfig,
- $form->{total_assets_this_period},
- $form->{decimalplaces}, "- ");
-
- $form->{total_liabilities_this_period} =
- $form->format_amount($myconfig,
- $form->{total_liabilities_this_period},
- $form->{decimalplaces}, "- ");
-
- $form->{total_equity_this_period} =
- $form->format_amount($myconfig,
- $form->{total_equity_this_period},
- $form->{decimalplaces}, "- ");
+ $form->{E}{description}='nicht verbuchter Gewinn/Verlust';
+ push @{ $TMPL_DATA->{Q} }, $form->{E};
$main::lxdebug->leave_sub();
+
+ return $TMPL_DATA;
}
sub get_accounts {
my ($null, $department_id) = split /--/, $form->{department};
my $query;
- my $dpt_where;
- my $dpt_join;
- my $project;
- my $where = "1 = 1";
- my $glwhere = "";
- my $subwhere = "";
+ my $dpt_where = '';
+ my $dpt_join = '';
+ my $project = '';
+ my $where = "1 = 1";
+ my $glwhere = "";
+ my $subwhere = "";
my $item;
my $sth;
+ my $dec = $form->{decimalplaces};
my $category = qq| AND (| . join(" OR ", map({ "(c.category = " . $dbh->quote($_) . ")" } @{$categories})) . qq|) |;
$sth = prepare_execute_query($form, $dbh, $query);
my @headingaccounts = ();
- while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
$form->{ $ref->{category} }{ $ref->{accno} }{description} =
"$ref->{description}";
$form->{ $ref->{category} }{ $ref->{accno} }{charttype} = "H";
$sth->finish;
+ # 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 ($fromdate) {
$fromdate = conv_dateq($fromdate);
if ($form->{method} eq 'cash') {
}
if ($form->{project_id}) {
+ # Diese Bedingung wird derzeit niemals wahr sein, da man in Bericht->Bilanz keine
+ # Projekte auswählen kann
$project = qq| AND (ac.project_id = | . conv_i($form->{project_id}, 'NULL') . qq|) |;
}
AND ac.trans_id IN
(
SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
+ FROM acc_trans a
+ JOIN chart c ON (a.chart_id = c.id)
WHERE (link LIKE '%AR_paid%')
$subwhere
)
AND ac.trans_id IN
(
SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
+ FROM acc_trans a
+ JOIN chart c ON (a.chart_id = c.id)
WHERE (link LIKE '%AP_paid%')
$subwhere
)
GROUP BY c.accno, c.description, c.category |;
if ($form->{project_id}) {
+ # s.o. keine Projektauswahl in Bilanz
$query .=
qq|
UNION ALL
AND ac.trans_id IN
(
SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
+ FROM acc_trans a
+ JOIN chart c ON (a.chart_id = c.id)
WHERE (link LIKE '%AR_paid%')
$subwhere
)
AND ac.trans_id IN
(
SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
+ FROM acc_trans a
+ JOIN chart c ON (a.chart_id = c.id)
WHERE link LIKE '%AP_paid%'
$subwhere
)
} else { # if ($form->{method} eq 'cash')
if ($department_id) {
$dpt_join = qq| JOIN dpt_trans t ON (t.trans_id = ac.trans_id) |;
- $dpt_where = qq| AND t.department_id = $department_id |;
+ $dpt_where = qq| AND t.department_id = | . conv_i($department_id);
}
$query = qq|
GROUP BY c.accno, c.description, c.category |;
if ($form->{project_id}) {
+ # s.o. keine Projektauswahl in Bilanz
$query .= qq|
UNION ALL
my $accno;
my $ref;
- my $sth = prepare_execute_query($form, $dbh, $query);
+ $sth = prepare_execute_query($form, $dbh, $query);
- while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while ($ref = $sth->fetchrow_hashref("NAME_lc")) {
if ($ref->{category} eq 'C') {
$ref->{category} = 'A';
}
$form->{ $ref->{category} }{ $ref->{accno} }{accno} = $ref->{accno};
- $form->{ $ref->{category} }{ $ref->{accno} }{description} =
- $ref->{description};
+ $form->{ $ref->{category} }{ $ref->{accno} }{description} = $ref->{description};
$form->{ $ref->{category} }{ $ref->{accno} }{charttype} = "A";
if ($last_period) {
# remove accounts with zero balance
foreach $category (@{$categories}) {
foreach $accno (keys %{ $form->{$category} }) {
- $form->{$category}{$accno}{last} =
- $form->round_amount($form->{$category}{$accno}{last},
- $form->{decimalplaces});
- $form->{$category}{$accno}{this} =
- $form->round_amount($form->{$category}{$accno}{this},
- $form->{decimalplaces});
+ $form->{$category}{$accno}{last} = $form->round_amount($form->{$category}{$accno}{last}, $dec);
+ $form->{$category}{$accno}{this} = $form->round_amount($form->{$category}{$accno}{this}, $dec);
delete $form->{$category}{$accno}
if ( $form->{$category}{$accno}{this} == 0
my $glwhere = "";
my $prwhere = "";
my $subwhere = "";
+ my $inwhere = "";
my $item;
+ $where .= ' AND ac.cb_transaction is false ' unless $form->{l_cb};
+
if ($fromdate) {
$fromdate = conv_dateq($fromdate);
if ($form->{method} eq 'cash') {
$subwhere .= " AND (transdate >= $fromdate)";
$glwhere = " AND (ac.transdate >= $fromdate)";
- $prwhere = " AND (ar.transdate >= $fromdate)";
+ $prwhere = " AND (a.transdate >= $fromdate)";
+ $inwhere = " AND (acc.transdate >= $fromdate)";
} else {
$where .= " AND (ac.transdate >= $fromdate)";
}
$todate = conv_dateq($todate);
$subwhere .= " AND (transdate <= $todate)";
$where .= " AND (ac.transdate <= $todate)";
- $prwhere .= " AND (ar.transdate <= $todate)";
+ $prwhere .= " AND (a.transdate <= $todate)";
+ $inwhere .= " AND (acc.transdate <= $todate)";
}
if ($department_id) {
$project = qq| AND (ac.project_id = | . conv_i($form->{project_id}) . qq|) |;
}
+#
+# GUV patch by Ronny Rentner (Bug 1190)
+#
+# GUV IST-Versteuerung
+#
+# Alle tatsaechlichen _Zahlungseingaenge_
+# im Zeitraum erfassen
+# (Teilzahlungen werden prozentual auf verschiedene Steuern aufgeteilt)
+#
+#
+
if ($form->{method} eq 'cash') {
$query =
qq|
+ SELECT SUM( ac.amount * CASE WHEN COALESCE((SELECT amount FROM ar WHERE id = ac.trans_id and amount != 0 ), 0) != 0 THEN
+ (SELECT SUM(acc.amount) * -1
+ FROM acc_trans acc
+ INNER JOIN chart c ON (acc.chart_id = c.id AND c.link LIKE '%AR_paid%')
+ WHERE 1=1 $inwhere AND acc.trans_id = ac.trans_id)
+ / (SELECT amount FROM ar WHERE id = ac.trans_id and amount != 0 ) ELSE 1 END
+ ) AS amount, c.$category
+ 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
+
+/*
SELECT SUM(ac.amount * chart_category_to_sgn(c.category)) AS amount, c.$category
FROM acc_trans ac
JOIN chart c ON (c.id = ac.chart_id)
JOIN ar a ON (a.id = ac.trans_id)
$dpt_join
WHERE $where $dpt_where
- AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AR_paid%') $subwhere)
+ AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AR_paid%') $subwhere)
$project
- GROUP BY c.$category
-
+ GROUP BY c.$category
+*/
UNION
SELECT SUM(ac.amount * chart_category_to_sgn(c.category)) AS amount, c.$category
JOIN ap a ON (a.id = ac.trans_id)
$dpt_join
WHERE $where $dpt_where
- AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AP_paid%') $subwhere)
+ AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AP_paid%') $subwhere)
$project
- GROUP BY c.$category
+ GROUP BY c.$category
UNION
JOIN chart c ON (c.id = ac.chart_id)
JOIN gl a ON (a.id = ac.trans_id)
$dpt_join
- WHERE $where $dpt_where $glwhere
+ WHERE $where $dpt_where $glwhere
AND NOT ((c.link = 'AR') OR (c.link = 'AP'))
$project
-
- $project_union
- GROUP BY c.$category
+ GROUP BY c.$category
|;
if ($form->{project_id}) {
- $project_union = qq|
+ $query .= qq|
UNION
SELECT SUM(ac.sellprice * ac.qty * chart_category_to_sgn(c.category)) AS amount, c.$category
JOIN chart c on (p.income_accno_id = c.id)
$dpt_join
WHERE (c.category = 'I') $prwhere $dpt_where
- AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AR_paid%') $subwhere)
+ AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AR_paid%') $subwhere)
$project
- GROUP BY c.$category
+ GROUP BY c.$category
UNION
JOIN chart c on (p.expense_accno_id = c.id)
$dpt_join
WHERE (c.category = 'E') $prwhere $dpt_where
- AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AP_paid%') $subwhere)
+ AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AP_paid%') $subwhere)
$project
- GROUP BY c.$category
+ GROUP BY c.$category
|;
}
my $accno;
my $ref;
- my $sth = prepare_execute_query($form, $dbh, $query);
-
- while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+ foreach my $ref (selectall_hashref_query($form, $dbh, $query)) {
if ($category eq "pos_bwa") {
if ($last_period) {
$form->{ $ref->{$category} }{kumm} += $ref->{amount};
$form->{ $ref->{$category} } += $ref->{amount};
}
}
- $sth->finish;
$main::lxdebug->leave_sub();
}
sub trial_balance {
$main::lxdebug->enter_sub();
- my ($self, $myconfig, $form) = @_;
+ my ($self, $myconfig, $form, %options) = @_;
my $dbh = $form->dbconnect($myconfig);
}
my $acc_cash_where = "";
- my $ar_cash_where = "";
- my $ap_cash_where = "";
+# my $ar_cash_where = "";
+# my $ap_cash_where = "";
if ($form->{method} eq "cash") {
- $acc_cash_where = qq| AND (ac.trans_id IN (SELECT id FROM ar WHERE datepaid>='$form->{fromdate}' AND datepaid<='$form->{todate}' UNION SELECT id FROM ap WHERE datepaid>='$form->{fromdate}' AND datepaid<='$form->{todate}' UNION SELECT id FROM gl WHERE transdate>='$form->{fromdate}' AND transdate<='$form->{todate}')) |;
- $ar_ap_cash_where = qq| AND (a.datepaid>='$form->{fromdate}' AND a.datepaid<='$form->{todate}') |;
+ $acc_cash_where =
+ qq| AND (ac.trans_id IN (
+ SELECT id
+ FROM ar
+ WHERE datepaid >= '$form->{fromdate}'
+ AND datepaid <= '$form->{todate}'
+
+ UNION
+
+ SELECT id
+ FROM ap
+ WHERE datepaid >= '$form->{fromdate}'
+ AND datepaid <= '$form->{todate}'
+
+ UNION
+
+ SELECT id
+ FROM gl
+ WHERE transdate >= '$form->{fromdate}'
+ AND transdate <= '$form->{todate}'
+ )) |;
+# $ar_ap_cash_where = qq| AND (a.datepaid>='$form->{fromdate}' AND a.datepaid<='$form->{todate}') |;
}
- # get beginning balances
- $query =
- qq|SELECT c.accno, c.category, SUM(ac.amount) AS amount, c.description
- FROM acc_trans ac
- LEFT JOIN chart c ON (ac.chart_id = c.id)
- $dpt_join
- WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) AND ac.ob_transaction $acc_cash_where
- $dpt_where
- $project
- GROUP BY c.accno, c.category, c.description |;
+ if ($options{beginning_balances}) {
+ foreach my $prefix (qw(from to)) {
+ next if ($form->{"${prefix}date"});
+
+ my $min_max = $prefix eq 'from' ? 'min' : 'max';
+ $query = qq|SELECT ${min_max}(transdate)
+ FROM acc_trans ac
+ $dpt_join
+ WHERE (1 = 1)
+ $dpt_where
+ $project|;
+ ($form->{"${prefix}date"}) = selectfirst_array_query($form, $dbh, $query);
+ }
- $sth = prepare_execute_query($form, $dbh, $query, $form->{fromdate});
+ # get beginning balances
+ $query =
+ qq|SELECT c.accno, c.category, SUM(ac.amount) AS amount, c.description
+ FROM acc_trans ac
+ LEFT JOIN chart c ON (ac.chart_id = c.id)
+ $dpt_join
+ WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) AND ac.ob_transaction
+ $dpt_where
+ $project
+ GROUP BY c.accno, c.category, c.description |;
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+ $sth = prepare_execute_query($form, $dbh, $query, $form->{fromdate});
- if ($ref->{amount} != 0 || $form->{all_accounts}) {
- $trb{ $ref->{accno} }{description} = $ref->{description};
- $trb{ $ref->{accno} }{charttype} = 'A';
-
- if ($ref->{amount} > 0) {
- $trb{ $ref->{accno} }{haben_eb} = $ref->{amount};
- } else {
- $trb{ $ref->{accno} }{soll_eb} = $ref->{amount} * -1;
+ while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
+
+ 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};
+ } else {
+ $trb{ $ref->{accno} }{soll_eb} = $ref->{amount} * -1;
+ }
+ $trb{ $ref->{accno} }{category} = $ref->{category};
}
- $trb{ $ref->{accno} }{category} = $ref->{category};
- }
+ }
+ $sth->finish;
}
- $sth->finish;
-
# get headings
$query =
$sth = prepare_execute_query($form, $dbh, $query);
- while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while ($ref = $sth->fetchrow_hashref("NAME_lc")) {
$trb{ $ref->{accno} }{description} = $ref->{description};
$trb{ $ref->{accno} }{charttype} = 'H';
$trb{ $ref->{accno} }{category} = $ref->{category};
$sth->finish;
$where = " 1 = 1 ";
- $saldowhere = " 1 = 1 ";
- $sumwhere = " 1 = 1 ";
+ my $saldowhere = " 1 = 1 ";
+ my $sumwhere = " 1 = 1 ";
+ my $subwhere = '';
+ my $sumsubwhere = '';
+ my $saldosubwhere = '';
+ my $glsaldowhere = '';
+ my $glsubwhere = '';
+ my $glwhere = '';
+ my $glsumwhere = '';
my $tofrom;
+ my ($fromdate, $todate);
if ($form->{fromdate} || $form->{todate}) {
if ($form->{fromdate}) {
- my $fromdate = conv_dateq($form->{fromdate});
- $tofrom .= " AND (ac.transdate >= $fromdate)";
- $subwhere .= " AND (transdate >= $fromdate)";
- $sumsubwhere .= " AND (transdate >= (select date_trunc('year', date $fromdate))) ";
- $saldosubwhere .= " AND transdate>=(select date_trunc('year', date $fromdate)) ";
- $invwhere .= " AND (a.transdate >= $fromdate)";
- $glsaldowhere .= " AND ac.transdate>=(select date_trunc('year', date $fromdate)) ";
- $glwhere = " AND (ac.transdate >= $fromdate)";
- $glsumwhere = " AND (ac.transdate >= (select date_trunc('year', date $fromdate))) ";
+ $fromdate = conv_dateq($form->{fromdate});
+ $tofrom .= " AND (ac.transdate >= $fromdate)";
+ $subwhere .= " AND (ac.transdate >= $fromdate)";
+ $sumsubwhere .= " AND (ac.transdate >= (select date_trunc('year', date $fromdate))) ";
+ $saldosubwhere .= " AND (ac,transdate>=(select date_trunc('year', date $fromdate))) ";
+ $invwhere .= " AND (a.transdate >= $fromdate)";
+ $glsaldowhere .= " AND ac.transdate>=(select date_trunc('year', date $fromdate)) ";
+ $glwhere = " AND (ac.transdate >= $fromdate)";
+ $glsumwhere = " AND (ac.transdate >= (select date_trunc('year', date $fromdate))) ";
}
if ($form->{todate}) {
- my $todate = conv_dateq($form->{todate});
- $tofrom .= " AND (ac.transdate <= $todate)";
- $invwhere .= " AND (a.transdate <= $todate)";
- $saldosubwhere .= " AND (transdate <= $todate)";
- $sumsubwhere .= " AND (transdate <= $todate)";
- $subwhere .= " AND (transdate <= $todate)";
- $glwhere .= " AND (ac.transdate <= $todate)";
- $glsumwhere .= " AND (ac.transdate <= $todate) ";
- $glsaldowhere .= " AND (ac.transdate <= $todate) ";
+ $todate = conv_dateq($form->{todate});
+ $tofrom .= " AND (ac.transdate <= $todate)";
+ $invwhere .= " AND (a.transdate <= $todate)";
+ $saldosubwhere .= " AND (ac.transdate <= $todate)";
+ $sumsubwhere .= " AND (ac.transdate <= $todate)";
+ $subwhere .= " AND (ac.transdate <= $todate)";
+ $glwhere .= " AND (ac.transdate <= $todate)";
+ $glsumwhere .= " AND (ac.transdate <= $todate) ";
+ $glsaldowhere .= " AND (ac.transdate <= $todate) ";
}
}
if ($form->{method} eq "cash") {
$where .=
- qq| AND ((ac.trans_id IN (SELECT id from ar) AND
- ac.trans_id IN
- (
- SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
- WHERE (link LIKE '%AR_paid%')
- $subwhere
- )
- )
- OR
- (ac.trans_id in (SELECT id from ap) AND
- ac.trans_id IN
- (
- SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
- WHERE (link LIKE '%AP_paid%')
- $subwhere
- )
- )
- OR
- (ac.trans_id in (SELECT id from gl)
- $glwhere)
- )|;
- $saldowhere .=
-qq| AND ((ac.trans_id IN (SELECT id from ar) AND
- ac.trans_id IN
- (
- SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
- WHERE (link LIKE '%AR_paid%')
- $saldosubwhere
- )
- )
- OR
- (ac.trans_id in (SELECT id from ap) AND
- ac.trans_id IN
- (
- SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
- WHERE (link LIKE '%AP_paid%')
- $saldosubwhere
- )
- )
- OR
- (ac.trans_id in (SELECT id from gl)
- $glsaldowhere)
- )|;
- $sumwhere .=
-qq| AND ((ac.trans_id IN (SELECT id from ar) AND
- ac.trans_id IN
- (
- SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
- WHERE (link LIKE '%AR_paid%')
- $sumsubwhere
- )
- )
- OR
- (ac.trans_id in (SELECT id from ap) AND
- ac.trans_id IN
- (
- SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
- WHERE (link LIKE '%AP_paid%')
- $sumsubwhere
- )
- )
- OR
- (ac.trans_id in (SELECT id from gl)
- $glsumwhere)
- )|;
+ qq| AND(ac.trans_id IN (SELECT id FROM ar WHERE datepaid>= $fromdate AND datepaid<= $todate UNION SELECT id FROM ap WHERE datepaid>= $fromdate AND datepaid<= $todate UNION SELECT id FROM gl WHERE transdate>= $fromdate AND transdate<= $todate)) AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL) |;
+ $saldowhere .= qq| AND(ac.trans_id IN (SELECT id FROM ar WHERE datepaid>= $fromdate AND datepaid<= $todate UNION SELECT id FROM ap WHERE datepaid>= $fromdate AND datepaid<= $todate UNION SELECT id FROM gl WHERE transdate>= $fromdate AND transdate<= $todate)) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL) |;
+ $sumwhere .= qq| AND(ac.trans_id IN (SELECT id FROM ar WHERE datepaid>= $fromdate AND datepaid<= $todate UNION SELECT id FROM ap WHERE datepaid>= $fromdate AND datepaid<= $todate UNION SELECT id FROM gl WHERE transdate>= $fromdate AND transdate<= $todate)) AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL) |;
} else {
$where .= $tofrom . " AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL)";
$saldowhere .= $glsaldowhere . " AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL)";
$sth = prepare_execute_query($form, $dbh, $query);
# calculate the debit and credit in the period
- while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while ($ref = $sth->fetchrow_hashref("NAME_lc")) {
$trb{ $ref->{accno} }{description} = $ref->{description};
$trb{ $ref->{accno} }{charttype} = 'A';
$trb{ $ref->{accno} }{category} = $ref->{category};
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
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
$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);
# get DR/CR
do_statement($form, $drcr, $q_drcr, $ref->{accno}, $ref->{accno}, $ref->{accno}, $ref->{accno}, $ref->{accno}, $ref->{accno});
- ($debit, $credit, $saldo, $haben_saldo, $soll_saldo, $soll_kumuliert, $haben_kumuliert) = (0, 0, 0, 0, 0, 0, 0);
+ ($debit, $credit, $saldo, $haben_saldo, $soll_saldo) = (0, 0, 0, 0, 0);
+ my ($soll_kumuliert, $haben_kumuliert) = (0, 0);
$last_transaction = "";
while (($debit, $credit, $saldo, $haben_kumuliert, $soll_kumuliert, $last_transaction) = $drcr->fetchrow_array) {
$ref->{debit} += $debit;
$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;
+ }
+ } else {
+ $ref->{soll_saldo} = $ref->{soll_saldo} - $ref->{beginning_balance};
+ if ($ref->{soll_saldo} < 0) {
+ $ref->{haben_saldo} = $form->round_amount(($ref->{soll_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);
}
# add subtotal
+ my @accno;
@accno = grep { $_ le "$ref->{accno}" } @headingaccounts;
$accno = pop @accno;
if ($accno) {
$dbh->disconnect;
# debits and credits for headings
- foreach $accno (@headingaccounts) {
+ foreach my $accno (@headingaccounts) {
foreach $ref (@{ $form->{TB} }) {
if ($accno eq $ref->{accno}) {
- $ref->{debit} = $trb{$accno}{debit};
- $ref->{credit} = $trb{$accno}{credit};
- $ref->{soll_saldo} = $trb{$accno}{soll_saldo};
- $ref->{haben_saldo} = $trb{$accno}{haben_saldo};
+ $ref->{debit} = $trb{$accno}{debit};
+ $ref->{credit} = $trb{$accno}{credit};
+ $ref->{soll_saldo} = $trb{$accno}{soll_saldo};
+ $ref->{haben_saldo} = $trb{$accno}{haben_saldo};
$ref->{soll_kumuliert} = $trb{$accno}{soll_kumuliert};
- $ref->{haben_kumuliert} = $trb{$accno}{haben_kumuliert}; }
+ $ref->{haben_kumuliert} = $trb{$accno}{haben_kumuliert};
+ }
}
}
}
my $dpt_join;
+ my $where_dpt;
if ($form->{department}) {
- ($null, $department_id) = split /--/, $form->{department};
+ my ($null, $department_id) = split /--/, $form->{department};
$dpt_join = qq| JOIN department d ON (a.department_id = d.id) |;
$where .= qq| AND (a.department_id = | . conv_i($department_id, 'NULL') . qq|)|;
+ $where_dpt = qq| AND (${arap}.department_id = | . conv_i($department_id, 'NULL') . qq|)|;
+ }
+ my $review_of_aging_list;
+ if ($form->{review_of_aging_list}) {
+ if ($form->{review_of_aging_list} =~ m "-"){
+ my @period = split(/-/, $form->{review_of_aging_list});
+ $review_of_aging_list = " AND $period[0] < date_part('days', now() - duedate)
+ AND date_part('days', now() - duedate) < $period[1]";
+ } else {
+ $form->{review_of_aging_list} =~ s/[^0-9]//g;
+ $review_of_aging_list = " AND $form->{review_of_aging_list} < date_part('days', now() - duedate)";
+ }
}
my $q_details = qq|
- -- between 0-30 days
SELECT ${ct}.id AS ctid, ${ct}.name,
street, zipcode, city, country, contact, email,
phone as customerphone, fax as customerfax, ${ct}number,
"invnumber", "transdate",
(amount - COALESCE((SELECT sum(amount)*$ml FROM acc_trans LEFT JOIN chart ON (acc_trans.chart_id=chart.id) WHERE link ilike '%paid%' AND acc_trans.trans_id=${arap}.id AND acc_trans.transdate <= (date $todate)),0)) as "open", "amount",
- "duedate", invoice, ${arap}.id,
+ "duedate", invoice, ${arap}.id, date_part('days', now() - duedate) as overduedays,
(SELECT $buysell
FROM exchangerate
WHERE (${arap}.curr = exchangerate.curr)
AND (exchangerate.transdate = ${arap}.transdate)) AS exchangerate
FROM ${arap}, ${ct}
WHERE ((paid != amount) OR (datepaid > (date $todate) AND datepaid is not null))
- AND (${arap}.storno IS FALSE)
+ AND NOT COALESCE (${arap}.storno, 'f')
AND (${arap}.${ct}_id = ${ct}.id)
+ $where_dpt
AND (${ct}.id = ?)
AND (transdate <= (date $todate) $fromwhere )
-
+ $review_of_aging_list
ORDER BY ctid, transdate, invnumber |;
my $sth_details = prepare_query($form, $dbh, $q_details);
while (my ($id) = $sth->fetchrow_array) {
do_statement($form, $sth_details, $q_details, $id);
- while (my $ref = $sth_details->fetchrow_hashref(NAME_lc)) {
+ while (my $ref = $sth_details->fetchrow_hashref("NAME_lc")) {
$ref->{module} = ($ref->{invoice}) ? $invoice : $arap;
$ref->{exchangerate} = 1 unless $ref->{exchangerate};
push @{ $form->{AG} }, $ref;
$main::lxdebug->leave_sub();
}
-sub get_taxaccounts {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = @_;
-
- # connect to database
- my $dbh = $form->dbconnect($myconfig);
-
- # get tax accounts
- my $query =
- qq|SELECT c.accno, c.description, t.rate
- FROM chart c, tax t
- WHERE (c.link LIKE '%CT_tax%') AND (c.id = t.chart_id)
- ORDER BY c.accno|;
- $form->{taxaccounts} = selectall_hashref_quert($form, $dbh, $query);
-
- $dbh->disconnect;
-
- $main::lxdebug->leave_sub();
-}
-
sub tax_report {
$main::lxdebug->enter_sub();
AND ac.trans_id IN
(
SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
+ FROM acc_trans a
+ JOIN chart c ON (a.chart_id = c.id)
WHERE (link LIKE '%${ARAP}_paid%')
AND (transdate <= $todate)
)
my $sortorder = join ', ', $form->sort_columns(qw(transdate invnumber name));
$sortorder = $form->{sort} if ($form->{sort} && grep({ $_ eq $form->{sort} } qw(id transdate invnumber name netamount tax)));
+ my $query = '';
if ($form->{report} !~ /nontaxable/) {
$query =
qq|SELECT a.id, '0' AS invoice, $transdate AS transdate, a.invnumber, n.name, a.netamount,
my $ml = 1;
my $arap;
+ my $table;
if ($form->{db} eq 'ar') {
$table = 'customer';
$ml = -1;
}
$query = qq|SELECT id, accno, description FROM chart WHERE accno = ?|;
- my $sth = prepare_query($form, $dbh, $query);
+ $sth = prepare_query($form, $dbh, $query);
my $q_details =
qq|SELECT c.name, a.invnumber, a.ordnumber,
&get_accounts_g($dbh, $last_period, $form->{fromdate}, $form->{todate}, $form, "pos_bwa");
# if there are any compare dates
+ my $year;
if ($form->{fromdate} || $form->{todate}) {
$last_period = 1;
if ($form->{fromdate}) {
$form->{todate} =~ /[0-9]*\.[0-9]*\.([0-9]*)/;
$year = $1;
}
- $kummfromdate = $form->{comparefromdate};
- $kummtodate = $form->{comparetodate};
+ my $kummfromdate = $form->{comparefromdate};
+ my $kummtodate = $form->{comparetodate};
&get_accounts_g($dbh, $last_period, $kummfromdate, $kummtodate, $form, "pos_bwa");
}
- @periods = qw(jetzt kumm);
- @gesamtleistung = qw(1 2 3);
- @gesamtkosten = qw (10 11 12 13 14 15 16 17 18 19 20);
- @ergebnisse =
+ my @periods = qw(jetzt kumm);
+ 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);
- foreach $key (@periods) {
+ foreach my $key (@periods) {
$form->{ "$key" . "gesamtleistung" } = 0;
$form->{ "$key" . "gesamtkosten" } = 0;
'0');
}
}
- foreach $item (@gesamtleistung) {
+ foreach my $item (@gesamtleistung) {
$form->{ "$key" . "gesamtleistung" } += $form->{$item}{$key};
}
- foreach $item (@gesamtkosten) {
+ $form->{ "$key" . "gesamtleistung" } -= $form->{2}{$key};
+
+ foreach my $item (@gesamtkosten) {
$form->{ "$key" . "gesamtkosten" } += $form->{$item}{$key};
}
$form->{ "$key" . "rohertrag" } =
'0');
}
}
- foreach $item (@ergebnisse) {
+ foreach my $item (@ergebnisse) {
$form->{ "$key" . "gl" . "$item" } =
$form->format_amount($myconfig,
$form->round_amount(
'0');
}
}
- foreach $item (@ergebnisse) {
+ foreach my $item (@ergebnisse) {
$form->{ "$key" . "gk" . "$item" } =
$form->format_amount($myconfig,
$form->round_amount(
'0');
}
}
- foreach $item (@ergebnisse) {
+ foreach my $item (@ergebnisse) {
$form->{ "$key" . "pk" . "$item" } =
$form->format_amount($myconfig,
$form->round_amount(
'0');
}
}
- foreach $item (@ergebnisse) {
+ foreach my $item (@ergebnisse) {
$form->{ "$key" . "auf" . "$item" } =
$form->format_amount($myconfig,
$form->round_amount(
}
}
- foreach $item (@ergebnisse) {
+ foreach my $item (@ergebnisse) {
$form->{ "$key" . "$item" } =
$form->format_amount($myconfig,
$form->round_amount($form->{ "$key" . "$item" },
my @categories_euro = qw(48 51 86 91 97 93 94);
$form->{decimalplaces} *= 1;
- foreach $item (@categories_cent) {
+ foreach my $item (@categories_cent) {
$form->{"$item"} = 0;
}
- foreach $item (@categories_euro) {
+ foreach my $item (@categories_euro) {
$form->{"$item"} = 0;
}
&get_accounts_g($dbh, $last_period, $form->{fromdate}, $form->{todate}, $form, "pos_ustva");
# foreach $item (@categories_cent) {
- # if ($form->{$item}{"jetzt"} > 0) {
- # $form->{$item} = $form->{$item}{"jetzt"};
- # delete $form->{$item}{"jetzt"};
- # }
+ # if ($form->{$item}{"jetzt"} > 0) {
+ # $form->{$item} = $form->{$item}{"jetzt"};
+ # delete $form->{$item}{"jetzt"};
+ # }
# }
# foreach $item (@categories_euro) {
- # if ($form->{$item}{"jetzt"} > 0) {
- # $form->{$item} = $form->{$item}{"jetzt"};
- # delete $form->{$item}{"jetzt"};
- # } foreach $item (@categories_cent) {
- # if ($form->{$item}{"jetzt"} > 0) {
- # $form->{$item} = $form->{$item}{"jetzt"};
- # delete $form->{$item}{"jetzt"};
- # }
+ # if ($form->{$item}{"jetzt"} > 0) {
+ # $form->{$item} = $form->{$item}{"jetzt"};
+ # delete $form->{$item}{"jetzt"};
+ # } foreach $item (@categories_cent) {
+ # if ($form->{$item}{"jetzt"} > 0) {
+ # $form->{$item} = $form->{$item}{"jetzt"};
+ # delete $form->{$item}{"jetzt"};
+ # }
# }
# foreach $item (@categories_euro) {
- # if ($form->{$item}{"jetzt"} > 0) {
- # $form->{$item} = $form->{$item}{"jetzt"};
- # delete $form->{$item}{"jetzt"};
- # }
+ # if ($form->{$item}{"jetzt"} > 0) {
+ # $form->{$item} = $form->{$item}{"jetzt"};
+ # delete $form->{$item}{"jetzt"};
+ # }
# }
#
# }
$form->{"65"} = $form->{"43"} - $form->{"66"};
$form->{"67"} = $form->{"43"} - $form->{"66"};
- foreach $item (@categories_cent) {
+ foreach my $item (@categories_cent) {
$form->{$item} =
$form->format_amount($myconfig, $form->round_amount($form->{$item}, 2),
2, '0');
}
- foreach $item (@categories_euro) {
+ foreach my $item (@categories_euro) {
$form->{$item} =
$form->format_amount($myconfig, $form->round_amount($form->{$item}, 0),
0, '0');
$form->{decimalplaces} *= 1;
- foreach $item (@categories_einnahmen) {
- $form->{$item} = 0;
- }
- foreach $item (@categories_ausgaben) {
- $form->{$item} = 0;
- }
- foreach $item (@ergebnisse) {
- $form->{$item} = 0;
- }
&get_accounts_g($dbh, $last_period, $form->{fromdate}, $form->{todate},
$form, "pos_eur");
- foreach $item (@categories_einnahmen) {
+
+ 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 $item (@categories_ausgaben) {
+ 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};
}
$form->{"guvsumme"} = $form->{"sumeura"} - $form->{"sumeurb"};
- foreach $item (@ergebnisse) {
+ 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();
}