[freeside-commits] freeside/httemplate/search cust_bill.html, 1.37.2.1, 1.37.2.2 report_cust_bill.html, 1.12, 1.12.2.1
Ivan,,,
ivan at wavetail.420.am
Wed Jul 27 16:27:28 PDT 2011
Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv32398/httemplate/search
Modified Files:
Tag: FREESIDE_2_1_BRANCH
cust_bill.html report_cust_bill.html
Log Message:
add per-customer "Invoice reports" link, RT#13802
Index: report_cust_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cust_bill.html,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -w -d -r1.12 -r1.12.2.1
--- report_cust_bill.html 28 Aug 2010 00:18:27 -0000 1.12
+++ report_cust_bill.html 27 Jul 2011 23:27:26 -0000 1.12.2.1
@@ -1,16 +1,19 @@
-<% include('/elements/header.html', 'Invoice Report' ) %>
+<% include('/elements/header.html', $title ) %>
<FORM ACTION="cust_bill.html" METHOD="GET">
<INPUT TYPE="hidden" NAME="magic" VALUE="_date">
+<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>">
<TABLE BGCOLOR="#cccccc" CELLSPACING=0
+% unless ( $custnum ) {
<% include( '/elements/tr-select-agent.html',
'curr_value' => scalar( $cgi->param('agentnum') ),
'label' => 'Invoices for agent: ',
'disable_empty' => 0,
)
%>
+% }
<% include( '/elements/tr-input-beginning_ending.html' ) %>
@@ -25,6 +28,10 @@
field => 'owed',
)
%>
+
+% if ( $cust_main ) {
+ <INPUT TYPE="hidden" NAME="payby" VALUE="<% $cust_main->payby %>">
+% } else {
<% include( '/elements/tr-select-payby.html',
label => 'Payment method:',
payby_type => 'cust',
@@ -32,15 +39,19 @@
all_selected => 1,
)
%>
+% }
<TR>
<TD ALIGN="right"><INPUT TYPE="checkbox" NAME="open" VALUE="1" CHECKED></TD>
<TD>Show only open invoices</TD>
</TR>
+
+% unless ( $custnum ) {
<TR>
<TD ALIGN="right"><INPUT TYPE="checkbox" NAME="newest_percust" VALUE="1"></TD>
<TD>Show only the single most recent invoice per-customer</TD>
</TR>
+% }
</TABLE>
@@ -55,4 +66,19 @@
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('List invoices');
+my $title = 'Invoice Report';
+
+#false laziness w/report_cust_pkg.html
+my $custnum = '';
+my $cust_main = '';
+if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
+ $custnum = $1;
+ $cust_main = qsearchs({
+ 'table' => 'cust_main',
+ 'hashref' => { 'custnum' => $custnum },
+ 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+ }) or die "unknown custnum $custnum";
+ $title .= ': '. $cust_main->name;
+}
+
</%init>
Index: cust_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill.html,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -u -w -d -r1.37.2.1 -r1.37.2.2
--- cust_bill.html 11 Nov 2010 01:44:50 -0000 1.37.2.1
+++ cust_bill.html 27 Jul 2011 23:27:26 -0000 1.37.2.2
@@ -98,6 +98,10 @@
$search{'agentnum'} = $1;
}
+ if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
+ $search{'custnum'} = $1;
+ }
+
# begin/end/beginning/ending
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, '');
$search{'_date'} = [ $beginning, $ending ]
More information about the freeside-commits
mailing list