mirror of
https://github.com/we-promise/sure.git
synced 2026-04-19 20:14:08 +00:00
Skip account valuation on entry balance_after_entry (#1435)
This commit is contained in:
@@ -14,9 +14,9 @@ module Account::EntriesHelper
|
||||
|
||||
def entries_by_date(entries, selectable: true, totals: false)
|
||||
entries.group_by(&:date).map do |date, grouped_entries|
|
||||
# Valuations always go first, then sort by created_at
|
||||
# Valuations always go first, then sort by created_at desc
|
||||
sorted_entries = grouped_entries.sort_by do |entry|
|
||||
[ entry.account_valuation? ? 0 : 1, entry.created_at ]
|
||||
[ entry.account_valuation? ? 0 : 1, -entry.created_at.to_i ]
|
||||
end
|
||||
|
||||
content = capture do
|
||||
|
||||
@@ -60,6 +60,8 @@ class Account::Entry < ApplicationRecord
|
||||
else
|
||||
new_balance = prior_balance
|
||||
entries_on_entry_date.each do |e|
|
||||
next if e.account_valuation?
|
||||
|
||||
change = e.amount
|
||||
change = account.liability? ? change : -change
|
||||
new_balance += change
|
||||
@@ -79,7 +81,7 @@ class Account::Entry < ApplicationRecord
|
||||
end
|
||||
|
||||
def entries_on_entry_date
|
||||
account.entries.where(date: date).order(created_at: :desc)
|
||||
account.entries.where(date: date).order(created_at: :asc)
|
||||
end
|
||||
|
||||
class << self
|
||||
|
||||
Reference in New Issue
Block a user