[freeside-commits] branch FREESIDE_4_BRANCH updated. 3a0faf78a1dc1e037409fd3e43461af42e47a82d

[Mark Wells]

The branch, FREESIDE_4_BRANCH has been updated
       via  3a0faf78a1dc1e037409fd3e43461af42e47a82d (commit)
       via  6d674b7531e814b9162696d1919ce644c955b407 (commit)
      from  0592d8e1ad7c8cab286b43743765fd1435cfac84 (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 3a0faf78a1dc1e037409fd3e43461af42e47a82d
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Jun 4 18:50:59 2015 -0700

    provide pkgpart in _item_discount for template use, #35103

diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index a5c4410..8233ce0 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -834,6 +834,8 @@ sub _item_discount {
     description     => $self->mt('Discount'),
     amount          => 0,
     ext_description => \@ext,
+    pkgpart         => $self->pkgpart,
+    feepart         => $self->feepart,
     # maybe should show quantity/unit discount?
   };
   foreach my $pkg_discount (@pkg_discounts) {

commit 6d674b7531e814b9162696d1919ce644c955b407
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Jun 4 18:50:53 2015 -0700

    load BroadWorks::OCI only as needed

diff --git a/FS/FS/part_export/broadworks.pm b/FS/FS/part_export/broadworks.pm
index 7a9ed70..5966867 100644
--- a/FS/FS/part_export/broadworks.pm
+++ b/FS/FS/part_export/broadworks.pm
@@ -6,7 +6,6 @@ use strict;
 use Tie::IxHash;
 use FS::Record qw(dbh qsearch qsearchs);
 use Locale::SubCountry;
-use BroadWorks::OCI;
 
 our $me = '[broadworks]';
 our %client; # exportnum => client object

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

Summary of changes:
 FS/FS/cust_bill_pkg.pm          |    2 ++
 FS/FS/part_export/broadworks.pm |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)