// Updated mailalerts module

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13780 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-01 13:32:16 +00:00
parent 303a301a92
commit ed6fb12963
8 changed files with 206 additions and 157 deletions
@@ -1540,7 +1540,6 @@ class AdminProductsControllerCore extends AdminController
 						$this->errors[] = Tools::displayError('An error occurred while adding tags.');
 					elseif (empty($this->errors))
 					{
-						Hook::exec('actionProductUpdate', array('product' => $object));
 						if (in_array($object->visibility, array('both', 'search')))
 							Search::indexation(false, $object->id);

@@ -147,6 +147,7 @@ class AdminStockManagementControllerCore extends AdminController
 				$last_sm_quantity = 0;
 				$last_sm_quantity_is_usable = -1;
 				$last_sm = StockMvt::getLastPositiveStockMvt($id_product, $id_product_attribute);
+
 				if ($last_sm != false)
 				{
 					$last_sm_currency = new Currency((int)$last_sm['id_currency']);
@@ -1033,6 +1034,9 @@ class AdminStockManagementControllerCore extends AdminController
 						'is_post' => 1,
 					);

+					if ($this->display == 'addstock')
+						$_POST['id_product'] = (int)$id_product;
+
 					if ($this->display == 'transferstock')
 					{
 						$helper->fields_value['id_warehouse_from'] = Tools::getValue('id_warehouse_from', '');