projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7ff3a40
)
agent wholesale bulk billing: respect date_format setting for details, RT#30484
author
Ivan Kohler
<ivan@freeside.biz>
Tue, 12 Aug 2014 22:31:00 +0000
(15:31 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Tue, 12 Aug 2014 22:31:00 +0000
(15:31 -0700)
FS/FS/part_pkg/agent.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_pkg/agent.pm
b/FS/FS/part_pkg/agent.pm
index
b122ff1
..
bc3c374
100644
(file)
--- a/
FS/FS/part_pkg/agent.pm
+++ b/
FS/FS/part_pkg/agent.pm
@@
-56,6
+56,7
@@
sub calc_recur {
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
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;
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 ).
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;
if $recur_charge;
$pkg_charge += $recur_charge;