dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Improved StockInstantState / StockMvt

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11803 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2011-12-27 16:25:34 +00:00
parent 5c4e87777d
commit 343591ef87
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStockMvtController.php
+13 -6
View File
@@ -61,6 +61,12 @@ class AdminStockMvtControllerCore extends AdminController
'title' => $this->l('Name'),
'havingFilter' => true
),
'warehouse_name' => array(
'title' => $this->l('Warehouse'),
'havingFilter' => false,
'orderby' => true,
'search' => false,
),
'sign' => array(
'title' => $this->l('Sign'),
'width' => 100,
@@ -123,12 +129,13 @@ class AdminStockMvtControllerCore extends AdminController
// overrides select
$this->_select = '
CONCAT(pl.name, \' \', GROUP_CONCAT(IFNULL(al.name, \'\'), \'\')) product_name,
CONCAT(a.employee_lastname, \' \', a.employee_firstname) AS employee,
mrl.name AS reason,
stock.reference AS product_reference,
stock.ean13 AS product_ean13,
stock.upc AS product_upc,
w.id_currency AS id_currency';
CONCAT(a.employee_lastname, \' \', a.employee_firstname) as employee,
mrl.name as reason,
stock.reference as product_reference,
stock.ean13 as product_ean13,
stock.upc as product_upc,
w.id_currency as id_currency,
w.name as warehouse_name';
// overrides join
$this->_join = 'INNER JOIN '._DB_PREFIX_.'stock stock ON a.id_stock = stock.id_stock