X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FRP.pm;h=28d01af19c7572ab34c65db403679a1b79a42d35;hb=1b032ef45d886922f1fe347ec234c9b0c8c50efd;hp=b6661b5ec764f37685a0fdcf84345eab67a860e0;hpb=b8fee3fc5f7ae08e3d431c6c2fad4add9a2d88cf;p=kivitendo-erp.git diff --git a/SL/RP.pm b/SL/RP.pm index b6661b5ec..28d01af19 100644 --- a/SL/RP.pm +++ b/SL/RP.pm @@ -25,7 +25,8 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1335, USA. #====================================================================== # # backend code for reports @@ -36,7 +37,10 @@ package RP; use SL::DBUtils; use Data::Dumper; +use SL::DB::Helper::AccountingPeriod qw(get_balance_starting_date); use List::Util qw(sum); +use List::UtilsBy qw(partition_by sort_by); +use SL::DB; # use warnings; use strict; @@ -50,19 +54,11 @@ use strict; # - proper testing for heading charts # - transmission from $form to TMPL realm is not as clear as i'd like -sub get_openbalance_date { - my ($closedto, $target) = map { $::locale->parse_date_to_object(\%::myconfig, $_) } @_; - - return unless $closedto; - - $closedto->subtract(years => 1) while ($target - $closedto)->is_negative; - $closedto->add(days => 1); - return $::locale->format_date(\%::myconfig, $closedto); -} - sub balance_sheet { $main::lxdebug->enter_sub(); + my ($self) = @_; + my $myconfig = \%main::myconfig; my $form = $main::form; my $dbh = $::form->get_standard_dbh; @@ -75,21 +71,18 @@ sub balance_sheet { $form->{period} = $form->{this_period} = conv_dateq($form->{asofdate}); } - # get end of financial year and convert to Date format - my ($closedto) = selectfirst_array_query($form, $dbh, 'SELECT closedto FROM defaults'); - - # get date of last opening balance - my $startdate = get_openbalance_date($closedto, $form->{asofdate}); + # get starting date for calculating balance + $form->{this_startdate} = $self->get_balance_starting_date($form->{asofdate}); - get_accounts($dbh, $last_period, $startdate, $form->{asofdate}, $form, \@categories); + get_accounts($dbh, $last_period, $form->{this_startdate}, $form->{asofdate}, $form, \@categories); # if there are any compare dates if ($form->{compareasofdate}) { $last_period = 1; - $startdate = get_openbalance_date($closedto, $form->{compareasofdate}); + $form->{last_startdate} = $self->get_balance_starting_date($form->{compareasofdate}); - get_accounts($dbh, $last_period, $startdate, $form->{compareasofdate}, $form, \@categories); + get_accounts($dbh, $last_period, $form->{last_startdate} , $form->{compareasofdate}, $form, \@categories); $form->{last_period} = conv_dateq($form->{compareasofdate}); } @@ -211,13 +204,25 @@ sub get_accounts { $sth->finish; + # filter for opening and closing bookings # 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 ( $last_period ) { + # ob/cb-settings for "compared to" balance + if ( $form->{l_ob_compared} ) { + $where .= ' AND ac.ob_transaction is true ' + } elsif ( not $form->{l_cb_compared} ) { + $where .= ' AND ac.cb_transaction is false '; + }; + } else { + # ob/cb-settings for "as of" balance + 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') { @@ -257,8 +262,7 @@ sub get_accounts { ( SELECT trans_id FROM acc_trans a - JOIN chart c ON (a.chart_id = c.id) - WHERE (link LIKE '%AR_paid%') + WHERE (a.chart_link LIKE '%AR_paid%') $subwhere ) $project @@ -277,8 +281,7 @@ sub get_accounts { ( SELECT trans_id FROM acc_trans a - JOIN chart c ON (a.chart_id = c.id) - WHERE (link LIKE '%AP_paid%') + WHERE (a.chart_link LIKE '%AP_paid%') $subwhere ) $project @@ -294,7 +297,7 @@ sub get_accounts { $glwhere $dpt_where $category - AND NOT ((c.link = 'AR') OR (c.link = 'AP')) + AND NOT ((ac.chart_link = 'AR') OR (ac.chart_link = 'AP')) $project GROUP BY c.accno, c.description, c.category |; @@ -308,7 +311,8 @@ sub get_accounts { 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 taxzone_charts t ON (p.buchungsgruppen_id = t.id) + JOIN chart c on (t.income_accno_id = c.id) -- use transdate from subwhere WHERE (c.category = 'I') $subwhere @@ -317,8 +321,7 @@ sub get_accounts { ( SELECT trans_id FROM acc_trans a - JOIN chart c ON (a.chart_id = c.id) - WHERE (link LIKE '%AR_paid%') + WHERE (a.chart_link LIKE '%AR_paid%') $subwhere ) $project @@ -330,7 +333,8 @@ sub get_accounts { 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 taxzone_charts t ON (p.buchungsgruppen_id = t.id) + JOIN chart c on (t.expense_accno_id = c.id) WHERE (c.category = 'E') $subwhere $dpt_where @@ -338,8 +342,7 @@ sub get_accounts { ( SELECT trans_id FROM acc_trans a - JOIN chart c ON (a.chart_id = c.id) - WHERE link LIKE '%AP_paid%' + WHERE a.chart_link LIKE '%AP_paid%' $subwhere ) $project @@ -373,7 +376,8 @@ sub get_accounts { 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 taxzone_charts t ON (p.buchungsgruppen_id = t.id) + JOIN chart c on (t.income_accno_id = c.id) -- use transdate from subwhere WHERE (c.category = 'I') $subwhere @@ -387,7 +391,8 @@ sub get_accounts { 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 taxzone_charts t ON (p.buchungsgruppen_id = t.id) + JOIN chart c on (t.expense_accno_id = c.id) WHERE (c.category = 'E') $subwhere $dpt_where @@ -475,6 +480,9 @@ sub get_accounts_g { $inwhere = " AND (acc.transdate >= $fromdate)"; } else { $where .= " AND (ac.transdate >= $fromdate)"; + # hotfix for projectfilter in guv and bwa + # fromdate is otherwise ignored if project is selected + $prwhere = " AND (a.transdate >= $fromdate)"; } } @@ -508,89 +516,85 @@ sub get_accounts_g { if ($form->{method} eq 'cash') { $query = qq| - SELECT SUM( ac.amount * CASE WHEN COALESCE((SELECT amount FROM ar WHERE id = ac.trans_id), 0) != 0 THEN + SELECT SUM( ac.amount * CASE WHEN COALESCE((SELECT amount FROM ar a WHERE id = ac.trans_id $dpt_where), 0) != 0 THEN /* ar amount is not zero, so we can divide by amount */ (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) + WHERE 1=1 $inwhere + AND acc.trans_id = ac.trans_id + AND acc.chart_link LIKE '%AR_paid%') / (SELECT amount FROM ar WHERE id = ac.trans_id) ELSE 0 /* ar amount is zero, or we are checking with a non-ar-transaction, so we return 0 in both cases as multiplicator of ac.amount */ END - ) AS amount, c.$category + ) AS amount, c.$category, c.accno, c.description 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 + GROUP BY c.$category, c.accno, c.description /* - SELECT SUM(ac.amount * chart_category_to_sgn(c.category)) AS amount, c.$category + SELECT SUM(ac.amount * chart_category_to_sgn(c.category)) AS amount, c.$category, c.accno, c.description FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) JOIN ar a ON (a.id = ac.trans_id) 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) + AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a WHERE (a.chart_link LIKE '%AR_paid%') $subwhere) $project - GROUP BY c.$category + GROUP BY c.$category, c.accno, c.description */ UNION - SELECT SUM(ac.amount * chart_category_to_sgn(c.category)) AS amount, c.$category + SELECT SUM(ac.amount * chart_category_to_sgn(c.category)) AS amount, c.$category, c.accno, c.description FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) JOIN ap a ON (a.id = ac.trans_id) 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) + AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a WHERE (a.chart_link LIKE '%AP_paid%') $subwhere) $project - GROUP BY c.$category + GROUP BY c.$category, c.accno, c.description UNION - SELECT SUM(ac.amount * chart_category_to_sgn(c.category)) AS amount, c.$category + SELECT SUM(ac.amount * chart_category_to_sgn(c.category)) AS amount, c.$category, c.accno, c.description FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) JOIN gl a ON (a.id = ac.trans_id) WHERE $where $dpt_where $glwhere - AND NOT ((c.link = 'AR') OR (c.link = 'AP')) + AND NOT ((ac.chart_link = 'AR') OR (ac.chart_link = 'AP')) $project - GROUP BY c.$category + GROUP BY c.$category, c.accno, c.description |; if ($form->{project_id}) { $query .= qq| UNION - SELECT SUM(ac.sellprice * ac.qty * chart_category_to_sgn(c.category)) AS amount, c.$category + SELECT SUM(ac.sellprice * ac.qty * chart_category_to_sgn(c.category)) AS amount, c.$category, c.accno, c.description 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 taxzone_charts t ON (p.buchungsgruppen_id = t.id) + JOIN chart c on (t.income_accno_id = c.id) 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) + AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a WHERE (a.chart_link LIKE '%AR_paid%') $subwhere) $project - GROUP BY c.$category + GROUP BY c.$category, c.accno, c.description UNION - SELECT SUM(ac.sellprice * chart_category_to_sgn(c.category)) AS amount, c.$category + SELECT SUM(ac.sellprice * chart_category_to_sgn(c.category)) AS amount, c.$category, c.accno, c.description 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 taxzone_charts t ON (p.buchungsgruppen_id = t.id) + JOIN chart c on (t.expense_accno_id = c.id) 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) + AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a WHERE (a.chart_link LIKE '%AP_paid%') $subwhere) $project - GROUP BY c.$category + GROUP BY c.$category, c.accno, c.description |; } @@ -603,41 +607,43 @@ sub get_accounts_g { } $query = qq| - SELECT sum(ac.amount * chart_category_to_sgn(c.category)) AS amount, c.$category + SELECT sum(ac.amount * chart_category_to_sgn(c.category)) AS amount, c.$category, c.accno, c.description FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) WHERE $where $dpt_where_without_arapgl $project - GROUP BY c.$category |; + GROUP BY c.$category, c.accno, c.description |; if ($form->{project_id}) { $query .= qq| UNION - SELECT SUM(ac.sellprice * ac.qty * chart_category_to_sgn(c.category)) AS amount, c.$category + SELECT SUM(ac.sellprice * ac.qty * chart_category_to_sgn(c.category)) AS amount, c.$category, c.accno, c.description 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 taxzone_charts t ON (p.buchungsgruppen_id = t.id) + JOIN chart c on (t.income_accno_id = c.id) WHERE (c.category = 'I') $prwhere $dpt_where $project - GROUP BY c.$category + GROUP BY c.$category, c.accno, c.description UNION - SELECT SUM(ac.sellprice * ac.qty * chart_category_to_sgn(c.category)) AS amount, c.$category + SELECT SUM(ac.sellprice * ac.qty * chart_category_to_sgn(c.category)) AS amount, c.$category, c.accno, c.description 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 taxzone_charts t ON (p.buchungsgruppen_id = t.id) + JOIN chart c on (t.expense_accno_id = c.id) WHERE (c.category = 'E') $prwhere $dpt_where $project - GROUP BY c.$category |; + GROUP BY c.$category, c.accno, c.description |; } } @@ -645,15 +651,27 @@ sub get_accounts_g { my $accno; my $ref; + # store information for chart list in $form->{charts} foreach my $ref (selectall_hashref_query($form, $dbh, $query)) { + unless ( defined $form->{charts}->{$ref->{accno}} ) { + # a chart may appear several times in the resulting hashref, init it the first time + $form->{charts}->{$ref->{accno}} = { amount => 0, + "$category" => $ref->{"$category"}, + accno => $ref->{accno}, + description => $ref->{description}, + }; + } if ($category eq "pos_bwa") { if ($last_period) { $form->{ $ref->{$category} }{kumm} += $ref->{amount}; } else { $form->{ $ref->{$category} }{jetzt} += $ref->{amount}; + # only increase chart amount for current period, not last_period + $form->{charts}->{$ref->{accno}}->{amount} += $ref->{amount}, } } else { $form->{ $ref->{$category} } += $ref->{amount}; + $form->{charts}->{$ref->{accno}}->{amount} += $ref->{amount}; # no last_period for eur } } @@ -665,7 +683,7 @@ sub trial_balance { my ($self, $myconfig, $form, %options) = @_; - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; my ($query, $sth, $ref); my %balance = (); @@ -674,6 +692,7 @@ sub trial_balance { my @headingaccounts = (); my $dpt_where; my $dpt_where_without_arapgl; + my ($customer_where, $customer_join, $customer_no_union); my $project; my $where = "1 = 1"; @@ -685,6 +704,11 @@ sub trial_balance { (SELECT department_id FROM gl WHERE gl.id=ac.trans_id), (SELECT department_id FROM ap WHERE ap.id=ac.trans_id)) = | . conv_i($department_id); } + if ($form->{customer_id}) { + $customer_join = qq| JOIN ar a ON (ac.trans_id = a.id) |; + $customer_where = qq| AND (a.customer_id = | . conv_i($form->{customer_id}, 'NULL') . qq|) |; + $customer_no_union = qq| AND 1=0 |; + } # project_id only applies to getting transactions # it has nothing to do with a trial balance @@ -731,8 +755,11 @@ sub trial_balance { my $min_max = $prefix eq 'from' ? 'min' : 'max'; $query = qq|SELECT ${min_max}(transdate) FROM acc_trans ac + $customer_join WHERE (1 = 1) $dpt_where_without_arapgl + $dpt_where + $customer_where $project|; ($form->{"${prefix}date"}) = selectfirst_array_query($form, $dbh, $query); } @@ -742,8 +769,10 @@ sub trial_balance { 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) + $customer_join WHERE ((select date_trunc('year', ac.transdate::date)) = (select date_trunc('year', ?::date))) AND ac.ob_transaction $dpt_where_without_arapgl + $customer_where $project GROUP BY c.accno, c.category, c.description |; @@ -798,19 +827,21 @@ sub trial_balance { my $glwhere = ''; my $glsumwhere = ''; my $tofrom; - my ($fromdate, $todate); + my ($fromdate, $todate, $fetch_accounts_before_from); if ($form->{fromdate} || $form->{todate}) { if ($form->{fromdate}) { $fromdate = conv_dateq($form->{fromdate}); + my $fiscal_year_startdate = conv_dateq($self->get_balance_starting_date($form->{fromdate})); + # my $date_trunc = "(select date_trunc('year', date $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)) "; + $sumsubwhere .= " AND (ac.transdate >= $fiscal_year_startdate) "; + $saldosubwhere .= " AND (ac.transdate >= $fiscal_year_startdate) "; + $invwhere .= " AND (a.transdate >= $fromdate)"; + $glsaldowhere .= " AND (ac.transdate >= $fiscal_year_startdate) "; $glwhere = " AND (ac.transdate >= $fromdate)"; - $glsumwhere = " AND (ac.transdate >= (select date_trunc('year', date $fromdate))) "; + $glsumwhere = " AND (ac.transdate >= $fiscal_year_startdate) "; } if ($form->{todate}) { $todate = conv_dateq($form->{todate}); @@ -835,12 +866,26 @@ sub trial_balance { $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)"; + + # get all entries before fromdate, which are not yet fetched + # TODO dpt_where_without_arapgl and project - project calculation seems bogus anyway + # TODO use fiscal_year_startdate for the whole trial balance + # anyway, if the last booking is in a deviating fiscal year, this already improves the query + my $fiscal_year_startdate = conv_dateq($self->get_balance_starting_date($form->{fromdate})); + $fetch_accounts_before_from = 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) WHERE 1 = 1 AND (ac.transdate <= $fromdate) + AND (ac.transdate >= $fiscal_year_startdate) + AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL) + AND c.accno NOT IN (SELECT c.accno FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) WHERE 1 = 1 AND (ac.transdate >= $fromdate) AND (ac.transdate <= $todate) + AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL)) + GROUP BY c.accno, c.description, c.category ORDER BY accno|; } $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) + $customer_join WHERE $where $dpt_where_without_arapgl $project @@ -856,9 +901,11 @@ sub trial_balance { 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 taxzone_charts t ON (p.buchungsgruppen_id = t.id) + JOIN chart c ON (t.income_accno_id = c.id) WHERE $invwhere $dpt_where + $customer_where $project GROUP BY c.accno, c.description, c.category @@ -868,9 +915,11 @@ sub trial_balance { 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 taxzone_charts t ON (p.buchungsgruppen_id = t.id) + JOIN chart c ON (t.expense_accno_id = c.id) WHERE $invwhere $dpt_where + $customer_no_union $project GROUP BY c.accno, c.description, c.category |; @@ -889,6 +938,17 @@ sub trial_balance { } $sth->finish; + if ($form->{method} ne "cash") { # better eq 'accrual' + $sth = prepare_execute_query($form, $dbh, $fetch_accounts_before_from); + while ($ref = $sth->fetchrow_hashref("NAME_lc")) { + $trb{ $ref->{accno} }{description} = $ref->{description}; + $trb{ $ref->{accno} }{charttype} = 'A'; + $trb{ $ref->{accno} }{category} = $ref->{category}; + $trb{ $ref->{accno} }{amount} += $ref->{amount}; + } + $sth->finish; + } + # prepare query for each account my ($q_drcr, $drcr, $q_project_drcr, $project_drcr); @@ -897,8 +957,10 @@ sub trial_balance { (SELECT SUM(ac.amount) * -1 FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) + $customer_join WHERE $where $dpt_where_without_arapgl + $customer_where $project AND (ac.amount < 0) AND (c.accno = ?)) AS debit, @@ -906,41 +968,51 @@ sub trial_balance { (SELECT SUM(ac.amount) FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) + $customer_join WHERE $where $dpt_where_without_arapgl + $customer_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) + $customer_join WHERE $saldowhere $dpt_where_without_arapgl + $customer_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) + $customer_join WHERE $sumwhere $dpt_where_without_arapgl + $customer_where $project - AND amount > 0 + AND ac.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) + $customer_join WHERE $sumwhere $dpt_where_without_arapgl + $customer_where $project - AND amount < 0 + AND ac.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) + $customer_join WHERE $where $dpt_where_without_arapgl + $customer_where $project AND c.accno = ?) AS last_transaction @@ -957,9 +1029,11 @@ sub trial_balance { 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) + JOIN taxzone_charts t ON (p.buchungsgruppen_id = t.id) + JOIN chart c ON (t.expense_accno_id = c.id) WHERE $invwhere $dpt_where + $customer_no_union $project AND c.accno = ?) AS debit, @@ -967,43 +1041,56 @@ sub trial_balance { 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) + JOIN taxzone_charts t ON (p.buchungsgruppen_id = t.id) + JOIN chart c ON (t.income_accno_id = c.id) WHERE $invwhere $dpt_where + $customer_where $project AND c.accno = ?) AS credit, (SELECT SUM(ac.amount) FROM acc_trans ac JOIN chart c ON (ac.chart_id = c.id) + $customer_join WHERE $saldowhere $dpt_where_without_arapgl + $dpt_where + $customer_where $project AND c.accno = ? AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL)) AS saldo, (SELECT SUM(ac.amount) FROM acc_trans ac JOIN chart c ON (ac.chart_id = c.id) + $customer_join WHERE $sumwhere $dpt_where_without_arapgl + $dpt_where + $customer_where $project - AND amount > 0 + AND ac.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) + $customer_join WHERE $sumwhere + $dpt_where $dpt_where_without_arapgl + $customer_where $project - AND amount < 0 + AND ac.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) + $customer_join WHERE $where $dpt_where_without_arapgl + $customer_where $project AND c.accno = ?) AS last_transaction |; @@ -1012,7 +1099,7 @@ sub trial_balance { } - my ($debit, $credit, $saldo, $soll_saldo, $haben_saldo,$soll_kummuliert, $haben_kummuliert, $last_transaction); + my ($debit, $credit, $saldo, $soll_saldo, $haben_saldo, $soll_kumuliert, $haben_kumuliert, $last_transaction); foreach my $accno (sort keys %trb) { $ref = {}; @@ -1104,8 +1191,6 @@ sub trial_balance { } - $dbh->disconnect; - # debits and credits for headings foreach my $accno (@headingaccounts) { foreach $ref (@{ $form->{TB} }) { @@ -1123,26 +1208,13 @@ 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(); my ($self, $myconfig, $form) = @_; # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; my ($invoice, $arap, $buysell, $ct, $ct_id, $ml); @@ -1167,10 +1239,12 @@ sub aging { # mit entsprechender altersstrukturliste (s.a. Bug 1842) # eine neue variable an der oberfläche eingeführt, somit ist # todate == freier zeitrau und fordate == stichtag + # duedate_where == nur fällige rechnungen anzeigen - my ($review_of_aging_list, $todate, $fromdate, $fromwhere, $fordate); + my ($review_of_aging_list, $todate, $fromdate, $fromwhere, $fordate, + $duedate_where); - if ($form->{reporttype} eq 'custom') { # altersstrukturliste + if ($form->{reporttype} eq 'custom') { # altersstrukturliste, nur fällige # explizit rausschmeissen was man für diesen bericht nicht braucht delete $form->{fromdate}; @@ -1193,7 +1267,8 @@ sub aging { $review_of_aging_list = " AND $form->{review_of_aging_list} < (date $fordate) - duedate"; } } - } else { # freier zeitraum OHNE review_of_aging_list + $duedate_where = " AND (date $fordate) - duedate >= 0 "; + } else { # freier zeitraum, nur rechnungsdatum und OHNE review_of_aging_list $form->{todate} = $form->current_date($myconfig) unless ($form->{todate}); $todate = conv_dateq($form->{todate}); $fromdate = conv_dateq($form->{fromdate}); @@ -1205,7 +1280,7 @@ sub aging { 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|)|; + $where .= qq| AND (ct.name ILIKE | . $dbh->quote(like($form->{$ct})) . qq|)|; } my $dpt_join; @@ -1221,12 +1296,12 @@ sub aging { 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, + "invnumber", "transdate", "type", + (amount - COALESCE((SELECT sum(amount)*$ml FROM acc_trans WHERE chart_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, datepaid, (amount - paid) as current_open, (SELECT $buysell FROM exchangerate - WHERE (${arap}.curr = exchangerate.curr) + WHERE (${arap}.currency_id = exchangerate.currency_id) AND (exchangerate.transdate = ${arap}.transdate)) AS exchangerate FROM ${arap}, ${ct} WHERE ((paid != amount) OR (datepaid > (date $todate) AND datepaid is not null)) @@ -1236,6 +1311,7 @@ sub aging { AND (${ct}.id = ?) AND (transdate <= (date $todate) $fromwhere ) $review_of_aging_list + $duedate_where ORDER BY ctid, transdate, invnumber |; my $sth_details = prepare_query($form, $dbh, $q_details); @@ -1270,9 +1346,6 @@ sub aging { $sth->finish; - # disconnect - $dbh->disconnect; - $main::lxdebug->leave_sub(); } @@ -1281,8 +1354,7 @@ sub get_customer { my ($self, $myconfig, $form) = @_; - # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; my $ct = $form->{ct} eq "customer" ? "customer" : "vendor"; @@ -1292,7 +1364,6 @@ sub get_customer { WHERE ct.id = ?|; ($form->{ $form->{ct} }, $form->{email}, $form->{cc}, $form->{bcc}) = selectrow_query($form, $dbh, $query, $form->{"${ct}_id"}); - $dbh->disconnect; $main::lxdebug->leave_sub(); } @@ -1302,8 +1373,7 @@ sub tax_report { my ($self, $myconfig, $form) = @_; - # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; my ($null, $department_id) = split /--/, $form->{department}; @@ -1347,8 +1417,7 @@ sub tax_report { ( SELECT trans_id FROM acc_trans a - JOIN chart c ON (a.chart_id = c.id) - WHERE (link LIKE '%${ARAP}_paid%') + WHERE (a.chart_link LIKE '%${ARAP}_paid%') AND (transdate <= $todate) ) |; @@ -1363,9 +1432,7 @@ sub tax_report { my $sortorder = join ', ', $form->sort_columns(qw(transdate invnumber name)); $sortorder = $form->{sort} if ($form->{sort} && grep({ $_ eq $form->{sort} } qw(id transdate invnumber name netamount tax))); - my $query = ''; - if ($form->{report} !~ /nontaxable/) { - $query = + my $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 @@ -1387,47 +1454,14 @@ sub tax_report { 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 ${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); - $dbh->disconnect; - $main::lxdebug->leave_sub(); } @@ -1437,7 +1471,7 @@ sub paymentaccounts { my ($self, $myconfig, $form) = @_; # connect to database, turn AutoCommit off - my $dbh = $form->dbconnect_noauto($myconfig); + my $dbh = SL::DB->client->dbh; my $ARAP = $form->{db} eq "ar" ? "AR" : "AP"; @@ -1448,8 +1482,6 @@ sub paymentaccounts { WHERE link LIKE '%${ARAP}_paid%'|; $form->{PR} = selectall_hashref_query($form, $dbh, $query); - $dbh->disconnect; - $main::lxdebug->leave_sub(); } @@ -1459,7 +1491,7 @@ sub payments { my ($self, $myconfig, $form) = @_; # connect to database, turn AutoCommit off - my $dbh = $form->dbconnect_noauto($myconfig); + my $dbh = SL::DB->client->dbh; my $ml = 1; my $arap; @@ -1493,15 +1525,15 @@ sub payments { my $invnumber; my $reference; if ($form->{reference}) { - $reference = $dbh->quote('%' . $form->{reference} . '%'); + $reference = $dbh->quote(like($form->{reference})); $invnumber = " AND (a.invnumber LIKE $reference)"; $reference = " AND (a.reference LIKE $reference)"; } if ($form->{source}) { - $where .= " AND (ac.source ILIKE " . $dbh->quote('%' . $form->{source} . '%') . ") "; + $where .= " AND (ac.source ILIKE " . $dbh->quote(like($form->{source})) . ") "; } if ($form->{memo}) { - $where .= " AND (ac.memo ILIKE " . $dbh->quote('%' . $form->{memo} . '%') . ") "; + $where .= " AND (ac.memo ILIKE " . $dbh->quote(like($form->{memo})) . ") "; } my %sort_columns = ( @@ -1580,8 +1612,6 @@ sub payments { $sth_details->finish(); } - $dbh->disconnect; - $main::lxdebug->leave_sub(); } @@ -1590,8 +1620,7 @@ sub bwa { my ($self, $myconfig, $form) = @_; - # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; my $last_period = 0; my $category; @@ -1618,6 +1647,15 @@ sub bwa { &get_accounts_g($dbh, $last_period, $kummfromdate, $kummtodate, $form, "pos_bwa"); } + my %charts_by_category = + partition_by { $_->{pos_bwa} } + sort_by { $_->{accno} } + map { $form->{charts}->{$_} } + keys %{ $form->{charts} }; + $form->{"charts_by_category"} = \%charts_by_category; + + $form->{category_names} = AM->get_bwa_categories($myconfig, $form); + my @periods = qw(jetzt kumm); my @gesamtleistung = qw(1 3); my @gesamtkosten = qw (10 11 12 13 14 15 16 17 18 20); @@ -1791,90 +1829,6 @@ sub bwa { } } - $dbh->disconnect; - - $main::lxdebug->leave_sub(); -} - -sub ustva { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # connect to database - my $dbh = $form->dbconnect($myconfig); - - my $last_period = 0; - my @categories_cent = qw(51r 511 86r 861 97r 971 93r 931 - 96 66 43 45 53 62 65 67); - my @categories_euro = qw(48 51 86 91 97 93 94); - $form->{decimalplaces} *= 1; - - foreach my $item (@categories_cent) { - $form->{"$item"} = 0; - } - foreach my $item (@categories_euro) { - $form->{"$item"} = 0; - } - - &get_accounts_g($dbh, $last_period, $form->{fromdate}, $form->{todate}, $form, "pos_ustva"); - - # foreach $item (@categories_cent) { - # if ($form->{$item}{"jetzt"} > 0) { - # $form->{$item} = $form->{$item}{"jetzt"}; - # delete $form->{$item}{"jetzt"}; - # } - # } - # foreach $item (@categories_euro) { - # if ($form->{$item}{"jetzt"} > 0) { - # $form->{$item} = $form->{$item}{"jetzt"}; - # delete $form->{$item}{"jetzt"}; - # } foreach $item (@categories_cent) { - # if ($form->{$item}{"jetzt"} > 0) { - # $form->{$item} = $form->{$item}{"jetzt"}; - # delete $form->{$item}{"jetzt"}; - # } - # } - # foreach $item (@categories_euro) { - # if ($form->{$item}{"jetzt"} > 0) { - # $form->{$item} = $form->{$item}{"jetzt"}; - # delete $form->{$item}{"jetzt"}; - # } - # } - # - # } - - # - # Berechnung der USTVA Formularfelder - # - $form->{"51r"} = $form->{"511"}; - $form->{"86r"} = $form->{"861"}; - $form->{"97r"} = $form->{"971"}; - $form->{"93r"} = $form->{"931"}; - - #$form->{"96"} = $form->{"94"} * 0.16; - $form->{"43"} = - $form->{"51r"} + $form->{"86r"} + $form->{"97r"} + $form->{"93r"} + - $form->{"96"}; - $form->{"45"} = $form->{"43"}; - $form->{"53"} = $form->{"43"}; - $form->{"62"} = $form->{"43"} - $form->{"66"}; - $form->{"65"} = $form->{"43"} - $form->{"66"}; - $form->{"67"} = $form->{"43"} - $form->{"66"}; - - foreach my $item (@categories_cent) { - $form->{$item} = - $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2), - 2, '0'); - } - - foreach my $item (@categories_euro) { - $form->{$item} = - $form->format_amount($myconfig, $form->round_amount($form->{$item}, 0), - 0, '0'); - } - - $dbh->disconnect; $main::lxdebug->leave_sub(); } @@ -1902,23 +1856,131 @@ sub income_statement { $form, "pos_eur"); + # add extra information to form to be used by template + my %charts_by_category = + partition_by { $_->{pos_eur} } + sort_by { $_->{accno} } + map { $form->{charts}->{$_} } + keys %{ $form->{charts} }; + $form->{"charts_by_category"} = \%charts_by_category; + + $form->{"categories_income"} = \@categories_einnahmen; + $form->{"categories_expense"} = \@categories_ausgaben; + + $form->{category_names} = AM->get_eur_categories($myconfig, $form); + + my %eur_amounts; + foreach my $item (@categories_einnahmen) { - $form->{"eur${item}"} = - $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2),2); + $eur_amounts{$item} = $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2),2); $form->{"sumeura"} += $form->{$item}; } foreach my $item (@categories_ausgaben) { - $form->{"eur${item}"} = - $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2),2); + $eur_amounts{$item} = $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2),2); $form->{"sumeurb"} += $form->{$item}; } $form->{"guvsumme"} = $form->{"sumeura"} - $form->{"sumeurb"}; + $form->{eur_amounts} = \%eur_amounts; + foreach my $item (@ergebnisse) { $form->{$item} = $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2),2); } $main::lxdebug->leave_sub(); } + +sub erfolgsrechnung { + $main::lxdebug->enter_sub(); + + my ($self, $myconfig, $form) = @_; + $form->{company} = $::instance_conf->get_company; + $form->{address} = $::instance_conf->get_address; + $form->{fromdate} = DateTime->new(year => 2000, month => 1, day => 1)->to_kivitendo unless $form->{fromdate}; + $form->{todate} = $form->current_date(%{$myconfig}) unless $form->{todate}; + + my %categories = (I => "ERTRAG", E => "AUFWAND"); + my $fromdate = conv_dateq($form->{fromdate}); + my $todate = conv_dateq($form->{todate}); + my $department_id = conv_i((split /--/, $form->{department})[1], 'NULL'); + + $form->{total} = 0; + + foreach my $category ('I', 'E') { + my %category = ( + name => $categories{$category}, + total => 0, + accounts => get_accounts_ch($category) + ); + foreach my $account (@{$category{accounts}}) { + $account->{total} = get_total_ch($department_id, $account->{id}, $fromdate, $todate); + $category{total} += $account->{total}; + $account->{total} = $form->format_amount($myconfig, $form->round_amount($account->{total}, 2), 2); + } + $form->{total} += $category{total}; + $category{total} = $form->format_amount($myconfig, $form->round_amount($category{total}, 2), 2); + push(@{$form->{categories}}, \%category); + } + $form->{total} = $form->format_amount($myconfig, $form->round_amount($form->{total}, 2), 2); + + $main::lxdebug->leave_sub(); + return {}; +} + +sub get_accounts_ch { + $main::lxdebug->enter_sub(); + + my ($category) = @_; + my $inclusion = '' ; + + if ($category eq 'I') { + $inclusion = "AND pos_er = NULL OR pos_er = '1'"; + } elsif ($category eq 'E') { + $inclusion = "AND pos_er = NULL OR pos_er = '6'"; + } else { + $inclusion = ""; + } + + my $query = qq| + SELECT id, accno, description, category + FROM chart + WHERE category = ? $inclusion + ORDER BY accno + |; + my $accounts = _query($query, $category); + + $main::lxdebug->leave_sub(); + return $accounts; +} + +sub get_total_ch { + $main::lxdebug->enter_sub(); + + my ($department_id, $chart_id, $fromdate, $todate) = @_; + my $total = 0; + my $query = qq| + SELECT SUM(amount) + FROM acc_trans + WHERE chart_id = ? + AND transdate >= ? + AND transdate <= ? + |; + if ($department_id) { + $query .= qq| AND COALESCE( + (SELECT department_id FROM ar WHERE ar.id=trans_id), + (SELECT department_id FROM gl WHERE gl.id=trans_id), + (SELECT department_id FROM ap WHERE ap.id=trans_id) + ) = ? |; + $total += _query($query, $chart_id, $fromdate, $todate, $department_id)->[0]->{sum}; + } else { + $total += _query($query, $chart_id, $fromdate, $todate)->[0]->{sum}; + } + + $main::lxdebug->leave_sub(); + return $total; +} + +sub _query {return selectall_hashref_query($::form, $::form->get_standard_dbh, @_);} + 1;