[freeside-commits] branch master updated. 0e4e128273e2e9ade0073c7c8a71fe95b9e19bc7

[Mitch Jackson]

The branch, master has been updated
       via  0e4e128273e2e9ade0073c7c8a71fe95b9e19bc7 (commit)
      from  a94906852f983d71d7b022f402ba74c7e9c90bad (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 0e4e128273e2e9ade0073c7c8a71fe95b9e19bc7
Author: Mitch Jackson <mitch at freeside.biz>
Date:   Tue Nov 28 02:21:57 2017 +0000

    Change selectbox to checkbox on Credit Report form RT#73200

diff --git a/httemplate/elements/tr-select-show_voided_credits.html b/httemplate/elements/tr-select-show_voided_credits.html
deleted file mode 100644
index 35c0cf401..000000000
--- a/httemplate/elements/tr-select-show_voided_credits.html
+++ /dev/null
@@ -1,15 +0,0 @@
-  <TR>
-    <TD ALIGN="right"><% $opt{'label'} || 'Show Voided Credits' %></TD>
-    <TD>
-      <select name='show_voided_credits'>
-        <option value=""></option>
-        <option value="0">no</option>
-        <option value="1">yes</option>
-      </select>
-    </TD>
-  </TR>
-<%init>
-
-my %opt = @_;
-
-</%init>
diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
index f81063cc8..4de50a035 100755
--- a/httemplate/search/cust_credit.html
+++ b/httemplate/search/cust_credit.html
@@ -33,14 +33,12 @@ my $clink = sub {
     : '';
 };
 
-# form selectbox for show_voided_credits:
-# - value='': use default from $conf
-# - value="0" : override default, do not show voided credits
-# - value="1" : override default, show voided credits
+# form checkbox for show_voided_credits:
+# - value=unset : do not show voided credits
+# - value="1"   : show voided credits
 my $show_voided_credits;
-$show_voided_credits = $conf->config('show_voided_credits');
 $show_voided_credits = $cgi->param('show_voided_credits')
-  if $cgi->param('show_voided_credits') =~ /^(\d)$/;
+  if $cgi->param('show_voided_credits');
 
 my (@header, @fields, @sort_fields, $align, @links, @color, @style);
 $align = '';
diff --git a/httemplate/search/report_cust_credit.html b/httemplate/search/report_cust_credit.html
index 34e05394e..cafe556ba 100644
--- a/httemplate/search/report_cust_credit.html
+++ b/httemplate/search/report_cust_credit.html
@@ -24,8 +24,10 @@
                 'field' => 'amount',
   &>
 
-  <& /elements/tr-select-show_voided_credits.html,
-                'label' => emt('Show Voided Credits'),
+  <& /elements/tr-checkbox.html,
+       'label' => emt('Show Voided Credits').':',
+       'field' => 'show_voided_credits',
+       'value' => '1',
   &>
 
 
@@ -51,4 +53,3 @@ my $title = $cgi->param('unapplied') ?
               'Unapplied credit report' : 'Credit report';
 
 </%init>
-

-----------------------------------------------------------------------

Summary of changes:
 httemplate/elements/tr-select-show_voided_credits.html | 15 ---------------
 httemplate/search/cust_credit.html                     | 10 ++++------
 httemplate/search/report_cust_credit.html              |  7 ++++---
 3 files changed, 8 insertions(+), 24 deletions(-)
 delete mode 100644 httemplate/elements/tr-select-show_voided_credits.html