Pull from master

2018-04-05 11:49:42 +06:30
parent 9bf4047548
commit fc8b2d3b73
14 changed files with 222 additions and 54 deletions
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -325,7 +325,8 @@
 			var str = '';
 			var param_shift = '<%= params[:shift_name]%>';
 			
-			url = '<%= reports_get_shift_by_date_path %>';
+			url = '<%= reports_get_shift_by_sale_item_path %>';
+			console.log(url)
 			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
 				console.log(data)