[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 188a434202af3a84a9ea0bcdb45a8cfb4cc60be3
Mark Wells
mark at 420.am
Thu Aug 2 15:56:05 PDT 2012
The branch, FREESIDE_2_3_BRANCH has been updated
via 188a434202af3a84a9ea0bcdb45a8cfb4cc60be3 (commit)
from 7b4022b9ca7443fe12c1a21d354d9b329d84ee54 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 188a434202af3a84a9ea0bcdb45a8cfb4cc60be3
Author: Mark Wells <mark at freeside.biz>
Date: Thu Aug 2 15:55:48 2012 -0700
sales by ad source report: filter by ad source, #17971
diff --git a/httemplate/elements/tr-select-part_referral.html b/httemplate/elements/tr-select-part_referral.html
index 765aa84..5041f7f 100644
--- a/httemplate/elements/tr-select-part_referral.html
+++ b/httemplate/elements/tr-select-part_referral.html
@@ -14,13 +14,7 @@
<INPUT TYPE="hidden" NAME="<% $opt{'element_name'} || $opt{'field'} || 'refnum' %>" VALUE="<% $opt{'part_referrals'}->[0]->refnum %>">
% } else {
-
- <TR>
-% if ( $opt{'label'} ) {
- <TD ALIGN="right"><% $opt{'label'} %></TD>
-% } else {
- <TH ALIGN="right"><%$r%><% mt('Advertising source') |h %></TH>
-% }
+ <& /elements/tr-td-label.html, label => 'Advertising source', %opt &>
<TD COLSPAN="<% $colspan %>">
<& /elements/select-part_referral.html,
'curr_value' => $refnum,
diff --git a/httemplate/search/cust_bill_pkg_referral.html b/httemplate/search/cust_bill_pkg_referral.html
index 3cb434c..77b4860 100644
--- a/httemplate/search/cust_bill_pkg_referral.html
+++ b/httemplate/search/cust_bill_pkg_referral.html
@@ -146,6 +146,16 @@ if ( @status_where ) {
') IN (' . join(',', @status_where) .')';
}
+my @refnum;
+foreach my $refnum ($cgi->param('refnum')) {
+ if ( $refnum =~ /^\d+$/ ) {
+ push @refnum, $refnum;
+ }
+}
+if ( @refnum ) {
+ push @where, 'cust_main.refnum IN ('.join(',', @refnum).')';
+}
+
if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
push @where, "cust_main.agentnum = $1";
}
diff --git a/httemplate/search/report_cust_bill_pkg_referral.html b/httemplate/search/report_cust_bill_pkg_referral.html
index ff2caa1..b4716d4 100644
--- a/httemplate/search/report_cust_bill_pkg_referral.html
+++ b/httemplate/search/report_cust_bill_pkg_referral.html
@@ -18,6 +18,11 @@
'disable_empty' => 1,
&>
+<& /elements/tr-select-part_referral.html,
+ 'multiple' => 1,
+ 'disable_empty' => 1,
+&>
+
<& /elements/tr-select-pkg_class.html,
'pre_options' => [ '' => 'all', '0' => '(empty class)' ],
'disable_empty' => 1,
-----------------------------------------------------------------------
Summary of changes:
httemplate/elements/tr-select-part_referral.html | 8 +-------
httemplate/search/cust_bill_pkg_referral.html | 10 ++++++++++
.../search/report_cust_bill_pkg_referral.html | 5 +++++
3 files changed, 16 insertions(+), 7 deletions(-)
More information about the freeside-commits
mailing list