[-] BO: Fix #PSCFV-4889 don't delete product if physical stock > 0

controllers/admin/AdminProductsController.php

@@ -536,15 +536,19 @@ class AdminProductsControllerCore extends AdminController
 						$this->errors[] = Tools::displayError('You cannot delete the product because there is physical stock left or supply orders in progress.');
 				}
 
+				if (!count($this->errors))
+				{
 					if ($object->delete())
 					{
 						$id_category = (int)Tools::getValue('id_category');
 						$category_url = empty($id_category) ? '' : '&id_category='.(int)$id_category;
 						$this->redirect_after = self::$currentIndex.'&conf=1&token='.$this->token.$category_url;
 					}
+					else
 						$this->errors[] = Tools::displayError('An error occurred during deletion.');
 				}
 			}
+		}
 		else
 			$this->errors[] = Tools::displayError('An error occurred while deleting object.').' <b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)');
 	}
@@ -632,10 +636,8 @@ class AdminProductsControllerCore extends AdminController
 								$real_quantity = $stock_manager->getProductRealQuantities($product->id, 0);
 								if ($physical_quantity > 0 || $real_quantity > $physical_quantity)
 									$this->errors[] = sprintf(Tools::displayError('You cannot delete the product #%d because there is physical stock left or supply orders in progress.'), $product->id);
-								else
-									$success &= $product->delete();
 							}
-							else
+							if (!count($this->errors))
 								$success &= $product->delete();
 						}
 					}