[freeside-commits] branch FREESIDE_4_BRANCH updated. 85da1b4d2deb6b0c0ff4031337f6592dfc9aaa3a

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  85da1b4d2deb6b0c0ff4031337f6592dfc9aaa3a (commit)
       via  9dc28fd405e2e60151d9cb372cb645474183c02a (commit)
       via  b0252a835ec2fc25a761e8785a0026316d1ea2d9 (commit)
      from  364cbaf3cff70ab0b3ae228f96bf1155cb6cbe7d (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 85da1b4d2deb6b0c0ff4031337f6592dfc9aaa3a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Sep 18 15:23:13 2017 -0700

    fix package change vs. v4 discount refactor, RT#77513, RT#14092

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 7b59b32..b68c4dc 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2627,9 +2627,9 @@ sub change {
     foreach my $old_discount ($self->cust_pkg_discount_active) {
       # don't remove the old discount, we may still need to bill that package.
       my $new_discount = new FS::cust_pkg_discount {
-        'pkgnum'      => $cust_pkg->pkgnum,
-        'discountnum' => $old_discount->discountnum,
-        'months_used' => $old_discount->months_used,
+        'pkgnum' => $cust_pkg->pkgnum,
+        map { $_ => $old_discount->$_() }
+          qw( discountnum months_used end_date usernum setuprecur ),
       };
       $error = $new_discount->insert;
       if ( $error ) {

commit 9dc28fd405e2e60151d9cb372cb645474183c02a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Sep 18 15:01:44 2017 -0700

    4.x style change package popup

diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi
index e3ef4b7..06a66ef 100755
--- a/httemplate/misc/change_pkg.cgi
+++ b/httemplate/misc/change_pkg.cgi
@@ -8,7 +8,7 @@
 
 
 <FONT CLASS="fsinnerbox-title"><% mt('Package') |h %></FONT>
-<% ntable('#cccccc') %>
+<TABLE CLASS="fsinnerbox">
 
   <TR>
     <TH ALIGN="right"><% mt('Current package') |h %></TH>
@@ -45,7 +45,7 @@
 &>
 
 <FONT CLASS="fsinnerbox-title"><% mt('Change') |h %></FONT>
-<% ntable('#cccccc') %>
+<TABLE CLASS="fsinnerbox">
 
   <SCRIPT TYPE="text/javascript">
     function delay_changed() {
@@ -86,7 +86,7 @@
 
 
 <FONT CLASS="fsinnerbox-title"><% mt('Location') |h %></FONT>
-<% ntable('#cccccc') %>
+<TABLE CLASS="fsinnerbox">
 
   <& /elements/tr-select-cust_location.html,
                'cgi'       => $cgi,

commit b0252a835ec2fc25a761e8785a0026316d1ea2d9
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Sep 18 14:58:30 2017 -0700

    fix stickiness of address fields on errors, when entering new address

diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index 5ff320b..7a2d886 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -214,7 +214,7 @@ Example:
                                         ''
                                       )
                    );
-% } else {
+% } elsif ( $locationnum != -1 ) {
     locationnum_changed(document.getElementById('locationnum'));
 % }
 </SCRIPT>

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

Summary of changes:
 FS/FS/cust_pkg.pm                                |    6 +++---
 httemplate/elements/tr-select-cust_location.html |    2 +-
 httemplate/misc/change_pkg.cgi                   |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)