[freeside-commits] branch FREESIDE_3_BRANCH updated. d33f4a0d2123c69e19bdc377c812ae929b3bd6a0

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  d33f4a0d2123c69e19bdc377c812ae929b3bd6a0 (commit)
      from  49a4c77aaa2edb57acbf931096df678dd5c1a262 (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 d33f4a0d2123c69e19bdc377c812ae929b3bd6a0
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Jun 26 23:37:45 2013 -0700

    give supplemental packages the same location as their parent, #23748

diff --git a/FS/FS/cust_main/Packages.pm b/FS/FS/cust_main/Packages.pm
index 8484df5..152c496 100644
--- a/FS/FS/cust_main/Packages.pm
+++ b/FS/FS/cust_main/Packages.pm
@@ -183,7 +183,6 @@ sub order_pkg {
         'pkglinknum'    => $link->pkglinknum,
         'custnum'       => $self->custnum,
         'main_pkgnum'   => $cust_pkg->pkgnum,
-        'locationnum'   => $cust_pkg->locationnum,
         # try to prevent as many surprises as possible
         'pkgbatch'      => $cust_pkg->pkgbatch,
         'start_date'    => $cust_pkg->start_date,
@@ -196,7 +195,8 @@ sub order_pkg {
         'waive_setup'   => $cust_pkg->waive_setup,
         'allow_pkgpart' => $opt->{'allow_pkgpart'},
     });
-    $error = $self->order_pkg('cust_pkg' => $pkg);
+    $error = $self->order_pkg('cust_pkg' => $pkg,
+                              'locationnum' => $cust_pkg->locationnum);
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return "inserting supplemental package: $error";

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

Summary of changes:
 FS/FS/cust_main/Packages.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)