[freeside-commits] freeside/httemplate/search report_receivables.cgi, 1.39, 1.40 report_receivables.html, 1.4, 1.5
Ivan,,,
ivan at wavetail.420.am
Thu Nov 8 19:12:26 PST 2007
Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv26521
Modified Files:
report_receivables.cgi report_receivables.html
Log Message:
add option for listing customers without a balance (closes: RT#2752) and fix bug in total row (closes: RT#2736)
Index: report_receivables.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_receivables.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- report_receivables.html 5 Feb 2007 13:10:16 -0000 1.4
+++ report_receivables.html 9 Nov 2007 03:12:24 -0000 1.5
@@ -1,23 +1,32 @@
<% include('/elements/header.html', 'Accounts Receivable Aging Summary' ) %>
- <FORM ACTION="report_receivables.cgi" METHOD="GET">
+<FORM NAME="OneTrueForm" ACTION="report_receivables.cgi" METHOD="GET">
- <TABLE>
+<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
- <% include( '/elements/tr-select-agent.html' ) %>
+ <TR>
+ <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left">
+ <FONT SIZE="+1">Search options</FONT>
+ </TH>
+ </TR>
- <TR>
- <TD ALIGN="right">Over </TD>
- <TD><INPUT NAME="days" TYPE="text" SIZE=4 MAXLENGTH=3> days</TD>
- </TR>
+ <% include( '/elements/tr-select-agent.html' ) %>
+
+ <TR>
+ <TD ALIGN="right">Customers</TD>
+ <TD>
+ <INPUT TYPE="radio" NAME="all_customers" VALUE="1" onClick="if (this.checked) { document.OneTrueForm.days.disabled=true; } else { document.OneTrueForm.days.disabled=false; }">All customers (even those without an outstanding balance)<BR>
+ <INPUT TYPE="radio" NAME="all_customers" VALUE="0" CHECKED onClick="if (this.checked) { document.OneTrueForm.days.disabled=false; } else { document.OneTrueForm.days.disabled=true; }">Customers with a balance over <INPUT NAME="days" TYPE="text" SIZE=4 MAXLENGTH=3 VALUE="0"> days old
+ </TD>
+ </TR>
- </TABLE>
+</TABLE>
- <BR><INPUT TYPE="submit" VALUE="Get Report">
- </FORM>
+<BR><INPUT TYPE="submit" VALUE="Get Report">
+</FORM>
+
+<% include('/elements/footer.html') %>
- </BODY>
-</HTML>
<%init>
die "access denied"
Index: report_receivables.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_receivables.cgi,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- report_receivables.cgi 29 Oct 2007 12:03:06 -0000 1.39
+++ report_receivables.cgi 9 Nov 2007 03:12:24 -0000 1.40
@@ -73,61 +73,6 @@
)
%>
-<%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;
-
- #handle 'cust' option
-
- push @where, "cust_main.custnum = cust_bill.custnum"
- if $opt{'cust'};
-
- #handle 'agentnum' option
- my $join = '';
- if ( $opt{'agentnum'} ) {
- $join = 'LEFT JOIN cust_main USING ( custnum )';
- push @where, "agentnum = '$opt{'agentnum'}'";
- }
-
- my $where = scalar(@where) ? 'WHERE '.join(' AND ', @where) : '';
-
- my $as = $opt{'noas'} ? '' : "as owed_${start}_$end";
-
- 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
- )
-
- )
-END
-
- "coalesce( ( select $charged from cust_bill $join $where ) ,0 ) $as";
-
-}
-
-</%once>
<%init>
die "access denied"
@@ -158,22 +103,29 @@
( $select_count_pkgs AND $cancelled_sql ) AS cancelled_pkgs
END
-my $days = 0;
-if ( $cgi->param('days') =~ /^\s*(\d+)\s*$/ ) {
- $days = $1;
-}
+my @where = ();
-#my $where = "where ". owed(0, 0, 'cust'=>1, 'noas'=>1). " > 0";
-my $where = "where ". owed($days, 0, 'cust'=>1, 'noas'=>1). " > 0";
+unless ( $cgi->param('all_customers') ) {
+
+ my $days = 0;
+ if ( $cgi->param('days') =~ /^\s*(\d+)\s*$/ ) {
+ $days = $1;
+ }
+
+ push @where, owed($days, 0, 'cust'=>1, 'noas'=>1). " > 0";
+
+}
-my $agentnum = '';
if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
- $agentnum = $1;
- $where .= " AND agentnum = '$agentnum' ";
+ my $agentnum = $1;
+ push @where, "agentnum = $agentnum";
}
#here is the agent virtualization
-$where .= ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql;
+push @where, $FS::CurrentUser::CurrentUser->agentnums_sql;
+
+my $where = join(' AND ', @where);
+$where = "WHERE $where" if $where;
my $count_sql = "select count(*) from cust_main $where";
@@ -184,8 +136,10 @@
'extra_sql' => "$where order by coalesce(lower(company), ''), lower(last)",
};
+my $join = 'LEFT JOIN cust_main USING ( custnum )';
+
my $total_sql = "select ".
- join(',', map owed( @$_, 'agentnum'=>$agentnum ), @ranges );
+ join(',', map owed( @$_, 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;
@@ -197,3 +151,56 @@
my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
</%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;
+
+ #handle 'cust' option
+ push @where, "cust_main.custnum = cust_bill.custnum"
+ if $opt{'cust'};
+
+ #handle 'join' option
+ my $join = $opt{'join'} || '';
+
+ #handle 'where' option
+ push @where, @{ $opt{'where'} } if $opt{'where'};
+
+ my $where = scalar(@where) ? 'WHERE '.join(' AND ', @where) : '';
+
+ my $as = $opt{'noas'} ? '' : "as owed_${start}_$end";
+
+ 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
+ )
+
+ )
+END
+
+ "coalesce( ( select $charged from cust_bill $join $where ) ,0 ) $as";
+
+}
+
+</%once>
More information about the freeside-commits
mailing list