From: Bernd Bleßmann Date: Fri, 11 Mar 2022 17:31:33 +0000 (+0100) Subject: Rechnungsbericht VK und EK nach Steuerzone sortieren können X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~123 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ac06e2571cc2b87554121de241df13a94406a27b;p=kivitendo-erp.git Rechnungsbericht VK und EK nach Steuerzone sortieren können --- diff --git a/SL/AP.pm b/SL/AP.pm index 9f34d9970..6912c551b 100644 --- a/SL/AP.pm +++ b/SL/AP.pm @@ -702,7 +702,7 @@ SQL my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; my $sortorder = join(', ', map { "$_ $sortdir" } @a); - if (grep({ $_ eq $form->{sort} } qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee transaction_description direct_debit department))) { + if (grep({ $_ eq $form->{sort} } qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee transaction_description direct_debit department taxzone))) { $sortorder = $form->{sort} . " $sortdir"; } diff --git a/SL/AR.pm b/SL/AR.pm index 73c57867b..db8a4aca7 100644 --- a/SL/AR.pm +++ b/SL/AR.pm @@ -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"; } diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 9f2d4d957..3c1386e0d 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -1080,7 +1080,7 @@ sub ap_transactions { 'insertdate' => { 'text' => $locale->text('Insert Date'), }, ); - foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit department)) { + foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit department taxzone)) { my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; } diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index a3205b0f7..bf2e24248 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -1085,7 +1085,7 @@ sub ar_transactions { %column_defs_cvars, ); - foreach my $name (qw(id transdate duedate invnumber ordnumber cusordnumber donumber deliverydate name datepaid employee shippingpoint shipvia transaction_description direct_debit department)) { + foreach my $name (qw(id transdate duedate invnumber ordnumber cusordnumber donumber deliverydate name datepaid employee shippingpoint shipvia transaction_description direct_debit department taxzone)) { my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; }