diff --git a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
index 8eb7302ed..88bc6c029 100644
--- a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+++ b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
@@ -33,8 +33,6 @@
 	var uploadableFileLabel = 0;
 	var textFieldLabel = 0;
 
-
-
 	function uploadFile()
 	{
 		$.ajaxFileUpload (
diff --git a/admin-dev/themes/default/template/controllers/products/warehouses.tpl b/admin-dev/themes/default/template/controllers/products/warehouses.tpl
index 41acf5298..e0a250abd 100644
--- a/admin-dev/themes/default/template/controllers/products/warehouses.tpl
+++ b/admin-dev/themes/default/template/controllers/products/warehouses.tpl
@@ -86,39 +86,4 @@
 		{/foreach}
 	</div>
 	<p>&nbsp;</p>
-
-	<script type="text/javascript">
-		$(document).ready(function() {
-			$('.check_all_warehouse').click(function() {
-				var check = $(this);
-				//get all checkboxes of current warehouse
-				var checkboxes = $('input[name*="'+check.val()+'"]');
-				
-				for (i=0; i<checkboxes.length; i++)
-				{
-					var item = $(checkboxes[i]);
-
-					if (item.is(':checked'))
-					{
-						item.attr("checked", "");
-					}
-					else
-					{
-						item.attr("checked", "checked");
-					}
-				}
-			});
-
-		// @TODO: a better way to fix the accordion wrong size bug when the selected page is this page
-		setTimeout(function() {
-			$('#warehouse_accordion').accordion();
-		}, 500);
-
-		// Resize the accordion once the page is visible because of the bug with accordions initialized
-		// inside a display:none block not having the correct size.
-		$('#warehouse_accordion').parents('.product-tab-content').bind('displayed', function(){
-			$('#warehouse_accordion').accordion("resize");
-		});
-		});
-	</script>
 {/if}
\ No newline at end of file
diff --git a/js/admin-products.js b/js/admin-products.js
index cc5c1ab83..636df2005 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -1140,6 +1140,43 @@ product_tabs['VirtualProduct'] = new function(){
 	}
 }
 
+product_tabs['Warehouses'] = new function(){
+	var self = this;
+
+	this.onReady = function(){
+		$('.check_all_warehouse').click(function() {
+			var check = $(this);
+			//get all checkboxes of current warehouse
+			var checkboxes = $('input[name*="'+check.val()+'"]');
+
+			for (i=0; i<checkboxes.length; i++)
+			{
+				var item = $(checkboxes[i]);
+
+				if (item.is(':checked'))
+				{
+					item.attr("checked", "");
+				}
+				else
+				{
+					item.attr("checked", "checked");
+				}
+			}
+		});
+
+		// @TODO: a better way to fix the accordion wrong size bug when the selected page is this page
+		setTimeout(function() {
+			$('#warehouse_accordion').accordion();
+		}, 500);
+
+		// Resize the accordion once the page is visible because of the bug with accordions initialized
+		// inside a display:none block not having the correct size.
+		$('#warehouse_accordion').parents('.product-tab-content').bind('displayed', function(){
+			$('#warehouse_accordion').accordion("resize");
+		});
+	};
+}
+
 var tabs_manager = new ProductTabsManager();
 tabs_manager.setTabs(product_tabs);