X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FRP.pm;h=3d730265849d7c9b9255aa470f6397b065851263;hb=5e96049428deceda2ef857930bbf67311deccbcb;hp=4a7b0afefdd657b7f1e1de0783a519b4a8eabc81;hpb=cb1341a6715ae92b278b49d8b14eee7d4018859e;p=kivitendo-erp.git diff --git a/SL/RP.pm b/SL/RP.pm index 4a7b0afef..3d7302658 100644 --- a/SL/RP.pm +++ b/SL/RP.pm @@ -50,15 +50,90 @@ 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, $_) } @_; +sub get_balance_starting_date { - return unless $closedto; + # determine date from which the balance is calculated. The method is + # configured in the client configuration. - $closedto->subtract(years => 1) while ($target - $closedto)->is_negative; - $closedto->add(days => 1); - return $::locale->format_date(\%::myconfig, $closedto); -} + my $asofdate = shift; + return unless $asofdate; + + $asofdate = $::locale->parse_date_to_object($asofdate); + + my $form = $main::form; + my $dbh = $::form->get_standard_dbh; + + my $startdate_method = $::instance_conf->get_balance_startdate_method; + + # We could use the following objects to determine the starting date for + # calculating the balance from asofdate (the reference date for the balance): + # * start_of_year - 1.1., no deviating fiscal year supported + # * closed_to - all transactions since the books were last closed + # * last_ob - all transactions since last opening balance transaction (usually 1.1.) + # * mindate - all transactions in database + + my $start_of_year = $asofdate->clone(); + $start_of_year->set_day(1); + $start_of_year->set_month(1); + + # closedto assumes that we only close the books at the end of a fiscal year, + # never during the fiscal year. If this assumption is valid closedto should + # also work for deviating fiscal years. But as the trial balance (SuSa) + # doesn't yet deal with deviating fiscal years, and is useful to also close + # the books after a month has been exported via DATEV, so this method of + # determining the starting date isn't recommended and has been removed as + # default. + my ($closedto) = selectfirst_array_query($form, $dbh, 'SELECT closedto FROM defaults'); + if ($closedto) { + $closedto = $::locale->parse_date_to_object($closedto); + $closedto->subtract(years => 1) while ($asofdate - $closedto)->is_negative; + $closedto->add(days => 1); + }; + + my ($query, $startdate, $last_ob, $mindate); + $query = qq|select max(transdate) from acc_trans where ob_transaction is true and transdate <= ?|; + ($last_ob) = selectrow_query($::form, $dbh, $query, $::locale->format_date(\%::myconfig, $asofdate)); + $last_ob = $::locale->parse_date_to_object($last_ob) if $last_ob; + + $query = qq|select min(transdate) from acc_trans|; + ($mindate) = selectrow_query($::form, $dbh, $query); + $mindate = $::locale->parse_date_to_object($mindate); + + # the default method is to use all transactions ($mindate) + + if ( $startdate_method eq 'closed_to' and $closedto ) { + # if no closedto is configured use default + return $::locale->format_date(\%::myconfig, $closedto); + + } elsif ( $startdate_method eq 'start_of_year' ) { + + return $::locale->format_date(\%::myconfig, $start_of_year); + + } elsif ( $startdate_method eq 'all_transactions' ) { + + return $::locale->format_date(\%::myconfig, $mindate); + + } elsif ( $startdate_method eq 'last_ob_or_all_transactions' and $last_ob ) { + # use default if there are no ob transactions + + return $::locale->format_date(\%::myconfig, $last_ob); + + } elsif ( $startdate_method eq 'last_ob_or_start_of_year' ) { + + if ( $last_ob ) { + return $::locale->format_date(\%::myconfig, $last_ob); + } else { + return $::locale->format_date(\%::myconfig, $start_of_year); + }; + + } else { + # default action, also used for closedto and last_ob_or_all_transactions if + # there are no valid dates + + return $::locale->format_date(\%::myconfig, $mindate); + }; + +}; sub balance_sheet { $main::lxdebug->enter_sub(); @@ -75,21 +150,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} = 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} = 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}); } @@ -676,6 +748,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"; @@ -687,6 +760,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 @@ -733,8 +811,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); } @@ -744,8 +825,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 |; @@ -843,6 +927,7 @@ sub trial_balance { 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 @@ -861,6 +946,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 @@ -873,6 +959,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 |; @@ -899,8 +986,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, @@ -908,41 +998,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 @@ -962,6 +1067,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, @@ -972,40 +1078,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 |;