EvergreenCrypto/docker-finance
1
1
Fork 1
Code Issues 31 Pull Requests Actions Releases 10 Activity

Merge pull request #165 into master

Browse Source 
da57805 container: hledger-flow: trezor: fix fees subaccount ordering (Aaron Fiore)
7b65d5d container: hledger-flow: ledger: fix fees subaccount ordering (Aaron Fiore)
fc1691e container: hledger-flow: blockfi: fix fees subaccount ordering (Aaron Fiore)
This commit was merged in pull request #165.
This commit is contained in:
Aaron Fiore
2025-01-03 21:40:16 -08:00
parent 3bb2d00e39 da57805c79
commit d971ac7ede
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
container/src/hledger-flow/accounts/blockfi/blockfi-shared.rules
View File

@@ -74,7 +74,7 @@ if %direction ^OUT$
if %direction ^OUT$
& %sub_type ^Withdrawal Fee$
account2 expenses:blockfi:%subaccount:withdrawals:fees:%currency_one
account2 expenses:blockfi:%subaccount:fees:withdrawals:%currency_one
comment type:%type, sub_type:%sub_type, direction:%direction, taxed_as:SPEND
comment2 %date +0000,SPEND,blockfi:%subaccount,%currency_one,%currency_one_amount,USD,,FEE

6
container/src/hledger-flow/accounts/ledger/ledger-shared.rules
View File

@@ -39,7 +39,7 @@ if %type ^OUT$
& %fees [1-9]
account3 assets:ledger:%account_name:%currency_
amount3 -%fees %currency_
account4 expenses:ledger:fees:%account_name:%currency_
account4 expenses:ledger:%account_name:fees:%currency_
amount4 %fees %currency_
comment type:%type, status:%status_, xpub:%xpub, txid:%txid, direction:%direction, taxed_as:SPEND
comment2
@@ -82,7 +82,7 @@ if %currency_ ^ADA$
& %fees [1-9]
account3 assets:ledger:%account_name:%currency_
amount3 -%fees %currency_
account4 expenses:ledger:fees:%account_name:%currency_
account4 expenses:ledger:%account_name:fees:%currency_
amount4 %fees %currency_
comment type:%type, status:%status_, xpub:%xpub, txid:%txid, direction:%direction, taxed_as:SPEND
comment3 %date +0000,SPEND,ledger:%account_name:%currency_,%currency_,%fees,USD,,FEE
@@ -95,7 +95,7 @@ if %currency_ ^ADA$
account2 equity:ledger:%account_name:withdrawal:stake_key_reg:%currency_
account3 assets:ledger:%account_name:%currency_
amount3 -%amount_ %currency_
account4 expenses:ledger:fees:%account_name:%currency_
account4 expenses:ledger:%account_name:fees:%currency_
amount4 %amount_ %currency_
comment type:%type, status:%status_, xpub:%xpub, txid:%txid, direction:%direction, taxed_as:SPEND
comment2 Stake key registration withdrawal

2
container/src/hledger-flow/accounts/trezor/trezor-shared.rules
View File

@@ -39,7 +39,7 @@ if %direction ^OUT$
& %fee [1-9]
account3 assets:trezor:%subaccount:%amount_unit
amount3 -%fee %amount_unit
account4 expenses:trezor:fees:%subaccount:%amount_unit
account4 expenses:trezor:%subaccount:fees:%amount_unit
amount4 %fee %amount_unit
comment label:%label, type:%type, address:%address, txid:%txid, direction:%direction, taxed_as:SPEND
comment2