X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/142ea3bff784ba29bd87de5615bb4f2aec8c977f..b36c791b78f3ca3895187db2b3f30ce5b29543e7:/SL/AR.pm diff --git a/SL/AR.pm b/SL/AR.pm index 30fb5e8a8..280184d7e 100644 --- a/SL/AR.pm +++ b/SL/AR.pm @@ -481,6 +481,7 @@ sub ar_transactions { my $query = qq|SELECT DISTINCT a.id, a.invnumber, a.ordnumber, a.cusordnumber, a.transdate, | . + qq| a.donumber, a.deliverydate, | . qq| a.duedate, a.netamount, a.amount, a.paid, | . qq| a.invoice, a.datepaid, a.notes, a.shipvia, | . qq| a.shippingpoint, a.storno, a.storno_id, a.globalproject_id, | . @@ -574,7 +575,7 @@ sub ar_transactions { $where .= " AND a.department_id = ?"; push(@values, $form->{department_id}); } - foreach my $column (qw(invnumber ordnumber cusordnumber notes transaction_description)) { + foreach my $column (qw(invnumber ordnumber cusordnumber notes transaction_description shipvia shippingpoint)) { if ($form->{$column}) { $where .= " AND a.$column ILIKE ?"; push(@values, like($form->{$column})); @@ -682,7 +683,7 @@ SQL 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 cusordnumber name datepaid employee shippingpoint shipvia transaction_description department))) { + if (grep({ $_ eq $form->{sort} } qw(id transdate duedate invnumber ordnumber cusordnumber donumber deliverydate name datepaid employee shippingpoint shipvia transaction_description department))) { $sortorder = $form->{sort} . " $sortdir"; }