--- Kernel/Modules/AgentTicketPrint.pm	2003-12-08 09:56:15.000000000 +1000
+++ Kernel/Modules/AgentTicketPrint.pm	2004-03-21 17:40:13.000000000 +1000
@@ -74,6 +74,13 @@
     $Ticket{FreeKey2} = '';
     $Ticket{FreeValue2} = '';
     $Ticket{TicketTimeUnits} = $Self->{TicketObject}->GetAccountedTime(TicketID => $Ticket{TicketID});
+	# --
+	# get queue data
+	# --
+	$Self->{DBObject}->Prepare(SQL =>
+	    'SELECT q.name, q.group_id, q.escalation_time FROM queue q WHERE id = '.$QueueID
+		);
+	my $Queue = $Self->{DBObject}->FetchrowHashref();
     # --
     # grep all atricle of this ticket
     # --
@@ -83,20 +90,18 @@
     " sa.create_time, stt.name as sender_type, at.name as article_type, ".
     " su.$Self->{ConfigObject}->{DatabaseUserTableUser}, ".
     " sl.name as lock_type, sp.name as priority, tsd.name as state, sa.content_path, ".
-    " sq.name as queue, st.create_time as ticket_create_time, ".
+    " st.create_time as ticket_create_time, ".
     " sa.a_freekey1, sa.a_freetext1, sa.a_freekey2, sa.a_freetext2, ".
     " sa.a_freekey3, sa.a_freetext3, st.freekey1, st.freekey2, st.freetext1, ".
-    " st.freetext2, st.customer_id, sq.group_id, st.ticket_answered, sq.escalation_time, ".
+    " st.freetext2, st.customer_id, st.ticket_answered, ".
     " sa.a_content_type, sa.incoming_time, st.until_time ".
     " FROM ".
     " article sa, ticket st, article_sender_type stt, article_type at, ".
     " $Self->{ConfigObject}->{DatabaseUserTable} su, ticket_lock_type sl, " .
-    " ticket_priority sp, ticket_state tsd, queue sq " .
+    " ticket_priority sp, ticket_state tsd " .
     " WHERE " .
     " sa.ticket_id = st.id " .
     " AND " .
-    " sq.id = st.queue_id " .
-    " AND " .
     " stt.id = sa.article_sender_type_id " .
     " AND " .
     " at.id = sa.article_type_id " .
@@ -115,16 +120,16 @@
     " sa.create_time, stt.name, at.name, ".
     " su.$Self->{ConfigObject}->{DatabaseUserTableUser}, ".
     " sl.name, sp.name, tsd.name, sa.content_path, ".
-    " sq.name, st.create_time, ".
+    " st.create_time, ".
     " sa.a_freekey1, sa.a_freetext1, sa.a_freekey2, sa.a_freetext2, ".
     " sa.a_freekey3, sa.a_freetext3, st.freekey1, st.freekey2, st.freetext1, ".
-    " st.freetext2, st.customer_id, sq.group_id, st.ticket_answered, sq.escalation_time, ".
+    " st.freetext2, st.customer_id, st.ticket_answered, ".
     " sa.a_content_type, sa.incoming_time, st.until_time ";
     $Self->{DBObject}->Prepare(SQL => $SQL);
     while (my $Data = $Self->{DBObject}->FetchrowHashref() ) {
         # get escalation_time
-        if ($$Data{escalation_time} && $$Data{sender_type} eq 'customer') {
-            $Ticket{TicketOverTime} = (($$Data{incoming_time} + ($$Data{escalation_time}*60)) - time());
+        if ($Queue->{escalation_time} && $$Data{sender_type} eq 'customer') {
+            $Ticket{TicketOverTime} = (($$Data{incoming_time} + ($Queue->{escalation_time}*60)) - time());
         }
         if (!$$Data{until_time} || $$Data{state} !~ /^pending/i) {
             $Ticket{UntilTime} = 0;
@@ -136,7 +141,7 @@
         $Ticket{TicketNumber} = $$Data{tn};
         $Ticket{State} = $$Data{state};
         $Ticket{CustomerID} = $$Data{customer_id};
-        $Ticket{Queue} = $$Data{queue};
+        $Ticket{Queue} = $Queue->{name};
         $Ticket{QueueID} = $QueueID;
         $Ticket{Lock} = $$Data{lock_type};
         $Ticket{Owner} = $$Data{login};
@@ -146,7 +151,7 @@
         $Ticket{TicketFreeKey2} = $$Data{freekey2};
         $Ticket{TicketFreeValue2} = $$Data{freetext2};
         $Ticket{Created} = $$Data{ticket_create_time};
-        $Ticket{GroupID} = $$Data{group_id};
+        $Ticket{GroupID} = $Queue->{group_id};
         $Ticket{Age} = time() - $$Data{create_time_unix};
         $Ticket{Answered} = $$Data{ticket_answered};
         # article data