WHERE id = ?|;
@values = ($form->{reference}, $form->{description}, $form->{notes},
- conv_date($form->{transdate}), $department_id, $form->{taxincluded},
+ conv_date($form->{transdate}), $department_id, $form->{taxincluded} ? 't' : 'f',
$form->{storno} ? 't' : 'f', conv_i($form->{storno_id}), $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f',
conv_i($form->{id}));
do_query($form, $dbh, $query, @values);
}
if ($form->{category} ne 'X') {
- $glwhere .=
- qq| AND gl.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN
- (SELECT id FROM chart c2 WHERE c2.category = ?))|;
- $arwhere .=
- qq| AND ar.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN
- (SELECT id FROM chart c2 WHERE c2.category = ?))|;
- $apwhere .=
- qq| AND ap.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN
- (SELECT id FROM chart c2 WHERE c2.category = ?))|;
+ $glwhere .= qq| AND g.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = ?))|;
+ $arwhere .= qq| AND a.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = ?))|;
+ $apwhere .= qq| AND a.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = ?))|;
push(@glvalues, $form->{category});
push(@arvalues, $form->{category});
push(@apvalues, $form->{category});
my $false = ($myconfig->{dbdriver} eq 'Pg') ? FALSE: q|'0'|;
- my $sortorder;
-
- if ($form->{sort}) {
- $form->{sort} =~ s/[^a-zA-Z_]//g;
- $sortorder = $form->{sort} . ",";
+ my %sort_columns = (
+ 'id' => [ qw(id) ],
+ 'transdate' => [ qw(transdate id) ],
+ 'reference' => [ qw(lower_reference id) ],
+ 'source' => [ qw(lower_source id) ],
+ 'description' => [ qw(lower_description id) ],
+ 'accno' => [ qw(accno transdate id) ],
+ );
+ my %lowered_columns = (
+ 'reference' => { 'gl' => 'g.reference', 'arap' => 'a.invnumber', },
+ 'source' => { 'gl' => 'ac.source', 'arap' => 'ac.source', },
+ 'description' => { 'gl' => 'g.description', 'arap' => 'ct.name', },
+ );
+
+ my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
+ my $sortkey = $sort_columns{$form->{sort}} ? $form->{sort} : 'transdate';
+ my $sortorder = join ', ', map { "$_ $sortdir" } @{ $sort_columns{$sortkey} };
+
+ my %columns_for_sorting = ( 'gl' => '', 'arap' => '', );
+ foreach my $spec (@{ $sort_columns{$sortkey} }) {
+ next if ($spec !~ m/^lower_(.*)$/);
+
+ my $column = $1;
+ map { $columns_for_sorting{$_} .= sprintf(', lower(%s) AS lower_%s', $lowered_columns{$column}->{$_}, $column) } qw(gl arap);
}
my $query =
g.description, ac.transdate, ac.source, ac.trans_id,
ac.amount, c.accno, g.notes, t.chart_id, ac.oid
$project_columns
+ $columns_for_sorting{gl}
FROM gl g, acc_trans ac $project_join, chart c
LEFT JOIN tax t ON (t.chart_id = c.id)
WHERE $glwhere
ct.name, ac.transdate, ac.source, ac.trans_id,
ac.amount, c.accno, a.notes, t.chart_id, ac.oid
$project_columns
+ $columns_for_sorting{arap}
FROM ar a, acc_trans ac $project_join, customer ct, chart c
LEFT JOIN tax t ON (t.chart_id=c.id)
WHERE $arwhere
ct.name, ac.transdate, ac.source, ac.trans_id,
ac.amount, c.accno, a.notes, t.chart_id, ac.oid
$project_columns
+ $columns_for_sorting{arap}
FROM ap a, acc_trans ac $project_join, vendor ct, chart c
LEFT JOIN tax t ON (t.chart_id=c.id)
WHERE $apwhere
AND (a.vendor_id = ct.id)
AND (a.id = ac.trans_id)
- ORDER BY $sortorder transdate, trans_id, acoid, taxkey DESC|;
+ ORDER BY $sortorder, acoid $sortdir|;
my @values = (@glvalues, @arvalues, @apvalues);