[freeside-commits] freeside/httemplate/search report_receivables.cgi, 1.36.2.3, 1.36.2.4
Ivan,,,
ivan at wavetail.420.am
Tue Jan 8 03:28:38 PST 2008
- Previous message: [freeside-commits] freeside/FS/FS cust_credit.pm, 1.24.2.7, 1.24.2.8 cust_main.pm, 1.271.2.37, 1.271.2.38 cust_refund.pm, 1.29, 1.29.2.1 cust_pay.pm, 1.50.2.5, 1.50.2.6
- Next message: [freeside-commits] freeside/FS/FS svc_acct.pm, 1.217.2.16, 1.217.2.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv32403/httemplate/search
Modified Files:
Tag: FREESIDE_1_7_BRANCH
report_receivables.cgi
Log Message:
show negative balances on A/R report, closes: RT#2983
Index: report_receivables.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_receivables.cgi,v
retrieving revision 1.36.2.3
retrieving revision 1.36.2.4
diff -u -d -r1.36.2.3 -r1.36.2.4
--- report_receivables.cgi 9 Nov 2007 03:12:25 -0000 1.36.2.3
+++ report_receivables.cgi 8 Jan 2008 11:28:36 -0000 1.36.2.4
@@ -5,8 +5,6 @@
'count_query' => $count_sql,
'header' => [
FS::UI::Web::cust_header(),
- #'Status', # (me)',
- #'Status', # (cust_main)',
'0-30',
'30-60',
'60-90',
@@ -20,40 +18,29 @@
scalar(FS::UI::Web::cust_header()-1)
)
),
- #'',
- #'',
sprintf( $money_char.'%.2f',
- $row->{'owed_0_30'} ),
+ $row->{'balance_0_30'} ),
sprintf( $money_char.'%.2f',
- $row->{'owed_30_60'} ),
+ $row->{'balance_30_60'} ),
sprintf( $money_char.'%.2f',
- $row->{'owed_60_90'} ),
+ $row->{'balance_60_90'} ),
sprintf( $money_char.'%.2f',
- $row->{'owed_90_0'} ),
+ $row->{'balance_90_0'} ),
sprintf( '<b>'. $money_char.'%.2f'. '</b>',
- $row->{'owed_0_0'} ),
+ $row->{'balance_0_0'} ),
],
'fields' => [
\&FS::UI::Web::cust_fields,
- #sub { ( &{$status_statuscol}(shift) )[0] },
- #sub { ucfirst(shift->status) },
- sub { sprintf( $money_char.'%.2f',
- shift->get('owed_0_30') ) },
- sub { sprintf( $money_char.'%.2f',
- shift->get('owed_30_60') ) },
- sub { sprintf( $money_char.'%.2f',
- shift->get('owed_60_90') ) },
- sub { sprintf( $money_char.'%.2f',
- shift->get('owed_90_0') ) },
- sub { sprintf( $money_char.'%.2f',
- shift->get('owed_0_0') ) },
+ format_balance('0_30'),
+ format_balance('30_60'),
+ format_balance('60_90'),
+ format_balance('90_0'),
+ format_balance('0_0'),
],
'links' => [
( map { $_ ne 'Cust. Status' ? $clink : '' }
FS::UI::Web::cust_header()
),
- #'',
- #'',
'',
'',
'',
@@ -72,8 +59,6 @@
'', '', '', '', 'b', ],
'color' => [
FS::UI::Web::cust_colors(),
- #sub { ( &{$status_statuscol}(shift) )[1] },
- #sub { shift->statuscolor; },
'',
'',
'',
@@ -96,7 +81,7 @@
[ 0, 0 ],
);
-my $owed_cols = join(',', map owed( @$_, 'cust'=>1 ), @ranges );
+my $owed_cols = join(',', map balance( @$_ ), @ranges );
my $select_count_pkgs = FS::cust_main->select_count_pkgs_sql;
@@ -122,7 +107,7 @@
$days = $1;
}
- push @where, owed($days, 0, 'cust'=>1, 'noas'=>1). " > 0";
+ push @where, balance($days, 0, 'no_as'=>1). " > 0";
}
@@ -143,94 +128,60 @@
'table' => 'cust_main',
'hashref' => {},
'select' => "*, $owed_cols, $packages_cols",
- 'extra_sql' => "$where order by coalesce(lower(company), ''), lower(last)",
+ 'extra_sql' => $where,
+ 'order_by' => "order by coalesce(lower(company), ''), lower(last)",
};
my $join = 'LEFT JOIN cust_main USING ( custnum )';
-my $total_sql = "select ".
- join(',', map owed( @$_, join=>$join, where=>\@where ), @ranges);
+my $total_sql = "SELECT ".
+ join(',', map balance( @$_, total=>1, join=>$join, where=>\@where ), @ranges);
my $total_sth = dbh->prepare($total_sql) or die dbh->errstr;
$total_sth->execute or die "error executing $total_sql: ". $total_sth->errstr;
my $row = $total_sth->fetchrow_hashref();
-my $conf = new FS::Conf;
-my $money_char = $conf->config('money_char') || '$';
-
my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
-my $status_statuscol = sub {
- #conceptual false laziness with cust_main::status...
- my $row = shift;
-
- my $status = 'unknown';
- if ( $row->num_pkgs_sql == 0 ) {
- $status = 'prospect';
- } elsif ( $row->active_pkgs > 0 ) {
- $status = 'active';
- } elsif ( $row->inactive_pkgs > 0 ) {
- $status = 'inactive';
- } elsif ( $row->suspended_pkgs > 0 ) {
- $status = 'suspended';
- } elsif ( $row->cancelled_pkgs > 0 ) {
- $status = 'cancelled'
- }
-
- ( ucfirst($status), $FS::cust_main::statuscolor{$status} );
-};
-
</%init>
<%once>
-sub owed {
- my($start, $end, %opt) = @_;
-
- my @where = ();
-
- #handle start and end ranges
-
- my $str2time = str2time_sql;
-
- #24h * 60m * 60s
- push @where, "cust_bill._date <= $str2time now() ) - ". ($start * 86400)
- if $start;
-
- push @where, "cust_bill._date > $str2time now() ) - ". ($end * 86400)
- if $end;
+my $conf = new FS::Conf;
- #handle 'cust' option
- push @where, "cust_main.custnum = cust_bill.custnum"
- if $opt{'cust'};
+my $money_char = $conf->config('money_char') || '$';
- #handle 'join' option
- my $join = $opt{'join'} || '';
+#Example:
+#
+# my $balance = balance(
+# $start, $end,
+# 'no_as' => 1, #set to true when using in a WHERE clause (supress AS clause)
+# #or 0 / omit when using in a SELECT clause as a column
+# # ("AS balance_$start_$end")
+# #options for totals
+# 'total' => 1, #set to true to remove all customer comparison clauses
+# 'join' => $join, #JOIN clause
+# 'where' => \@where, #WHERE clause hashref (elements "AND"ed together)
+# )
- #handle 'where' option
- push @where, @{ $opt{'where'} } if $opt{'where'};
+sub balance {
+ my($start, $end, %opt) = @_;
- my $where = scalar(@where) ? 'WHERE '.join(' AND ', @where) : '';
+ my $as = $opt{'no_as'} ? '' : " AS balance_${start}_$end";
- my $as = $opt{'noas'} ? '' : "as owed_${start}_$end";
+ #handle start and end ranges (86400 = 24h * 60m * 60s)
+ my $str2time = str2time_sql;
+ $start = $start ? "( $str2time now() ) - ".($start * 86400). ' )' : '';
+ $end = $end ? "( $str2time now() ) - ".($end * 86400). ' )' : '';
- my $charged = <<END;
-sum( charged
- - coalesce(
- ( select sum(amount) from cust_bill_pay
- where cust_bill.invnum = cust_bill_pay.invnum )
- ,0
- )
- - coalesce(
- ( select sum(amount) from cust_credit_bill
- where cust_bill.invnum = cust_credit_bill.invnum )
- ,0
- )
+ $opt{'unapplied_date'} = 1;
- )
-END
+ FS::cust_main->balance_date_sql( $start, $end, %opt ). $as;
- "coalesce( ( select $charged from cust_bill $join $where ) ,0 ) $as";
+}
+sub format_balance { #closures help alot
+ my $range = shift;
+ sub { sprintf( $money_char.'%.2f', shift->get("balance_$range") ) };
}
</%once>
- Previous message: [freeside-commits] freeside/FS/FS cust_credit.pm, 1.24.2.7, 1.24.2.8 cust_main.pm, 1.271.2.37, 1.271.2.38 cust_refund.pm, 1.29, 1.29.2.1 cust_pay.pm, 1.50.2.5, 1.50.2.6
- Next message: [freeside-commits] freeside/FS/FS svc_acct.pm, 1.217.2.16, 1.217.2.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the freeside-commits
mailing list