Docker/Maybe
Docker/Maybe
1
0
Fork 0
mirror of https://github.com/maybe-finance/maybe.git synced 2025-07-24 23:59:40 +02:00
Code Issues Releases Activity Actions 1

Skip account valuation on entry balance_after_entry (#1435)

Browse source
This commit is contained in:
bruno costanzo 2024-11-08 15:17:55 +01:00 • committed by GitHub
parent 3b928775a8
commit a113d573d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/account/entries_helper.rb
View file

@ -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

4
app/models/account/entry.rb
View file

@ -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