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|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";
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))) {
- $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) ||
$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)};