diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2015-09-19 18:11:54 -0500 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2015-09-19 18:11:54 -0500 |
| commit | 15278bb4dcfaf4bdb79c7f8781320e24ef8f1e7d (patch) | |
| tree | 3463c2fefad884fe92d74c4fc4c0a023ef2dff58 | |
| parent | c0c5709fb022b83a482d0b35f7094505766d5868 (diff) | |
RT#35197: Apply changes button in Edit rate plan screen clears the global default [removed preserve_rate_detail, always true]
| -rw-r--r-- | FS/FS/rate.pm | 7 | ||||
| -rw-r--r-- | httemplate/edit/rate.cgi | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/FS/FS/rate.pm b/FS/FS/rate.pm index 03dde041b..d26d11697 100644 --- a/FS/FS/rate.pm +++ b/FS/FS/rate.pm @@ -469,11 +469,8 @@ sub process { warn "$rate replacing $old (". $param->{'ratenum'}. ")\n" if $DEBUG; my @param = ( 'job'=>$job ); - if ($param->{'preserve_rate_detail'}) { - $rate->default_detailnum($old->default_detailnum); - } else { - push @param, 'rate_detail'=>\@rate_detail; - } + + $rate->default_detailnum($old->default_detailnum); $error = $rate->replace( $old, @param ); diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi index 183ea8a42..1b052d62d 100644 --- a/httemplate/edit/rate.cgi +++ b/httemplate/edit/rate.cgi @@ -5,7 +5,7 @@ <% include('/elements/progress-init.html', 'OneTrueForm', - [ 'rate', 'agentnum', 'preserve_rate_detail' ], # 'rate', 'min_', 'sec_' ], + [ 'rate', 'agentnum' ], 'process/rate.cgi', $p.'browse/rate.cgi', ) @@ -27,8 +27,6 @@ </TABLE> <BR> -<INPUT TYPE="hidden" NAME="preserve_rate_detail" VALUE="1"> - <INPUT NAME="submit" TYPE="button" VALUE="<% $rate->ratenum ? "Apply changes" : "Add rate plan" %>" onClick="document.OneTrueForm.submit.disabled=true; process();"> |