diff --git a/admin-dev/themes/template/helper/list/list_action_addstock.tpl b/admin-dev/themes/template/helper/list/list_action_addstock.tpl index 945bf23ee..a3dd29a3c 100644 --- a/admin-dev/themes/template/helper/list/list_action_addstock.tpl +++ b/admin-dev/themes/template/helper/list/list_action_addstock.tpl @@ -24,4 +24,4 @@ * International Registered Trademark & Property of PrestaShop SA *} -{$action} \ No newline at end of file +{$action} diff --git a/admin-dev/themes/template/helper/list/list_action_removestock.tpl b/admin-dev/themes/template/helper/list/list_action_removestock.tpl index 551cab4c9..2a01ff537 100644 --- a/admin-dev/themes/template/helper/list/list_action_removestock.tpl +++ b/admin-dev/themes/template/helper/list/list_action_removestock.tpl @@ -24,4 +24,4 @@ * International Registered Trademark & Property of PrestaShop SA *} -{$action} \ No newline at end of file +{$action} diff --git a/admin-dev/themes/template/helper/list/list_action_transferstock.tpl b/admin-dev/themes/template/helper/list/list_action_transferstock.tpl index 0703b3eb8..dab100dc8 100644 --- a/admin-dev/themes/template/helper/list/list_action_transferstock.tpl +++ b/admin-dev/themes/template/helper/list/list_action_transferstock.tpl @@ -24,4 +24,4 @@ * International Registered Trademark & Property of PrestaShop SA *} -{$action} \ No newline at end of file +{$action} diff --git a/controllers/admin/AdminStockMvtController.php b/controllers/admin/AdminStockMvtController.php index 873a7e683..02d123fa2 100644 --- a/controllers/admin/AdminStockMvtController.php +++ b/controllers/admin/AdminStockMvtController.php @@ -55,8 +55,8 @@ class AdminStockMvtControllerCore extends AdminController '-1' => $this->l('Decrement'), ), 'icon' => array( - -1 => 'arrow_down.png', - 1 => 'arrow_up.png' + -1 => 'remove_stock.png', + 1 => 'add_stock.png' ), 'orderby' => false ), @@ -217,6 +217,21 @@ class AdminStockMvtControllerCore extends AdminController 'width' => 200, 'havingFilter' => true ), + 'sign' => array( + 'title' => $this->l('Sign'), + 'width' => 100, + 'align' => 'center', + 'type' => 'select', + 'filter_key' => 'a!sign', + 'list' => array( + '1' => $this->l('Increment'), + '-1' => $this->l('Decrement'), + ), + 'icon' => array( + -1 => 'remove_stock.png', + 1 => 'add_stock.png' + ), + ), 'physical_quantity' => array( 'title' => $this->l('Quantity'), 'width' => 40, diff --git a/img/admin/add_stock.png b/img/admin/add_stock.png new file mode 100644 index 000000000..ce36e4fc1 Binary files /dev/null and b/img/admin/add_stock.png differ diff --git a/img/admin/remove_stock.png b/img/admin/remove_stock.png new file mode 100644 index 000000000..26e7f78c8 Binary files /dev/null and b/img/admin/remove_stock.png differ diff --git a/img/admin/transfer_stock.png b/img/admin/transfer_stock.png new file mode 100644 index 000000000..d2d0d9241 Binary files /dev/null and b/img/admin/transfer_stock.png differ diff --git a/img/t/AdminStock.gif b/img/t/AdminStock.gif index d85510bed..de02a9159 100644 Binary files a/img/t/AdminStock.gif and b/img/t/AdminStock.gif differ diff --git a/img/t/AdminStockMvt.gif b/img/t/AdminStockMvt.gif index 2a85c456c..1186f6030 100755 Binary files a/img/t/AdminStockMvt.gif and b/img/t/AdminStockMvt.gif differ