[freeside-commits] freeside/httemplate/search cust_bill.html, 1.39, 1.40 report_cust_bill.html, 1.14, 1.15
Ivan,,,
ivan at wavetail.420.am
Wed Jul 27 16:26:59 PDT 2011
Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv32301/httemplate/search
Modified Files:
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.14
retrieving revision 1.15
diff -u -w -d -r1.14 -r1.15
--- report_cust_bill.html 27 May 2011 02:25:42 -0000 1.14
+++ report_cust_bill.html 27 Jul 2011 23:26:57 -0000 1.15
@@ -1,15 +1,18 @@
-<& /elements/header.html, mt('Invoice Report') &>
+<& /elements/header.html, mt($title, @title_arg) &>
<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 ) {
<& /elements/tr-select-agent.html,
'curr_value' => scalar( $cgi->param('agentnum') ),
'label' => emt('Invoices for agent: '),
'disable_empty' => 0,
&>
+% }
<& /elements/tr-input-beginning_ending.html &>
@@ -22,21 +25,29 @@
label => emt('Owed'),
field => 'owed',
&>
+
+% if ( $cust_main ) {
+ <INPUT TYPE="hidden" NAME="payby" VALUE="<% $cust_main->payby %>">
+% } else {
<& /elements/tr-select-payby.html,
label => emt('Payment method:'),
payby_type => 'cust',
multiple => 1,
all_selected => 1,
&>
+% }
<TR>
<TD ALIGN="right"><INPUT TYPE="checkbox" NAME="open" VALUE="1" CHECKED></TD>
<TD><% mt('Show only open invoices') |h %></TD>
</TR>
+
+% unless ( $custnum ) {
<TR>
<TD ALIGN="right"><INPUT TYPE="checkbox" NAME="newest_percust" VALUE="1"></TD>
<TD><% mt('Show only the single most recent invoice per-customer') |h %></TD>
</TR>
+% }
</TABLE>
@@ -51,4 +62,21 @@
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('List invoices');
+my $title = 'Invoice Report';
+#false laziness w/report_cust_pkg.html
+my @title_arg = ();
+
+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 .= ': [_1]';
+ push @title_arg, $cust_main->name;
+}
+
</%init>
Index: cust_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -w -d -r1.39 -r1.40
--- cust_bill.html 21 May 2011 18:56:45 -0000 1.39
+++ cust_bill.html 27 Jul 2011 23:26:57 -0000 1.40
@@ -93,6 +93,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