From: Mark Wells <mark@freeside.biz>
Date: Sat, 11 Jul 2015 01:15:08 +0000 (-0700)
Subject: Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=88bf5db0cca989c51237c661a13078eef08b3674;hp=e7eb845db1afab1cbdbc34ff9c387c5ac554659e;p=freeside.git

Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
---

diff --git a/httemplate/elements/tr-part_pkg-taxproducts.html b/httemplate/elements/tr-part_pkg-taxproducts.html
index 274dc3b48..ad464ca77 100644
--- a/httemplate/elements/tr-part_pkg-taxproducts.html
+++ b/httemplate/elements/tr-part_pkg-taxproducts.html
@@ -21,9 +21,12 @@
 my %opt = @_;
 my $field = delete($opt{field}) || 'taxproductnum';
 my $pkgpart = delete($opt{pkgpart});
-my $part_pkg = FS::part_pkg->by_key($pkgpart);
-my %pkg_options = $part_pkg->options;
-$pkg_options{'usage_taxproductnum_'} = $part_pkg->taxproductnum;
+my %pkg_options;
+if ($pkgpart) {
+  my $part_pkg = FS::part_pkg->by_key($pkgpart);
+  my %pkg_options = $part_pkg->options;
+  $pkg_options{'usage_taxproductnum_'} = $part_pkg->taxproductnum;
+}
 
 my @classes = qsearch('usage_class', { 'disabled' => '' });
 unshift @classes,