projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USTVA Ist-Soll Testskript für Steuerzone Inland überarbeitet
[kivitendo-erp.git]
/
SL
/
CT.pm
diff --git
a/SL/CT.pm
b/SL/CT.pm
index
a4eb0b2
..
8a3ff85
100644
(file)
--- a/
SL/CT.pm
+++ b/
SL/CT.pm
@@
-185,7
+185,7
@@
sub get_tuple {
# get payment terms
$query = qq|SELECT id, description
FROM payment_terms
# get payment terms
$query = qq|SELECT id, description
FROM payment_terms
-
ORDER BY 1
|;
+
ORDER BY sortkey
|;
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
@@
-315,7
+315,7
@@
sub taxaccounts {
# get payment terms
$query = qq|SELECT id, description
FROM payment_terms
# get payment terms
$query = qq|SELECT id, description
FROM payment_terms
-
ORDER BY 1
|;
+
ORDER BY sortkey
|;
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
@@
-695,6
+695,9
@@
sub search {
my $where = "1 = 1";
$form->{sort} = "name" unless ($form->{sort});
my $where = "1 = 1";
$form->{sort} = "name" unless ($form->{sort});
+ if ($form->{sort} eq "address") {
+ $form->{sort} = "country,city,street";
+ }
if ($form->{"$form->{db}number"}) {
my $companynumber = $form->like(lc $form->{"$form->{db}number"});
if ($form->{"$form->{db}number"}) {
my $companynumber = $form->like(lc $form->{"$form->{db}number"});