projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7404ff9
)
sales by ad source report: filter by ad source, #17971
author
Mark Wells
<mark@freeside.biz>
Thu, 2 Aug 2012 22:54:31 +0000
(15:54 -0700)
committer
Mark Wells
<mark@freeside.biz>
Thu, 2 Aug 2012 22:54:31 +0000
(15:54 -0700)
httemplate/elements/tr-select-part_referral.html
patch
|
blob
|
history
httemplate/search/cust_bill_pkg_referral.html
patch
|
blob
|
history
httemplate/search/report_cust_bill_pkg_referral.html
patch
|
blob
|
history
diff --git
a/httemplate/elements/tr-select-part_referral.html
b/httemplate/elements/tr-select-part_referral.html
index
765aa84
..
5041f7f
100644
(file)
--- 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 {
<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,
<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
(file)
--- 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) .')';
}
') 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";
}
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
(file)
--- 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,
&>
'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,
<& /elements/tr-select-pkg_class.html,
'pre_options' => [ '' => 'all', '0' => '(empty class)' ],
'disable_empty' => 1,