git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-09-07 15:37:12 +06:30
parent f67d4197ec 43cc308d89
commit 3d7295c081
6 changed files with 218 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/reports/stock_check_controller.rb
View File

@@ -9,12 +9,10 @@ class Reports::StockCheckController < BaseReportController
to_date = Date.parse(params[:daterange].split(' - ')[1]).end_of_day.utc.getlocal
@daterange = params[:daterange]
end
commissioner = params[:commissioner].to_i
@com_id = commissioner
@commissioner = Commissioner.active.all
@item_code = params[:item_code]
@inventory_definitions = InventoryDefinition.active.all
@transaction = ProductCommission.get_transaction(from_date, to_date, commissioner)
@transaction = StockCheckItem.get_transaction(from_date, to_date, @item_code)
@from = from_date
@to = to_date