diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 95af5d1ff25..038b456291b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3096,10 +3096,20 @@ class Form
         		$defaulttx = $this->cache_vatrates[$num-1]['txtva'];
         	}
 
-        	if (! $options_only) $return.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+        	// Disabled if $mysoc is not subject to VAT
+        	$disabled=false; $title='';
+        	if (is_object($societe_vendeuse) && $societe_vendeuse->id == $mysoc->id && $societe_vendeuse->tva_assuj == "0") {
+        		$title=' title="'.$langs->trans('VATIsNotUsed').'"';
+        		$disabled=true;
+        	}
+
+        	if (! $options_only) $return.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled="disabled"':'').$title.'>';
 
         	foreach ($this->cache_vatrates as $rate)
         	{
+        		// Force 0 if $mysoc is not subject to VAT
+        		if ($disabled && $rate['txtva'] != 0) continue;
+
         		$return.= '<option value="'.$rate['txtva'];
         		$return.= $rate['nprtva'] ? '*': '';
         		$return.= '"';
diff --git a/htdocs/core/tpl/objectline_add.tpl.php b/htdocs/core/tpl/objectline_add.tpl.php
index fbf9fe29d8b..f24a256df6a 100644
--- a/htdocs/core/tpl/objectline_add.tpl.php
+++ b/htdocs/core/tpl/objectline_add.tpl.php
@@ -145,11 +145,8 @@ if (! empty($conf->margin->enabled)) {
 	</td>
 
 	<td align="right">
-	<?php
-	if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" value="0">0';
-	else echo $form->load_tva('tva_tx', (GETPOST('tva_tx')?GETPOST('tva_tx'):-1), $seller, $buyer);
-	?>
-	<input type="hidden" id="origin_tva_tx_cache" name="origin_tva_tx_cache" value="" />
+		<?php echo $form->load_tva('tva_tx', (GETPOST('tva_tx')?GETPOST('tva_tx'):-1), $seller, $buyer); ?>
+		<input type="hidden" id="origin_tva_tx_cache" name="origin_tva_tx_cache" value="" />
 	</td>
 	<td align="right">
 		<input type="text" size="8" id="price_ht" name="price_ht" value="<?php echo (GETPOST('price_ht')?GETPOST('price_ht'):''); ?>">