summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xLedgerSMB/Auth/DB.pm2
-rw-r--r--LedgerSMB/GL.pm11
-rw-r--r--UI/ca-list-selector.html23
-rw-r--r--bin/gl.pl9
-rw-r--r--bin/rp.pl6
5 files changed, 37 insertions, 14 deletions
diff --git a/LedgerSMB/Auth/DB.pm b/LedgerSMB/Auth/DB.pm
index de9d23fe..4ffa5a0a 100755
--- a/LedgerSMB/Auth/DB.pm
+++ b/LedgerSMB/Auth/DB.pm
@@ -70,6 +70,7 @@ sub session_check {
|| $form->dberror(
__FILE__ . ':' . __LINE__ . ': Looking for session: ' );
my $sessionValid = $checkQuery->rows;
+ $dbh->commit;
if ($sessionValid) {
@@ -112,7 +113,6 @@ sub session_check {
print qq|Set-Cookie: ${LedgerSMB::Sysconfig::cookie_name}=; path=$path;\n|;
return 0;
}
- $dbh->commit;
}
sub session_create {
diff --git a/LedgerSMB/GL.pm b/LedgerSMB/GL.pm
index 25b0206d..63201e69 100644
--- a/LedgerSMB/GL.pm
+++ b/LedgerSMB/GL.pm
@@ -234,6 +234,12 @@ sub all_transactions {
my $sth;
my $var;
my $null;
+ if ($form->{accno} and !$form->{chart_id}){
+ my $sth = $dbh->prepare('SELECT id FROM chart WHERE accno = ?');
+ $sth->execute($form->{accno});
+ ($form->{chart_id}) = $sth->fetchrow_array();
+ delete $form->{accno};
+ }
my ( $glwhere, $arwhere, $apwhere ) = ( "1 = 1", "1 = 1", "1 = 1" );
@@ -304,13 +310,13 @@ sub all_transactions {
$var = $dbh->quote( $form->like( lc $form->{description} ) );
$glwhere .= " AND lower(g.description) LIKE $var";
- $arwhere .= " AND (lower(ct.name) LIKE $var
+ $arwhere .= " AND (lower(e.name) LIKE $var
OR lower(ac.memo) LIKE $var
OR a.id IN (SELECT DISTINCT trans_id
FROM invoice
WHERE lower(description) LIKE $var))";
- $apwhere .= " AND (lower(ct.name) LIKE $var
+ $apwhere .= " AND (lower(e.name) LIKE $var
OR lower(ac.memo) LIKE $var
OR a.id IN (SELECT DISTINCT trans_id
FROM invoice
@@ -485,7 +491,6 @@ sub all_transactions {
$approved =
(ac.approved AND a.approved))
ORDER BY $sortorder|;
-
my $sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
diff --git a/UI/ca-list-selector.html b/UI/ca-list-selector.html
index 4f4798ad..7f1d66ee 100644
--- a/UI/ca-list-selector.html
+++ b/UI/ca-list-selector.html
@@ -16,9 +16,9 @@
<?lsmb PROCESS elements.html ?>
<body>
-<form method="post" action="ca.pl">
-
-<?lsmb FOREACH hidden IN ['accno', 'description', 'sort', 'oldsort', 'accounttype', 'gifi_accno', 'gifi_description'];
+<form method="post" action="gl.pl">
+<?lsmb IF form.accounttype == '' ; form.accounttype = 'standard'; END ?>
+<?lsmb FOREACH hidden IN ['accno', 'sort', 'oldsort', 'accounttype', 'gifi_accno', 'gifi_description'];
PROCESS input element_data={type => 'hidden', name => hidden, value => form.item(hidden)}; END ?>
<table border="0" width="100%">
<tr><th class="listtop"><?lsmb form.title ?></th></tr>
@@ -29,9 +29,9 @@
<tr>
<th align="right"><?lsmb text('From') ?></th>
- <td><?lsmb PROCESS input element_data={class => 'date', name => 'fromdate' size => '11', title="yyyy-mm-dd"} ?></td>
+ <td><?lsmb PROCESS input element_data={class => 'date', name => 'datefrom' size => '11', title="yyyy-mm-dd"} ?></td>
<th align="right"><?lsmb text('To') ?></th>
- <td><?lsmb PROCESS input element_data={class => 'date', name => 'todate' size => '11', title="yyyy-mm-dd"} ?></td>
+ <td><?lsmb PROCESS input element_data={class => 'date', name => 'dateto' size => '11', title="yyyy-mm-dd"} ?></td>
</tr>
<?lsmb IF form.all_department ?>
@@ -69,9 +69,20 @@
<?lsmb FOREACH hidden IN ['login', 'path', 'sessionid'];
PROCESS input element_data={type => 'hidden', name => hidden, value => form.$hidden}; END ?>
+<?lsmb FOREACH hidden IN ['l_transdate', 'l_reference', 'l_description', 'l_debit', 'l_credit', 'l_balance'];
+ PROCESS input element_data = {
+ type = 'hidden'
+ name = hidden
+ value = 'Y'
+ }; END ?>
+ <?lsmb PROCESS input element_data = {
+ type = 'hidden'
+ name = 'category'
+ value = 'X'
+ };?>
<br />
-<?lsmb PROCESS button element_data={class => "submit", name => "action", value => "list_transactions", text => text('List Transactions')} ?>
+<?lsmb PROCESS button element_data={class => "submit", name => "action", value => "generate_report", text => text('List Transactions')} ?>
</form>
</body>
diff --git a/bin/gl.pl b/bin/gl.pl
index 9a0d8572..95e9a438 100644
--- a/bin/gl.pl
+++ b/bin/gl.pl
@@ -403,6 +403,11 @@ qq|<input name="l_description" class=checkbox type=checkbox value=Y checked> |
. $locale->text('Subtotal')
. qq|</td>
</tr>
+ <tr>
+ <td nowrap><input name="l_balance" class=checkbox type=checkbox value=Y> |
+ . $locale->text('Balance')
+ . qq|</td>
+ </tr>
</table>
</tr>
</table>
@@ -478,7 +483,7 @@ sub generate_report {
$ml = ( $form->{category} =~ /(A|E)/ ) ? -1 : 1;
- unless ( $form->{category} eq 'X' ) {
+ if (defined $form->{category} and $form->{category} ne 'X' ) {
$form->{title} .=
" : " . $locale->text( $acctype{ $form->{category} } );
}
@@ -590,7 +595,7 @@ sub generate_report {
$form->{l_cleared} = "Y";
}
- if ( $form->{accno} || $form->{gifi_accno} ) {
+ if ( $form->{chart_id} || $form->{gifi_accno} ) {
@columns = grep !/(accno|gifi_accno)/, @columns;
push @columns, "balance";
$form->{l_balance} = "Y";
diff --git a/bin/rp.pl b/bin/rp.pl
index 1426824e..257a6bb2 100644
--- a/bin/rp.pl
+++ b/bin/rp.pl
@@ -715,8 +715,10 @@ sub list_accounts {
my %column_data;
my $description = $form->escape( $ref->{description} );
+ # gl.pl requires datefrom instead of fromdate, etc. We will get this
+ # consistent.... eventually.... --CT
my $href =
-qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&sessionid=$form->{sessionid}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&prevreport=$form->{callback}|;
+qq|gl.pl?path=$form->{path}&action=generate_report&accounttype=$form->{accounttype}&datefrom=$form->{fromdate}&dateto=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&l_balance=Y&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&prevreport=$form->{callback}&category=X&l_reference=Y&l_transdate=Y&l_description=Y&l_debit=Y&l_credit=Y|;
if ( $form->{accounttype} eq 'gifi' ) {
$href .= "&gifi_accno=$ref->{accno}&gifi_description=$description";
@@ -726,7 +728,7 @@ qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{account
}
}
else {
- $href .= "&accno=$ref->{accno}&description=$description";
+ $href .= "&accno=$ref->{accno}";
}
$ml = ( $ref->{category} =~ /(A|E)/ ) ? -1 : 1;