[freeside-commits] freeside/httemplate/search rt_transaction.html, 1.5, 1.6
Ivan,,,
ivan at wavetail.420.am
Mon Jun 14 23:40:05 PDT 2010
Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv27617
Modified Files:
rt_transaction.html
Log Message:
ticket # and account(customer) options for time worked report
Index: rt_transaction.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/rt_transaction.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- rt_transaction.html 15 Jun 2010 06:35:47 -0000 1.5
+++ rt_transaction.html 15 Jun 2010 06:40:03 -0000 1.6
@@ -54,8 +54,9 @@
";
my $join = 'JOIN Tickets ON Transactions.ObjectId = Tickets.Id '.
- 'JOIN Users ON Transactions.Creator = Users.Id ';
-
+ 'JOIN Users ON Transactions.Creator = Users.Id '.
+ 'LEFT JOIN acct_rt_transaction '.
+ ' ON Transactions.Id = acct_rt_transaction.transaction_id';
my $where = "
WHERE objecttype='RT::Ticket'
AND ( ( Transactions.Type = 'Set'
@@ -96,15 +97,13 @@
'select' => "Transactions.*, Tickets.Id AS ticketid, Tickets.Subject, Users.name as otaker, $transactiontime AS transaction_time, acct_rt_transaction.support",
#'table' => 'Transactions',
'table' => 'transactions',
- 'addl_from' => $join.
- 'LEFT JOIN acct_rt_transaction '.
- ' ON Transactions.Id = acct_rt_transaction.transaction_id',
+ 'addl_from' => $join,
'extra_sql' => $where,
'order by' => 'ORDER BY Created',
};
my $count_query =
- "SELECT COUNT(*), SUM($transactiontime), SUM(support) FROM Transactions $join $where";
+ "SELECT COUNT(*), SUM($transactiontime), SUM(acct_rt_transaction.support) FROM Transactions $join $where";
my $link = [ "${p}rt/Ticket/Display.html?id=", sub { shift->get('ticketid'); } ];
More information about the freeside-commits
mailing list