X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Ftimeworked.html;h=bbfd0334d2e1bc4fc29a99e15ff0d5900b73d19e;hb=53fe471803155c11f32d7d1626960f6951b618bc;hp=1d877e6ef219039862d5d5b9074f1f1d114bad68;hpb=63a268637b2d51a8766412617724b9436439deb6;p=freeside.git

diff --git a/httemplate/search/timeworked.html b/httemplate/search/timeworked.html
index 1d877e6ef..bbfd0334d 100644
--- a/httemplate/search/timeworked.html
+++ b/httemplate/search/timeworked.html
@@ -45,12 +45,14 @@ my @groupby = ();
 
 my $transactiontime = "
   CASE Transactions.Type WHEN 'Set'
-    THEN (TO_NUMBER(NewValue,'999999')-TO_NUMBER(OldValue, '999999')) * 60
+    THEN (  CASE WHEN NewValue = '' THEN 0 ELSE TO_NUMBER(NewValue,'999999') END
+           -TO_NUMBER(OldValue, '999999')
+          ) * 60
     ELSE TimeTaken*60
   END
 ";
 
-push @groupby, qw( transactions.type newvalue oldvalue timetaken );
+push @groupby, qw( Transactions.Type NewValue OldValue TimeTaken );
 
 my $appliedtimeclause = "COALESCE (SUM(acct_rt_transaction.seconds), 0)";
 
@@ -76,9 +78,7 @@ my $groupby = join(',', @groupby);
 my $where = "
   WHERE ObjectType='RT::Ticket'
     AND ( ( Transactions.Type='Set' AND Field='TimeWorked' )
-          OR Transactions.Type='Create'
-          OR Transactions.Type='Comment'
-          OR Transactions.Type='Correspond'
+          OR Transactions.Type IN ( 'Create', 'Comment', 'Correspond', 'Touch' )
         )
     AND $wheretimeleft
 ";