From: Mark Wells <mark@freeside.biz>
Date: Sat, 9 Feb 2013 00:24:45 +0000 (-0800)
Subject: keep package dates when changing packages and not crediting, from #16066
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=fb33bc6850eb5ebf1f63d79afd503202b277b9a3;p=freeside.git

keep package dates when changing packages and not crediting, from #16066
---

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index c2077c533..9c3d16a79 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1753,9 +1753,11 @@ sub change {
   # going to be credited for remaining time, don't keep setup, bill, 
   # or last_bill dates, and DO pass the flag to cancel() to credit 
   # the customer.
-  if ( $opt->{'pkgpart'} and $opt->{'pkgpart'} != $self->pkgpart ) {
+  if ( $opt->{'pkgpart'} 
+       and $opt->{'pkgpart'} != $self->pkgpart
+       and $self->part_pkg->option('unused_credit_change', 1) ) {
+    $unused_credit = 1;
     $keep_dates = 0;
-    $unused_credit = 1 if $self->part_pkg->option('unused_credit_change', 1);
     $hash{$_} = '' foreach qw(setup bill last_bill);
   }