Hide tax options when disabled. Closes #2205.

admin/post-types/writepanels/variation-admin-html.php

@@ -120,11 +120,13 @@ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 								echo wp_dropdown_categories( $args );
 							?></td>
 							<td>
+								<?php if ( get_option( 'woocommerce_calc_taxes' ) == 'yes' ) : ?>
 								<label><?php _e( 'Tax class:', 'woocommerce' ); ?></label>
 								<select name="variable_tax_class[<?php echo $loop; ?>]"><?php
 									foreach ( $parent_data['tax_class_options'] as $key => $value )
 										echo '<option value="' . esc_attr( $key ) . '" ' . selected( $key, $_tax_class, false ) . '>' . esc_html( $value ) . '</option>';
 								?></select>
+								<?php endif; ?>
 							</td>
 						</tr>
 						<tr class="show_if_variation_downloadable">

admin/post-types/writepanels/writepanel-product_data.php

@@ -170,6 +170,8 @@ function woocommerce_product_data_box() {
 
 			echo '</div>';
 
+			if ( get_option( 'woocommerce_calc_taxes' ) == 'yes' ) {
+
 				echo '<div class="options_group show_if_simple show_if_external show_if_variable">';
 
 					// Tax
@@ -192,6 +194,8 @@ function woocommerce_product_data_box() {
 
 				echo '</div>';
 
+			}
+
 			do_action( 'woocommerce_product_options_general_product_data' );
 			?>
 		</div>