diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2015-09-17 19:27:10 -0500 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2015-09-17 19:27:10 -0500 |
| commit | 7ee96ef046f8e5167a4dda7c4322485549ec29c3 (patch) | |
| tree | af560b4124f9486b07058d7294551fc05fb331d1 | |
| parent | 62bfe13409a16e04599f52edb3ce00ee3031a0f9 (diff) | |
RT#35197: Apply changes button in Edit rate plan screen clears the global default
| -rw-r--r-- | FS/FS/rate.pm | 7 | ||||
| -rw-r--r-- | httemplate/edit/process/rate_detail.html | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/FS/FS/rate.pm b/FS/FS/rate.pm index 8ee9a83be..03dde041b 100644 --- a/FS/FS/rate.pm +++ b/FS/FS/rate.pm @@ -469,8 +469,11 @@ sub process { warn "$rate replacing $old (". $param->{'ratenum'}. ")\n" if $DEBUG; my @param = ( 'job'=>$job ); - push @param, 'rate_detail'=>\@rate_detail - unless $param->{'preserve_rate_detail'}; + if ($param->{'preserve_rate_detail'}) { + $rate->default_detailnum($old->default_detailnum); + } else { + push @param, 'rate_detail'=>\@rate_detail; + } $error = $rate->replace( $old, @param ); diff --git a/httemplate/edit/process/rate_detail.html b/httemplate/edit/process/rate_detail.html index 0709d5079..f8a744418 100644 --- a/httemplate/edit/process/rate_detail.html +++ b/httemplate/edit/process/rate_detail.html @@ -12,7 +12,6 @@ die "access denied" my $set_default_detail = sub { my ($cgi, $rate_detail) = @_; -warn Dumper $rate_detail; if (!$rate_detail->dest_regionnum) { # then this is a global default rate my $rate = $rate_detail->rate; |