Merge von 740 aus unstable: Bugfix 179

Solved 179, Dank an Anneli Huth
Spalten Sortierung funktioniert nicht in Tabellen

diff --git a/SL/AP.pm b/SL/AP.pm
index 6475bf2ec610ef60533ef2fe0627b999e1cebc93..8be0c8f8188a4c9904222c5c83a3ae118eb69050 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -448,8 +448,8 @@ sub ap_transactions {
   my @a = (transdate, invnumber, name);
   push @a, "employee" if $self->{l_employee};
   my $sortorder = join ', ', $form->sort_columns(@a);
-  $sortorder = $form->{sort} unless $sortorder;
-
+  $sortorder = $form->{sort} if $form->{sort};
+  
   $query .= "WHERE $where
              ORDER by $sortorder";
 

diff --git a/SL/AR.pm b/SL/AR.pm
index a6b0f42d36237c69bf856b3df1dbd1cb4b156761..c2c81e630709e2c0535e745baf153efc9e8517c3 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -443,7 +443,7 @@ sub ar_transactions {
   my @a = (transdate, invnumber, name);
   push @a, "employee" if $form->{l_employee};
   my $sortorder = join ', ', $form->sort_columns(@a);
-  $sortorder = $form->{sort} unless $sortorder;
+  $sortorder = $form->{sort} if $form->{sort};
 
   $query .= "WHERE $where
              ORDER by $sortorder";

diff --git a/SL/BP.pm b/SL/BP.pm
index 2122a51d7ff8ed9e14384825dd8f57b599054b9a..e776954260e9d83aad493a0093abf390225a616b 100644 (file)
--- a/SL/BP.pm
+++ b/SL/BP.pm
@@ -185,7 +185,7 @@ sub get_spoolfiles {
 
   my @a = (transdate, $invnumber, name);
   my $sortorder = join ', ', $form->sort_columns(@a);
-  $sortorder = $form->{sort} unless $sortorder;
+  $sortorder = $form->{sort} if $form->{sort};
 
   $query .= " ORDER by $sortorder";
 

diff --git a/SL/IC.pm b/SL/IC.pm
index b8815cc59605fc904b7159d606d99f697be47b81..eb230ef9fc8becc3cffeb81e0fa63009a5ab13f5 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -934,7 +934,7 @@ sub all_parts {
 
   my $sortorder = $form->{sort};
   $sortorder .= $form->{desc};
-  $sortorder = $form->{sort} unless $sortorder;
+  $sortorder = $form->{sort} if $form->{sort};
 
   my $query = "";
 

diff --git a/SL/OE.pm b/SL/OE.pm
index 2caab7290466cb44371ed799e6f0059ba53dfa20..4e3be4539bb735c066e0b101f083ac0568db2d36 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -125,7 +125,7 @@ sub transactions {
 
   my $sortorder = join ', ',
     ("o.id", $form->sort_columns(transdate, $ordnumber, name));
-  $sortorder = $form->{sort} unless $sortorder;
+  $sortorder = $form->{sort} if $form->{sort};
 
   $query .= " AND lower($ordnumber) LIKE '$number'" if $form->{$ordnumber};
   $query .= " AND o.transdate >= '$form->{transdatefrom}'"

diff --git a/SL/RP.pm b/SL/RP.pm
index 6c328326c7fca6cb2edaaac50b157fa4bec9a1fb..8879bced148b190654b8a35f97da435bba7d5d8a 100644 (file)
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -2088,7 +2088,7 @@ sub tax_report {
   my $ml = ($form->{db} eq 'ar') ? 1 : -1;
 
   my $sortorder = join ', ', $form->sort_columns(qw(transdate invnumber name));
-  $sortorder = $form->{sort} unless $sortorder;
+  $sortorder = $form->{sort} if $form->{sort};
 
   $query = qq|SELECT a.id, '0' AS invoice, $transdate AS transdate,
               a.invnumber, n.name, a.netamount,