X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FRP.pm;h=4c817f8a16452f3c294f2282a845174cb29bbe99;hb=3253777d478fe7f8b8d85ef867c864cdae16d7fa;hp=90662f5d124b8e8db0382bdb1bfb5481405bd79f;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git diff --git a/SL/RP.pm b/SL/RP.pm index 90662f5d1..4c817f8a1 100644 --- a/SL/RP.pm +++ b/SL/RP.pm @@ -34,197 +34,66 @@ package RP; -sub income_statement { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # connect to database - my $dbh = $form->dbconnect($myconfig); - - my $last_period = 0; - my @categories = qw(I E); - my $category; - - $form->{decimalplaces} *= 1; - - &get_accounts($dbh, $last_period, $form->{fromdate}, $form->{todate}, $form, \@categories); - - # if there are any compare dates - if ($form->{comparefromdate} || $form->{comparetodate}) { - $last_period = 1; - - &get_accounts($dbh, $last_period, $form->{comparefromdate}, $form->{comparetodate}, $form, \@categories); - } - - - # disconnect - $dbh->disconnect; - - - # now we got $form->{I}{accno}{ } - # and $form->{E}{accno}{ } - - my %account = ( 'I' => { 'label' => 'income', - 'labels' => 'income', - 'ml' => 1 }, - 'E' => { 'label' => 'expense', - 'labels' => 'expenses', - 'ml' => -1 } - ); - - my $str; - - foreach $category (@categories) { - - foreach $key (sort keys %{ $form->{$category} }) { - # push description onto array - - $str = ($form->{l_heading}) ? $form->{padding} : ""; - - 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}{labels}_this_period"}}, $form->format_amount($myconfig, $account{$category}{subthis} * $account{$category}{ml}, $form->{decimalplaces}, $dash)); - - if ($last_period) { - push(@{$form->{"$account{$category}{labels}_last_period"}}, $form->format_amount($myconfig, $account{$category}{sublast} * $account{$category}{ml}, $form->{decimalplaces}, $dash)); - } - - } - - $str = "$form->{br}$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}; - $account{$category}{subtotal} = 1; - - $form->{$category}{$key}{this} = 0; - $form->{$category}{$key}{last} = 0; - - next unless $form->{l_heading}; - - $dash = " "; - } - - 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 = "- "; - } - - push(@{$form->{"$account{$category}{labels}_this_period"}}, $form->format_amount($myconfig, $form->{$category}{$key}{this} * $account{$category}{ml}, $form->{decimalplaces}, $dash)); - - # add amount or - for last period - if ($last_period) { - $form->{"total_$account{$category}{labels}_last_period"} += $form->{$category}{$key}{last} * $account{$category}{ml}; - - push(@{$form->{"$account{$category}{labels}_last_period"}}, $form->format_amount($myconfig,$form->{$category}{$key}{last} * $account{$category}{ml}, $form->{decimalplaces}, $dash)); - } - } - - $str = ($form->{l_heading}) ? $form->{padding} : ""; - 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}{labels}_this_period"}}, $form->format_amount($myconfig, $account{$category}{subthis} * $account{$category}{ml}, $form->{decimalplaces}, $dash)); - - if ($last_period) { - push(@{$form->{"$account{$category}{labels}_last_period"}}, $form->format_amount($myconfig, $account{$category}{sublast} * $account{$category}{ml}, $form->{decimalplaces}, $dash)); - } - } - - } - - - # totals for income and expenses - $form->{total_income_this_period} = $form->round_amount($form->{total_income_this_period}, $form->{decimalplaces}); - $form->{total_expenses_this_period} = $form->round_amount($form->{total_expenses_this_period}, $form->{decimalplaces}); - - # total for income/loss - $form->{total_this_period} = $form->{total_income_this_period} - $form->{total_expenses_this_period}; - - if ($last_period) { - # total for income/loss - $form->{total_last_period} = $form->format_amount($myconfig, $form->{total_income_last_period} - $form->{total_expenses_last_period}, $form->{decimalplaces}, "- "); - - # totals for income and expenses for last_period - $form->{total_income_last_period} = $form->format_amount($myconfig, $form->{total_income_last_period}, $form->{decimalplaces}, "- "); - $form->{total_expenses_last_period} = $form->format_amount($myconfig, $form->{total_expenses_last_period}, $form->{decimalplaces}, "- "); - - } - - - $form->{total_income_this_period} = $form->format_amount($myconfig,$form->{total_income_this_period}, $form->{decimalplaces}, "- "); - $form->{total_expenses_this_period} = $form->format_amount($myconfig,$form->{total_expenses_this_period}, $form->{decimalplaces}, "- "); - $form->{total_this_period} = $form->format_amount($myconfig,$form->{total_this_period}, $form->{decimalplaces}, "- "); - - $main::lxdebug->leave_sub(); -} - - sub balance_sheet { $main::lxdebug->enter_sub(); my ($self, $myconfig, $form) = @_; - + # connect to database my $dbh = $form->dbconnect($myconfig); my $last_period = 0; - my @categories = qw(A C L Q); + my @categories = qw(A C L Q); # if there are any dates construct a where if ($form->{asofdate}) { - + $form->{this_period} = "$form->{asofdate}"; - $form->{period} = "$form->{asofdate}"; - + $form->{period} = "$form->{asofdate}"; + } $form->{decimalplaces} *= 1; - &get_accounts($dbh, $last_period, "", $form->{asofdate}, $form, \@categories); - + &get_accounts($dbh, $last_period, "", $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); - + &get_accounts($dbh, $last_period, "", $form->{compareasofdate}, + $form, \@categories); + $form->{last_period} = "$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' => { 'label' => 'asset', + 'labels' => 'assets', + 'ml' => -1 + }, + 'L' => { 'label' => 'liability', + 'labels' => 'liabilities', + 'ml' => 1 + }, + 'Q' => { 'label' => 'equity', + 'labels' => 'equity', + 'ml' => 1 + }); + foreach $category (grep { !/C/ } @categories) { foreach $key (sort keys %{ $form->{$category} }) { @@ -232,138 +101,237 @@ sub balance_sheet { $str = ($form->{l_heading}) ? $form->{padding} : ""; if ($form->{$category}{$key}{charttype} eq "A") { - $str .= ($form->{l_accno}) ? "$form->{$category}{$key}{accno} - $form->{$category}{$key}{description}" : "$form->{$category}{$key}{description}"; + $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)); - - if ($last_period) { - push(@{$form->{"$account{$category}{label}_last_period"}}, $form->format_amount($myconfig, $account{$category}{sublast} * $account{$category}{ml}, $form->{decimalplaces}, $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}; - $account{$category}{subtotal} = 1; - - $form->{$category}{$key}{this} = 0; - $form->{$category}{$key}{last} = 0; - - next unless $form->{l_heading}; - - $dash = " "; + 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 + )); + + if ($last_period) { + push(@{ $form->{"$account{$category}{label}_last_period"} }, + $form->format_amount( + $myconfig, + $account{$category}{sublast} * $account{$category}{ml}, + $form->{decimalplaces}, $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}; + $account{$category}{subtotal} = 1; + + $form->{$category}{$key}{this} = 0; + $form->{$category}{$key}{last} = 0; + + next unless $form->{l_heading}; + + $dash = " "; } - + # push description onto array - push(@{$form->{"$account{$category}{label}_account"}}, $str); - + 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 = "- "; + $form->{"total_$account{$category}{labels}_this_period"} += + $form->{$category}{$key}{this} * $account{$category}{ml}; + $dash = "- "; } - 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}_this_period"} }, + $form->format_amount( + $myconfig, + $form->{$category}{$key}{this} * $account{$category}{ml}, + $form->{decimalplaces}, $dash + )); - push(@{$form->{"$account{$category}{label}_last_period"}}, $form->format_amount($myconfig, $form->{$category}{$key}{last} * $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 + )); } } $str = ($form->{l_heading}) ? $form->{padding} : ""; 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)); - + 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)); + push(@{ $form->{"$account{$category}{label}_last_period"} }, + $form->format_amount( + $myconfig, + $account{$category}{sublast} * $account{$category}{ml}, + $form->{decimalplaces}, $dash + )); } } } - # 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}); + $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}; + $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}, "- "); + 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}); + $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}); + $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}, "- "); - - } - - - $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->{total_last_period} = + $form->format_amount($myconfig, + $form->{total_liabilities_last_period} + + $form->{total_equity_last_period}, + $form->{decimalplaces}, + "- "); + + } + + $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}, "- "); $main::lxdebug->leave_sub(); } - sub get_accounts { $main::lxdebug->enter_sub(); my ($dbh, $last_period, $fromdate, $todate, $form, $categories) = @_; my ($null, $department_id) = split /--/, $form->{department}; - + my $query; my $dpt_where; my $dpt_join; my $project; - my $where = "1 = 1"; - my $glwhere = ""; + my $where = "1 = 1"; + my $glwhere = ""; my $subwhere = ""; my $item; - + my $category = "AND ("; - foreach $item (@{ $categories }) { + foreach $item (@{$categories}) { $category .= qq|c.category = '$item' OR |; } $category =~ s/OR $/\)/; - # get headings $query = qq|SELECT c.accno, c.description, c.category FROM chart c @@ -371,8 +339,7 @@ sub get_accounts { $category ORDER by c.accno|; - if ($form->{accounttype} eq 'gifi') - { + if ($form->{accounttype} eq 'gifi') { $query = qq|SELECT g.accno, g.description, c.category FROM gifi g JOIN chart c ON (c.gifi_accno = g.accno) @@ -383,14 +350,14 @@ sub get_accounts { $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); - + my @headingaccounts = (); - while ($ref = $sth->fetchrow_hashref(NAME_lc)) - { - $form->{$ref->{category}}{$ref->{accno}}{description} = "$ref->{description}"; - $form->{$ref->{category}}{$ref->{accno}}{charttype} = "H"; - $form->{$ref->{category}}{$ref->{accno}}{accno} = $ref->{accno}; - + while ($ref = $sth->fetchrow_hashref(NAME_lc)) { + $form->{ $ref->{category} }{ $ref->{accno} }{description} = + "$ref->{description}"; + $form->{ $ref->{category} }{ $ref->{accno} }{charttype} = "H"; + $form->{ $ref->{category} }{ $ref->{accno} }{accno} = $ref->{accno}; + push @headingaccounts, $ref->{accno}; } @@ -406,13 +373,11 @@ sub get_accounts { } if ($todate) { - $where .= " AND ac.transdate <= '$todate'"; + $where .= " AND ac.transdate <= '$todate'"; $subwhere .= " AND transdate <= '$todate'"; } - - if ($department_id) - { + if ($department_id) { $dpt_join = qq| JOIN department t ON (a.department_id = t.id) |; @@ -421,22 +386,18 @@ sub get_accounts { |; } - if ($form->{project_id}) - { + if ($form->{project_id}) { $project = qq| AND ac.project_id = $form->{project_id} |; } + if ($form->{accounttype} eq 'gifi') { - if ($form->{accounttype} eq 'gifi') - { - - if ($form->{method} eq 'cash') - { + if ($form->{method} eq 'cash') { + + $query = qq| - $query = qq| - SELECT g.accno, sum(ac.amount) AS amount, g.description, c.category FROM acc_trans ac @@ -457,9 +418,9 @@ sub get_accounts { ) $project GROUP BY g.accno, g.description, c.category - + UNION ALL - + SELECT '' AS accno, SUM(ac.amount) AS amount, '' AS description, c.category FROM acc_trans ac @@ -503,9 +464,9 @@ sub get_accounts { ) $project GROUP BY g.accno, g.description, c.category - + UNION ALL - + SELECT '' AS accno, SUM(ac.amount) AS amount, '' AS description, c.category FROM acc_trans ac @@ -530,7 +491,7 @@ sub get_accounts { UNION ALL -- add gl - + SELECT g.accno, sum(ac.amount) AS amount, g.description, c.category FROM acc_trans ac @@ -545,9 +506,9 @@ sub get_accounts { AND NOT (c.link = 'AR' OR c.link = 'AP') $project GROUP BY g.accno, g.description, c.category - + UNION ALL - + SELECT '' AS accno, SUM(ac.amount) AS amount, '' AS description, c.category FROM acc_trans ac @@ -564,12 +525,12 @@ sub get_accounts { GROUP BY c.category |; - if ($form->{project_id}) { + if ($form->{project_id}) { + + $query .= qq| - $query .= qq| - UNION ALL - + SELECT g.accno AS accno, SUM(ac.sellprice * ac.qty) AS amount, g.description AS description, c.category FROM invoice ac @@ -594,7 +555,7 @@ sub get_accounts { GROUP BY g.accno, g.description, c.category UNION ALL - + SELECT g.accno AS accno, SUM(ac.sellprice * ac.qty) * -1 AS amount, g.description AS description, c.category FROM invoice ac @@ -617,23 +578,22 @@ sub get_accounts { $project GROUP BY g.accno, g.description, c.category |; - } + } } else { - if ($department_id) - { - $dpt_join = qq| + if ($department_id) { + $dpt_join = qq| JOIN dpt_trans t ON (t.trans_id = ac.trans_id) |; - $dpt_where = qq| + $dpt_where = qq| AND t.department_id = $department_id |; } $query = qq| - + SELECT g.accno, SUM(ac.amount) AS amount, g.description, c.category FROM acc_trans ac @@ -645,9 +605,9 @@ sub get_accounts { $category $project GROUP BY g.accno, g.description, c.category - + UNION ALL - + SELECT '' AS accno, SUM(ac.amount) AS amount, '' AS description, c.category FROM acc_trans ac @@ -661,13 +621,12 @@ sub get_accounts { GROUP BY c.category |; - if ($form->{project_id}) - { + if ($form->{project_id}) { + + $query .= qq| - $query .= qq| - UNION ALL - + SELECT g.accno AS accno, SUM(ac.sellprice * ac.qty) AS amount, g.description AS description, c.category FROM invoice ac @@ -684,7 +643,7 @@ sub get_accounts { GROUP BY g.accno, g.description, c.category UNION ALL - + SELECT g.accno AS accno, SUM(ac.sellprice * ac.qty) * -1 AS amount, g.description AS description, c.category FROM invoice ac @@ -699,17 +658,16 @@ sub get_accounts { $project GROUP BY g.accno, g.description, c.category |; - } + } } - + } else { # standard account - if ($form->{method} eq 'cash') - { + if ($form->{method} eq 'cash') { $query = qq| - + SELECT c.accno, sum(ac.amount) AS amount, c.description, c.category FROM acc_trans ac @@ -727,12 +685,12 @@ sub get_accounts { WHERE link LIKE '%AR_paid%' $subwhere ) - + $project GROUP BY c.accno, c.description, c.category - + UNION ALL - + SELECT c.accno, sum(ac.amount) AS amount, c.description, c.category FROM acc_trans ac @@ -750,10 +708,10 @@ sub get_accounts { WHERE link LIKE '%AP_paid%' $subwhere ) - + $project GROUP BY c.accno, c.description, c.category - + UNION ALL SELECT c.accno, sum(ac.amount) AS amount, @@ -770,14 +728,13 @@ sub get_accounts { $project GROUP BY c.accno, c.description, c.category |; - - if ($form->{project_id}) - { - $query .= qq| - + if ($form->{project_id}) { + + $query .= qq| + UNION ALL - + SELECT c.accno AS accno, SUM(ac.sellprice * ac.qty) AS amount, c.description AS description, c.category FROM invoice ac @@ -802,7 +759,7 @@ sub get_accounts { GROUP BY c.accno, c.description, c.category UNION ALL - + SELECT c.accno AS accno, SUM(ac.sellprice) AS amount, c.description AS description, c.category FROM invoice ac @@ -828,20 +785,18 @@ sub get_accounts { } } else { - - if ($department_id) - { - $dpt_join = qq| + + if ($department_id) { + $dpt_join = qq| JOIN dpt_trans t ON (t.trans_id = ac.trans_id) |; - $dpt_where = qq| + $dpt_where = qq| AND t.department_id = $department_id |; } - $query = qq| - + SELECT c.accno, sum(ac.amount) AS amount, c.description, c.category FROM acc_trans ac @@ -854,13 +809,12 @@ sub get_accounts { GROUP BY c.accno, c.description, c.category |; - if ($form->{project_id}) - { + if ($form->{project_id}) { + + $query .= qq| - $query .= qq| - UNION ALL - + SELECT c.accno AS accno, SUM(ac.sellprice * ac.qty) AS amount, c.description AS description, c.category FROM invoice ac @@ -876,7 +830,7 @@ sub get_accounts { GROUP BY c.accno, c.description, c.category UNION ALL - + SELECT c.accno AS accno, SUM(ac.sellprice * ac.qty) * -1 AS amount, c.description AS description, c.category FROM invoice ac @@ -895,97 +849,96 @@ sub get_accounts { } } - my @accno; my $accno; my $ref; - + my $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); - while ($ref = $sth->fetchrow_hashref(NAME_lc)) - { + while ($ref = $sth->fetchrow_hashref(NAME_lc)) { if ($ref->{category} eq 'C') { $ref->{category} = 'A'; } - + # get last heading account @accno = grep { $_ le "$ref->{accno}" } @headingaccounts; $accno = pop @accno; if ($accno) { - if ($last_period) - { - $form->{$ref->{category}}{$accno}{last} += $ref->{amount}; + if ($last_period) { + $form->{ $ref->{category} }{$accno}{last} += $ref->{amount}; } else { - $form->{$ref->{category}}{$accno}{this} += $ref->{amount}; + $form->{ $ref->{category} }{$accno}{this} += $ref->{amount}; } } - - $form->{$ref->{category}}{$ref->{accno}}{accno} = $ref->{accno}; - $form->{$ref->{category}}{$ref->{accno}}{description} = $ref->{description}; - $form->{$ref->{category}}{$ref->{accno}}{charttype} = "A"; - - if ($last_period) - { - $form->{$ref->{category}}{$ref->{accno}}{last} += $ref->{amount}; + + $form->{ $ref->{category} }{ $ref->{accno} }{accno} = $ref->{accno}; + $form->{ $ref->{category} }{ $ref->{accno} }{description} = + $ref->{description}; + $form->{ $ref->{category} }{ $ref->{accno} }{charttype} = "A"; + + if ($last_period) { + $form->{ $ref->{category} }{ $ref->{accno} }{last} += $ref->{amount}; } else { - $form->{$ref->{category}}{$ref->{accno}}{this} += $ref->{amount}; + $form->{ $ref->{category} }{ $ref->{accno} }{this} += $ref->{amount}; } } $sth->finish; - # remove accounts with zero balance - foreach $category (@{ $categories }) { + 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}); - - delete $form->{$category}{$accno} if ($form->{$category}{$accno}{this} == 0 && $form->{$category}{$accno}{last} == 0); + $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}); + + delete $form->{$category}{$accno} + if ( $form->{$category}{$accno}{this} == 0 + && $form->{$category}{$accno}{last} == 0); } } $main::lxdebug->leave_sub(); } - sub get_accounts_g { $main::lxdebug->enter_sub(); my ($dbh, $last_period, $fromdate, $todate, $form, $category) = @_; my ($null, $department_id) = split /--/, $form->{department}; - + my $query; my $dpt_where; my $dpt_join; my $project; - my $where = "1 = 1"; - my $glwhere = ""; + my $where = "1 = 1"; + my $glwhere = ""; + my $prwhere = ""; my $subwhere = ""; my $item; - - - if ($fromdate) { if ($form->{method} eq 'cash') { $subwhere .= " AND transdate >= '$fromdate'"; $glwhere = " AND ac.transdate >= '$fromdate'"; + $prwhere = " AND ar.transdate >= '$fromdate'"; } else { $where .= " AND ac.transdate >= '$fromdate'"; } } if ($todate) { - $where .= " AND ac.transdate <= '$todate'"; + $where .= " AND ac.transdate <= '$todate'"; $subwhere .= " AND transdate <= '$todate'"; + $prwhere .= " AND ar.transdate <= '$todate'"; } - - if ($department_id) - { + if ($department_id) { $dpt_join = qq| JOIN department t ON (a.department_id = t.id) |; @@ -994,19 +947,16 @@ sub get_accounts_g { |; } - if ($form->{project_id}) - { + if ($form->{project_id}) { $project = qq| AND ac.project_id = $form->{project_id} |; } + if ($form->{method} eq 'cash') { - if ($form->{method} eq 'cash') - { + $query = qq| - $query = qq| - SELECT sum(ac.amount) AS amount, c.$category FROM acc_trans ac @@ -1023,12 +973,12 @@ sub get_accounts_g { WHERE link LIKE '%AR_paid%' $subwhere ) - + $project GROUP BY c.$category - + UNION - + SELECT sum(ac.amount) AS amount, c.$category FROM acc_trans ac @@ -1045,10 +995,10 @@ sub get_accounts_g { WHERE link LIKE '%AP_paid%' $subwhere ) - + $project GROUP BY c.$category - + UNION SELECT sum(ac.amount) AS amount, @@ -1064,14 +1014,13 @@ sub get_accounts_g { $project GROUP BY c.$category |; - - if ($form->{project_id}) - { - $query .= qq| - + if ($form->{project_id}) { + + $query .= qq| + UNION - + SELECT SUM(ac.sellprice * ac.qty) AS amount, c.$category FROM invoice ac @@ -1079,8 +1028,7 @@ sub get_accounts_g { JOIN parts p ON (ac.parts_id = p.id) JOIN chart c on (p.income_accno_id = c.id) $dpt_join - -- use transdate from subwhere - WHERE 1 = 1 $subwhere + WHERE 1 = 1 $prwhere AND c.category = 'I' $dpt_where AND ac.trans_id IN @@ -1096,7 +1044,7 @@ sub get_accounts_g { GROUP BY c.$category UNION - + SELECT SUM(ac.sellprice) AS amount, c.$category FROM invoice ac @@ -1104,7 +1052,7 @@ sub get_accounts_g { JOIN parts p ON (ac.parts_id = p.id) JOIN chart c on (p.expense_accno_id = c.id) $dpt_join - WHERE 1 = 1 $subwhere + WHERE 1 = 1 $prwhere AND c.category = 'E' $dpt_where AND ac.trans_id IN @@ -1119,23 +1067,21 @@ sub get_accounts_g { $project GROUP BY c.$category |; - } + } - } else { - - if ($department_id) - { - $dpt_join = qq| + } else { + + if ($department_id) { + $dpt_join = qq| JOIN dpt_trans t ON (t.trans_id = ac.trans_id) |; - $dpt_where = qq| + $dpt_where = qq| AND t.department_id = $department_id |; - } + } + + $query = qq| - - $query = qq| - SELECT sum(ac.amount) AS amount, c.$category FROM acc_trans ac @@ -1147,13 +1093,12 @@ sub get_accounts_g { GROUP BY c.$category |; - if ($form->{project_id}) - { + if ($form->{project_id}) { + + $query .= qq| - $query .= qq| - UNION - + SELECT SUM(ac.sellprice * ac.qty) AS amount, c.$category FROM invoice ac @@ -1161,15 +1106,14 @@ sub get_accounts_g { JOIN parts p ON (ac.parts_id = p.id) JOIN chart c on (p.income_accno_id = c.id) $dpt_join - -- use transdate from subwhere - WHERE 1 = 1 $subwhere + WHERE 1 = 1 $prwhere AND c.category = 'I' $dpt_where $project GROUP BY c.$category UNION - + SELECT SUM(ac.sellprice * ac.qty) * -1 AS amount, c.$category FROM invoice ac @@ -1177,38 +1121,36 @@ sub get_accounts_g { JOIN parts p ON (ac.parts_id = p.id) JOIN chart c on (p.expense_accno_id = c.id) $dpt_join - WHERE 1 = 1 $subwhere + WHERE 1 = 1 $prwhere AND c.category = 'E' $dpt_where $project GROUP BY c.$category |; - } } - + } my @accno; my $accno; my $ref; + #print $query; my $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); - while ($ref = $sth->fetchrow_hashref(NAME_lc)) - { + while ($ref = $sth->fetchrow_hashref(NAME_lc)) { if ($ref->{amount} < 0) { $ref->{amount} *= -1; } if ($category eq "pos_bwa") { - if ($last_period) - { - $form->{$ref->{$category}}{kumm} += $ref->{amount}; - } else { - $form->{$ref->{$category}}{jetzt} += $ref->{amount}; - } + if ($last_period) { + $form->{ $ref->{$category} }{kumm} += $ref->{amount}; + } else { + $form->{ $ref->{$category} }{jetzt} += $ref->{amount}; + } } else { - $form->{$ref->{$category}} += $ref->{amount}; + $form->{ $ref->{$category} } += $ref->{amount}; } } $sth->finish; @@ -1225,16 +1167,16 @@ sub trial_balance { my ($query, $sth, $ref); my %balance = (); - my %trb = (); + my %trb = (); my ($null, $department_id) = split /--/, $form->{department}; my @headingaccounts = (); my $dpt_where; my $dpt_join; my $project; - my $where = "1 = 1"; + my $where = "1 = 1"; my $invwhere = $where; - + if ($department_id) { $dpt_join = qq| JOIN dpt_trans t ON (ac.trans_id = t.trans_id) @@ -1243,23 +1185,22 @@ sub trial_balance { AND t.department_id = $department_id |; } - - + # project_id only applies to getting transactions # it has nothing to do with a trial balance # but we use the same function to collect information - + if ($form->{project_id}) { $project = qq| AND ac.project_id = $form->{project_id} |; } - + # get beginning balances if ($form->{fromdate}) { if ($form->{accounttype} eq 'gifi') { - + $query = qq|SELECT g.accno, c.category, SUM(ac.amount) AS amount, g.description FROM acc_trans ac @@ -1271,9 +1212,9 @@ sub trial_balance { $project GROUP BY g.accno, c.category, g.description |; - + } else { - + $query = qq|SELECT c.accno, c.category, SUM(ac.amount) AS amount, c.description FROM acc_trans ac @@ -1284,19 +1225,19 @@ sub trial_balance { $project GROUP BY c.accno, c.category, c.description |; - + } $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { - $balance{$ref->{accno}} = $ref->{amount}; + $balance{ $ref->{accno} } = $ref->{amount}; if ($ref->{amount} != 0 && $form->{all_accounts}) { - $trb{$ref->{accno}}{description} = $ref->{description}; - $trb{$ref->{accno}}{charttype} = 'A'; - $trb{$ref->{accno}}{category} = $ref->{category}; + $trb{ $ref->{accno} }{description} = $ref->{description}; + $trb{ $ref->{accno} }{charttype} = 'A'; + $trb{ $ref->{accno} }{category} = $ref->{category}; } } @@ -1304,15 +1245,13 @@ sub trial_balance { } - # get headings $query = qq|SELECT c.accno, c.description, c.category FROM chart c WHERE c.charttype = 'H' ORDER by c.accno|; - if ($form->{accounttype} eq 'gifi') - { + if ($form->{accounttype} eq 'gifi') { $query = qq|SELECT g.accno, g.description, c.category FROM gifi g JOIN chart c ON (c.gifi_accno = g.accno) @@ -1322,32 +1261,31 @@ sub trial_balance { $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); - - while ($ref = $sth->fetchrow_hashref(NAME_lc)) - { - $trb{$ref->{accno}}{description} = $ref->{description}; - $trb{$ref->{accno}}{charttype} = 'H'; - $trb{$ref->{accno}}{category} = $ref->{category}; - + + while ($ref = $sth->fetchrow_hashref(NAME_lc)) { + $trb{ $ref->{accno} }{description} = $ref->{description}; + $trb{ $ref->{accno} }{charttype} = 'H'; + $trb{ $ref->{accno} }{category} = $ref->{category}; + push @headingaccounts, $ref->{accno}; } $sth->finish; $where = " 1 = 1 "; - + if ($form->{fromdate} || $form->{todate}) { if ($form->{fromdate}) { - $tofrom .= " AND ac.transdate >= '$form->{fromdate}'"; + $tofrom .= " AND ac.transdate >= '$form->{fromdate}'"; $subwhere .= " AND transdate >= '$form->{fromdate}'"; $invwhere .= " AND a.transdate >= '$form->{fromdate}'"; $glwhere = " AND ac.transdate >= '$form->{fromdate}'"; } if ($form->{todate}) { - $tofrom .= " AND ac.transdate <= '$form->{todate}'"; + $tofrom .= " AND ac.transdate <= '$form->{todate}'"; $invwhere .= " AND a.transdate <= '$form->{todate}'"; $subwhere .= " AND transdate <= '$form->{todate}'"; - $glwhere .= " AND ac.transdate <= '$form->{todate}'"; + $glwhere .= " AND ac.transdate <= '$form->{todate}'"; } } if ($form->{eur}) { @@ -1372,7 +1310,7 @@ sub trial_balance { } else { $where .= $tofrom; } - + if ($form->{accounttype} eq 'gifi') { $query = qq|SELECT g.accno, g.description, c.category, @@ -1392,9 +1330,9 @@ sub trial_balance { $query .= qq| -- add project transactions from invoice - + UNION ALL - + SELECT g.accno, g.description, c.category, SUM(ac.sellprice * ac.qty) AS amount FROM invoice ac @@ -1409,7 +1347,7 @@ sub trial_balance { GROUP BY g.accno, g.description, c.category UNION ALL - + SELECT g.accno, g.description, c.category, SUM(ac.sellprice * ac.qty) * -1 AS amount FROM invoice ac @@ -1427,7 +1365,7 @@ sub trial_balance { $query .= qq| ORDER BY accno|; - + } else { $query = qq|SELECT c.accno, c.description, c.category, @@ -1446,9 +1384,9 @@ sub trial_balance { $query .= qq| -- add project transactions from invoice - + UNION ALL - + SELECT c.accno, c.description, c.category, SUM(ac.sellprice * ac.qty) AS amount FROM invoice ac @@ -1462,7 +1400,7 @@ sub trial_balance { GROUP BY c.accno, c.description, c.category UNION ALL - + SELECT c.accno, c.description, c.category, SUM(ac.sellprice * ac.qty) * -1 AS amount FROM invoice ac @@ -1485,7 +1423,6 @@ sub trial_balance { $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); - # prepare query for each account $query = qq|SELECT (SELECT SUM(ac.amount) * -1 FROM acc_trans ac @@ -1496,7 +1433,7 @@ sub trial_balance { $project AND ac.amount < 0 AND c.accno = ?) AS debit, - + (SELECT SUM(ac.amount) FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) @@ -1519,7 +1456,7 @@ sub trial_balance { $project AND ac.amount < 0 AND c.gifi_accno = ?) AS debit, - + (SELECT SUM(ac.amount) FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) @@ -1529,13 +1466,13 @@ sub trial_balance { $project AND ac.amount > 0 AND c.gifi_accno = ?) AS credit|; - + } - + $drcr = $dbh->prepare($query); - if ($form->{project_id}) { + # prepare query for each account $query = qq|SELECT (SELECT SUM(ac.sellprice * ac.qty) * -1 FROM invoice ac @@ -1547,7 +1484,7 @@ sub trial_balance { $dpt_where $project AND c.accno = ?) AS debit, - + (SELECT SUM(ac.sellprice * ac.qty) FROM invoice ac JOIN parts p ON (ac.parts_id = p.id) @@ -1561,66 +1498,70 @@ sub trial_balance { |; $project_drcr = $dbh->prepare($query); - + } - + # calculate the debit and credit in the period while ($ref = $sth->fetchrow_hashref(NAME_lc)) { - $trb{$ref->{accno}}{description} = $ref->{description}; - $trb{$ref->{accno}}{charttype} = 'A'; - $trb{$ref->{accno}}{category} = $ref->{category}; - $trb{$ref->{accno}}{amount} += $ref->{amount}; + $trb{ $ref->{accno} }{description} = $ref->{description}; + $trb{ $ref->{accno} }{charttype} = 'A'; + $trb{ $ref->{accno} }{category} = $ref->{category}; + $trb{ $ref->{accno} }{amount} += $ref->{amount}; } $sth->finish; my ($debit, $credit); - + foreach my $accno (sort keys %trb) { $ref = (); - + $ref->{accno} = $accno; - map { $ref->{$_} = $trb{$accno}{$_} } qw(description category charttype amount); - - $ref->{balance} = $form->round_amount($balance{$ref->{accno}}, 2); + map { $ref->{$_} = $trb{$accno}{$_} } + qw(description category charttype amount); + + $ref->{balance} = $form->round_amount($balance{ $ref->{accno} }, 2); if ($trb{$accno}{charttype} eq 'A') { + # get DR/CR $drcr->execute($ref->{accno}, $ref->{accno}) || $form->dberror($query); - - ($debit, $credit) = (0,0); + + ($debit, $credit) = (0, 0); while (($debit, $credit) = $drcr->fetchrow_array) { - $ref->{debit} += $debit; - $ref->{credit} += $credit; + $ref->{debit} += $debit; + $ref->{credit} += $credit; } $drcr->finish; if ($form->{project_id}) { - # get DR/CR - $project_drcr->execute($ref->{accno}, $ref->{accno}) || $form->dberror($query); - - ($debit, $credit) = (0,0); - while (($debit, $credit) = $project_drcr->fetchrow_array) { - $ref->{debit} += $debit; - $ref->{credit} += $credit; - } - $project_drcr->finish; + + # get DR/CR + $project_drcr->execute($ref->{accno}, $ref->{accno}) + || $form->dberror($query); + + ($debit, $credit) = (0, 0); + while (($debit, $credit) = $project_drcr->fetchrow_array) { + $ref->{debit} += $debit; + $ref->{credit} += $credit; + } + $project_drcr->finish; } - $ref->{debit} = $form->round_amount($ref->{debit}, 2); + $ref->{debit} = $form->round_amount($ref->{debit}, 2); $ref->{credit} = $form->round_amount($ref->{credit}, 2); - + } # add subtotal @accno = grep { $_ le "$ref->{accno}" } @headingaccounts; $accno = pop @accno; if ($accno) { - $trb{$accno}{debit} += $ref->{debit}; + $trb{$accno}{debit} += $ref->{debit}; $trb{$accno}{credit} += $ref->{credit}; } push @{ $form->{TB} }, $ref; - + } $dbh->disconnect; @@ -1629,7 +1570,7 @@ sub trial_balance { foreach $accno (@headingaccounts) { foreach $ref (@{ $form->{TB} }) { if ($accno eq $ref->{accno}) { - $ref->{debit} = $trb{$accno}{debit}; + $ref->{debit} = $trb{$accno}{debit}; $ref->{credit} = $trb{$accno}{credit}; } } @@ -1638,16 +1579,15 @@ sub trial_balance { $main::lxdebug->leave_sub(); } - sub aging { $main::lxdebug->enter_sub(); my ($self, $myconfig, $form) = @_; # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = $form->dbconnect($myconfig); my $invoice = ($form->{arap} eq 'ar') ? 'is' : 'ir'; - + $form->{todate} = $form->current_date($myconfig) unless ($form->{todate}); my $where = "1 = 1"; @@ -1656,9 +1596,9 @@ sub aging { if ($form->{"$form->{ct}_id"}) { $where .= qq| AND ct.id = $form->{"$form->{ct}_id"}|; } else { - if ($form->{$form->{ct}}) { - $name = $form->like(lc $form->{$form->{ct}}); - $where .= qq| AND lower(ct.name) LIKE '$name'| if $form->{$form->{ct}}; + if ($form->{ $form->{ct} }) { + $name = $form->like(lc $form->{ $form->{ct} }); + $where .= qq| AND lower(ct.name) LIKE '$name'| if $form->{ $form->{ct} }; } } @@ -1671,7 +1611,7 @@ sub aging { $where .= qq| AND a.department_id = $department_id|; } - + # select outstanding vendors or customers, depends on $ct my $query = qq|SELECT DISTINCT ct.id, ct.name FROM $form->{ct} ct, $form->{arap} a @@ -1686,10 +1626,10 @@ sub aging { $sth->execute || $form->dberror; my $buysell = ($form->{arap} eq 'ar') ? 'buy' : 'sell'; - + # for each company that has some stuff outstanding - while ( my ($id) = $sth->fetchrow_array ) { - + while (my ($id) = $sth->fetchrow_array) { + $query = qq| -- between 0-30 days @@ -1703,15 +1643,15 @@ sub aging { (SELECT $buysell FROM exchangerate WHERE $form->{arap}.curr = exchangerate.curr AND exchangerate.transdate = $form->{arap}.transdate) AS exchangerate - FROM $form->{arap}, $form->{ct} + FROM $form->{arap}, $form->{ct} WHERE paid != amount AND $form->{arap}.$form->{ct}_id = $form->{ct}.id AND $form->{ct}.id = $id AND ( - transdate <= (date '$form->{todate}' - interval '0 days') + transdate <= (date '$form->{todate}' - interval '0 days') AND transdate >= (date '$form->{todate}' - interval '30 days') ) - + UNION -- between 31-60 days @@ -1719,66 +1659,66 @@ sub aging { SELECT $form->{ct}.id AS ctid, $form->{ct}.name, street, zipcode, city, country, contact, email, phone as customerphone, fax as customerfax, $form->{ct}number, - "invnumber", "transdate", + "invnumber", "transdate", 0.00 as "c0", (amount - paid) as "c30", 0.00 as "c60", 0.00 as "c90", "duedate", invoice, $form->{arap}.id, (SELECT $buysell FROM exchangerate WHERE $form->{arap}.curr = exchangerate.curr AND exchangerate.transdate = $form->{arap}.transdate) AS exchangerate FROM $form->{arap}, $form->{ct} - WHERE paid != amount - AND $form->{arap}.$form->{ct}_id = $form->{ct}.id + WHERE paid != amount + AND $form->{arap}.$form->{ct}_id = $form->{ct}.id AND $form->{ct}.id = $id AND ( - transdate < (date '$form->{todate}' - interval '30 days') + transdate < (date '$form->{todate}' - interval '30 days') AND transdate >= (date '$form->{todate}' - interval '60 days') ) UNION - + -- between 61-90 days SELECT $form->{ct}.id AS ctid, $form->{ct}.name, street, zipcode, city, country, contact, email, phone as customerphone, fax as customerfax, $form->{ct}number, - "invnumber", "transdate", + "invnumber", "transdate", 0.00 as "c0", 0.00 as "c30", (amount - paid) as "c60", 0.00 as "c90", "duedate", invoice, $form->{arap}.id, (SELECT $buysell FROM exchangerate WHERE $form->{arap}.curr = exchangerate.curr AND exchangerate.transdate = $form->{arap}.transdate) AS exchangerate - FROM $form->{arap}, $form->{ct} + FROM $form->{arap}, $form->{ct} WHERE paid != amount - AND $form->{arap}.$form->{ct}_id = $form->{ct}.id + AND $form->{arap}.$form->{ct}_id = $form->{ct}.id AND $form->{ct}.id = $id AND ( - transdate < (date '$form->{todate}' - interval '60 days') + transdate < (date '$form->{todate}' - interval '60 days') AND transdate >= (date '$form->{todate}' - interval '90 days') ) UNION - + -- over 90 days SELECT $form->{ct}.id AS ctid, $form->{ct}.name, street, zipcode, city, country, contact, email, phone as customerphone, fax as customerfax, $form->{ct}number, - "invnumber", "transdate", + "invnumber", "transdate", 0.00 as "c0", 0.00 as "c30", 0.00 as "c60", (amount - paid) as "c90", "duedate", invoice, $form->{arap}.id, (SELECT $buysell FROM exchangerate WHERE $form->{arap}.curr = exchangerate.curr AND exchangerate.transdate = $form->{arap}.transdate) AS exchangerate - FROM $form->{arap}, $form->{ct} + FROM $form->{arap}, $form->{ct} WHERE paid != amount - AND $form->{arap}.$form->{ct}_id = $form->{ct}.id + AND $form->{arap}.$form->{ct}_id = $form->{ct}.id AND $form->{ct}.id = $id - AND transdate < (date '$form->{todate}' - interval '90 days') + AND transdate < (date '$form->{todate}' - interval '90 days') ORDER BY - + ctid, transdate, invnumber - + |; my $sth = $dbh->prepare($query); @@ -1789,19 +1729,19 @@ sub aging { $ref->{exchangerate} = 1 unless $ref->{exchangerate}; push @{ $form->{AG} }, $ref; } - + $sth->finish; } $sth->finish; + # disconnect $dbh->disconnect; $main::lxdebug->leave_sub(); } - sub get_customer { $main::lxdebug->enter_sub(); @@ -1816,14 +1756,14 @@ sub get_customer { my $sth = $dbh->prepare($query); $sth->execute || $form->dberror; - ($form->{$form->{ct}}, $form->{email}, $form->{cc}, $form->{bcc}) = $sth->fetchrow_array; + ($form->{ $form->{ct} }, $form->{email}, $form->{cc}, $form->{bcc}) = + $sth->fetchrow_array; $sth->finish; $dbh->disconnect; $main::lxdebug->leave_sub(); } - sub get_taxaccounts { $main::lxdebug->enter_sub(); @@ -1842,13 +1782,13 @@ sub get_taxaccounts { $sth->execute || $form->dberror; my $ref = (); - while ($ref = $sth->fetchrow_hashref(NAME_lc) ) { + while ($ref = $sth->fetchrow_hashref(NAME_lc)) { push @{ $form->{taxaccounts} }, $ref; } $sth->finish; # get gifi tax accounts - my $query = qq|SELECT DISTINCT ON (g.accno) g.accno, g.description, + $query = qq|SELECT DISTINCT ON (g.accno) g.accno, g.description, sum(t.rate) AS rate FROM gifi g, chart c, tax t WHERE g.accno = c.gifi_accno @@ -1856,10 +1796,10 @@ sub get_taxaccounts { AND c.link LIKE '%CT_tax%' GROUP BY g.accno, g.description ORDER BY accno|; - my $sth = $dbh->prepare($query); + $sth = $dbh->prepare($query); $sth->execute || $form->dberror; - while ($ref = $sth->fetchrow_hashref(NAME_lc) ) { + while ($ref = $sth->fetchrow_hashref(NAME_lc)) { push @{ $form->{gifi_taxaccounts} }, $ref; } $sth->finish; @@ -1869,8 +1809,6 @@ sub get_taxaccounts { $main::lxdebug->leave_sub(); } - - sub tax_report { $main::lxdebug->enter_sub(); @@ -1880,7 +1818,7 @@ sub tax_report { my $dbh = $form->dbconnect($myconfig); my ($null, $department_id) = split /--/, $form->{department}; - + # build WHERE my $where = "1 = 1"; @@ -1889,42 +1827,41 @@ sub tax_report { AND a.department_id = $department_id |; } - + my ($accno, $rate); - + if ($form->{accno}) { if ($form->{accno} =~ /^gifi_/) { ($null, $accno) = split /_/, $form->{accno}; - $rate = $form->{"$form->{accno}_rate"}; + $rate = $form->{"$form->{accno}_rate"}; $accno = qq| AND ch.gifi_accno = '$accno'|; } else { $accno = $form->{accno}; - $rate = $form->{"$form->{accno}_rate"}; + $rate = $form->{"$form->{accno}_rate"}; $accno = qq| AND ch.accno = '$accno'|; } } $rate *= 1; - - my ($table, $ARAP); - + if ($form->{db} eq 'ar') { $table = "customer"; - $ARAP = "AR"; + $ARAP = "AR"; } if ($form->{db} eq 'ap') { $table = "vendor"; - $ARAP = "AP"; + $ARAP = "AP"; } my $transdate = "a.transdate"; - + if ($form->{method} eq 'cash') { $transdate = "a.datepaid"; - my $todate = ($form->{todate}) ? $form->{todate} : $form->current_date($myconfig); - + my $todate = + ($form->{todate}) ? $form->{todate} : $form->current_date($myconfig); + $where .= qq| AND ac.trans_id IN ( @@ -1937,7 +1874,6 @@ sub tax_report { |; } - # if there are any dates construct a where if ($form->{fromdate} || $form->{todate}) { if ($form->{fromdate}) { @@ -1947,12 +1883,12 @@ sub tax_report { $where .= " AND $transdate <= '$form->{todate}'"; } } - + my $ml = ($form->{db} eq 'ar') ? 1 : -1; - + my $sortorder = join ', ', $form->sort_columns(qw(transdate invnumber name)); - $sortorder = $form->{sort} unless $sortorder; - + $sortorder = $form->{sort} if $form->{sort}; + $query = qq|SELECT a.id, '0' AS invoice, $transdate AS transdate, a.invnumber, n.name, a.netamount, ac.amount * $ml AS tax @@ -1980,6 +1916,7 @@ sub tax_report { ORDER by $sortorder|; if ($form->{report} =~ /nontaxable/) { + # only gather up non-taxable transactions $query = qq|SELECT a.id, '0' AS invoice, $transdate AS transdate, a.invnumber, n.name, a.netamount @@ -2013,7 +1950,7 @@ sub tax_report { my $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); - while ( my $ref = $sth->fetchrow_hashref(NAME_lc)) { + while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { push @{ $form->{TR} }, $ref; } @@ -2023,24 +1960,23 @@ sub tax_report { $main::lxdebug->leave_sub(); } - sub paymentaccounts { $main::lxdebug->enter_sub(); my ($self, $myconfig, $form) = @_; - + # connect to database, turn AutoCommit off my $dbh = $form->dbconnect_noauto($myconfig); my $ARAP = uc $form->{db}; - + # get A(R|P)_paid accounts my $query = qq|SELECT c.accno, c.description FROM chart c WHERE c.link LIKE '%${ARAP}_paid%'|; my $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); - + while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { push @{ $form->{PR} }, $ref; } @@ -2051,7 +1987,6 @@ sub paymentaccounts { $main::lxdebug->leave_sub(); } - sub payments { $main::lxdebug->enter_sub(); @@ -2063,12 +1998,11 @@ sub payments { my $ml = 1; if ($form->{db} eq 'ar') { $table = 'customer'; - $ml = -1; + $ml = -1; } if ($form->{db} eq 'ap') { $table = 'vendor'; } - my ($query, $sth); my $dpt_join; @@ -2093,7 +2027,7 @@ sub payments { if (!$form->{fx_transaction}) { $where .= " AND ac.fx_transaction = '0'"; } - + my $invnumber; my $reference; if ($form->{reference}) { @@ -2110,10 +2044,10 @@ sub payments { $where .= " AND lower(ac.memo) LIKE '$memo'"; } + my $sortorder = join ', ', + $form->sort_columns(qw(name invnumber ordnumber transdate source)); + $sortorder = $form->{sort} if $form->{sort}; - my $sortorder = join ', ', $form->sort_columns(qw(name invnumber ordnumber transdate source)); - - # cycle through each id foreach my $accno (split(/ /, $form->{paymentaccounts})) { @@ -2127,7 +2061,6 @@ sub payments { push @{ $form->{PR} }, $ref; $sth->finish; - $query = qq|SELECT c.name, a.invnumber, a.ordnumber, ac.transdate, ac.amount * $ml AS paid, ac.source, a.invoice, a.id, ac.memo, '$form->{db}' AS module @@ -2138,7 +2071,7 @@ sub payments { WHERE ac.chart_id = $ref->{id} $where $invnumber - + UNION SELECT g.description, g.reference, NULL AS ordnumber, ac.transdate, ac.amount * $ml AS paid, ac.source, @@ -2156,14 +2089,14 @@ sub payments { $sth->execute || $form->dberror($query); while (my $pr = $sth->fetchrow_hashref(NAME_lc)) { - push @{ $form->{$ref->{id}} }, $pr; + push @{ $form->{ $ref->{id} } }, $pr; } $sth->finish; } - + $dbh->disconnect; - + $main::lxdebug->leave_sub(); } @@ -2176,112 +2109,204 @@ sub bwa { my $dbh = $form->dbconnect($myconfig); my $last_period = 0; - my $category = "pos_bwa"; - my @categories = qw(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40); + my $category = "pos_bwa"; + my @categories = + qw(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40); $form->{decimalplaces} *= 1; - &get_accounts_g($dbh, $last_period, $form->{fromdate}, $form->{todate}, $form, $category); - + &get_accounts_g($dbh, $last_period, $form->{fromdate}, $form->{todate}, + $form, $category); + # if there are any compare dates if ($form->{fromdate} || $form->{todate}) { $last_period = 1; if ($form->{fromdate}) { $form->{fromdate} =~ /[0-9]*\.[0-9]*\.([0-9]*)/; $year = $1; - } else { - $form->{todate} =~ /[0-9]*\.[0-9]*\.([0-9]*)/; - $year = $1; - } + } else { + $form->{todate} =~ /[0-9]*\.[0-9]*\.([0-9]*)/; + $year = $1; + } $kummfromdate = $form->{comparefromdate}; - $kummtodate = $form->{comparetodate}; - &get_accounts_g($dbh, $last_period, $kummfromdate, $kummtodate, $form, $category); - } + $kummtodate = $form->{comparetodate}; + &get_accounts_g($dbh, $last_period, $kummfromdate, $kummtodate, $form, + $category); + } - - - @periods = qw(jetzt kumm); + @periods = qw(jetzt kumm); @gesamtleistung = qw(1 2 3); - @gesamtkosten = qw (10 11 12 13 14 15 16 17 18 19 20); - @ergebnisse = qw (rohertrag betriebrohertrag betriebsergebnis neutraleraufwand neutralerertrag ergebnisvorsteuern ergebnis gesamtleistung gesamtkosten); + @gesamtkosten = qw (10 11 12 13 14 15 16 17 18 19 20); + @ergebnisse = + qw (rohertrag betriebrohertrag betriebsergebnis neutraleraufwand neutralerertrag ergebnisvorsteuern ergebnis gesamtleistung gesamtkosten); - foreach $key (@periods) { - $form->{"$key"."gesamtleistung"} = 0; - $form->{"$key"."gesamtkosten"} = 0; - - foreach $category (@categories){ + $form->{ "$key" . "gesamtleistung" } = 0; + $form->{ "$key" . "gesamtkosten" } = 0; + + foreach $category (@categories) { if (defined($form->{$category}{$key})) { - $form->{"$key$category"} = $form->format_amount($myconfig, $form->round_amount( $form->{$category}{$key},2)); + $form->{"$key$category"} = + $form->format_amount($myconfig, + $form->round_amount($form->{$category}{$key}, 2 + ), + $form->{decimalplaces}, + '0'); } } foreach $item (@gesamtleistung) { - $form->{"$key"."gesamtleistung"} += $form->{$item}{$key}; + $form->{ "$key" . "gesamtleistung" } += $form->{$item}{$key}; } foreach $item (@gesamtkosten) { - $form->{"$key"."gesamtkosten"} += $form->{$item}{$key}; + $form->{ "$key" . "gesamtkosten" } += $form->{$item}{$key}; } - $form->{"$key"."rohertrag"} = $form->{"$key"."gesamtleistung"} - $form->{4}{$key}; - $form->{"$key"."betriebrohertrag"} = $form->{"$key"."rohertrag"} + $form->{5}{$key}; - $form->{"$key"."betriebsergebnis"} = $form->{"$key"."betriebrohertrag"} - $form->{"$key"."gesamtkosten"}; - $form->{"$key"."neutraleraufwand"} = $form->{30}{$key} + $form->{31}{$key}; - $form->{"$key"."neutralertrag"} = $form->{32}{$key} + $form->{33}{$key} + $form->{34}{$key}; - $form->{"$key"."ergebnisvorsteuern"} = $form->{"$key"."betriebsergebnis"} - ($form->{"$key"."neutraleraufwand"} + $form->{"$key"."neutralertrag"}); - $form->{"$key"."ergebnis"} = $form->{"$key"."ergebnisvorsteuern"} + $form->{35}{$key}; - - if ($form->{"$key"."gesamtleistung"} > 0) { - foreach $category (@categories) { - if (defined($form->{$category}{$key})) { - $form->{"$key"."gl"."$category"} = $form->format_amount($myconfig, $form->round_amount( ($form->{$category}{$key}/$form->{"$key"."gesamtleistung"}*100),2)); - } - } - foreach $item (@ergebnisse) { - $form->{"$key"."gl"."$item"} = $form->format_amount($myconfig, $form->round_amount( ($form->{"$key"."$item"}/$form->{"$key"."gesamtleistung"}*100),2)); - } + $form->{ "$key" . "rohertrag" } = + $form->{ "$key" . "gesamtleistung" } - $form->{4}{$key}; + $form->{ "$key" . "betriebrohertrag" } = + $form->{ "$key" . "rohertrag" } + $form->{5}{$key}; + $form->{ "$key" . "betriebsergebnis" } = + $form->{ "$key" . "betriebrohertrag" } - + $form->{ "$key" . "gesamtkosten" }; + $form->{ "$key" . "neutraleraufwand" } = + $form->{30}{$key} + $form->{31}{$key}; + $form->{ "$key" . "neutralertrag" } = + $form->{32}{$key} + $form->{33}{$key} + $form->{34}{$key}; + $form->{ "$key" . "ergebnisvorsteuern" } = + $form->{ "$key" . "betriebsergebnis" } - + $form->{ "$key" . "neutraleraufwand" } + + $form->{ "$key" . "neutralertrag" }; + $form->{ "$key" . "ergebnis" } = + $form->{ "$key" . "ergebnisvorsteuern" } + $form->{35}{$key}; + + if ($form->{ "$key" . "gesamtleistung" } > 0) { + foreach $category (@categories) { + if (defined($form->{$category}{$key})) { + $form->{ "$key" . "gl" . "$category" } = + $form->format_amount( + $myconfig, + $form->round_amount( + ($form->{$category}{$key} / + $form->{ "$key" . "gesamtleistung" } * 100 + ), + $form->{decimalplaces} + ), + $form->{decimalplaces}, + '0'); + } + } + foreach $item (@ergebnisse) { + $form->{ "$key" . "gl" . "$item" } = + $form->format_amount($myconfig, + $form->round_amount( + ( $form->{ "$key" . "$item" } / + $form->{ "$key" . "gesamtleistung" } * 100 + ), + $form->{decimalplaces} + ), + $form->{decimalplaces}, + '0'); + } } - - if ($form->{"$key"."gesamtkosten"} > 0) { - foreach $category (@categories) { - if (defined($form->{$category}{$key})) { - $form->{"$key"."gk"."$category"} = $form->format_amount($myconfig, $form->round_amount( ($form->{$category}{$key}/$form->{"$key"."gesamtkosten"}*100),2)); - } - } - foreach $item (@ergebnisse) { - $form->{"$key"."gk"."$item"} = $form->format_amount($myconfig, $form->round_amount( ($form->{"$key"."$item"}/$form->{"$key"."gesamtkosten"}*100),2)); - } + + if ($form->{ "$key" . "gesamtkosten" } > 0) { + foreach $category (@categories) { + if (defined($form->{$category}{$key})) { + $form->{ "$key" . "gk" . "$category" } = + $form->format_amount($myconfig, + $form->round_amount( + ($form->{$category}{$key} / + $form->{ "$key" . "gesamtkosten" } * 100 + ), + $form->{decimalplaces} + ), + $form->{decimalplaces}, + '0'); + } + } + foreach $item (@ergebnisse) { + $form->{ "$key" . "gk" . "$item" } = + $form->format_amount($myconfig, + $form->round_amount( + ($form->{ "$key" . "$item" } / + $form->{ "$key" . "gesamtkosten" } * 100 + ), + $form->{decimalplaces} + ), + $form->{decimalplaces}, + '0'); + } } - + if ($form->{10}{$key} > 0) { - foreach $category (@categories) { - if (defined($form->{$category}{$key})) { - $form->{"$key"."pk"."$category"} = $form->format_amount($myconfig, $form->round_amount( ($form->{$category}{$key}/$form->{10}{$key}*100),2)); - } - } - foreach $item (@ergebnisse) { - $form->{"$key"."pk"."$item"} = $form->format_amount($myconfig, $form->round_amount( ($form->{"$key"."$item"}/$form->{10}{$key}*100),2)); - } + foreach $category (@categories) { + if (defined($form->{$category}{$key})) { + $form->{ "$key" . "pk" . "$category" } = + $form->format_amount( + $myconfig, + $form->round_amount( + ($form->{$category}{$key} / $form->{10}{$key} * 100), + $form->{decimalplaces} + ), + $form->{decimalplaces}, + '0'); + } + } + foreach $item (@ergebnisse) { + $form->{ "$key" . "pk" . "$item" } = + $form->format_amount($myconfig, + $form->round_amount( + ($form->{ "$key" . "$item" } / + $form->{10}{$key} * 100 + ), + $form->{decimalplaces} + ), + $form->{decimalplaces}, + '0'); + } } - + if ($form->{4}{$key} > 0) { - foreach $category (@categories) { - if (defined($form->{$category}{$key})) { - $form->{"$key"."auf"."$category"} = $form->format_amount($myconfig, $form->round_amount( ($form->{$category}{$key}/$form->{4}{$key}*100),2)); - } - } - foreach $item (@ergebnisse) { - $form->{"$key"."auf"."$item"} = $form->format_amount($myconfig, $form->round_amount( ($form->{"$key"."$item"}/$form->{4}{$key}*100),2)); - } + foreach $category (@categories) { + if (defined($form->{$category}{$key})) { + $form->{ "$key" . "auf" . "$category" } = + $form->format_amount( + $myconfig, + $form->round_amount( + ($form->{$category}{$key} / $form->{4}{$key} * 100), + $form->{decimalplaces} + ), + $form->{decimalplaces}, + '0'); + } + } + foreach $item (@ergebnisse) { + $form->{ "$key" . "auf" . "$item" } = + $form->format_amount($myconfig, + $form->round_amount( + ($form->{ "$key" . "$item" } / + $form->{4}{$key} * 100 + ), + $form->{decimalplaces} + ), + $form->{decimalplaces}, + '0'); + } } - + foreach $item (@ergebnisse) { - $form->{"$key"."$item"} = $form->format_amount($myconfig, $form->round_amount( $form->{"$key"."$item"},2)); + $form->{ "$key" . "$item" } = + $form->format_amount($myconfig, + $form->round_amount($form->{ "$key" . "$item" }, + $form->{decimalplaces} + ), + $form->{decimalplaces}, + '0'); } - - } - $dbh->disconnect; - + } + $dbh->disconnect; + $main::lxdebug->leave_sub(); } @@ -2293,70 +2318,80 @@ sub ustva { # connect to database my $dbh = $form->dbconnect($myconfig); - my $last_period = 0; - my $category = "pos_ustva"; - my @categories_cent = qw(51r 86r 97r 93r 96 66 43 45 53 62 65 67); + my $last_period = 0; + my $category = "pos_ustva"; + my @categories_cent = qw(51r 511 86r 861 97r 971 93r 931 + 96 66 43 45 53 62 65 67); my @categories_euro = qw(48 51 86 91 97 93 94); $form->{decimalplaces} *= 1; - + foreach $item (@categories_cent) { - $form->{"$item"} = 0; + $form->{"$item"} = 0; } foreach $item (@categories_euro) { - $form->{"$item"} = 0; - } - - &get_accounts_g($dbh, $last_period, $form->{fromdate}, $form->{todate}, $form, $category); - -# 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"}; -# } 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"}; -# } -# } -# -# } - - - $form->{"51r"} = $form->{"51"} * 0.16; - $form->{"86r"} = $form->{"86"} * 0.07; - $form->{"97r"} = $form->{"97"} * 0.16; - $form->{"93r"} = $form->{"93"} * 0.07; - $form->{"96"} = $form->{"94"} * 0.16; - $form->{"43"} = $form->{"51r"} + $form->{"86r"} + $form->{"97r"} + $form->{"93r"} + $form->{"96"}; + $form->{"$item"} = 0; + } + + &get_accounts_g($dbh, $last_period, $form->{fromdate}, $form->{todate}, + $form, $category); + + # 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"}; + # } 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"}; + # } + # } + # + # } + + # + # Berechnung der USTVA Formularfelder + # + $form->{"51r"} = $form->{"511"}; + $form->{"86r"} = $form->{"861"}; + $form->{"97r"} = $form->{"971"}; + $form->{"93r"} = $form->{"931"}; + + #$form->{"96"} = $form->{"94"} * 0.16; + $form->{"43"} = + $form->{"51r"} + $form->{"86r"} + $form->{"97r"} + $form->{"93r"} + + $form->{"96"}; $form->{"45"} = $form->{"43"}; $form->{"53"} = $form->{"43"}; $form->{"62"} = $form->{"43"} - $form->{"66"}; - $form->{"65"} = $form->{"43"} - $form->{"66"}; + $form->{"65"} = $form->{"43"} - $form->{"66"}; $form->{"67"} = $form->{"43"} - $form->{"66"}; - foreach $item (@categories_cent) { - $form->{$item} = $form->format_amount($myconfig, $form->round_amount( $form->{$item},2)); - } + $form->{$item} = + $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2), + 2, '0'); + } foreach $item (@categories_euro) { - $form->{$item} = $form->format_amount($myconfig, $form->round_amount( $form->{$item},0)); - } - - $dbh->disconnect; - + $form->{$item} = + $form->format_amount($myconfig, $form->round_amount($form->{$item}, 0), + 0, '0'); + } + + $dbh->disconnect; + $main::lxdebug->leave_sub(); } @@ -2368,44 +2403,47 @@ sub income_statement { # connect to database my $dbh = $form->dbconnect($myconfig); - my $last_period = 0; - my $category = "pos_eur"; + my $last_period = 0; + my $category = "pos_eur"; my @categories_einnahmen = qw(1 2 3 4 5 6 7); - my @categories_ausgaben = qw(8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31); - + my @categories_ausgaben = + qw(8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31); + my @ergebnisse = qw(sumeura sumeurb guvsumme); - + $form->{decimalplaces} *= 1; - + foreach $item (@categories_einnahmen) { - $form->{$item} = 0; + $form->{$item} = 0; } foreach $item (@categories_ausgaben) { - $form->{$item} = 0; + $form->{$item} = 0; } - + foreach $item (@ergebnisse) { - $form->{$item} = 0; + $form->{$item} = 0; } - - &get_accounts_g($dbh, $last_period, $form->{fromdate}, $form->{todate}, $form, $category); - + + &get_accounts_g($dbh, $last_period, $form->{fromdate}, $form->{todate}, + $form, $category); + foreach $item (@categories_einnahmen) { - $form->{"eur${item}"} = $form->format_amount($myconfig, $form->round_amount( $form->{$item},2)); - $form->{"sumeura"} += $form->{$item}; - } + $form->{"eur${item}"} = + $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2)); + $form->{"sumeura"} += $form->{$item}; + } foreach $item (@categories_ausgaben) { - $form->{"eur${item}"} = $form->format_amount($myconfig, $form->round_amount( $form->{$item},2)); - $form->{"sumeurb"} += $form->{$item}; + $form->{"eur${item}"} = + $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2)); + $form->{"sumeurb"} += $form->{$item}; } - + $form->{"guvsumme"} = $form->{"sumeura"} - $form->{"sumeurb"}; - - foreach $item (@ergebnisse) { - $form->{$item} = $form->format_amount($myconfig, $form->round_amount( $form->{$item},2)); + + foreach $item (@ergebnisse) { + $form->{$item} = + $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2)); } $main::lxdebug->leave_sub(); } 1; - -