[freeside-commits] branch FREESIDE_4_BRANCH updated. 4a4722fbb99c7db7f68fd4a1078ae67358f5d2cb
Ivan Kohler
ivan at freeside.biz
Mon Nov 9 13:18:11 PST 2020
The branch, FREESIDE_4_BRANCH has been updated
via 4a4722fbb99c7db7f68fd4a1078ae67358f5d2cb (commit)
from ee40d380a8f2c91f1cab6cc058505c38bd82cd21 (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 4a4722fbb99c7db7f68fd4a1078ae67358f5d2cb
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Nov 9 13:18:10 2020 -0800
add credit reason selection, RT#85046
diff --git a/httemplate/elements/tr-select-reason.html b/httemplate/elements/tr-select-reason.html
index 8cb922381..d1b142bae 100755
--- a/httemplate/elements/tr-select-reason.html
+++ b/httemplate/elements/tr-select-reason.html
@@ -16,7 +16,7 @@ Example:
'control_button' => 'element_name', #button to be enabled when a reason is
#selected
'id' => 'element_id',
- 'hide_add' => '1', # setting this will hide the add new reason link,
+ 'hide_addnew' => '1', # setting this will hide the add new reason link,
# even if the user has access to add a new reason.
'hide_onload' => '1', # setting this will hide reason select box on page load,
# allowing for it do be displayed later.
diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
index 1edcd35eb..6f95c91ba 100755
--- a/httemplate/search/cust_credit.html
+++ b/httemplate/search/cust_credit.html
@@ -195,6 +195,10 @@ if ( $cgi->param('credbatch') =~ /^([\w\-\/\.\:]+)$/ ) {
push @search, "cust_credit.credbatch = '$1'";
}
+if ( $cgi->param('reasonnum') =~ /^(\d+)$/ && $1 ) {
+ push @search, "cust_credit.reasonnum = $1";
+}
+
# commission_salesnum
if ( $cgi->param('commission_salesnum') =~ /^(\d+)$/ ) {
push @search, "commission_salesnum = $1";
diff --git a/httemplate/search/report_cust_credit.html b/httemplate/search/report_cust_credit.html
index cafe556ba..c37b578b4 100644
--- a/httemplate/search/report_cust_credit.html
+++ b/httemplate/search/report_cust_credit.html
@@ -24,6 +24,15 @@
'field' => 'amount',
&>
+ <& /elements/tr-select-reason.html,
+ 'label' => emt('Reason').':',
+ 'field' => 'reasonnum',
+ 'reason_class' => 'R',
+ 'cgi' => $cgi,
+ 'hide_addnew' => 1,
+ 'pre_options' => [ 0 => emt('(any reason)') ],
+ &>
+
<& /elements/tr-checkbox.html,
'label' => emt('Show Voided Credits').':',
'field' => 'show_voided_credits',
-----------------------------------------------------------------------
Summary of changes:
httemplate/elements/tr-select-reason.html | 2 +-
httemplate/search/cust_credit.html | 4 ++++
httemplate/search/report_cust_credit.html | 9 +++++++++
3 files changed, 14 insertions(+), 1 deletion(-)
More information about the freeside-commits
mailing list