# - 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();
$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});
}
$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') {
(
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
(
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
$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 |;
(
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
(
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
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 */
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
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
*/
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
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
|;
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
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
|;
my @headingaccounts = ();
my $dpt_where;
my $dpt_where_without_arapgl;
+ my ($customer_where, $customer_join, $customer_no_union);
my $project;
my $where = "1 = 1";
(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
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);
}
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 |;
my $glwhere = '';
my $glsumwhere = '';
my $tofrom;
- my ($fromdate, $todate);
+ my ($fromdate, $todate, $fetch_accounts_before_from);
if ($form->{fromdate} || $form->{todate}) {
if ($form->{fromdate}) {
$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(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
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
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
|;
}
$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);
(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,
(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
JOIN chart c ON (p.expense_accno_id = c.id)
WHERE $invwhere
$dpt_where
+ $customer_no_union
$project
AND c.accno = ?) AS debit,
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
|;
# 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};
$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});
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))
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);
(
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)
)
|;