fixed conflict after merge with dev branch for report query updated

This commit is contained in:
Nweni
2019-11-27 14:09:16 +06:30
75 changed files with 1509 additions and 1940 deletions

View File

@@ -1,4 +1,5 @@
class SaleTax < ApplicationRecord
include NumberFormattable
self.primary_key = "sale_tax_id"
#primary key - need to be unique generated for multiple shops
@@ -44,7 +45,6 @@ class SaleTax < ApplicationRecord
def round_to_precision
if self.tax_payable_amount != self.tax_payable_amount_was
if self.tax_payable_amount % 1 > 0
precision = PrintSetting.get_precision_delimiter().precision.to_i
self.tax_payable_amount = self.tax_payable_amount.round(precision)
end
end