rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v.0.1.06'

Browse Source
This commit is contained in:
Roland Schneider 2017-05-01 22:16:28 +02:00
commit 656ad21e41
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/controllers/InventoryItemController.php
View File

@ -81,6 +81,7 @@ class InventoryItemController extends Controller
['item_count_sold', 'Eladott mennyiség (db)'], ['item_count_sold', 'Eladott mennyiség (db)'],
['item_count_in', 'Beszerzett mennyiség (db)'], ['item_count_in', 'Beszerzett mennyiség (db)'],
['item_count', 'Leltározott mennyiség (db)'], ['item_count', 'Leltározott mennyiség (db)'],
['item_count_waste', 'Selejtezett mennyiség (db)'],
['item_purchase_price_net', 'Nettó beszerezési ár (Ft)'], ['item_purchase_price_net', 'Nettó beszerezési ár (Ft)'],
['item_net_stock_money', 'Nettó készlet érték (Ft)'], ['item_net_stock_money', 'Nettó készlet érték (Ft)'],
['item_stock_missing_count', 'Különbség (db)'], ['item_stock_missing_count', 'Különbség (db)'],
@ -88,7 +89,7 @@ class InventoryItemController extends Controller
['item_stock_missing_money', 'Leltár hiány (Ft)'], ['item_stock_missing_money', 'Leltár hiány (Ft)'],
['item_count_system', 'Rendszer szerinti mennyiség (db)'], ['item_count_system', 'Rendszer szerinti mennyiség (db)'],
]; ];
$cols = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P']; $cols = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P','Q'];
/** @noinspection PhpUndefinedMethodInspection */ /** @noinspection PhpUndefinedMethodInspection */
$models = $dataProvider->getModels(); $models = $dataProvider->getModels();

3
backend/models/InventoryItemSearch.php
View File

@ -67,6 +67,7 @@ class InventoryItemSearch extends InventoryItem
'coalesce(inventory_item.count_sold,0) as item_count_sold', 'coalesce(inventory_item.count_sold,0) as item_count_sold',
'coalesce(inventory_item.count,0) as item_count', 'coalesce(inventory_item.count,0) as item_count',
'coalesce(inventory_item.count_system,0) as item_count_system', 'coalesce(inventory_item.count_system,0) as item_count_system',
'coalesce(inventory_item.count_waste,0) as item_count_waste',
'inventory.created_at as inventory_created_at', 'inventory.created_at as inventory_created_at',
'inventory_prev.id_inventory as inventory_prev_id_inventory', 'inventory_prev.id_inventory as inventory_prev_id_inventory',
'inventory_prev.name as inventory_prev_name', 'inventory_prev.name as inventory_prev_name',
@ -107,7 +108,7 @@ class InventoryItemSearch extends InventoryItem
['item_count_sold', 'item_count_sold'], ['item_count_sold', 'item_count_sold'],
['item_count_in', 'item_count_in'], ['item_count_in', 'item_count_in'],
['item_count', 'item_count'], ['item_count', 'item_count'],
['item_count', 'item_count'], ['item_count_waste', 'item_count_waste'],
['item_difference', 'item_difference'], ['item_difference', 'item_difference'],
['item_count_system', 'item_count_system'], ['item_count_system', 'item_count_system'],
['inventory.id_inventory', 'inventory_id_inventory'], ['inventory.id_inventory', 'inventory_id_inventory'],

6
backend/views/inventory-item/index.php
View File

@ -152,6 +152,12 @@ $this->registerJs('inventoryItemIndex.init( ' . json_encode($options) . ' );');
'label' => 'Beszerzett mennyiség (db)', 'label' => 'Beszerzett mennyiség (db)',
'contentOptions' => ['class' => 'numeric ' ] 'contentOptions' => ['class' => 'numeric ' ]
],
[
'attribute' => 'item_count_waste',
'label' => 'Selejtezett mennyiség (db)',
'contentOptions' => ['class' => 'numeric ' ]
], ],
[ [
'attribute' => 'item_count_sold', 'attribute' => 'item_count_sold',

2
changelog.txt
View File

@ -1,3 +1,5 @@
-0.1.06
- add inventory waste gui
-0.1.05 -0.1.05
- add inventory waste fix - add inventory waste fix
-0.1.04 -0.1.04

2
common/config/params.php
View File

@ -5,7 +5,7 @@ return [
'supportEmail' => 'rocho02@gmail.com', 'supportEmail' => 'rocho02@gmail.com',
'infoEmail' => 'info@rocho-net.hu', 'infoEmail' => 'info@rocho-net.hu',
'user.passwordResetTokenExpire' => 3600, 'user.passwordResetTokenExpire' => 3600,
'version' => 'v0.1.05', 'version' => 'v0.1.06',
'company' => 'movar',//gyor 'company' => 'movar',//gyor
'company_name' => "Freimann Kft.", 'company_name' => "Freimann Kft.",
'product_visiblity' => 'account',// on reception which products to display. account or global 'product_visiblity' => 'account',// on reception which products to display. account or global