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

// Advanced stock management bootstraping

Browse Source
This commit is contained in:
Jerome Nadaud
2013-10-02 14:48:23 +02:00
parent dec213aecf
commit 3ce163449e
6 changed files with 109 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl
+5 -2
View File
@@ -24,7 +24,9 @@
*} *}
{extends file="helpers/list/list_header.tpl"} {extends file="helpers/list/list_header.tpl"}
{block name=override_header} {block name=override_header}
<div class="filter-stock-extended"> <fieldset>
<h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
<div class="filter-stock-extended">
<form id="stock_cover" type="get" class="form-horizontal"> <form id="stock_cover" type="get" class="form-horizontal">
<input type="hidden" name="controller" value="AdminStockCover" /> <input type="hidden" name="controller" value="AdminStockCover" />
<input type="hidden" name="token" value="{$token}" /> <input type="hidden" name="token" value="{$token}" />
@@ -59,5 +61,6 @@
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</fieldset>
{/block} {/block}
admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl
+5 -2
View File
@@ -24,7 +24,9 @@
*} *}
{extends file="helpers/list/list_header.tpl"} {extends file="helpers/list/list_header.tpl"}
{block name=override_header} {block name=override_header}
<div class="filter-stock"> <fieldset>
<h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
<div class="filter-stock">
<form id="stock_instant_state" type="get" class="form-horizontal"> <form id="stock_instant_state" type="get" class="form-horizontal">
<input type="hidden" name="controller" value="AdminStockInstantState" /> <input type="hidden" name="controller" value="AdminStockInstantState" />
<input type="hidden" name="token" value="{$token}" /> <input type="hidden" name="token" value="{$token}" />
@@ -41,5 +43,6 @@
</div> </div>
{/if} {/if}
</form> </form>
</div> </div>
</fieldset>
{/block} {/block}
admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl
+5 -2
View File
@@ -25,7 +25,9 @@
{extends file="helpers/list/list_header.tpl"} {extends file="helpers/list/list_header.tpl"}
{block name=override_header} {block name=override_header}
{if count($list_warehouses) > 0} {if count($list_warehouses) > 0}
<div class="filter-stock"> <fieldset>
<h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
<div class="filter-stock">
<form type="get" class="form-horizontal"> <form type="get" class="form-horizontal">
<input type="hidden" name="controller" value="AdminStockMvt" /> <input type="hidden" name="controller" value="AdminStockMvt" />
<input type="hidden" name="token" value="{$token}" /> <input type="hidden" name="token" value="{$token}" />
@@ -41,5 +43,6 @@
</div> </div>
</form> </form>
{/if} {/if}
</div> </div>
</fieldset>
{/block} {/block}
admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl
+5 -2
View File
@@ -25,7 +25,9 @@
{extends file="helpers/list/list_header.tpl"} {extends file="helpers/list/list_header.tpl"}
{block name=override_header} {block name=override_header}
{if isset($warehouses) && count($warehouses) > 0 && isset($filter_status)} {if isset($warehouses) && count($warehouses) > 0 && isset($filter_status)}
<div class="filter-stock-extended"> <fieldset>
<h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
<div class="filter-stock-extended">
<form id="supply_orders" type="get" class="form-horizontal"> <form id="supply_orders" type="get" class="form-horizontal">
<input type="hidden" name="controller" value="AdminSupplyOrders" /> <input type="hidden" name="controller" value="AdminSupplyOrders" />
<input type="hidden" name="token" value="{$token}" /> <input type="hidden" name="token" value="{$token}" />
@@ -47,6 +49,7 @@
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</fieldset>
{/if} {/if}
{/block} {/block}
controllers/admin/AdminStockInstantStateController.php
+6 -3
View File
@@ -75,19 +75,22 @@ class AdminStockInstantStateControllerCore extends AdminController
), ),
'physical_quantity' => array( 'physical_quantity' => array(
'title' => $this->l('Physical quantity'), 'title' => $this->l('Physical quantity'),
'width' => 80, 'class' => 'fixed-width-xs',
'align' => 'center',
'orderby' => true, 'orderby' => true,
'search' => false 'search' => false
), ),
'usable_quantity' => array( 'usable_quantity' => array(
'title' => $this->l('Usable quantity'), 'title' => $this->l('Usable quantity'),
'width' => 80, 'class' => 'fixed-width-xs',
'align' => 'center',
'orderby' => true, 'orderby' => true,
'search' => false, 'search' => false,
), ),
'real_quantity' => array( 'real_quantity' => array(
'title' => $this->l('Real quantity'), 'title' => $this->l('Real quantity'),
'width' => 80, 'class' => 'fixed-width-xs',
'align' => 'center',
'orderby' => false, 'orderby' => false,
'search' => false, 'search' => false,
'hint' => $this->l('Physical quantity (usable) - Client orders + Supply Orders'), 'hint' => $this->l('Physical quantity (usable) - Client orders + Supply Orders'),
controllers/admin/AdminStockMvtController.php
+4 -5
View File
@@ -67,7 +67,6 @@ class AdminStockMvtControllerCore extends AdminController
), ),
'sign' => array( 'sign' => array(
'title' => $this->l('Sign'), 'title' => $this->l('Sign'),
'width' => 100,
'align' => 'center', 'align' => 'center',
'type' => 'select', 'type' => 'select',
'filter_key' => 'a!sign', 'filter_key' => 'a!sign',
@@ -79,15 +78,16 @@ class AdminStockMvtControllerCore extends AdminController
-1 => 'remove_stock.png', -1 => 'remove_stock.png',
1 => 'add_stock.png' 1 => 'add_stock.png'
), ),
'class' => 'fixed-width-xs'
), ),
'physical_quantity' => array( 'physical_quantity' => array(
'title' => $this->l('Quantity'), 'title' => $this->l('Quantity'),
'filter_key' => 'a!physical_quantity' 'align' => 'center',
'filter_key' => 'a!physical_quantity',
'class' => 'fixed-width-sm'
), ),
'price_te' => array( 'price_te' => array(
'title' => $this->l('Price (tax excl.)'), 'title' => $this->l('Price (tax excl.)'),
'width' => 70,
'align' => 'right',
'type' => 'price', 'type' => 'price',
'currency' => true, 'currency' => true,
'filter_key' => 'a!price_te' 'filter_key' => 'a!price_te'
@@ -102,7 +102,6 @@ class AdminStockMvtControllerCore extends AdminController
), ),
'date_add' => array( 'date_add' => array(
'title' => $this->l('Date'), 'title' => $this->l('Date'),
'align' => 'right',
'type' => 'datetime', 'type' => 'datetime',
'filter_key' => 'a!date_add' 'filter_key' => 'a!date_add'
), ),