fix payment/credit line-item application erroring out on tax applications

1 files changed, 9 insertions, 1 deletions

diff --git a/FS/FS/cust_bill_ApplicationCommon.pm b/FS/FS/cust_bill_ApplicationCommon.pm
index 467b581ab..9f61f5be5 100644
--- a/FS/FS/cust_bill_ApplicationCommon.pm
+++ b/FS/FS/cust_bill_ApplicationCommon.pm
@@ -178,7 +178,15 @@ sub apply_to_lineitems {
     # - apply based on weights...
 
     my $weight_col = $self->_app_part_pkg_weight_column;
-    my @openweight = map { [ $_, ($_->cust_pkg->part_pkg->$weight_col()||0) ] }
+    my @openweight = map { 
+                           my $open = $_;
+                           my $cust_pkg = $open->cust_pkg;
+                           my $weight =
+                             $cust_pkg
+                               ? ( $cust_pkg->part_pkg->$weight_col() || 0 )
+                               : 0; #default or per-tax weight?
+                           [ $open, $weight ]
+                         }
                          @open;
 
     my %saw = ();