[freeside-commits] branch master updated. 7ee96ef046f8e5167a4dda7c4322485549ec29c3

[Jonathan Prykop]

The branch, master has been updated
       via  7ee96ef046f8e5167a4dda7c4322485549ec29c3 (commit)
      from  62bfe13409a16e04599f52edb3ce00ee3031a0f9 (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 7ee96ef046f8e5167a4dda7c4322485549ec29c3
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Thu Sep 17 19:27:10 2015 -0500

    RT#35197: Apply changes button in Edit rate plan screen clears the global default

diff --git a/FS/FS/rate.pm b/FS/FS/rate.pm
index 8ee9a83..03dde04 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 0709d50..f8a7444 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;

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

Summary of changes:
 FS/FS/rate.pm                            |    7 +++++--
 httemplate/edit/process/rate_detail.html |    1 -
 2 files changed, 5 insertions(+), 3 deletions(-)