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($(''+row[it]+'')); else - content.append($(''+row[it]+'')); + content.append($(''+row[it]+'')); } }); content.append($('')); 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.' ' : '').'