[freeside-commits] branch FREESIDE_3_BRANCH updated. 342e1472c53f4718b6600fe52be3068f2caba61a

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  342e1472c53f4718b6600fe52be3068f2caba61a (commit)
      from  3006575f9f09477ac2a72cf2b0a16d911cc09172 (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 342e1472c53f4718b6600fe52be3068f2caba61a
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Feb 12 11:01:46 2015 -0800

    unbreak fixed-amount discounts on quotations, #33099

diff --git a/FS/FS/quotation_pkg.pm b/FS/FS/quotation_pkg.pm
index 88147bc..6c8aa46 100644
--- a/FS/FS/quotation_pkg.pm
+++ b/FS/FS/quotation_pkg.pm
@@ -105,11 +105,8 @@ otherwise returns false.
 
 =cut
 
-use Data::Dumper; #XXX DEBUG
 sub insert {
   my ($self, %options) = @_;
-  warn Dumper($self);
-  warn Dumper(\%options);
 
   my $dbh = dbh;
   my $oldAutoCommit = $FS::UID::AutoCommit;
@@ -318,7 +315,7 @@ sub insert_discount {
   #my ($self, %options) = @_;
   my $self = shift;
 
-  my $cust_pkg_discount = FS::quotation_pkg_discount->new( {
+  my $quotation_pkg_discount = FS::quotation_pkg_discount->new( {
     'quotationpkgnum' => $self->quotationpkgnum,
     'discountnum'     => $self->discountnum,
     #for the create a new discount case
@@ -329,7 +326,7 @@ sub insert_discount {
     'setup'       => $self->discountnum_setup,
   } );
 
-  $cust_pkg_discount->insert;
+  $quotation_pkg_discount->insert;
 }
 
 sub _item_discount {
@@ -351,7 +348,7 @@ sub _item_discount {
     push @ext, $pkg_discount->description;
     $d->{setup_amount} -= $pkg_discount->setup_amount;
     $d->{recur_amount} -= $pkg_discount->recur_amount;
-  } 
+  }
   $d->{setup_amount} *= $self->quantity || 1;
   $d->{recur_amount} *= $self->quantity || 1;
   $d->{amount} = $d->{setup_amount} + $d->{recur_amount};
diff --git a/FS/FS/quotation_pkg_discount.pm b/FS/FS/quotation_pkg_discount.pm
index 19a7bce..87ac6bd 100644
--- a/FS/FS/quotation_pkg_discount.pm
+++ b/FS/FS/quotation_pkg_discount.pm
@@ -118,18 +118,6 @@ sub check {
 
 =back
 
-=item amount
-
-Returns the total amount of this discount (setup + recur), for compatibility
-with L<FS::cust_bill_pkg_discount>.
-
-=cut
-
-sub amount {
-  my $self = shift;
-  return $self->get('setup_amount') + $self->get('recur_amount');
-}
-
 =item description
 
 Returns a string describing the discount (for use on the quotation).

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

Summary of changes:
 FS/FS/quotation_pkg.pm          |    9 +++------
 FS/FS/quotation_pkg_discount.pm |   12 ------------
 2 files changed, 3 insertions(+), 18 deletions(-)