remove conflict data

2018-03-05 16:24:45 +06:30
parent 4b311789e1 311bef4411
commit bd06e80b37
111 changed files with 3612 additions and 1386 deletions
--- a/app/controllers/reports/stock_check_controller.rb
+++ b/app/controllers/reports/stock_check_controller.rb
@@ -17,7 +17,7 @@ class Reports::StockCheckController < BaseReportController
    @from       = from_date
    @to         = to_date
    # get printer info
-  @print_settings = PrintSetting.get_precision_delimiter()
+    @print_settings = PrintSetting.get_precision_delimiter()
    respond_to do |format|
      format.html
      format.xls