Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[mfinanz.git] / SL / DB / Manager / TimeRecording.pm

diff --git a/SL/DB/Manager/TimeRecording.pm b/SL/DB/Manager/TimeRecording.pm
index e1e9b84e15ae8b0eefea74e672c26e507755610b..2a8677d996c857dabe4ddbeb01d1bc068c22f7db 100644 (file)
--- a/SL/DB/Manager/TimeRecording.pm
+++ b/SL/DB/Manager/TimeRecording.pm
@@ -16,8 +16,19 @@ __PACKAGE__->make_manager_methods;
 
 sub _sort_spec {
   return ( default => [ 'start_time', 1 ],
-           columns => { SIMPLE    => 'ALL' ,
-                        customer  => [ 'lower(customer.name)', ],
+           nulls   => {
+             date       => 'FIRST',
+             start_time => 'FIRST',
+             end_time   => 'FIRST',
+           },
+           columns => { SIMPLE       => 'ALL' ,
+                        start_time   => [ 'date', 'start_time' ],
+                        end_time     => [ 'date', 'end_time' ],
+                        customer     => [ 'lower(customer.name)', 'date','start_time'],
+                        staff_member => [ 'lower(staff_member.name)', 'date','start_time'],
+                        order        => [ 'order.ordnumber', 'date','start_time'],
+                        part         => [ 'lower(part.partnumber)', 'date','start_time'],
+                        project      => [ 'lower(project.projectnumber)', 'date','start_time'],
            }
   );
 }