From d2aaf4cbd85e211699409ac98c1ca1ebfe6dd50e Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Fri, 21 Oct 2011 15:27:12 +0000
Subject: [PATCH] [-] BugFix : Bad group by in request for admin stock instant
 states [-] BugFix is actions details

---
 admin-dev/themes/template/list_action_details.tpl      | 2 +-
 controllers/admin/AdminStockInstantStateController.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/template/list_action_details.tpl b/admin-dev/themes/template/list_action_details.tpl
index 089837598..721c3614a 100644
--- a/admin-dev/themes/template/list_action_details.tpl
+++ b/admin-dev/themes/template/list_action_details.tpl
@@ -83,7 +83,7 @@ $(document).ready(function() {
 									else if (count == 0)
 										content.append($('<td class="'+this.align+' last">'+row[it]+'</td>'));
 									else
-										content.append($('<td class="'+this.align+count+'">'+row[it]+'</td>'));
+										content.append($('<td class="'+this.align+'">'+row[it]+'</td>'));
 								}
 							});
 							content.append($('<td class="empty"></td>'));
diff --git a/controllers/admin/AdminStockInstantStateController.php b/controllers/admin/AdminStockInstantStateController.php
index 97f6a739e..decb4a509 100644
--- a/controllers/admin/AdminStockInstantStateController.php
+++ b/controllers/admin/AdminStockInstantStateController.php
@@ -222,7 +222,7 @@ class AdminStockInstantStateControllerCore extends AdminController
 			WHERE id_warehouse = '.$this->getCurrentWarehouseId().' '.(isset($this->_where) ? $this->_where.' ' : '').
 			($this->deleted ? 'AND a.`deleted` = 0 ' : '').
 			(isset($this->_filter) ? $this->_filter : '').'
-			GROUP BY pac.id_product_attribute
+			GROUP BY pac.id_product_attribute, p.id_product
 			'.((isset($this->_filterHaving) || isset($this->_having)) ? 'HAVING ' : '').
 			(isset($this->_filterHaving) ? ltrim($this->_filterHaving, ' AND ') : '').
 			(isset($this->_having) ? $this->_having.' ' : '').'