X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main_county.pm;h=effc428817091f69b3ebff09f3ab94cbc9a70aa6;hb=7109bfc5e06bbabb3d61c6298ce59cf287541667;hp=ab1ac1e33c54598e3d50ae1d4b319c477d846434;hpb=40a7b3dc653e099f7bd0bd762b649b04c4432db2;p=freeside.git

diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index ab1ac1e33..effc42881 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -256,7 +256,10 @@ sub taxline {
       my ($mon,$year) =
         (localtime( $cust_bill_pkg->sdate || $invoice_date ) )[4,5];
       $mon++;
-      my $freq = $part_pkg->freq || 1;
+      my $freq = $cust_bill_pkg->freq;
+      unless ($freq) {
+        $freq = $part_pkg->freq || 1;  # less trustworthy fallback
+      }
       if ( $freq !~ /(\d+)$/ ) {
         $dbh->rollback if $oldAutoCommit;
         return "daily/weekly package definitions not (yet?)".
@@ -325,7 +328,7 @@ sub taxline {
             'taxnum'     => $self->taxnum,
             'year'       => 1900+$year,
             'month'      => $mon,
-            'amount'     => sprintf("%.2f", $addl ),
+            'amount'     => sprintf('%.2f', $addl ),
           } );
           if ($cust_bill_pkg->billpkgnum) {
             $cust_tax_exempt_pkg->billpkgnum($cust_bill_pkg->billpkgnum);