X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FRP.pm;h=b2fd5e0699f273c76ed908342dc8beebdc389c95;hb=51264c4371793e3ac8990a54640f9e9b43e3f306;hp=607eb389e445bf6a04f9ea96fb636b8babfba193;hpb=1f8f0aa0be2133ce5c93b2928cb5847a56b1c1fb;p=kivitendo-erp.git diff --git a/SL/RP.pm b/SL/RP.pm index 607eb389e..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,17 +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, $_) } @_; - - $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; @@ -73,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}); } @@ -176,7 +168,7 @@ sub get_accounts { my $query; my $dpt_where = ''; - my $dpt_join = ''; + my $dpt_where_without_arapgl = ''; my $project = ''; my $where = "1 = 1"; my $glwhere = ""; @@ -209,6 +201,25 @@ sub get_accounts { $sth->finish; + # filter for opening and closing bookings + # if l_ob is selected l_cb is always ignored + 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') { @@ -226,8 +237,7 @@ sub get_accounts { } if ($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|)|; + $dpt_where = qq| AND (a.department_id = | . conv_i($department_id, 'NULL') . qq|)|; } if ($form->{project_id}) { @@ -242,7 +252,6 @@ sub get_accounts { 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 @@ -250,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 @@ -263,7 +271,6 @@ sub get_accounts { 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 @@ -271,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 @@ -284,12 +290,11 @@ sub get_accounts { 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')) + AND NOT ((ac.chart_link = 'AR') OR (ac.chart_link = 'AP')) $project GROUP BY c.accno, c.description, c.category |; @@ -304,7 +309,6 @@ sub get_accounts { 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 @@ -313,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 @@ -327,7 +330,6 @@ sub get_accounts { 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 @@ -335,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 @@ -344,20 +345,19 @@ sub get_accounts { } } else { # if ($form->{method} eq 'cash') - # ich sehe keinen sinn das nochmal explizit ohne conv_i aufzurufen - # bitte prüfen und löschen jan 15.11.2009 - # 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 |; - # } + if ($department_id) { + $dpt_where = qq| AND a.department_id = | . conv_i($department_id); + $dpt_where_without_arapgl = qq| AND COALESCE((SELECT department_id FROM ar WHERE ar.id=ac.trans_id), + (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); + } $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 + $dpt_where_without_arapgl $category $project GROUP BY c.accno, c.description, c.category |; @@ -372,7 +372,6 @@ sub get_accounts { 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 @@ -387,7 +386,6 @@ sub get_accounts { 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 @@ -455,7 +453,7 @@ sub get_accounts_g { my $query; my $dpt_where; - my $dpt_join; + my $dpt_where_without_arapgl; my $project; my $where = "1 = 1"; my $glwhere = ""; @@ -464,6 +462,8 @@ sub get_accounts_g { 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') { @@ -485,8 +485,7 @@ sub get_accounts_g { } if ($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|) |; + $dpt_where = qq| AND (a.department_id = | . conv_i($department_id, 'NULL') . qq|) |; } if ($form->{project_id}) { @@ -507,35 +506,32 @@ sub get_accounts_g { if ($form->{method} eq 'cash') { $query = qq| - SELECT SUM( ac.amount * + 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) - ) AS amount, c.pos_eur + 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 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.pos_eur + 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) + 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 */ @@ -545,9 +541,8 @@ sub get_accounts_g { 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) + 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 @@ -557,9 +552,8 @@ sub get_accounts_g { 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')) + AND NOT ((ac.chart_link = 'AR') OR (ac.chart_link = 'AP')) $project GROUP BY c.$category |; @@ -573,9 +567,8 @@ sub get_accounts_g { 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) + 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 @@ -586,27 +579,27 @@ sub get_accounts_g { 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) + 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 |; } } else { # if ($form->{method} eq 'cash') - # s.o. jan 15.11.2009 -# if ($department_id) { -# ($dpt_join, $dpt_where) = sql_department($department_id); -# } + if ($department_id) { + $dpt_where = qq| AND (a.department_id = | . conv_i($department_id, 'NULL') . qq|) |; + $dpt_where_without_arapgl = qq| AND COALESCE((SELECT department_id FROM ar WHERE ar.id=ac.trans_id), + (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); + } $query = qq| 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 + $dpt_where_without_arapgl $project GROUP BY c.$category |; @@ -619,7 +612,6 @@ sub get_accounts_g { 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 @@ -633,7 +625,6 @@ sub get_accounts_g { 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 @@ -674,15 +665,23 @@ sub trial_balance { my ($null, $department_id) = split /--/, $form->{department}; my @headingaccounts = (); my $dpt_where; - my $dpt_join; + my $dpt_where_without_arapgl; + my ($customer_where, $customer_join, $customer_no_union); my $project; my $where = "1 = 1"; 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 = | . conv_i($department_id, 'NULL') . qq|) |; + $dpt_where = qq| AND (a.department_id = | . conv_i($department_id, 'NULL') . qq|) |; + $dpt_where_without_arapgl = qq| AND COALESCE((SELECT department_id FROM ar WHERE ar.id=ac.trans_id), + (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 @@ -730,9 +729,11 @@ sub trial_balance { my $min_max = $prefix eq 'from' ? 'min' : 'max'; $query = qq|SELECT ${min_max}(transdate) FROM acc_trans ac - $dpt_join + $customer_join WHERE (1 = 1) + $dpt_where_without_arapgl $dpt_where + $customer_where $project|; ($form->{"${prefix}date"}) = selectfirst_array_query($form, $dbh, $query); } @@ -742,9 +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) - $dpt_join + $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 |; @@ -799,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}) { @@ -836,15 +839,28 @@ 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) - $dpt_join + $customer_join WHERE $where - $dpt_where + $dpt_where_without_arapgl $project GROUP BY c.accno, c.description, c.category |; @@ -859,9 +875,9 @@ sub trial_balance { 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 + $customer_where $project GROUP BY c.accno, c.description, c.category @@ -872,9 +888,9 @@ sub trial_balance { 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 + $customer_no_union $project GROUP BY c.accno, c.description, c.category |; @@ -893,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); @@ -901,9 +928,11 @@ sub trial_balance { (SELECT SUM(ac.amount) * -1 FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) - $dpt_join + $customer_join WHERE $where + $dpt_where_without_arapgl $dpt_where + $customer_where $project AND (ac.amount < 0) AND (c.accno = ?)) AS debit, @@ -911,46 +940,56 @@ sub trial_balance { (SELECT SUM(ac.amount) FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) - $dpt_join + $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) - $dpt_join + $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) - $dpt_join + $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) - $dpt_join + $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) - $dpt_join + $customer_join WHERE $where + $dpt_where_without_arapgl $dpt_where + $customer_where $project AND c.accno = ?) AS last_transaction @@ -968,9 +1007,9 @@ sub trial_balance { 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 + $customer_no_union $project AND c.accno = ?) AS debit, @@ -979,47 +1018,55 @@ sub trial_balance { 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 + $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) - $dpt_join + $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) - $dpt_join + $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) - $dpt_join + $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) - $dpt_join + $customer_join WHERE $where + $dpt_where_without_arapgl $dpt_where + $customer_where $project AND c.accno = ?) AS last_transaction |; @@ -1162,6 +1209,8 @@ sub aging { my ($invoice, $arap, $buysell, $ct, $ct_id, $ml); + # falls customer ziehen wir die offene forderungsliste + # anderfalls für die lieferanten die offenen verbindlichkeitne if ($form->{ct} eq "customer") { $invoice = "is"; $arap = "ar"; @@ -1177,12 +1226,45 @@ sub aging { } $ct_id = "${ct}_id"; - $form->{todate} = $form->current_date($myconfig) unless ($form->{todate}); - my $todate = conv_dateq($form->{todate}); - my $fromdate = conv_dateq($form->{fromdate}); - - my $fromwhere = ($form->{fromdate} ne "") ? " AND (transdate >= (date $fromdate)) " : ""; - + # 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 + # duedate_where == nur fällige rechnungen anzeigen + + my ($review_of_aging_list, $todate, $fromdate, $fromwhere, $fordate, + $duedate_where); + + if ($form->{reporttype} eq 'custom') { # altersstrukturliste, nur fällige + + # 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"; + } + } + $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}); + $fromwhere = ($form->{fromdate} ne "") ? " AND (transdate >= (date $fromdate)) " : ""; + } my $where = " 1 = 1 "; my ($name, $null); @@ -1193,42 +1275,34 @@ sub aging { } my $dpt_join; + my $where_dpt; if ($form->{department}) { my ($null, $department_id) = split /--/, $form->{department}; $dpt_join = qq| JOIN department d ON (a.department_id = d.id) |; $where .= qq| AND (a.department_id = | . conv_i($department_id, 'NULL') . qq|)|; + $where_dpt = qq| AND (${arap}.department_id = | . conv_i($department_id, 'NULL') . qq|)|; } - my $review_of_aging_list; - if ($form->{review_of_aging_list}) { - if ($form->{review_of_aging_list} =~ m "-"){ - my @period = split(/-/, $form->{review_of_aging_list}); - $review_of_aging_list = " AND $period[0] < date_part('days', now() - duedate) - AND date_part('days', now() - duedate) < $period[1]"; - } else { - $form->{review_of_aging_list} =~ s/[^0-9]//g; - $review_of_aging_list = " AND $form->{review_of_aging_list} < date_part('days', now() - duedate)"; - } - } - - my $q_details = qq| + 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, + (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)) 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 + $duedate_where ORDER BY ctid, transdate, invnumber |; my $sth_details = prepare_query($form, $dbh, $q_details); @@ -1290,27 +1364,6 @@ sub get_customer { $main::lxdebug->leave_sub(); } -sub get_taxaccounts { - $main::lxdebug->enter_sub(); - - my ($self, $myconfig, $form) = @_; - - # connect to database - my $dbh = $form->dbconnect($myconfig); - - # get tax accounts - my $query = - qq|SELECT c.accno, c.description, t.rate - FROM chart c, tax t - WHERE (c.link LIKE '%CT_tax%') AND (c.id = t.chart_id) - ORDER BY c.accno|; - $form->{taxaccounts} = selectall_hashref_quert($form, $dbh, $query); - - $dbh->disconnect; - - $main::lxdebug->leave_sub(); -} - sub tax_report { $main::lxdebug->enter_sub(); @@ -1361,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) ) |; @@ -1377,9 +1429,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 @@ -1401,42 +1451,11 @@ 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); @@ -1488,12 +1507,10 @@ sub payments { } my ($query, $sth); - my $dpt_join; 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 = | . conv_i($form->{department_id}, 'NULL') . qq|) |; + $where = qq| AND (a.department_id = | . conv_i($form->{department_id}, 'NULL') . qq|) |; } if ($form->{fromdate}) { @@ -1511,7 +1528,7 @@ sub payments { if ($form->{reference}) { $reference = $dbh->quote('%' . $form->{reference} . '%'); $invnumber = " AND (a.invnumber LIKE $reference)"; - $reference = " AND (g.reference LIKE $reference)"; + $reference = " AND (a.reference LIKE $reference)"; } if ($form->{source}) { $where .= " AND (ac.source ILIKE " . $dbh->quote('%' . $form->{source} . '%') . ") "; @@ -1528,10 +1545,10 @@ sub payments { 'memo' => [ qw(lower_memo) ], ); my %lowered_columns = ( - 'invnumber' => { 'gl' => 'g.reference', 'arap' => 'a.invnumber', }, + 'invnumber' => { 'gl' => 'a.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', }, + 'name' => { 'gl' => 'a.description', 'arap' => 'c.name', }, ); my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; @@ -1558,20 +1575,18 @@ sub payments { 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, + SELECT a.description, a.reference, NULL AS ordnumber, ac.transdate, ac.amount * $ml AS paid, ac.source, - '0' as invoice, g.id, ac.memo, 'gl' AS module + '0' as invoice, a.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 + JOIN gl a ON (a.id = ac.trans_id) WHERE (ac.chart_id = ?) $where $reference @@ -1638,7 +1653,7 @@ sub bwa { my @periods = qw(jetzt kumm); my @gesamtleistung = qw(1 3); - my @gesamtkosten = qw (10 11 12 13 14 15 16 17 18 19 20); + my @gesamtkosten = qw (10 11 12 13 14 15 16 17 18 20); my @ergebnisse = qw (rohertrag betriebrohertrag betriebsergebnis neutraleraufwand neutralerertrag ergebnisvorsteuern ergebnis gesamtleistung gesamtkosten); @@ -1673,13 +1688,13 @@ 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" . "neutralerertrag" }; $form->{ "$key" . "ergebnis" } = $form->{ "$key" . "ergebnisvorsteuern" } - $form->{35}{$key}; @@ -1814,89 +1829,6 @@ sub bwa { $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(); -} - sub income_statement { $main::lxdebug->enter_sub();