Rechnungsbericht VK und EK nach Steuerzone sortieren können

diff --git a/SL/AP.pm b/SL/AP.pm
index 9f34d99700926e321ca1636fa756b3d814576bd1..6912c551b9e6addeae38fb69735042a34c11940b 100644 (file)
--- 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);
 
   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";
   }
 
     $sortorder = $form->{sort} . " $sortdir";
   }
 

diff --git a/SL/AR.pm b/SL/AR.pm
index 73c57867b7704e202828372254b986183c4a0dc3..db8a4aca706870c25634237e6ba60f35791f0306 100644 (file)
--- 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);
 
   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";
   }
 
     $sortorder = $form->{sort} . " $sortdir";
   }
 

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 9f2d4d957b9dd5e505417d0dd600017d648c6964..3c1386e0d63a47ffce206bbffe9f308a570180d8 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -1080,7 +1080,7 @@ sub ap_transactions {
     'insertdate'              => { 'text' => $locale->text('Insert Date'), },
   );
 
     '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";
   }
     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 a3205b0f7c7eece88e19be053d412a65cc30c8ab..bf2e242484753d45369b2ed83a82c21ecf5dbc76 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1085,7 +1085,7 @@ sub ar_transactions {
     %column_defs_cvars,
   );
 
     %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";
   }
     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
     $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
   }