X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAR.pm;h=db8a4aca706870c25634237e6ba60f35791f0306;hb=b775c378552e6b5bf59f98046cdf4e577cd351df;hp=148edd2d3d431c55f848083df0f3424be46c8cdf;hpb=76ed70e1568a63f94218173545024691470ba096;p=kivitendo-erp.git diff --git a/SL/AR.pm b/SL/AR.pm index 148edd2d3..db8a4aca7 100644 --- a/SL/AR.pm +++ b/SL/AR.pm @@ -573,9 +573,9 @@ sub ar_transactions { $where .= " AND c.business_id = ?"; push(@values, $business_id); } - if ($form->{department_id}) { - $where .= " AND a.department_id = ?"; - push(@values, $form->{department_id}); + if ($form->{taxzone_id}) { + $where .= " AND a.taxzone_id = ?"; + push(@values, $form->{taxzone_id}); } foreach my $column (qw(invnumber ordnumber cusordnumber notes transaction_description shipvia shippingpoint)) { if ($form->{$column}) { @@ -685,7 +685,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 donumber deliverydate 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 taxzone))) { $sortorder = $form->{sort} . " $sortdir"; }