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/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -65,6 +65,8 @@ class Origami::TableInvoicesController < BaseOrigamiController
    if !lookup_spit_bill[0].nil?
      @split_bill = lookup_spit_bill[0][1]
    end
+    # get printer info
+    @print_settings = PrintSetting.get_precision_delimiter()
  end

 end