diff --git a/Kernel/Config/Files/XML/Ticket.xml b/Kernel/Config/Files/XML/Ticket.xml
index acbbb22eab..7355b783b6 100644
--- a/Kernel/Config/Files/XML/Ticket.xml
+++ b/Kernel/Config/Files/XML/Ticket.xml
@@ -2408,6 +2408,13 @@
1
+
+ Which units are used and shown in the overview for timeunits?
+ Frontend::Agent::Ticket::AccountedTime
+
+ Minutes
+
+ Defines the default ticket attribute for ticket sorting in the status view of the agent interface.Frontend::Agent::View::TicketStatus
@@ -13094,6 +13101,13 @@ Thanks for your help!
+
+ If the accounted time units for articles are shown in the article list. Only showing if at least one article has any accounted time.
+ Frontend::Agent::View::TicketZoom
+
+ 1
+
+ AgentTicketZoom widget that displays ticket data in the side bar.Frontend::Agent::View::TicketZoom
@@ -13779,6 +13793,7 @@ Thanks for your help!
1 - Available2 - Enabled by default
+
@@ -13817,6 +13832,7 @@ Thanks for your help!
1 - Available2 - Enabled by default
+
@@ -13855,6 +13871,7 @@ Thanks for your help!
1 - Available2 - Enabled by default
+
@@ -13893,6 +13910,7 @@ Thanks for your help!
1 - Available2 - Enabled by default
+
@@ -13931,6 +13949,7 @@ Thanks for your help!
1 - Available2 - Enabled by default
+
@@ -13969,6 +13988,7 @@ Thanks for your help!
1 - Available2 - Enabled by default
+
@@ -14007,6 +14027,7 @@ Thanks for your help!
1 - Available2 - Enabled by default
+
@@ -14045,6 +14066,7 @@ Thanks for your help!
1 - Available2 - Enabled by default
+
diff --git a/Kernel/Modules/AgentTicketZoom.pm b/Kernel/Modules/AgentTicketZoom.pm
index e001053697..8fdf26fb89 100644
--- a/Kernel/Modules/AgentTicketZoom.pm
+++ b/Kernel/Modules/AgentTicketZoom.pm
@@ -2389,6 +2389,25 @@ sub _ArticleTree {
},
);
+ # fetching accounted times of all articles to check if we display the column
+ my %ArticleAccountedTimes;
+ my $ShowTimeUnits = 0;
+ if ( $Self->{Config}{ArticleListShowTimeUnits} ) {
+ for my $ArticleTmp (@ArticleBox) {
+
+ # Get accounted time for article using ArticleAccountedTimeGet
+ $ArticleAccountedTimes{ $ArticleTmp->{ArticleID} } = $ArticleObject->ArticleAccountedTimeGet(
+ ArticleID => $ArticleTmp->{ArticleID},
+ );
+ }
+ $ShowTimeUnits = ( any { $_ != 0 } values %ArticleAccountedTimes ) ? 1 : 0;
+ if ($ShowTimeUnits) {
+ $LayoutObject->Block(
+ Name => 'TimeUnitHeader',
+ );
+ }
+ }
+
ARTICLE:
for my $ArticleTmp (@ArticleBox) {
my %Article = %$ArticleTmp;
@@ -2473,6 +2492,17 @@ sub _ArticleTree {
ShowDeletedArticles => $Self->{ShowDeletedArticles}
);
+ if ($ShowTimeUnits) {
+
+ my %TimeUnitField = (
+ Value => $ArticleAccountedTimes{ $ArticleTmp->{ArticleID} },
+ Label => 'Time Unit'
+ );
+ $Article{TimeUnit} = $ArticleAccountedTimes{ $ArticleTmp->{ArticleID} };
+
+ $ArticleFields{TimeUnit} = \%TimeUnitField;
+ }
+
# Get transmission status information for email articles.
my $TransmissionStatus;
if ( $Article{ChannelName} && $Article{ChannelName} eq 'Email' ) {
@@ -2494,6 +2524,7 @@ sub _ArticleTree {
TransmissionStatus => $TransmissionStatus,
ZoomExpand => $Self->{ZoomExpand},
ZoomExpandSort => $Self->{ZoomExpandSort},
+ ShowTimeUnits => $ShowTimeUnits,
},
);
diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewMedium.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewMedium.tt
index 185e4534df..ee4a71c6b5 100644
--- a/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewMedium.tt
+++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewMedium.tt
@@ -202,6 +202,12 @@