[freeside-commits] branch FREESIDE_4_BRANCH updated. dbc0db124d4568f3b97238e4c3e645e68f7e8b9c

[Ivan Kohler]

The branch, FREESIDE_4_BRANCH has been updated
       via  dbc0db124d4568f3b97238e4c3e645e68f7e8b9c (commit)
      from  d22f5c5b31de57f510c19694786e36354a67b81a (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 dbc0db124d4568f3b97238e4c3e645e68f7e8b9c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Feb 1 10:20:04 2018 -0800

    quiet warnings

diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index e44a84709..9567278aa 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -863,7 +863,7 @@ sub _item_discount {
   # show introductory rate as a pseudo-discount
   if (!$d) { # this will conflict with showing real discounts
     my $part_pkg = $self->part_pkg;
-    if ( $part_pkg and $part_pkg->option('show_as_discount') ) {
+    if ( $part_pkg and $part_pkg->option('show_as_discount',1) ) {
       my $cust_pkg = $self->cust_pkg;
       my $intro_end = $part_pkg->intro_end($cust_pkg);
       my $_date = $self->cust_bill->_date;
diff --git a/FS/FS/part_pkg/flat_introrate.pm b/FS/FS/part_pkg/flat_introrate.pm
index e43a525d2..f12b1accd 100644
--- a/FS/FS/part_pkg/flat_introrate.pm
+++ b/FS/FS/part_pkg/flat_introrate.pm
@@ -94,7 +94,7 @@ sub base_recur {
 
 sub item_discount {
   my ($self, $cust_pkg) = @_;
-  return unless $self->option('show_as_discount');
+  return unless $self->option('show_as_discount',1);
   my $intro_end = $self->intro_end($cust_pkg);
   my $amount = sprintf('%.2f',
                 $self->option('intro_fee') - $self->option('recur_fee')

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

Summary of changes:
 FS/FS/cust_bill_pkg.pm           | 2 +-
 FS/FS/part_pkg/flat_introrate.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)