From a6150e4e2884c039ca26352976f1fa71c33fc929 Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Mon, 25 Jun 2012 14:29:39 +0000
Subject: [PATCH] [-] BO : fix bug #PSCFV-2897 - JS error on combination page

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16119 b9a71923-0436-4b27-9f14-aed3839534dd
---
 js/admin-products.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/js/admin-products.js b/js/admin-products.js
index a404b8dbf..88e666607 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -527,13 +527,16 @@ product_tabs['Prices'] = new function(){
 			context: this,
 			async: false,
 			success: function(data) {
-				if (data.status == 'ok')
+				if (data !== null)
 				{
-					showSuccessMessage(data.message);
-					parent.remove();
+					if (data.status == 'ok')
+					{
+						showSuccessMessage(data.message);
+						parent.remove();
+					}
+					else
+						showErrorMessage(data.message);
 				}
-				else
-					showErrorMessage(data.message);
 			}
 		});
 	};