projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b608648
)
torrus, RT#10574
author
ivan
<ivan>
Mon, 24 Jan 2011 00:38:00 +0000
(
00:38
+0000)
committer
ivan
<ivan>
Mon, 24 Jan 2011 00:38:00 +0000
(
00:38
+0000)
FS/FS/part_pkg/torrus_Common.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_pkg/torrus_Common.pm
b/FS/FS/part_pkg/torrus_Common.pm
index
38e5499
..
61cdde0
100644
(file)
--- a/
FS/FS/part_pkg/torrus_Common.pm
+++ b/
FS/FS/part_pkg/torrus_Common.pm
@@
-30,9
+30,12
@@
sub calc_usage {
my $self = shift;
my($cust_pkg, $sdate, $details, $param ) = @_;
my $self = shift;
my($cust_pkg, $sdate, $details, $param ) = @_;
-
my @sdate = localtime($$sdate);
my @sdate = localtime($$sdate);
- my $rep_date = ($sdate[5]+1900). '-'. ($sdate[4]+1). '-01';
+ #sdate is next bill date, but we want the report from last month
+ my($m, $y) = ($sdate[4], $sdate[5]);
+ if ( $m == 0 ) { $m=12; $y--; }
+ $m = "0$m" if length($m) == 1;
+ my $rep_date = "$y-$m-01";
warn "searching for MonthlyUsage report for $rep_date\n" if $DEBUG;
my $rep_sql = "
SELECT id FROM reports WHERE rep_date = ?
warn "searching for MonthlyUsage report for $rep_date\n" if $DEBUG;
my $rep_sql = "
SELECT id FROM reports WHERE rep_date = ?