[freeside-commits] freeside/FS/FS cust_main.pm,1.464,1.465

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv3460/FS/FS

Modified Files:
	cust_main.pm 
Log Message:
using the per-city taxes sure was a lot easier than the UI... RT#5852

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -d -r1.464 -r1.465
--- cust_main.pm	9 Oct 2009 23:59:24 -0000	1.464
+++ cust_main.pm	12 Oct 2009 02:34:44 -0000	1.465
@@ -3105,7 +3105,7 @@
 
     } else {
 
-      my @loc_keys = qw( state county country );
+      my @loc_keys = qw( city county state country );
       my %taxhash;
       if ( $conf->exists('tax-pkg_address') && $cust_pkg->locationnum ) {
         my $cust_location = $cust_pkg->cust_location;
@@ -3124,7 +3124,7 @@
 
       my %taxhash_elim = %taxhash;
 
-      my @elim = qw( taxclass county state );
+      my @elim = qw( taxclass city county state );
       while ( !scalar(@taxes) && scalar(@elim) ) {
         $taxhash_elim{ shift(@elim) } = '';
         @taxes = qsearch( 'cust_main_county', \%taxhash_elim );
@@ -7243,7 +7243,7 @@
     'plan'          => 'flat',
     'freq'          => 0,
     'disabled'      => 'Y',
-    'classnum'      => $classnum ? $classnum : '',
+    'classnum'      => ( $classnum ? $classnum : '' ),
     'setuptax'      => $setuptax,
     'taxclass'      => $taxclass,
     'taxproductnum' => $taxproduct,