projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Einen Test für Postgres-Datenbankcluster hinzugefügt, ob sie anständig mit Umlauten...
[kivitendo-erp.git]
/
SL
/
AR.pm
diff --git
a/SL/AR.pm
b/SL/AR.pm
index
79653a7
..
e37128c
100644
(file)
--- a/
SL/AR.pm
+++ b/
SL/AR.pm
@@
-416,10
+416,12
@@
sub ar_transactions {
qq| a.transaction_description, | .
qq| pr.projectnumber AS globalprojectnumber, | .
qq| c.name, | .
qq| a.transaction_description, | .
qq| pr.projectnumber AS globalprojectnumber, | .
qq| c.name, | .
- qq| e.name AS employee | .
+ qq| e.name AS employee, | .
+ qq| e2.name AS salesman | .
qq|FROM ar a | .
qq|JOIN customer c ON (a.customer_id = c.id) | .
qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
qq|FROM ar a | .
qq|JOIN customer c ON (a.customer_id = c.id) | .
qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
+ qq|LEFT JOIN employee e2 ON (a.salesman_id = e2.id) | .
qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id)|;
my $where = "1 = 1";
qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id)|;
my $where = "1 = 1";
@@
-466,15
+468,16
@@
sub ar_transactions {
my @a = (transdate, invnumber, name);
push @a, "employee" if $form->{l_employee};
my @a = (transdate, invnumber, name);
push @a, "employee" if $form->{l_employee};
- my $sortorder = join(', ', @a);
+ my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
+ my $sortorder = join(', ', map { "$_ $sortdir" } @a);
if (grep({ $_ eq $form->{sort} }
qw(id transdate duedate invnumber ordnumber name
datepaid employee shippingpoint shipvia))) {
if (grep({ $_ eq $form->{sort} }
qw(id transdate duedate invnumber ordnumber name
datepaid employee shippingpoint shipvia))) {
- $sortorder = $form->{sort};
+ $sortorder = $form->{sort}
. " $sortdir"
;
}
}
- $query .= " WHERE $where ORDER
by
$sortorder";
+ $query .= " WHERE $where ORDER
BY
$sortorder";
my $sth = $dbh->prepare($query);
$sth->execute(@values) ||
my $sth = $dbh->prepare($query);
$sth->execute(@values) ||
@@
-635,7
+638,7
@@
sub storno {
$storno_row->{invnumber} = 'Storno-' . $storno_row->{invnumber};
$storno_row->{amount} *= -1;
$storno_row->{netamount} *= -1;
$storno_row->{invnumber} = 'Storno-' . $storno_row->{invnumber};
$storno_row->{amount} *= -1;
$storno_row->{netamount} *= -1;
- $storno_row->{paid} = $storno_
amount
->{amount};
+ $storno_row->{paid} = $storno_
row
->{amount};
delete @$storno_row{qw(itime mtime)};
delete @$storno_row{qw(itime mtime)};