X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FRP.pm;h=a319cf59d50090e0efddaa3be72eb152b0590eb1;hb=980dc53321ae6c2d3e448b6ca2a0c7d11a65ee8c;hp=8879bced148b190654b8a35f97da435bba7d5d8a;hpb=993f05d0c65e9f1c990364303c7474cf0873f429;p=kivitendo-erp.git diff --git a/SL/RP.pm b/SL/RP.pm index 8879bced1..a319cf59d 100644 --- a/SL/RP.pm +++ b/SL/RP.pm @@ -34,483 +34,139 @@ 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 - )); +use SL::DBUtils; +use Data::Dumper; +use List::Util qw(sum); - # 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 - )); +# use warnings; +use strict; - 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}, "- "); +# 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, $_) } @_; - $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}, "- "); + return unless $closedto; - $main::lxdebug->leave_sub(); + $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); # if there are any dates construct a where if ($form->{asofdate}) { - - $form->{this_period} = "$form->{asofdate}"; - $form->{period} = "$form->{asofdate}"; - + $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_accounts($dbh, $last_period, "", $form->{asofdate}, $form, - \@categories); + # get date of last opening balance + my $startdate = get_openbalance_date($closedto, $form->{asofdate}); + + 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} = "$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 - }); - - foreach $category (grep { !/C/ } @categories) { - - foreach $key (sort keys %{ $form->{$category} }) { - - $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}{label}_this_period"} }, - $form->format_amount( - $myconfig, - $account{$category}{subthis} * $account{$category}{ml}, - $form->{decimalplaces}, $dash - )); + my %account = ('A' => { 'ml' => -1 }, + 'L' => { 'ml' => 1 }, + 'Q' => { 'ml' => 1 }); - if ($last_period) { - push(@{ $form->{"$account{$category}{label}_last_period"} }, - $form->format_amount( - $myconfig, - $account{$category}{sublast} * $account{$category}{ml}, - $form->{decimalplaces}, $dash - )); - } - } + my $TMPL_DATA = {}; - $str = - "$form->{bold}$form->{$category}{$key}{description}$form->{endbold}"; + foreach my $category (grep { !/C/ } @categories) { - $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; + $TMPL_DATA->{$category} = []; + my $ml = $account{$category}{ml}; - $form->{$category}{$key}{this} = 0; - $form->{$category}{$key}{last} = 0; + foreach my $key (sort keys %{ $form->{$category} }) { - next unless $form->{l_heading}; + my $row = { %{ $form->{$category}{$key} } }; - $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 + } - # push description onto array - push(@{ $form->{"$account{$category}{label}_account"} }, $str); + $row->{subheader} = 1; + $account{$category}{subthis} = $row->{this}; + $account{$category}{sublast} = $row->{last}; + $account{$category}{subdescription} = $row->{description}; + $account{$category}{subtotal} = 1; - if ($form->{$category}{$key}{charttype} eq 'A') { - $form->{"total_$account{$category}{labels}_this_period"} += - $form->{$category}{$key}{this} * $account{$category}{ml}; - $dash = "- "; - } + $row->{this} = 0; + $row->{last} = 0; - push(@{ $form->{"$account{$category}{label}_this_period"} }, - $form->format_amount( - $myconfig, - $form->{$category}{$key}{this} * $account{$category}{ml}, - $form->{decimalplaces}, $dash - )); + next unless $form->{l_heading}; + } - 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 - )); + for my $period (qw(this last)) { + next if ($period eq 'last' && !$last_period); + # only add assets + $row->{$period} *= $ml; } - } - $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 @{ $TMPL_DATA->{$category} }, $row; + } # foreach - if ($last_period) { - push(@{ $form->{"$account{$category}{label}_last_period"} }, - $form->format_amount( - $myconfig, - $account{$category}{sublast} * $account{$category}{ml}, - $form->{decimalplaces}, $dash - )); - } + # resolve heading/subtotal + if ($account{$category}{subtotal} && $form->{l_subtotal}) { + $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 { @@ -521,41 +177,30 @@ 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 = "AND ("; - foreach $item (@{$categories}) { - $category .= qq|c.category = '$item' OR |; - } - $category =~ s/OR $/\)/; + my $category = qq| AND (| . join(" OR ", map({ "(c.category = " . $dbh->quote($_) . ")" } @{$categories})) . qq|) |; # get headings - $query = qq|SELECT c.accno, c.description, c.category - FROM chart c - WHERE c.charttype = 'H' - $category - ORDER by c.accno|; - - 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) - WHERE c.charttype = 'H' - $category - ORDER BY g.accno|; - } + $query = + qq|SELECT c.accno, c.description, c.category + FROM chart c + WHERE (c.charttype = 'H') + $category + ORDER by c.accno|; - $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); + $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"; @@ -566,489 +211,195 @@ sub get_accounts { $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') { - $subwhere .= " AND transdate >= '$fromdate'"; - $glwhere = " AND ac.transdate >= '$fromdate'"; + $subwhere .= " AND (transdate >= $fromdate)"; + $glwhere = " AND (ac.transdate >= $fromdate)"; } else { - $where .= " AND ac.transdate >= '$fromdate'"; + $where .= " AND (ac.transdate >= $fromdate)"; } } if ($todate) { - $where .= " AND ac.transdate <= '$todate'"; - $subwhere .= " AND transdate <= '$todate'"; + $todate = conv_dateq($todate); + $where .= " AND (ac.transdate <= $todate)"; + $subwhere .= " AND (transdate <= $todate)"; } if ($department_id) { - $dpt_join = qq| - JOIN department t ON (a.department_id = t.id) - |; - $dpt_where = qq| - AND t.id = $department_id - |; + $dpt_join = qq| JOIN department t ON (a.department_id = t.id) |; + $dpt_where = qq| AND (t.id = | . conv_i($department_id, 'NULL') . qq|)|; } if ($form->{project_id}) { - $project = qq| - AND ac.project_id = $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|) |; } - if ($form->{accounttype} eq 'gifi') { - - if ($form->{method} eq 'cash') { - - $query = qq| - - SELECT g.accno, sum(ac.amount) AS amount, - g.description, c.category - FROM acc_trans ac - JOIN chart c ON (c.id = ac.chart_id) - JOIN ar a ON (a.id = ac.trans_id) - JOIN gifi g ON (g.accno = c.gifi_accno) - $dpt_join - WHERE $where - $dpt_where - $category - AND ac.trans_id IN - ( - SELECT trans_id - FROM acc_trans - JOIN chart ON (chart_id = id) - WHERE link LIKE '%AR_paid%' - $subwhere - ) - $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 - JOIN chart c ON (c.id = ac.chart_id) - JOIN ar a ON (a.id = ac.trans_id) - $dpt_join - WHERE $where - $dpt_where - $category - AND c.gifi_accno = '' - AND ac.trans_id IN - ( - SELECT trans_id - FROM acc_trans - JOIN chart ON (chart_id = id) - WHERE link LIKE '%AR_paid%' - $subwhere - ) - $project - GROUP BY c.category - - UNION ALL - - SELECT g.accno, sum(ac.amount) AS amount, - g.description, c.category - FROM acc_trans ac - JOIN chart c ON (c.id = ac.chart_id) - JOIN ap a ON (a.id = ac.trans_id) - JOIN gifi g ON (g.accno = c.gifi_accno) - $dpt_join - WHERE $where - $dpt_where - $category - AND ac.trans_id IN - ( - SELECT trans_id - FROM acc_trans - JOIN chart ON (chart_id = id) - WHERE link LIKE '%AP_paid%' - $subwhere - ) - $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 - JOIN chart c ON (c.id = ac.chart_id) - JOIN ap a ON (a.id = ac.trans_id) - $dpt_join - WHERE $where - $dpt_where - $category - AND c.gifi_accno = '' - AND ac.trans_id IN - ( - SELECT trans_id - FROM acc_trans - JOIN chart ON (chart_id = id) - WHERE link LIKE '%AP_paid%' - $subwhere - ) - $project - GROUP BY c.category - - UNION ALL - --- add gl - - SELECT g.accno, sum(ac.amount) AS amount, - g.description, c.category - FROM acc_trans ac - JOIN chart c ON (c.id = ac.chart_id) - JOIN gifi g ON (g.accno = c.gifi_accno) - JOIN gl a ON (a.id = ac.trans_id) - $dpt_join - WHERE $where - $glwhere - $dpt_where - $category - 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 - JOIN chart c ON (c.id = ac.chart_id) - JOIN gl a ON (a.id = ac.trans_id) - $dpt_join - WHERE $where - $glwhere - $dpt_where - $category - AND c.gifi_accno = '' - AND NOT (c.link = 'AR' OR c.link = 'AP') - $project - GROUP BY c.category - |; - - if ($form->{project_id}) { - - $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 - JOIN ar a ON (a.id = ac.trans_id) - JOIN parts p ON (ac.parts_id = p.id) - JOIN chart c on (p.income_accno_id = c.id) - JOIN gifi g ON (g.accno = c.gifi_accno) - $dpt_join - -- use transdate from subwhere - WHERE 1 = 1 $subwhere - AND c.category = 'I' - $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 - ) - $project - 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 - JOIN ap a ON (a.id = ac.trans_id) - JOIN parts p ON (ac.parts_id = p.id) - JOIN chart c on (p.expense_accno_id = c.id) - JOIN gifi g ON (g.accno = c.gifi_accno) - $dpt_join - WHERE 1 = 1 $subwhere - AND c.category = 'E' - $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 - ) - $project - GROUP BY g.accno, g.description, c.category - |; - } - - } else { - - 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 - |; - - } - - $query = qq| - - SELECT g.accno, SUM(ac.amount) AS amount, - g.description, c.category - FROM acc_trans ac - JOIN chart c ON (c.id = ac.chart_id) - JOIN gifi g ON (c.gifi_accno = g.accno) - $dpt_join - WHERE $where - $dpt_from - $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 - JOIN chart c ON (c.id = ac.chart_id) - $dpt_join - WHERE $where - $dpt_from - $category - AND c.gifi_accno = '' - $project - GROUP BY c.category - |; - - if ($form->{project_id}) { - - $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 - JOIN ar a ON (a.id = ac.trans_id) - JOIN parts p ON (ac.parts_id = p.id) - JOIN chart c on (p.income_accno_id = c.id) - JOIN gifi g ON (c.gifi_accno = g.accno) - $dpt_join - -- use transdate from subwhere - WHERE 1 = 1 $subwhere - AND c.category = 'I' - $dpt_where - $project - 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 - JOIN ap a ON (a.id = ac.trans_id) - JOIN parts p ON (ac.parts_id = p.id) - JOIN chart c on (p.expense_accno_id = c.id) - JOIN gifi g ON (c.gifi_accno = g.accno) - $dpt_join - WHERE 1 = 1 $subwhere - AND c.category = 'E' - $dpt_where - $project - GROUP BY g.accno, g.description, c.category - |; - } + if ($form->{method} eq 'cash') { + $query = + qq|SELECT c.accno, sum(ac.amount) AS amount, c.description, 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 + $category + 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.accno, c.description, c.category + + UNION ALL + + SELECT c.accno, sum(ac.amount) AS amount, c.description, c.category + FROM acc_trans ac + JOIN chart c ON (c.id = ac.chart_id) + JOIN ap a ON (a.id = ac.trans_id) + $dpt_join + WHERE $where + $dpt_where + $category + 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.accno, c.description, c.category + + UNION ALL + + SELECT c.accno, sum(ac.amount) AS amount, c.description, c.category + FROM acc_trans ac + JOIN chart c ON (c.id = ac.chart_id) + JOIN gl a ON (a.id = ac.trans_id) + $dpt_join + WHERE $where + $glwhere + $dpt_where + $category + AND NOT ((c.link = 'AR') OR (c.link = 'AP')) + $project + GROUP BY c.accno, c.description, c.category |; + if ($form->{project_id}) { + # s.o. keine Projektauswahl in Bilanz + $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 + JOIN ar a ON (a.id = ac.trans_id) + 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 (c.category = 'I') + $subwhere + $dpt_where + 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.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 + JOIN ap a ON (a.id = ac.trans_id) + JOIN parts p ON (ac.parts_id = p.id) + JOIN chart c on (p.expense_accno_id = c.id) + $dpt_join + WHERE (c.category = 'E') + $subwhere + $dpt_where + 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.accno, c.description, c.category |; } - } else { # standard account - - if ($form->{method} eq 'cash') { - - $query = qq| - - SELECT c.accno, sum(ac.amount) AS amount, - c.description, 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 - $category - AND ac.trans_id IN - ( - SELECT trans_id - FROM acc_trans - JOIN chart ON (chart_id = id) - 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 - JOIN chart c ON (c.id = ac.chart_id) - JOIN ap a ON (a.id = ac.trans_id) - $dpt_join - WHERE $where - $dpt_where - $category - AND ac.trans_id IN - ( - SELECT trans_id - FROM acc_trans - JOIN chart ON (chart_id = id) - 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, - c.description, c.category - FROM acc_trans ac - JOIN chart c ON (c.id = ac.chart_id) - JOIN gl a ON (a.id = ac.trans_id) - $dpt_join - WHERE $where - $glwhere - $dpt_from - $category - AND NOT (c.link = 'AR' OR c.link = 'AP') - $project - GROUP BY c.accno, c.description, c.category - |; - - 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 - JOIN ar a ON (a.id = ac.trans_id) - 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 - AND c.category = 'I' - $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 - ) - - $project - 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 - JOIN ap a ON (a.id = ac.trans_id) - 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 - AND c.category = 'E' - $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 - ) - - $project - GROUP BY c.accno, c.description, c.category - |; - } - - } else { - - 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 - |; - } - - $query = qq| - - SELECT c.accno, sum(ac.amount) AS amount, - c.description, c.category - FROM acc_trans ac - JOIN chart c ON (c.id = ac.chart_id) - $dpt_join - WHERE $where - $dpt_where - $category - $project - GROUP BY c.accno, c.description, c.category - |; - - if ($form->{project_id}) { + } 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 = | . conv_i($department_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 - JOIN ar a ON (a.id = ac.trans_id) - 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 - AND c.category = 'I' - $dpt_where - $project - 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 - JOIN ap a ON (a.id = ac.trans_id) - 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 - AND c.category = 'E' - $dpt_where - $project - GROUP BY c.accno, c.description, c.category - |; + $query = qq| + SELECT c.accno, sum(ac.amount) AS amount, c.description, c.category + FROM acc_trans ac + JOIN chart c ON (c.id = ac.chart_id) + $dpt_join + WHERE $where + $dpt_where + $category + $project + GROUP BY c.accno, c.description, c.category |; - } + if ($form->{project_id}) { + # s.o. keine Projektauswahl in Bilanz + $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 + JOIN ar a ON (a.id = ac.trans_id) + 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 (c.category = 'I') + $subwhere + $dpt_where + $project + 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 + JOIN ap a ON (a.id = ac.trans_id) + JOIN parts p ON (ac.parts_id = p.id) + JOIN chart c on (p.expense_accno_id = c.id) + $dpt_join + WHERE (c.category = 'E') + $subwhere + $dpt_where + $project + GROUP BY c.accno, c.description, c.category |; } } @@ -1056,10 +407,9 @@ sub get_accounts { my $accno; my $ref; - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($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'; @@ -1077,8 +427,7 @@ sub get_accounts { } $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) { @@ -1092,12 +441,8 @@ sub get_accounts { # 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 @@ -1121,229 +466,196 @@ sub get_accounts_g { my $project; my $where = "1 = 1"; 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'"; + $subwhere .= " AND (transdate >= $fromdate)"; + $glwhere = " AND (ac.transdate >= $fromdate)"; + $prwhere = " AND (a.transdate >= $fromdate)"; + $inwhere = " AND (acc.transdate >= $fromdate)"; } else { - $where .= " AND ac.transdate >= '$fromdate'"; + $where .= " AND (ac.transdate >= $fromdate)"; } } if ($todate) { - $where .= " AND ac.transdate <= '$todate'"; - $subwhere .= " AND transdate <= '$todate'"; + $todate = conv_dateq($todate); + $subwhere .= " AND (transdate <= $todate)"; + $where .= " AND (ac.transdate <= $todate)"; + $prwhere .= " AND (a.transdate <= $todate)"; + $inwhere .= " AND (acc.transdate <= $todate)"; } if ($department_id) { - $dpt_join = qq| - JOIN department t ON (a.department_id = t.id) - |; - $dpt_where = qq| - AND t.id = $department_id - |; + $dpt_join = qq| JOIN department t ON (a.department_id = t.id) |; + $dpt_where = qq| AND (t.id = | . conv_i($department_id, 'NULL') . qq|) |; } if ($form->{project_id}) { - $project = qq| - AND ac.project_id = $form->{project_id} - |; + $project = qq| AND (ac.project_id = | . conv_i($form->{project_id}) . qq|) |; } - if ($form->{method} eq 'cash') { - - $query = qq| - - SELECT sum(ac.amount) 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 - ) - - $project - GROUP BY c.$category - - UNION - - SELECT sum(ac.amount) AS amount, - c.$category - FROM acc_trans ac - JOIN chart c ON (c.id = ac.chart_id) - 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 - ) - - $project - GROUP BY c.$category - - UNION +# +# GUV patch by Ronny Rentner (Bug 1190) +# +# GUV IST-Versteuerung +# +# Alle tatsaechlichen _Zahlungseingaenge_ +# im Zeitraum erfassen +# (Teilzahlungen werden prozentual auf verschiedene Steuern aufgeteilt) +# +# - SELECT sum(ac.amount) AS amount, - c.$category - FROM acc_trans ac - JOIN chart c ON (c.id = ac.chart_id) - JOIN gl a ON (a.id = ac.trans_id) - $dpt_join - WHERE $where - $glwhere - $dpt_from - AND NOT (c.link = 'AR' OR c.link = 'AP') - $project - GROUP BY c.$category - |; + 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 a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AR_paid%') $subwhere) + $project + GROUP BY c.$category +*/ + UNION + + 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 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 a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AP_paid%') $subwhere) + $project + GROUP BY c.$category + + UNION + + 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 gl a ON (a.id = ac.trans_id) + $dpt_join + WHERE $where $dpt_where $glwhere + AND NOT ((c.link = 'AR') OR (c.link = 'AP')) + $project + GROUP BY c.$category + |; if ($form->{project_id}) { - $query .= qq| - - UNION - - SELECT SUM(ac.sellprice * ac.qty) AS amount, - c.$category - FROM invoice ac - JOIN ar a ON (a.id = ac.trans_id) - 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 - AND c.category = 'I' - $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 - ) - - $project - GROUP BY c.$category - - UNION - - SELECT SUM(ac.sellprice) AS amount, - c.$category - FROM invoice ac - JOIN ap a ON (a.id = ac.trans_id) - 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 - AND c.category = 'E' - $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 - ) - - $project - GROUP BY c.$category - |; + UNION + + SELECT SUM(ac.sellprice * ac.qty * chart_category_to_sgn(c.category)) AS amount, c.$category + FROM invoice ac + JOIN ar a ON (a.id = ac.trans_id) + JOIN parts p ON (ac.parts_id = p.id) + 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 a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AR_paid%') $subwhere) + $project + GROUP BY c.$category + + UNION + + SELECT SUM(ac.sellprice * chart_category_to_sgn(c.category)) AS amount, c.$category + FROM invoice ac + JOIN ap a ON (a.id = ac.trans_id) + JOIN parts p ON (ac.parts_id = p.id) + 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 a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AP_paid%') $subwhere) + $project + GROUP BY c.$category + |; } - } else { - + } 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_join = qq| JOIN dpt_trans t ON (t.trans_id = ac.trans_id) |; + $dpt_where = qq| AND (t.department_id = | . conv_i($department_id, 'NULL') . qq|) |; } $query = qq| - - SELECT sum(ac.amount) AS amount, - c.$category - FROM acc_trans ac - JOIN chart c ON (c.id = ac.chart_id) - $dpt_join - WHERE $where - $dpt_where - $project - 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) + $dpt_join + WHERE $where + $dpt_where + $project + GROUP BY c.$category |; if ($form->{project_id}) { - $query .= qq| + UNION + + SELECT SUM(ac.sellprice * ac.qty * chart_category_to_sgn(c.category)) AS amount, c.$category + FROM invoice ac + JOIN ar a ON (a.id = ac.trans_id) + JOIN parts p ON (ac.parts_id = p.id) + JOIN chart c on (p.income_accno_id = c.id) + $dpt_join + WHERE (c.category = 'I') + $prwhere + $dpt_where + $project + GROUP BY c.$category - UNION - - SELECT SUM(ac.sellprice * ac.qty) AS amount, - c.$category - FROM invoice ac - JOIN ar a ON (a.id = ac.trans_id) - 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 - 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 - JOIN ap a ON (a.id = ac.trans_id) - 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 - AND c.category = 'E' - $dpt_where - $project - GROUP BY c.$category - |; + UNION + SELECT SUM(ac.sellprice * ac.qty * chart_category_to_sgn(c.category)) AS amount, c.$category + FROM invoice ac + JOIN ap a ON (a.id = ac.trans_id) + JOIN parts p ON (ac.parts_id = p.id) + JOIN chart c on (p.expense_accno_id = c.id) + $dpt_join + WHERE (c.category = 'E') + $prwhere + $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)) { - if ($ref->{amount} < 0) { - $ref->{amount} *= -1; - } + foreach my $ref (selectall_hashref_query($form, $dbh, $query)) { if ($category eq "pos_bwa") { if ($last_period) { $form->{ $ref->{$category} }{kumm} += $ref->{amount}; @@ -1354,7 +666,6 @@ sub get_accounts_g { $form->{ $ref->{$category} } += $ref->{amount}; } } - $sth->finish; $main::lxdebug->leave_sub(); } @@ -1362,7 +673,7 @@ sub get_accounts_g { sub trial_balance { $main::lxdebug->enter_sub(); - my ($self, $myconfig, $form) = @_; + my ($self, $myconfig, $form, %options) = @_; my $dbh = $form->dbconnect($myconfig); @@ -1379,12 +690,8 @@ sub trial_balance { my $invwhere = $where; if ($department_id) { - $dpt_join = qq| - JOIN dpt_trans t ON (ac.trans_id = t.trans_id) - |; - $dpt_where = qq| - AND t.department_id = $department_id - |; + $dpt_join = qq| JOIN dpt_trans t ON (ac.trans_id = t.trans_id) |; + $dpt_where = qq| AND (t.department_id = | . conv_i($department_id, 'NULL') . qq|) |; } # project_id only applies to getting transactions @@ -1392,78 +699,95 @@ sub trial_balance { # but we use the same function to collect information if ($form->{project_id}) { - $project = qq| - AND ac.project_id = $form->{project_id} - |; + $project = qq| AND (ac.project_id = | . conv_i($form->{project_id}, 'NULL') . qq|) |; } - # get beginning balances - if ($form->{fromdate}) { + my $acc_cash_where = ""; +# my $ar_cash_where = ""; +# my $ap_cash_where = ""; - if ($form->{accounttype} eq 'gifi') { - $query = qq|SELECT g.accno, c.category, SUM(ac.amount) AS amount, - g.description - FROM acc_trans ac - JOIN chart c ON (ac.chart_id = c.id) - JOIN gifi g ON (c.gifi_accno = g.accno) - $dpt_join - WHERE ac.transdate < '$form->{fromdate}' - $dpt_where - $project - GROUP BY g.accno, c.category, g.description - |; + 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}' - } else { + UNION + + SELECT id + FROM ap + WHERE datepaid >= '$form->{fromdate}' + AND datepaid <= '$form->{todate}' + + UNION - $query = qq|SELECT c.accno, c.category, SUM(ac.amount) AS amount, - c.description - FROM acc_trans ac - JOIN chart c ON (ac.chart_id = c.id) - $dpt_join - WHERE ac.transdate < '$form->{fromdate}' - $dpt_where - $project - GROUP BY c.accno, c.category, c.description - |; + 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}') |; + } + + 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 = $dbh->prepare($query); - $sth->execute || $form->dberror($query); + # 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 |; + + $sth = prepare_execute_query($form, $dbh, $query, $form->{fromdate}); - while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { - $balance{ $ref->{accno} } = $ref->{amount}; + while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - if ($ref->{amount} != 0 && $form->{all_accounts}) { + 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}; } } $sth->finish; - } # 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') { - $query = qq|SELECT g.accno, g.description, c.category - FROM gifi g - JOIN chart c ON (c.gifi_accno = g.accno) - WHERE c.charttype = 'H' - ORDER BY g.accno|; - } + $query = + qq|SELECT c.accno, c.description, c.category + FROM chart c + WHERE c.charttype = 'H' + ORDER by c.accno|; - $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($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}; @@ -1474,236 +798,103 @@ sub trial_balance { $sth->finish; $where = " 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}) { - $tofrom .= " AND ac.transdate >= '$form->{fromdate}'"; - $subwhere .= " AND transdate >= '$form->{fromdate}'"; - $invwhere .= " AND a.transdate >= '$form->{fromdate}'"; - $glwhere = " AND ac.transdate >= '$form->{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}) { - $tofrom .= " AND ac.transdate <= '$form->{todate}'"; - $invwhere .= " AND a.transdate <= '$form->{todate}'"; - $subwhere .= " AND transdate <= '$form->{todate}'"; - $glwhere .= " AND ac.transdate <= '$form->{todate}'"; - } - } - if ($form->{eur}) { - $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))|; + $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 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; + $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)"; + $sumwhere .= $glsumwhere . " AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL)"; } - if ($form->{accounttype} eq 'gifi') { - - $query = qq|SELECT g.accno, g.description, c.category, - SUM(ac.amount) AS amount - FROM acc_trans ac - JOIN chart c ON (c.id = ac.chart_id) - JOIN gifi g ON (c.gifi_accno = g.accno) - $dpt_join - WHERE $where - $dpt_where - $project - GROUP BY g.accno, g.description, c.category - |; - - if ($form->{project_id}) { - - $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 - JOIN ar a ON (ac.trans_id = a.id) - JOIN parts p ON (ac.parts_id = p.id) - JOIN chart c ON (p.income_accno_id = c.id) - JOIN gifi g ON (c.gifi_accno = g.accno) - $dpt_join - WHERE $invwhere - $dpt_where - $project - 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 - JOIN ap a ON (ac.trans_id = a.id) - JOIN parts p ON (ac.parts_id = p.id) - JOIN chart c ON (p.expense_accno_id = c.id) - JOIN gifi g ON (c.gifi_accno = g.accno) - $dpt_join - WHERE $invwhere - $dpt_where - $project - GROUP BY g.accno, g.description, c.category - |; - } + $query = qq| + SELECT c.accno, c.description, c.category, SUM(ac.amount) AS amount + FROM acc_trans ac + JOIN chart c ON (c.id = ac.chart_id) + $dpt_join + WHERE $where + $dpt_where + $project + GROUP BY c.accno, c.description, c.category |; + if ($form->{project_id}) { $query .= qq| - ORDER BY accno|; - - } else { - - $query = qq|SELECT c.accno, c.description, c.category, - SUM(ac.amount) AS amount - FROM acc_trans ac - JOIN chart c ON (c.id = ac.chart_id) - $dpt_join - WHERE $where - $dpt_where - $project - GROUP BY c.accno, c.description, c.category - |; - - if ($form->{project_id}) { - - $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 - JOIN ar a ON (ac.trans_id = a.id) - JOIN parts p ON (ac.parts_id = p.id) - JOIN chart c ON (p.income_accno_id = c.id) - $dpt_join - WHERE $invwhere - $dpt_where - $project - 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 - JOIN ap a ON (ac.trans_id = a.id) - JOIN parts p ON (ac.parts_id = p.id) - JOIN chart c ON (p.expense_accno_id = c.id) - $dpt_join - WHERE $invwhere - $dpt_where - $project - GROUP BY c.accno, c.description, c.category - |; + -- add project transactions from invoice + + UNION ALL + + SELECT c.accno, c.description, c.category, SUM(ac.sellprice * ac.qty) AS amount + FROM invoice ac + JOIN ar a ON (ac.trans_id = a.id) + JOIN parts p ON (ac.parts_id = p.id) + JOIN chart c ON (p.income_accno_id = c.id) + $dpt_join + WHERE $invwhere + $dpt_where + $project + 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 + JOIN ap a ON (ac.trans_id = a.id) + JOIN parts p ON (ac.parts_id = p.id) + JOIN chart c ON (p.expense_accno_id = c.id) + $dpt_join + WHERE $invwhere + $dpt_where + $project + GROUP BY c.accno, c.description, c.category + |; } - $query .= qq| - ORDER BY accno|; - - } - - $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); + $query .= qq| ORDER BY accno|; - # prepare query for each account - $query = qq|SELECT (SELECT SUM(ac.amount) * -1 - FROM acc_trans ac - JOIN chart c ON (c.id = ac.chart_id) - $dpt_join - WHERE $where - $dpt_where - $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) - $dpt_join - WHERE $where - $dpt_where - $project - AND ac.amount > 0 - AND c.accno = ?) AS credit - |; - - if ($form->{accounttype} eq 'gifi') { - - $query = qq|SELECT (SELECT SUM(ac.amount) * -1 - FROM acc_trans ac - JOIN chart c ON (c.id = ac.chart_id) - $dpt_join - WHERE $where - $dpt_where - $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) - $dpt_join - WHERE $where - $dpt_where - $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 - JOIN parts p ON (ac.parts_id = p.id) - JOIN ap a ON (ac.trans_id = a.id) - JOIN chart c ON (p.expense_accno_id = c.id) - $dpt_join - WHERE $invwhere - $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) - JOIN ar a ON (ac.trans_id = a.id) - JOIN chart c ON (p.income_accno_id = c.id) - $dpt_join - WHERE $invwhere - $dpt_where - $project - AND c.accno = ?) AS credit - |; - - $project_drcr = $dbh->prepare($query); - - } + $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}; @@ -1711,39 +902,190 @@ sub trial_balance { } $sth->finish; - my ($debit, $credit); + # prepare query for each account + my ($q_drcr, $drcr, $q_project_drcr, $project_drcr); + + $q_drcr = + qq|SELECT + (SELECT SUM(ac.amount) * -1 + FROM acc_trans ac + JOIN chart c ON (c.id = ac.chart_id) + $dpt_join + WHERE $where + $dpt_where + $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) + $dpt_join + WHERE $where + $dpt_where + $project + AND ac.amount > 0 + AND c.accno = ?) AS credit, + (SELECT SUM(ac.amount) + FROM acc_trans ac + JOIN chart c ON (ac.chart_id = c.id) + $dpt_join + WHERE $saldowhere + $dpt_where + $project + AND c.accno = ? AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL)) AS saldo, + + (SELECT SUM(ac.amount) + FROM acc_trans ac + JOIN chart c ON (ac.chart_id = c.id) + $dpt_join + WHERE $sumwhere + $dpt_where + $project + AND amount > 0 + AND c.accno = ?) AS sum_credit, + + (SELECT SUM(ac.amount) + FROM acc_trans ac + JOIN chart c ON (ac.chart_id = c.id) + $dpt_join + WHERE $sumwhere + $dpt_where + $project + AND amount < 0 + AND c.accno = ?) AS sum_debit, + + (SELECT max(ac.transdate) FROM acc_trans ac + JOIN chart c ON (ac.chart_id = c.id) + $dpt_join + WHERE $where + $dpt_where + $project + AND c.accno = ?) AS last_transaction + + + |; + + $drcr = prepare_query($form, $dbh, $q_drcr); + + if ($form->{project_id}) { + # prepare query for each account + $q_project_drcr = + qq|SELECT + (SELECT SUM(ac.sellprice * ac.qty) * -1 + FROM invoice ac + JOIN parts p ON (ac.parts_id = p.id) + JOIN ap a ON (ac.trans_id = a.id) + JOIN chart c ON (p.expense_accno_id = c.id) + $dpt_join + WHERE $invwhere + $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) + JOIN ar a ON (ac.trans_id = a.id) + JOIN chart c ON (p.income_accno_id = c.id) + $dpt_join + WHERE $invwhere + $dpt_where + $project + AND c.accno = ?) AS credit, + + (SELECT SUM(ac.amount) + FROM acc_trans ac + JOIN chart c ON (ac.chart_id = c.id) + $dpt_join + WHERE $saldowhere + $dpt_where + $project + AND c.accno = ? AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL)) AS saldo, + + (SELECT SUM(ac.amount) + FROM acc_trans ac + JOIN chart c ON (ac.chart_id = c.id) + $dpt_join + WHERE $sumwhere + $dpt_where + $project + AND amount > 0 + AND c.accno = ?) AS sum_credit, + + (SELECT SUM(ac.amount) + FROM acc_trans ac + JOIN chart c ON (ac.chart_id = c.id) + $dpt_join + WHERE $sumwhere + $dpt_where + $project + AND amount < 0 + AND c.accno = ?) AS sum_debit, + + + (SELECT max(ac.transdate) FROM acc_trans ac + JOIN chart c ON (ac.chart_id = c.id) + $dpt_join + WHERE $where + $dpt_where + $project + AND c.accno = ?) AS last_transaction + |; + + $project_drcr = prepare_query($form, $dbh, $q_project_drcr); + } + + + my ($debit, $credit, $saldo, $soll_saldo, $haben_saldo,$soll_kummuliert, $haben_kummuliert, $last_transaction); foreach my $accno (sort keys %trb) { - $ref = (); + $ref = {}; $ref->{accno} = $accno; map { $ref->{$_} = $trb{$accno}{$_} } - qw(description category charttype amount); + qw(description category charttype amount soll_eb haben_eb beginning_balance); $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); + do_statement($form, $drcr, $q_drcr, $ref->{accno}, $ref->{accno}, $ref->{accno}, $ref->{accno}, $ref->{accno}, $ref->{accno}); - ($debit, $credit) = (0, 0); - while (($debit, $credit) = $drcr->fetchrow_array) { + ($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->{credit} += $credit; + if ($saldo >= 0) { + $ref->{haben_saldo} += $saldo; + } else { + $ref->{soll_saldo} += $saldo * -1; + } + $ref->{last_transaction} = $last_transaction; + $ref->{soll_kumuliert} = $soll_kumuliert * -1; + $ref->{haben_kumuliert} = $haben_kumuliert; } $drcr->finish; if ($form->{project_id}) { # get DR/CR - $project_drcr->execute($ref->{accno}, $ref->{accno}) - || $form->dberror($query); + do_statement($form, $project_drcr, $q_project_drcr, $ref->{accno}, $ref->{accno}, $ref->{accno}, $ref->{accno}, $ref->{accno}, $ref->{accno}); ($debit, $credit) = (0, 0); - while (($debit, $credit) = $project_drcr->fetchrow_array) { + while (($debit, $credit, $saldo, $haben_kumuliert, $soll_kumuliert, $last_transaction) = $project_drcr->fetchrow_array) { $ref->{debit} += $debit; $ref->{credit} += $credit; + if ($saldo >= 0) { + $ref->{haben_saldo} += $saldo; + } else { + $ref->{soll_saldo} += $saldo * -1; + } + $ref->{soll_kumuliert} += $soll_kumuliert * -1; + $ref->{haben_kumuliert} += $haben_kumuliert; } $project_drcr->finish; } @@ -1751,14 +1093,36 @@ sub trial_balance { $ref->{debit} = $form->round_amount($ref->{debit}, 2); $ref->{credit} = $form->round_amount($ref->{credit}, 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) { $trb{$accno}{debit} += $ref->{debit}; $trb{$accno}{credit} += $ref->{credit}; + $trb{$accno}{soll_saldo} += $ref->{soll_saldo}; + $trb{$accno}{haben_saldo} += $ref->{haben_saldo}; + $trb{$accno}{soll_kumuliert} += $ref->{soll_kumuliert}; + $trb{$accno}{haben_kumuliert} += $ref->{haben_kumuliert}; } push @{ $form->{TB} }, $ref; @@ -1768,11 +1132,15 @@ sub trial_balance { $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->{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}; } } } @@ -1780,6 +1148,19 @@ sub trial_balance { $main::lxdebug->leave_sub(); } +sub get_storno { + $main::lxdebug->enter_sub(); + my ($self, $dbh, $form) = @_; + my $arap = $form->{arap} eq "ar" ? "ar" : "ap"; + my $query = qq|SELECT invnumber FROM $arap WHERE invnumber LIKE "Storno zu "|; + my $sth = $dbh->prepare($query); + while(my $ref = $sth->fetchrow_hashref()) { + $ref->{invnumer} =~ s/Storno zu //g; + $form->{storno}{$ref->{invnumber}} = 1; + } + $main::lxdebug->leave_sub(); +} + sub aging { $main::lxdebug->enter_sub(); @@ -1787,151 +1168,128 @@ sub aging { # connect to database my $dbh = $form->dbconnect($myconfig); - my $invoice = ($form->{arap} eq 'ar') ? 'is' : 'ir'; - $form->{todate} = $form->current_date($myconfig) unless ($form->{todate}); + my ($invoice, $arap, $buysell, $ct, $ct_id, $ml); - my $where = "1 = 1"; - my ($name, $null); - - if ($form->{"$form->{ct}_id"}) { - $where .= qq| AND ct.id = $form->{"$form->{ct}_id"}|; + # falls customer ziehen wir die offene forderungsliste + # anderfalls für die lieferanten die offenen verbindlichkeitne + if ($form->{ct} eq "customer") { + $invoice = "is"; + $arap = "ar"; + $buysell = "buy"; + $ct = "customer"; + $ml = -1; } else { - if ($form->{ $form->{ct} }) { - $name = $form->like(lc $form->{ $form->{ct} }); - $where .= qq| AND lower(ct.name) LIKE '$name'| if $form->{ $form->{ct} }; + $invoice = "ir"; + $arap = "ap"; + $buysell = "sell"; + $ct = "vendor"; + $ml = 1; + } + $ct_id = "${ct}_id"; + + # erweiterung um einen freien zeitraum oder einen stichtag + # mit entsprechender altersstrukturliste (s.a. Bug 1842) + # eine neue variable an der oberfläche eingeführt, somit ist + # todate == freier zeitrau und fordate == stichtag + + my ($review_of_aging_list, $todate, $fromdate, $fromwhere, $fordate); + + if ($form->{reporttype} eq 'custom') { # altersstrukturliste + + # explizit rausschmeissen was man für diesen bericht nicht braucht + delete $form->{fromdate}; + delete $form->{todate}; + + # an der oberfläche ist das tagesaktuelle datum vorausgewählt + # falls es dennoch per Benutzereingabe gelöscht wird, lieber wieder vorbelegen + # ferner muss für die spätere DB-Abfrage muss todate gesetzt sein. + $form->{fordate} = $form->current_date($myconfig) unless ($form->{fordate}); + $fordate = conv_dateq($form->{fordate}); + $todate = $fordate; + + if ($form->{review_of_aging_list}) { # falls die liste leer ist, alles anzeigen + if ($form->{review_of_aging_list} =~ m "-") { # .. periode von bis + my @period = split(/-/, $form->{review_of_aging_list}); # ... von periode bis periode + $review_of_aging_list = " AND $period[0] < (date $fordate) - duedate + AND (date $fordate) - duedate < $period[1]"; + } else { + $form->{review_of_aging_list} =~ s/[^0-9]//g; # größer 120 das substitute ist nur für das '>' zeichen + $review_of_aging_list = " AND $form->{review_of_aging_list} < (date $fordate) - duedate"; + } } + } else { # freier zeitraum OHNE review_of_aging_list + $form->{todate} = $form->current_date($myconfig) unless ($form->{todate}); + $todate = conv_dateq($form->{todate}); + $fromdate = conv_dateq($form->{fromdate}); + $fromwhere = ($form->{fromdate} ne "") ? " AND (transdate >= (date $fromdate)) " : ""; + } + my $where = " 1 = 1 "; + my ($name, $null); + + if ($form->{$ct_id}) { + $where .= qq| AND (ct.id = | . conv_i($form->{$ct_id}) . qq|)|; + } elsif ($form->{ $form->{ct} }) { + $where .= qq| AND (ct.name ILIKE | . $dbh->quote('%' . $form->{$ct} . '%') . qq|)|; } my $dpt_join; + my $where_dpt; if ($form->{department}) { - ($null, $department_id) = split /--/, $form->{department}; - $dpt_join = qq| - JOIN department d ON (a.department_id = d.id) - |; - - $where .= qq| AND a.department_id = $department_id|; - } + 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 $q_details = qq| + + 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, 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 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); # select outstanding vendors or customers, depends on $ct - my $query = qq|SELECT DISTINCT ct.id, ct.name - FROM $form->{ct} ct, $form->{arap} a - $dpt_join - WHERE $where - AND a.$form->{ct}_id = ct.id - AND a.paid != a.amount - AND (a.transdate <= '$form->{todate}') - ORDER BY ct.name|; - - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror; - - my $buysell = ($form->{arap} eq 'ar') ? 'buy' : 'sell'; - + my $query = + qq|SELECT DISTINCT ct.id, ct.name + FROM $ct ct, $arap a + $dpt_join + WHERE $where + AND (a.${ct_id} = ct.id) + AND ((a.paid != a.amount) OR ((a.datepaid > $todate) AND (datepaid is NOT NULL))) + AND (a.transdate <= $todate $fromwhere) + ORDER BY ct.name|; + + my $sth = prepare_execute_query($form, $dbh, $query); + + $form->{AG} = []; # for each company that has some stuff outstanding while (my ($id) = $sth->fetchrow_array) { + do_statement($form, $sth_details, $q_details, $id); - $query = qq| - --- between 0-30 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", - (amount - paid) as "c0", 0.00 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 - AND $form->{ct}.id = $id - AND ( - transdate <= (date '$form->{todate}' - interval '0 days') - AND transdate >= (date '$form->{todate}' - interval '30 days') - ) - - UNION - --- between 31-60 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", - 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 - AND $form->{ct}.id = $id - AND ( - 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", - 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} - WHERE paid != amount - AND $form->{arap}.$form->{ct}_id = $form->{ct}.id - AND $form->{ct}.id = $id - AND ( - 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", - 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} - WHERE paid != amount - AND $form->{arap}.$form->{ct}_id = $form->{ct}.id - AND $form->{ct}.id = $id - AND transdate < (date '$form->{todate}' - interval '90 days') - - ORDER BY - - ctid, transdate, invnumber - - |; - - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror; - - while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { - $ref->{module} = ($ref->{invoice}) ? $invoice : $form->{arap}; + 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; } - $sth->finish; + $sth_details->finish; } @@ -1951,60 +1309,14 @@ sub get_customer { # connect to database my $dbh = $form->dbconnect($myconfig); - my $query = qq|SELECT ct.name, ct.email, ct.cc, ct.bcc - FROM $form->{ct} ct - WHERE ct.id = $form->{"$form->{ct}_id"}|; - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror; + my $ct = $form->{ct} eq "customer" ? "customer" : "vendor"; + my $query = + qq|SELECT ct.name, ct.email, ct.cc, ct.bcc + FROM $ct ct + WHERE ct.id = ?|; ($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(); - - 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|; - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror; - - my $ref = (); - 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, - sum(t.rate) AS rate - FROM gifi g, chart c, tax t - WHERE g.accno = c.gifi_accno - AND c.id = t.chart_id - AND c.link LIKE '%CT_tax%' - GROUP BY g.accno, g.description - ORDER BY accno|; - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror; - - while ($ref = $sth->fetchrow_hashref(NAME_lc)) { - push @{ $form->{gifi_taxaccounts} }, $ref; - } - $sth->finish; - + selectrow_query($form, $dbh, $query, $form->{"${ct}_id"}); $dbh->disconnect; $main::lxdebug->leave_sub(); @@ -2024,23 +1336,15 @@ sub tax_report { my $where = "1 = 1"; if ($department_id) { - $where .= qq| - AND a.department_id = $department_id - |; + $where .= qq| AND (a.department_id = | . conv_i($department_id, 'NULL') . qq|) |; } my ($accno, $rate); if ($form->{accno}) { - if ($form->{accno} =~ /^gifi_/) { - ($null, $accno) = split /_/, $form->{accno}; - $rate = $form->{"$form->{accno}_rate"}; - $accno = qq| AND ch.gifi_accno = '$accno'|; - } else { - $accno = $form->{accno}; - $rate = $form->{"$form->{accno}_rate"}; - $accno = qq| AND ch.accno = '$accno'|; - } + $accno = $form->{accno}; + $rate = $form->{"$form->{accno}_rate"}; + $accno = qq| AND (ch.accno = | . $dbh->quote($accno) . qq|)|; } $rate *= 1; @@ -2049,113 +1353,104 @@ sub tax_report { if ($form->{db} eq 'ar') { $table = "customer"; $ARAP = "AR"; - } - if ($form->{db} eq 'ap') { + } else { $table = "vendor"; $ARAP = "AP"; } + my $arap = lc($ARAP); + my $transdate = "a.transdate"; if ($form->{method} eq 'cash') { $transdate = "a.datepaid"; - my $todate = - ($form->{todate}) ? $form->{todate} : $form->current_date($myconfig); + my $todate = conv_dateq($form->{todate} ? $form->{todate} : $form->current_date($myconfig)); $where .= qq| - AND ac.trans_id IN - ( - SELECT trans_id - FROM acc_trans - JOIN chart ON (chart_id = id) - WHERE link LIKE '%${ARAP}_paid%' - AND transdate <= '$todate' - ) - |; + AND ac.trans_id IN + ( + SELECT trans_id + FROM acc_trans a + JOIN chart c ON (a.chart_id = c.id) + WHERE (link LIKE '%${ARAP}_paid%') + AND (transdate <= $todate) + ) + |; } # if there are any dates construct a where - if ($form->{fromdate} || $form->{todate}) { - if ($form->{fromdate}) { - $where .= " AND $transdate >= '$form->{fromdate}'"; - } - if ($form->{todate}) { - $where .= " AND $transdate <= '$form->{todate}'"; - } - } + $where .= " AND ($transdate >= " . conv_dateq($form->{fromdate}) . ") " if ($form->{fromdate}); + $where .= " AND ($transdate <= " . conv_dateq($form->{todate}) . ") " if ($form->{todate}); my $ml = ($form->{db} eq 'ar') ? 1 : -1; my $sortorder = join ', ', $form->sort_columns(qw(transdate invnumber name)); - $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 - FROM acc_trans ac - JOIN $form->{db} a ON (a.id = ac.trans_id) - JOIN chart ch ON (ch.id = ac.chart_id) - JOIN $table n ON (n.id = a.${table}_id) - WHERE $where - $accno - AND a.invoice = '0' - UNION - SELECT a.id, '1' AS invoice, $transdate AS transdate, - a.invnumber, n.name, i.sellprice * i.qty AS netamount, - i.sellprice * i.qty * $rate * $ml AS tax - FROM acc_trans ac - JOIN $form->{db} a ON (a.id = ac.trans_id) - JOIN chart ch ON (ch.id = ac.chart_id) - JOIN $table n ON (n.id = a.${table}_id) - JOIN ${table}tax t ON (t.${table}_id = n.id) - JOIN invoice i ON (i.trans_id = a.id) - JOIN partstax p ON (p.parts_id = i.parts_id) - WHERE $where - $accno - AND a.invoice = '1' - ORDER by $sortorder|; - - if ($form->{report} =~ /nontaxable/) { - + $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, + ac.amount * $ml AS tax + FROM acc_trans ac + JOIN ${arap} a ON (a.id = ac.trans_id) + JOIN chart ch ON (ch.id = ac.chart_id) + JOIN $table n ON (n.id = a.${table}_id) + WHERE + $where + $accno + AND (a.invoice = '0') + + UNION + + SELECT a.id, '1' AS invoice, $transdate AS transdate, a.invnumber, n.name, i.sellprice * i.qty AS netamount, + i.sellprice * i.qty * $rate * $ml AS tax + FROM acc_trans ac + JOIN ${arap} a ON (a.id = ac.trans_id) + JOIN chart ch ON (ch.id = ac.chart_id) + JOIN $table n ON (n.id = a.${table}_id) + JOIN ${table}tax t ON (t.${table}_id = n.id) + JOIN invoice i ON (i.trans_id = a.id) + JOIN partstax p ON (p.parts_id = i.parts_id) + WHERE + $where + $accno + AND (a.invoice = '1') + ORDER BY $sortorder|; + } else { # only gather up non-taxable transactions - $query = qq|SELECT a.id, '0' AS invoice, $transdate AS transdate, - a.invnumber, n.name, a.netamount - FROM acc_trans ac - JOIN $form->{db} a ON (a.id = ac.trans_id) - JOIN $table n ON (n.id = a.${table}_id) - WHERE $where - AND a.invoice = '0' - AND a.netamount = a.amount - UNION - SELECT a.id, '1' AS invoice, $transdate AS transdate, - a.invnumber, n.name, i.sellprice * i.qty AS netamount - FROM acc_trans ac - JOIN $form->{db} a ON (a.id = ac.trans_id) - JOIN $table n ON (n.id = a.${table}_id) - JOIN invoice i ON (i.trans_id = a.id) - WHERE $where - AND a.invoice = '1' - AND ( - a.${table}_id NOT IN ( - SELECT ${table}_id FROM ${table}tax t (${table}_id) - ) OR - i.parts_id NOT IN ( - SELECT parts_id FROM partstax p (parts_id) - ) - ) - GROUP BY a.id, a.invnumber, $transdate, n.name, i.sellprice, i.qty - ORDER by $sortorder|; - } - - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); + $query = + qq|SELECT a.id, '0' AS invoice, $transdate AS transdate, a.invnumber, n.name, a.netamount + FROM acc_trans ac + JOIN ${arap} a ON (a.id = ac.trans_id) + JOIN $table n ON (n.id = a.${table}_id) + WHERE + $where + AND (a.invoice = '0') + AND (a.netamount = a.amount) + + UNION + + SELECT a.id, '1' AS invoice, $transdate AS transdate, a.invnumber, n.name, i.sellprice * i.qty AS netamount + FROM acc_trans ac + JOIN ${arap} a ON (a.id = ac.trans_id) + JOIN $table n ON (n.id = a.${table}_id) + JOIN invoice i ON (i.trans_id = a.id) + WHERE + $where + AND (a.invoice = '1') + AND ( + a.${table}_id NOT IN (SELECT ${table}_id FROM ${table}tax t (${table}_id)) + OR + i.parts_id NOT IN (SELECT parts_id FROM partstax p (parts_id)) + ) + GROUP BY a.id, a.invnumber, $transdate, n.name, i.sellprice, i.qty + ORDER by $sortorder|; + } + + $form->{TR} = selectall_hashref_query($form, $dbh, $query); - while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { - push @{ $form->{TR} }, $ref; - } - - $sth->finish; $dbh->disconnect; $main::lxdebug->leave_sub(); @@ -2169,20 +1464,15 @@ sub paymentaccounts { # connect to database, turn AutoCommit off my $dbh = $form->dbconnect_noauto($myconfig); - my $ARAP = uc $form->{db}; + my $ARAP = $form->{db} eq "ar" ? "AR" : "AP"; # 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; - } + my $query = + qq|SELECT accno, description + FROM chart + WHERE link LIKE '%${ARAP}_paid%'|; + $form->{PR} = selectall_hashref_query($form, $dbh, $query); - $sth->finish; $dbh->disconnect; $main::lxdebug->leave_sub(); @@ -2197,12 +1487,15 @@ sub payments { my $dbh = $form->dbconnect_noauto($myconfig); my $ml = 1; + my $arap; + my $table; if ($form->{db} eq 'ar') { $table = 'customer'; - $ml = -1; - } - if ($form->{db} eq 'ap') { + $ml = -1; + $arap = 'ar'; + } else { $table = 'vendor'; + $arap = 'ap'; } my ($query, $sth); @@ -2210,20 +1503,15 @@ sub payments { my $where; if ($form->{department_id}) { - $dpt_join = qq| - JOIN dpt_trans t ON (t.trans_id = ac.trans_id) - |; - - $where = qq| - AND t.department_id = $form->{department_id} - |; + $dpt_join = qq| JOIN dpt_trans t ON (t.trans_id = ac.trans_id) |; + $where = qq| AND (t.department_id = | . conv_i($form->{department_id}, 'NULL') . qq|) |; } if ($form->{fromdate}) { - $where .= " AND ac.transdate >= '$form->{fromdate}'"; + $where .= " AND (ac.transdate >= " . $dbh->quote($form->{fromdate}) . ") "; } if ($form->{todate}) { - $where .= " AND ac.transdate <= '$form->{todate}'"; + $where .= " AND (ac.transdate <= " . $dbh->quote($form->{todate}) . ") "; } if (!$form->{fx_transaction}) { $where .= " AND ac.fx_transaction = '0'"; @@ -2232,67 +1520,93 @@ sub payments { my $invnumber; my $reference; if ($form->{reference}) { - $reference = $form->like(lc $form->{reference}); - $invnumber = " AND lower(a.invnumber) LIKE '$reference'"; - $reference = " AND lower(g.reference) LIKE '$reference'"; + $reference = $dbh->quote('%' . $form->{reference} . '%'); + $invnumber = " AND (a.invnumber LIKE $reference)"; + $reference = " AND (g.reference LIKE $reference)"; } if ($form->{source}) { - my $source = $form->like(lc $form->{source}); - $where .= " AND lower(ac.source) LIKE '$source'"; + $where .= " AND (ac.source ILIKE " . $dbh->quote('%' . $form->{source} . '%') . ") "; } if ($form->{memo}) { - my $memo = $form->like(lc $form->{memo}); - $where .= " AND lower(ac.memo) LIKE '$memo'"; - } - - my $sortorder = join ', ', - $form->sort_columns(qw(name invnumber ordnumber transdate source)); + $where .= " AND (ac.memo ILIKE " . $dbh->quote('%' . $form->{memo} . '%') . ") "; + } + + my %sort_columns = ( + 'transdate' => [ qw(transdate lower_invnumber lower_name) ], + 'invnumber' => [ qw(lower_invnumber lower_name transdate) ], + 'name' => [ qw(lower_name transdate) ], + 'source' => [ qw(lower_source) ], + 'memo' => [ qw(lower_memo) ], + ); + my %lowered_columns = ( + 'invnumber' => { 'gl' => 'g.reference', 'arap' => 'a.invnumber', }, + 'memo' => { 'gl' => 'ac.memo', 'arap' => 'ac.memo', }, + 'source' => { 'gl' => 'ac.source', 'arap' => 'ac.source', }, + 'name' => { 'gl' => 'g.description', 'arap' => 'c.name', }, + ); + + my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; + my $sortkey = $sort_columns{$form->{sort}} ? $form->{sort} : 'transdate'; + my $sortorder = join ', ', map { "$_ $sortdir" } @{ $sort_columns{$sortkey} }; + + + my %columns_for_sorting = ( 'gl' => '', 'arap' => '', ); + foreach my $spec (@{ $sort_columns{$sortkey} }) { + next if ($spec !~ m/^lower_(.*)$/); + + my $column = $1; + map { $columns_for_sorting{$_} .= sprintf(', lower(%s) AS lower_%s', $lowered_columns{$column}->{$_}, $column) } qw(gl arap); + } + + $query = qq|SELECT id, accno, description FROM chart WHERE accno = ?|; + $sth = prepare_query($form, $dbh, $query); + + my $q_details = + qq|SELECT c.name, a.invnumber, a.ordnumber, + ac.transdate, ac.amount * $ml AS paid, ac.source, + a.invoice, a.id, ac.memo, '${arap}' AS module + $columns_for_sorting{arap} + FROM acc_trans ac + JOIN $arap a ON (ac.trans_id = a.id) + JOIN $table c ON (c.id = a.${table}_id) + $dpt_join + WHERE (ac.chart_id = ?) + $where + $invnumber + + UNION + + SELECT g.description, g.reference, NULL AS ordnumber, + ac.transdate, ac.amount * $ml AS paid, ac.source, + '0' as invoice, g.id, ac.memo, 'gl' AS module + $columns_for_sorting{gl} + FROM acc_trans ac + JOIN gl g ON (g.id = ac.trans_id) + $dpt_join + WHERE (ac.chart_id = ?) + $where + $reference + AND (ac.amount * $ml) > 0 + + ORDER BY $sortorder|; + my $sth_details = prepare_query($form, $dbh, $q_details); + + $form->{PR} = []; # cycle through each id foreach my $accno (split(/ /, $form->{paymentaccounts})) { + do_statement($form, $sth, $query, $accno); + my $ref = $sth->fetchrow_hashref(); + push(@{ $form->{PR} }, $ref); + $sth->finish(); - $query = qq|SELECT c.id, c.accno, c.description - FROM chart c - WHERE c.accno = '$accno'|; - $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); + $form->{ $ref->{id} } = [] unless ($form->{ $ref->{id} }); - my $ref = $sth->fetchrow_hashref(NAME_lc); - 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 - FROM acc_trans ac - JOIN $form->{db} a ON (ac.trans_id = a.id) - JOIN $table c ON (c.id = a.${table}_id) - $dpt_join - 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, - '0' as invoice, g.id, ac.memo, 'gl' AS module - FROM acc_trans ac - JOIN gl g ON (g.id = ac.trans_id) - $dpt_join - WHERE ac.chart_id = $ref->{id} - $where - $reference - AND (ac.amount * $ml) > 0 - ORDER BY $sortorder|; - - $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); - - while (my $pr = $sth->fetchrow_hashref(NAME_lc)) { - push @{ $form->{ $ref->{id} } }, $pr; + do_statement($form, $sth_details, $q_details, $ref->{id}, $ref->{id}); + while (my $pr = $sth_details->fetchrow_hashref()) { + push(@{ $form->{ $ref->{id} } }, $pr); } - $sth->finish; - + $sth_details->finish(); } $dbh->disconnect; @@ -2309,16 +1623,16 @@ sub bwa { my $dbh = $form->dbconnect($myconfig); my $last_period = 0; - my $category = "pos_bwa"; + my $category; 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, "pos_bwa"); # if there are any compare dates + my $year; if ($form->{fromdate} || $form->{todate}) { $last_period = 1; if ($form->{fromdate}) { @@ -2328,26 +1642,20 @@ sub bwa { $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); + 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 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; - foreach $kosten (@gesamtkosten) { - $form->{$kosten}{$key} *= -1; - } - - $form->{4}{$key} *= -1; foreach $category (@categories) { @@ -2355,14 +1663,17 @@ sub bwa { $form->{"$key$category"} = $form->format_amount($myconfig, $form->round_amount($form->{$category}{$key}, 2 - ), $form->{decimalplaces}, '0'); + ), + $form->{decimalplaces}, + '0'); } } - foreach $item (@gesamtleistung) { + foreach my $item (@gesamtleistung) { $form->{ "$key" . "gesamtleistung" } += $form->{$item}{$key}; } - foreach $item (@gesamtkosten) { - $form->{$item}{$key} *= -1; + $form->{ "$key" . "gesamtleistung" } -= $form->{2}{$key}; + + foreach my $item (@gesamtkosten) { $form->{ "$key" . "gesamtkosten" } += $form->{$item}{$key}; } $form->{ "$key" . "rohertrag" } = @@ -2373,15 +1684,15 @@ sub bwa { $form->{ "$key" . "betriebrohertrag" } - $form->{ "$key" . "gesamtkosten" }; $form->{ "$key" . "neutraleraufwand" } = - $form->{30}{$key} + $form->{31}{$key}; - $form->{ "$key" . "neutralertrag" } = + $form->{19}{$key} + $form->{30}{$key} + $form->{31}{$key}; + $form->{ "$key" . "neutralerertrag" } = $form->{32}{$key} + $form->{33}{$key} + $form->{34}{$key}; $form->{ "$key" . "ergebnisvorsteuern" } = $form->{ "$key" . "betriebsergebnis" } - - ($form->{ "$key" . "neutraleraufwand" } + - $form->{ "$key" . "neutralertrag" }); + $form->{ "$key" . "neutraleraufwand" } + + $form->{ "$key" . "neutralerertrag" }; $form->{ "$key" . "ergebnis" } = - $form->{ "$key" . "ergebnisvorsteuern" } + $form->{35}{$key}; + $form->{ "$key" . "ergebnisvorsteuern" } - $form->{35}{$key}; if ($form->{ "$key" . "gesamtleistung" } > 0) { foreach $category (@categories) { @@ -2394,10 +1705,12 @@ sub bwa { $form->{ "$key" . "gesamtleistung" } * 100 ), $form->{decimalplaces} - ), $form->{decimalplaces}, '0'); + ), + $form->{decimalplaces}, + '0'); } } - foreach $item (@ergebnisse) { + foreach my $item (@ergebnisse) { $form->{ "$key" . "gl" . "$item" } = $form->format_amount($myconfig, $form->round_amount( @@ -2405,7 +1718,9 @@ sub bwa { $form->{ "$key" . "gesamtleistung" } * 100 ), $form->{decimalplaces} - ), $form->{decimalplaces}, '0'); + ), + $form->{decimalplaces}, + '0'); } } @@ -2419,10 +1734,12 @@ sub bwa { $form->{ "$key" . "gesamtkosten" } * 100 ), $form->{decimalplaces} - ), $form->{decimalplaces}, '0'); + ), + $form->{decimalplaces}, + '0'); } } - foreach $item (@ergebnisse) { + foreach my $item (@ergebnisse) { $form->{ "$key" . "gk" . "$item" } = $form->format_amount($myconfig, $form->round_amount( @@ -2430,7 +1747,9 @@ sub bwa { $form->{ "$key" . "gesamtkosten" } * 100 ), $form->{decimalplaces} - ), $form->{decimalplaces}, '0'); + ), + $form->{decimalplaces}, + '0'); } } @@ -2439,14 +1758,16 @@ sub bwa { 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'); + $myconfig, + $form->round_amount( + ($form->{$category}{$key} / $form->{10}{$key} * 100), + $form->{decimalplaces} + ), + $form->{decimalplaces}, + '0'); } } - foreach $item (@ergebnisse) { + foreach my $item (@ergebnisse) { $form->{ "$key" . "pk" . "$item" } = $form->format_amount($myconfig, $form->round_amount( @@ -2454,7 +1775,9 @@ sub bwa { $form->{10}{$key} * 100 ), $form->{decimalplaces} - ), $form->{decimalplaces}, '0'); + ), + $form->{decimalplaces}, + '0'); } } @@ -2463,14 +1786,16 @@ sub bwa { 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'); + $myconfig, + $form->round_amount( + ($form->{$category}{$key} / $form->{4}{$key} * 100), + $form->{decimalplaces} + ), + $form->{decimalplaces}, + '0'); } } - foreach $item (@ergebnisse) { + foreach my $item (@ergebnisse) { $form->{ "$key" . "auf" . "$item" } = $form->format_amount($myconfig, $form->round_amount( @@ -2478,16 +1803,20 @@ sub bwa { $form->{4}{$key} * 100 ), $form->{decimalplaces} - ), $form->{decimalplaces}, '0'); + ), + $form->{decimalplaces}, + '0'); } } - foreach $item (@ergebnisse) { + foreach my $item (@ergebnisse) { $form->{ "$key" . "$item" } = $form->format_amount($myconfig, - $form->round_amount($form->{ "$key" . "$item" }, - $form->{decimalplaces} - ), $form->{decimalplaces}, '0'); + $form->round_amount($form->{ "$key" . "$item" }, + $form->{decimalplaces} + ), + $form->{decimalplaces}, + '0'); } } @@ -2505,47 +1834,45 @@ sub ustva { my $dbh = $form->dbconnect($myconfig); 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); + 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) { + 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, $category); + &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"}; + # } # } # # } - + # # Berechnung der USTVA Formularfelder # @@ -2553,8 +1880,9 @@ sub ustva { $form->{"86r"} = $form->{"861"}; $form->{"97r"} = $form->{"971"}; $form->{"93r"} = $form->{"931"}; + #$form->{"96"} = $form->{"94"} * 0.16; - $form->{"43"} = + $form->{"43"} = $form->{"51r"} + $form->{"86r"} + $form->{"97r"} + $form->{"93r"} + $form->{"96"}; $form->{"45"} = $form->{"43"}; @@ -2563,14 +1891,16 @@ sub ustva { $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'); + $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->format_amount($myconfig, $form->round_amount($form->{$item}, 0), + 0, '0'); } $dbh->disconnect; @@ -2587,7 +1917,6 @@ sub income_statement { my $dbh = $form->dbconnect($myconfig); 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); @@ -2596,36 +1925,28 @@ sub income_statement { $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, $category); + $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(); }