Browse Source

PR comments

pull/1429/head
Kat 3 years ago
parent
commit
598f2f4f20
  1. 2
      app/models/sales_log.rb
  2. 2
      app/models/validations/sales/sale_information_validations.rb

2
app/models/sales_log.rb

@ -335,7 +335,7 @@ class SalesLog < Log
return if value.blank?
discount_amount = discount ? value * discount / 100 : 0
(value - discount_amount)
value - discount_amount
end
def mortgage_deposit_and_grand_total

2
app/models/validations/sales/sale_information_validations.rb

@ -47,7 +47,7 @@ module Validations::Sales::SaleInformationValidations
end
def validate_discounted_ownership_value(record)
return unless record.saledate && collection_start_year(record.saledate) > 2023
return unless record.saledate && collection_start_year(record.saledate) >= 2024
return unless record.value && record.deposit && record.ownershipsch
return unless record.mortgage || record.mortgageused == 2
return unless record.discount || record.grant || record.type == 29

Loading…
Cancel
Save