Admin may set no tax category on product unless tax category is required

app/views/spree/admin/products/_tax_category_form.html.haml

@@ -2,5 +2,5 @@
   = f.label :tax_category_id, t(:tax_category)
   %span.required *
   %br
-  = f.collection_select(:tax_category_id, Spree::TaxCategory.all, :id, :name, {:include_blank => Spree::TaxCategory.count > 1}, {:class => "select2 fullwidth"})
+  = f.collection_select(:tax_category_id, Spree::TaxCategory.all, :id, :name, {:include_blank => Spree::Config.products_require_tax_category ? false : 'None'}, {:class => "select2 fullwidth"})
   = f.error_message_on :tax_category_id

spec/features/admin/products_spec.rb

@@ -118,6 +118,8 @@
     end
 
     scenario "creating a new product" do
+      Spree::Config.products_require_tax_category = false
+
       click_link 'Products'
       click_link 'New Product'
 
@@ -127,7 +129,7 @@
       page.should have_selector('#product_supplier_id')
       select 'Another Supplier', :from => 'product_supplier_id'
       select taxon.name, from: "product_primary_taxon_id"
-      select tax_category.name, from: "product_tax_category_id"
+      select 'None', from: "product_tax_category_id"
 
       # Should only have suppliers listed which the user can manage
       page.should have_select 'product_supplier_id', with_options: [@supplier2.name, @supplier_permitted.name]
@@ -138,7 +140,7 @@
       flash_message.should == 'Product "A new product !!!" has been successfully created!'
       product = Spree::Product.find_by_name('A new product !!!')
       product.supplier.should == @supplier2
-      product.tax_category.should == tax_category
+      product.tax_category.should be_nil
     end
 
     scenario "editing a product" do