Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant

# Conflicts:
#	Gemfile.lock
#	app/views/layouts/application.html.erb
This commit is contained in:
Min Zeya Phyo
2017-06-26 21:57:55 +06:30
128 changed files with 3988 additions and 646 deletions

View File

@@ -0,0 +1,2 @@
module Reports::DailySalesHelper
end

View File

@@ -0,0 +1,2 @@
module Reports::DailysalesHelper
end

View File

@@ -0,0 +1,2 @@
module Reports::SaleItemsHelper
end