From a3cd2b805c84be9cece3a74f1db9f1a9df09baf3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 24 Oct 2011 21:21:10 +0000
Subject: [PATCH] fix display of duration on inbound packages with
 use_duraiton, RT#14370

---
 FS/FS/part_pkg/voip_inbound.pm | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/FS/FS/part_pkg/voip_inbound.pm b/FS/FS/part_pkg/voip_inbound.pm
index 528a85dcf..ea3250b7c 100644
--- a/FS/FS/part_pkg/voip_inbound.pm
+++ b/FS/FS/part_pkg/voip_inbound.pm
@@ -284,22 +284,26 @@ sub calc_usage {
                                  + 0.00000001 ); #so 1.00005 rounds to 1.0001
 
       if ( $charge > 0 ) {
-          $charges += $charge;
-          my @call_details = ($cdr->downstream_csv( 'format' => $output_format,
-                                                 'charge'  => $charge,
-                                                 'minutes' => $minutes,
-                                                 'granularity' => $granularity,
-                                               )
-                            );
-          push @$details,
-            [ 'C',
-              $call_details[0],
-              $charge,
-              $cdr->calltypenum, #classnum
-              $self->phonenum,
-              $seconds,
-              '', #regionname, not set for inbound calls
-            ];
+        $charges += $charge;
+        my @call_details = (
+          $cdr->downstream_csv( 'format'      => $output_format,
+                                'charge'      => $charge,
+                                'seconds'     => ($use_duration
+                                                   ? $cdr->duration
+                                                   : $cdr->billsec
+                                                 ),
+                                'granularity' => $granularity,
+                              )
+        );
+        push @$details,
+          [ 'C',
+            $call_details[0],
+            $charge,
+            $cdr->calltypenum, #classnum
+            $self->phonenum,
+            $seconds,
+            '', #regionname, not set for inbound calls
+          ];
     }
 
     my $error = $cdr->set_status_and_rated_price( 'done',
-- 
2.11.0