From 33cb7fc58966405d44437971f87f21bf4b99df95 Mon Sep 17 00:00:00 2001
From: bMancone <brice.mancone@prestashop.com>
Date: Fri, 11 May 2012 10:00:16 +0000
Subject: [PATCH] // Fixed #PSCFV-2175

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15214 b9a71923-0436-4b27-9f14-aed3839534dd
---
 .../admin/AdminPPreferencesController.php     | 63 +------------------
 js/admin.js                                   | 17 -----
 2 files changed, 1 insertion(+), 79 deletions(-)

diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php
index 6e5079a71..693be23a7 100644
--- a/controllers/admin/AdminPPreferencesController.php
+++ b/controllers/admin/AdminPPreferencesController.php
@@ -213,22 +213,9 @@ class AdminPPreferencesControllerCore extends AdminController
 						'required' => false,
 						'type' => 'bool',
 						'visibility' => Shop::CONTEXT_ALL,
-						'js' => array(
-							'on' => 'onchange="advStockManagementActivationAuthorization()"',
-							'off' => 'onchange="advStockManagementActivationAuthorization()"'
-						)
-					),
-					'UPDATE_ASM_PRODUCTS' => array(
-						'title' => $this->l('Update products:'),
-						'desc' => $this->l('Massively activate(yes) or desactivate(no) advanced stock management for all products.'),
-						'validation' => 'isBool',
-						'cast' => 'intval',
-						'required' => false,
-						'type' => 'bool',
-						'visibility' => Shop::CONTEXT_ALL,
 					),
 				),
-				'bottom' => '<script type="text/javascript">stockManagementActivationAuthorization(); advStockManagementActivationAuthorization();</script>',
+				'bottom' => '<script type="text/javascript">stockManagementActivationAuthorization();</script>',
 				'submit' => array()
 			),
 		);
@@ -255,52 +242,4 @@ class AdminPPreferencesControllerCore extends AdminController
 		}
 	}
 
-	public function postProcess()
-	{
-		// if advanced stock management is activated, and mass update of products is required
-		if (((int)Tools::getValue('PS_ADVANCED_STOCK_MANAGEMENT') == 1 || Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') == 1) &&
-			Tools::isSubmit('UPDATE_ASM_PRODUCTS'))
-		{
-			// gets the value to set
-			$advanced_stock_management = (int)Tools::getValue('UPDATE_ASM_PRODUCTS');
-
-			// updates product table
-			ObjectModel::updateMultishopTable(
-				'Product',
-				array(
-					'advanced_stock_management' => $advanced_stock_management
-				),
-				'product_shop.`advanced_stock_management` = '.($advanced_stock_management == 1 ? 0 : 1).'
-				 AND `cache_is_pack` = 0
-				 AND `is_virtual` = 0'
-			);
-
-			// updates stock available table
-			Db::getInstance()->execute(
-				'UPDATE `'._DB_PREFIX_.'stock_available` s
-				 LEFT JOIN
-				 	`'._DB_PREFIX_.'product` p
-				 ON
-				 (
-				 	p.`id_product` = s.`id_product`
-				 )
-				 LEFT JOIN
-				 	`'._DB_PREFIX_.'product_shop` product_shop
-				 ON
-				 (
-				 	p.`cache_is_pack` = 0
-				 	AND p.`is_virtual` = 0
-				 	AND product_shop.`advanced_stock_management` = '.$advanced_stock_management.'
-				 )
-				 SET s.`depends_on_stock` = '.$advanced_stock_management.',
-				 	 s.`quantity` = 0
-				 WHERE s.`depends_on_stock` = '.($advanced_stock_management == 1 ? 0 : 1));
-		}
-
-		// deletes from post since it's not a configuration variable..
-		if (Tools::isSubmit('UPDATE_ASM_PRODUCTS'))
-			unset($_POST['UPDATE_ASM_PRODUCTS']);
-
-		return parent::postProcess();
-	}
 }
diff --git a/js/admin.js b/js/admin.js
index dc46c7695..6d0f360ef 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -514,23 +514,6 @@ function stockManagementActivationAuthorization()
 		getE('PS_ADVANCED_STOCK_MANAGEMENT_on').disabled = 'disabled';
 		getE('PS_ADVANCED_STOCK_MANAGEMENT_off').disabled = 'disabled';
 	}
-	
-	advStockManagementActivationAuthorization();
-}
-
-function advStockManagementActivationAuthorization()
-{
-	if (getE('PS_ADVANCED_STOCK_MANAGEMENT_on').checked)
-	{
-		getE('UPDATE_ASM_PRODUCTS_on').disabled = false;
-		getE('UPDATE_ASM_PRODUCTS_off').disabled = false;
-	}
-	else
-	{
-		getE('UPDATE_ASM_PRODUCTS_off').checked = true;
-		getE('UPDATE_ASM_PRODUCTS_on').disabled = 'disabled';
-		getE('UPDATE_ASM_PRODUCTS_off').disabled = 'disabled';
-	}
 }
 
 function hookCheckboxes(id, opt, champ)