From 565ce7a2c1b7d3f59038e647e57fdcd1275fd5d7 Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Tue, 22 May 2012 13:23:35 +0000
Subject: [PATCH] [-] BO : fix bug #PSCFV-2522 - Unable to switch a product
 from virtual to normal

---
 .../template/controllers/products/helpers/form/form.tpl     | 1 +
 .../template/controllers/products/virtualproduct.tpl        | 1 -
 js/admin-products.js                                        | 6 ++++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
index 6cb6b3cf3..76e35fc8f 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
@@ -234,6 +234,7 @@
 
 	<form id="product_form" action="{$form_action}" method="post" enctype="multipart/form-data" name="product" style="display:none;">
 		<input type="hidden" name="id_product" value="{$id_product}" />
+		<input type="hidden" id="is_virtual" name="is_virtual" value="{$product->is_virtual}" />
 		<div class="tab-pane" id="tabPane1">
 		{if !$product->active && $product->isAssociatedToShop()}
 			<div class="warn draft" >
diff --git a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
index 74447a6a5..d1251faf1 100644
--- a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+++ b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
@@ -116,7 +116,6 @@
 	</div>
 	{* [begin] virtual product *}
 	<div id="virtual_good" {if !$product->productDownload->id || $product->productDownload->active}style="display:none"{/if} >
-		<input type="hidden" id="is_virtual" name="is_virtual" value="{$product->is_virtual}" />
 		<div>
 			<label>{l s='Does this product has an associated file?'}</label>
 			<label style="width:50px"><input type="radio" value="1"  name="is_virtual_file" {if $product_downloaded}checked="checked"{/if} />{l s='Yes'}</label>
diff --git a/js/admin-products.js b/js/admin-products.js
index f406fd222..893aa2377 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -816,9 +816,11 @@ product_tabs['Informations'] = new function(){
 			$('li.tab-row a[id*="Pack"]').hide();
 			$('li.tab-row a[id*="VirtualProduct"]').hide();
 			$('div.ppack').hide();
-			$('#is_virtual_good').removeAttr('checked');
 			$('div.is_virtual_good').hide();
 			$('#is_virtual').val(0);
+			tabs_manager.onLoad('VirtualProduct', function(){
+				$('#is_virtual_good').removeAttr('checked');
+			});
 
 			product_type = $(this).val();
 
@@ -855,11 +857,11 @@ product_tabs['Informations'] = new function(){
 				else
 				{
 					$('li.tab-row a[id*="VirtualProduct"]').show().click();
+					$('#is_virtual').val(1);
 
 					tabs_manager.onLoad('VirtualProduct', function(){
 						$('#is_virtual_good').attr('checked', true);
 						$('#virtual_good').show();
-						$('#is_virtual').val(1);
 					});
 
 					tabs_manager.onLoad('Quantities', function(){