Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined FS/FS/cust_main/Billing.pm
index 47cbbf1,aadc8e1..c0c15e4
--- 1/FS/FS/cust_main/Billing.pm
--- 2/FS/FS/cust_main/Billing.pm
+++ b/FS/FS/cust_main/Billing.pm
@@@ -1087,9 -1087,7 +1087,9 @@@ sub _make_lines 
      }
  
      $lineitems++
 -    if $cust_pkg->waive_setup && $part_pkg->can('prorate_setup') && $part_pkg->prorate_setup($cust_pkg, $time);
 +      if $cust_pkg->waive_setup
 +      && $part_pkg->can('prorate_setup')
 +      && $part_pkg->prorate_setup($cust_pkg, $time);
  
      if ( $cust_pkg->get('setup') ) {
        # don't change it
@@@ -1651,10 -1649,28 +1651,28 @@@ sub _handle_taxes 
      my @taxes = (); # entries are cust_main_county objects
      my %taxhash_elim = %taxhash;
      my @elim = qw( district city county state );
+ 
+     # WA state district city names are not stable in the WA tax tables
+     # Allow districts to match with just a district id
+     if ( $taxhash{district} ) {
+       @taxes = qsearch( cust_main_county => {
+         district => $taxhash{district},
+         taxclass => $taxhash{taxclass},
+       });
+       if ( !scalar(@taxes) && $taxhash{taxclass} ) {
+         qsearch( cust_main_county => {
+           district => $taxhash{district},
+           taxclass => '',
+         });
+       }
+     }
+ 
      do { 
  
        #first try a match with taxclass
-       @taxes = qsearch( 'cust_main_county', \%taxhash_elim );
+       if ( !scalar(@taxes) ) {
+         @taxes = qsearch( 'cust_main_county', \%taxhash_elim );
+       }
  
        if ( !scalar(@taxes) && $taxhash_elim{'taxclass'} ) {
          #then try a match without taxclass