X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FRP.pm;h=b2fd5e0699f273c76ed908342dc8beebdc389c95;hb=51264c4371793e3ac8990a54640f9e9b43e3f306;hp=37b1109b7d8b13cb106f5eea23a9f7c96f4dc389;hpb=49556f01cfe6a395cf5554e1a00dc61d6da0493e;p=kivitendo-erp.git diff --git a/SL/RP.pm b/SL/RP.pm index 37b1109b7..b2fd5e069 100644 --- a/SL/RP.pm +++ b/SL/RP.pm @@ -36,6 +36,7 @@ package RP; use SL::DBUtils; use Data::Dumper; +use SL::DB::Helper::AccountingPeriod qw(get_balance_starting_date); use List::Util qw(sum); # use warnings; @@ -50,19 +51,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 +68,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 +201,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 +259,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 +278,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 +294,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 |; @@ -317,8 +317,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 @@ -338,8 +337,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 @@ -508,12 +506,13 @@ 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 */ @@ -522,13 +521,6 @@ sub get_accounts_g { 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 @@ -539,7 +531,7 @@ sub get_accounts_g { 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 */ @@ -550,7 +542,7 @@ sub get_accounts_g { 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 @@ -561,7 +553,7 @@ sub get_accounts_g { 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 |; @@ -576,7 +568,7 @@ sub get_accounts_g { JOIN parts p ON (ac.parts_id = p.id) JOIN chart c on (p.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 @@ -588,7 +580,7 @@ sub get_accounts_g { JOIN parts p ON (ac.parts_id = p.id) JOIN chart c on (p.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 |; @@ -674,6 +666,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 +678,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 +729,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 +743,11 @@ 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 + $dpt_where + $customer_where $project GROUP BY c.accno, c.category, c.description |; @@ -798,7 +802,7 @@ 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}) { @@ -835,12 +839,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 @@ -859,6 +877,7 @@ sub trial_balance { JOIN chart c ON (p.income_accno_id = c.id) WHERE $invwhere $dpt_where + $customer_where $project GROUP BY c.accno, c.description, c.category @@ -871,6 +890,7 @@ sub trial_balance { JOIN chart c ON (p.expense_accno_id = c.id) WHERE $invwhere $dpt_where + $customer_no_union $project GROUP BY c.accno, c.description, c.category |; @@ -889,6 +909,17 @@ sub trial_balance { } $sth->finish; + if (!$form->{method} ne "cash") { + $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 +928,11 @@ 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 + $dpt_where + $customer_where $project AND (ac.amount < 0) AND (c.accno = ?)) AS debit, @@ -906,41 +940,56 @@ 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 + $dpt_where + $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 + $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_without_arapgl + $dpt_where + $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 + $dpt_where + $customer_where $project AND c.accno = ?) AS last_transaction @@ -960,6 +1009,7 @@ sub trial_balance { JOIN chart c ON (p.expense_accno_id = c.id) WHERE $invwhere $dpt_where + $customer_no_union $project AND c.accno = ?) AS debit, @@ -970,40 +1020,53 @@ sub trial_balance { JOIN chart c ON (p.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 + $dpt_where + $customer_where $project AND c.accno = ?) AS last_transaction |; @@ -1167,10 +1230,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 +1258,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}); @@ -1222,11 +1288,11 @@ sub aging { 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", + (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, (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 +1302,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); @@ -1347,8 +1414,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) ) |;