[freeside-commits] branch master updated. 6a7acbedcaa251d104b9cdfc3875b5e5274f8a9a

[Mark Wells]

The branch, master has been updated
       via  6a7acbedcaa251d104b9cdfc3875b5e5274f8a9a (commit)
       via  52e5c0e05140ae3b1ae0bfd7486ac33a3af6f55c (commit)
       via  ef7a02376e94a07b6488956c467ae2e2face8b99 (commit)
      from  e151a538a611ed5aa3c08164cebc7230e5fa0da1 (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 6a7acbedcaa251d104b9cdfc3875b5e5274f8a9a
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Feb 24 15:13:35 2015 -0800

    fix incorrect use of FS::Conf, #27276

diff --git a/FS/FS/detail_format.pm b/FS/FS/detail_format.pm
index e49a9f9..be84680 100644
--- a/FS/FS/detail_format.pm
+++ b/FS/FS/detail_format.pm
@@ -63,13 +63,13 @@ sub new {
   my %opt = @_;
 
   my $locale = $opt{'locale'} || '';
-  my $conf = FS::Conf->new(locale => $locale);
+  my $conf = FS::Conf->new({ locale => $locale });
   $locale ||= $conf->config('locale') || 'en_US';
 
   my %locale_info = FS::Locales->locale_info($locale);
   my $language_name = $locale_info{'name'};
 
-  my $self = { conf => FS::Conf->new(locale => $locale),
+  my $self = { conf => FS::Conf->new({ locale => $locale }),
                csv  => Text::CSV_XS->new({ binary => 1 }),
                inbound  => ($opt{'inbound'} ? 1 : 0),
                buffer   => ($opt{'buffer'} || []),

commit 52e5c0e05140ae3b1ae0bfd7486ac33a3af6f55c
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Feb 24 15:12:13 2015 -0800

    fix SQL syntax, #25718

diff --git a/FS/FS/part_pkg_taxproduct.pm b/FS/FS/part_pkg_taxproduct.pm
index c12a432..e86d028 100644
--- a/FS/FS/part_pkg_taxproduct.pm
+++ b/FS/FS/part_pkg_taxproduct.pm
@@ -153,7 +153,11 @@ sub part_pkg_taxrate {
     map { $_->taxproductnum }
     $self->expand_cch_taxproduct
   );
-  $extra_sql .= "AND taxproductnum IN($tpnums)";
+
+  # if there are no taxproductnums, there are no matching tax classes
+  return if length($tpnums) == 0;
+
+  $extra_sql .= " AND taxproductnum IN($tpnums)";
 
   my $addl_from = 'LEFT JOIN part_pkg_taxproduct USING ( taxproductnum )';
   my $order_by = 'ORDER BY taxclassnum, length(geocode) desc, length(taxproduct) desc';

commit ef7a02376e94a07b6488956c467ae2e2face8b99
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Feb 24 15:11:35 2015 -0800

    fix for new tax engine, #32866

diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm
index 9305eb3..87499a9 100644
--- a/FS/FS/cust_main/Billing.pm
+++ b/FS/FS/cust_main/Billing.pm
@@ -537,7 +537,12 @@ sub bill {
           push @passes, $pass;
           $total_setup{$pass} = do { my $z = 0; \$z };
           $total_recur{$pass} = do { my $z = 0; \$z };
-          $taxlisthash{$pass} = {};
+          # it also needs its own tax context
+          $tax_engines{$pass} = FS::TaxEngine->new(
+                                  cust_main    => $self,
+                                  invoice_time => $invoice_time,
+                                  cancel       => $options{cancel}
+                                );
           $cust_bill_pkg{$pass} = [];
         }
       } elsif ( ($cust_pkg->no_auto || $part_pkg->no_auto) ) {

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

Summary of changes:
 FS/FS/cust_main/Billing.pm   |    7 ++++++-
 FS/FS/detail_format.pm       |    4 ++--
 FS/FS/part_pkg_taxproduct.pm |    6 +++++-
 3 files changed, 13 insertions(+), 4 deletions(-)