X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_cust_pkg.html;h=66dd7d15e4ba915860407ce66172469bfbc72b33;hb=d1014a727cefa5d9813153594541f62ec15fc8b9;hp=1412816c989b217b8aa9a32302e9ab5b83677764;hpb=f145ba710c004d0735caae621004d2776b178a6e;p=freeside.git
diff --git a/httemplate/search/report_cust_pkg.html b/httemplate/search/report_cust_pkg.html
index 1412816c9..66dd7d15e 100755
--- a/httemplate/search/report_cust_pkg.html
+++ b/httemplate/search/report_cust_pkg.html
@@ -6,14 +6,18 @@
- Search options |
+
+ Search options
+ |
+
<% include( '/elements/tr-select-agent.html',
- ($cgi->param('agentnum') || ''),
+ 'curr_value' => scalar( $cgi->param('agentnum') ),
+ 'disable_empty' => 0,
)
%>
- <% include( '/elements/tr-select-cust_pkg-status.html', '',
+ <% include( '/elements/tr-select-cust_pkg-status.html',
'onchange' => 'status_changed(this);',
)
%>
@@ -26,7 +30,7 @@
if ( what.options[what.selectedIndex].value == '<% $status %>' ) {
-% foreach my $field (qw( setup last_bill bill susp expire cancel )) {
+% foreach my $field (qw( setup last_bill bill adjourn susp expire cancel )) {
% if ( $disable{$status}->{$field} ) {
what.form.<% $field %>_beginning_text.disabled = true;
@@ -62,13 +66,27 @@
- <% include( '/elements/tr-select-pkg_class.html', '',
+ <% include( '/elements/tr-select-pkg_class.html',
'pre_options' => [ '0' => 'all' ],
'empty_label' => '(empty class)',
)
%>
-% foreach my $field (qw( setup last_bill bill susp expire cancel )) {
+% if ( scalar( qsearch( 'part_pkg_report_option', { 'disabled' => '' } ) ) ) {
+
+ <% include( '/elements/tr-select-table.html',
+ 'label' => 'Report classes',
+ 'table' => 'part_pkg_report_option',
+ 'name_col' => 'name',
+ 'hashref' => { 'disabled' => '' },
+ 'element_name' => 'report_option',
+ 'multiple' => 'multiple',
+ )
+ %>
+
+% }
+
+% foreach my $field (qw( setup last_bill bill adjourn susp expire cancel )) {
<% $label{$field} %> |
@@ -85,6 +103,34 @@
% }
+
+
+ <% include( '/elements/tr-checkbox.html',
+ 'label' => 'Custom packages',
+ 'field' => 'custom',
+ 'value' => 1,
+ 'onchange' => 'custom_changed(this);',
+ )
+ %>
+
<% include( '/elements/tr-selectmultiple-part_pkg.html' ) %>
@@ -116,6 +162,7 @@ my %label = (
'setup' => 'Setup',
'last_bill' => 'Last bill',
'bill' => 'Next bill',
+ 'adjourn' => 'Adjourns',
'susp' => 'Suspended',
'expire' => 'Expires',
'cancel' => 'Cancelled',
@@ -124,7 +171,8 @@ my %label = (
#false laziness w/cust_pkg.cgi
my %disable = (
'all' => {},
- 'one-time charge' => { 'last_bill'=>1, 'bill'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, },
+ 'not yet billed' => { 'setup'=>1, 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, },
+ 'one-time charge' => { 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, },
'active' => { 'susp'=>1, 'cancel'=>1 },
'suspended' => { 'cancel' => 1 },
'cancelled' => {},