diff options
Diffstat (limited to 'LedgerSMB')
| -rw-r--r-- | LedgerSMB/Form.pm | 20 | ||||
| -rw-r--r-- | LedgerSMB/GL.pm | 14 |
2 files changed, 33 insertions, 1 deletions
diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm index 496cfcbf..ff0166a1 100644 --- a/LedgerSMB/Form.pm +++ b/LedgerSMB/Form.pm @@ -1816,6 +1816,26 @@ sub all_vc { $self->all_taxaccounts( $myconfig, $dbh, $transdate ); } +=item $form->all_accounts() + +Sets $form->{accounts} to all accounts. Returns the list as well. +Example: my @account_list = $form->all_accounts(); + +=cut + +sub all_accounts { + my ($self) = @_; + my $ref; + $self->{all_accounts} = []; + my $sth = $self->{dbh}->prepare('SELECT * FROM chart_list_all()'); + $sth->execute || $self->dberror('SELECT * FROM chart_list_all()'); + while ($ref = $sth->fetchrow_hashref('NAME_lc')){ + push(@{$self->{all_accounts}}, $ref); + } + $sth->finish; + return @{$self->{all_accounts}}; +} + =item $form->all_taxaccounts($myconfig, $dbh2[, $transdate]); Get the tax rates and numbers for all the taxes in $form->{taxaccounts}. Does diff --git a/LedgerSMB/GL.pm b/LedgerSMB/GL.pm index 1c5cd97c..8979d3ca 100644 --- a/LedgerSMB/GL.pm +++ b/LedgerSMB/GL.pm @@ -411,6 +411,12 @@ sub all_transactions { my @a = ( id, transdate, reference, source, description, accno ); my $sortorder = $form->sort_order( \@a, \%ordinal ); + my $chart_id; + if ($form->{chart_id}){ + $chart_id = $dbh->quote($form->{chart_id}); + } else { + $chart_id = 'NULL'; + } my $query = qq|SELECT g.id, 'gl' AS type, $false AS invoice, g.reference, g.description, ac.transdate, ac.source, ac.amount, c.accno, c.gifi_accno, g.notes, c.link, @@ -420,7 +426,9 @@ sub all_transactions { JOIN acc_trans ac ON (g.id = ac.trans_id) JOIN chart c ON (ac.chart_id = c.id) LEFT JOIN department d ON (d.id = g.department_id) - WHERE $glwhere + WHERE $glwhere + AND (ac.chart_id = $chart_id OR + $chart_id IS NULL) UNION ALL @@ -435,6 +443,8 @@ sub all_transactions { JOIN entity e ON (a.entity_id = e.id) LEFT JOIN department d ON (d.id = a.department_id) WHERE $arwhere + AND (ac.chart_id = $chart_id OR + $chart_id IS NULL) UNION ALL @@ -449,6 +459,8 @@ sub all_transactions { JOIN entity e ON (a.entity_id = e.id) LEFT JOIN department d ON (d.id = a.department_id) WHERE $apwhere + AND (ac.chart_id = $chart_id OR + $chart_id IS NULL) ORDER BY $sortorder|; my $sth = $dbh->prepare($query); |