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

merge with r-19

Browse Source
This commit is contained in:
NyanLinHtut
2020-01-11 11:08:33 +06:30
parent d43266bd7d 2d57faf7cf
commit 314cc507a3
106 changed files with 2722 additions and 3024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/inventory/inventory_definitions_controller.rb
View File

@@ -86,10 +86,10 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
def destroy
inventory = InventoryDefinition.find_by_id_and_shop_code(params[:id],@shop.shop_code)
@inventory_definition.destroy
# respond_to do |format|
# format.html { redirect_to inventory_inventory_definitions_url, notice: 'Inventory definition was successfully destroyed.' }
# format.json { head :no_content }
# end
respond_to do |format|
format.html { redirect_to inventory_inventory_definitions_url, notice: 'Inventory definition was successfully destroyed.' }
format.json { head :no_content }
end
# inventory = InventoryDefinition.find_by_id_and_shop_code(params[:id],@shop.shop_code)
StockJournal.delete_stock_journal(inventory.item_code,@shop)