X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fagent.pm;h=bc3c37409512cf2a89498cc393004b8fdfe863d3;hb=e03f1de6578f009f306d92ec713b533e799330cd;hp=e34b017cd343011d9a1e3ffe400ad2362ddaacc8;hpb=cd5882bb376d0e46f97d760072311b912f921e26;p=freeside.git

diff --git a/FS/FS/part_pkg/agent.pm b/FS/FS/part_pkg/agent.pm
index e34b017cd..bc3c37409 100644
--- a/FS/FS/part_pkg/agent.pm
+++ b/FS/FS/part_pkg/agent.pm
@@ -40,7 +40,7 @@ $me = '[FS::part_pkg::agent]';
 
   'fieldorder' => [qw( cutoff_day add_full_period no_pkg_prorate ) ],
 
-  'weight' => 51,
+  'weight' => 52,
 
 );
 
@@ -56,6 +56,7 @@ sub calc_recur {
 
   my $conf = new FS::Conf;
   my $money_char = $conf->config('money_char') || '$';
+  my $date_format = $conf->config('date_format') || '%m/%d/%Y';
 
   my $total_agent_charge = 0;
 
@@ -137,8 +138,8 @@ sub calc_recur {
         my $recur_charge += $pkg_recur_charge;
 
         $pkg_details .= $money_char. sprintf('%.2f', $recur_charge ).
-                        ' ('.  time2str('%x', $pkg_start).
-                        ' - '. time2str('%x', $pkg_end  ). ')'
+                        ' ('.  time2str($date_format, $pkg_start).
+                        ' - '. time2str($date_format, $pkg_end  ). ')'
           if $recur_charge;
 
         $pkg_charge += $recur_charge;