AaronFiore/docker-finance
1
0
Fork 0
forked from EvergreenCrypto/docker-finance
Code Activity

Merge pull request #218 into master

Browse Source 
3a35e45 container: hledger-flow: add explicit amount4 to applicable rules (Aaron Fiore)
This commit is contained in:
Aaron Fiore
2025-09-19 13:00:00 -07:00
parent 8edc17b18b 3a35e45ffa
commit 02da22e50c
5 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
container/src/hledger-flow/accounts/adalite/adalite-shared.rules
View File

@@ -41,6 +41,7 @@ if %direction ^OUT$
account3 assets:adalite:%subaccount:%fee_currency
amount3 -%fee_amount %fee_currency
account4 expenses:adalite:%subaccount:fees:%fee_currency
amount4 %fee_amount %fee_currency
comment type:%type, txid:%txid, direction:%direction, taxed_as:SPEND
comment3 %timestamp,SPEND,adalite:%subaccount,%fee_currency,%fee_amount,USD,,FEE
# Using comment3 so a comment2 SPEND isn't overwritten (when applicable)

1
container/src/hledger-flow/accounts/celsius/celsius-shared.rules
View File

@@ -65,6 +65,7 @@ if %type (reward|interest|award)
account2 equity:celsius:%subaccount:conversion:USD
amount3 %usd_value USD @@ %amount_ %currency_one
account3 equity:celsius:%subaccount:conversion:USD
amount4 -%amount_ %currency_one
account4 income:celsius:%subaccount:%currency_one
comment type:%type, code:%code_, taxed_as:INCOME
comment4 %date +0000,INCOME,celsius:%subaccount,%currency_one,%amount_,USD,%usd_value,INTEREST

1
container/src/hledger-flow/accounts/changelly/changelly-shared.rules
View File

@@ -25,6 +25,7 @@ account2 assets:changelly:%subaccount:%currency_from
account3 assets:changelly:%subaccount:%currency_from
amount3 -%currency_from_amount %currency_from @@ %currency_to_amount %currency_to
account4 equity:changelly:%subaccount:deposit:%currency_to
amount4 %currency_to_amount %currency_to
# NOTE:
#

5
container/src/hledger-flow/accounts/nexo/nexo-shared.rules
View File

@@ -113,6 +113,7 @@ if %description_ Interest Earned$
account2 equity:nexo:%subaccount:conversion:USD
amount3 %usd_amount USD @@ %input_amount "%input_currency"
account3 equity:nexo:%subaccount:conversion:USD
amount4 -%input_amount "%input_currency"
account4 income:nexo:%subaccount:interest:%input_currency
comment description:%description_, code:%code_, status:%status_, type:InterestEarned, direction:%direction, taxed_as:INCOME
comment2 %date +0000,INCOME,nexo:%subaccount,%input_currency,%input_amount,USD,%usd_amount,INTEREST
@@ -123,6 +124,7 @@ if %type ^FixedTermInterest$
account2 equity:nexo:%subaccount:conversion:USD
amount3 %usd_amount USD @@ %input_amount "%input_currency"
account3 equity:nexo:%subaccount:conversion:USD
amount4 -%input_amount "%input_currency"
account4 income:nexo:%subaccount:interest:%input_currency
comment description:%description_, code:%code_, status:%status_, type:InterestEarned, direction:%direction, taxed_as:INCOME
comment2 %date +0000,INCOME,nexo:%subaccount,%input_currency,%input_amount,USD,%usd_amount,INTEREST
@@ -134,6 +136,7 @@ if %description_ Airdrop
account2 equity:nexo:%subaccount:conversion:USD
amount3 %usd_amount USD @@ %input_amount "%input_currency"
account3 equity:nexo:%subaccount:conversion:USD
amount4 -%input_amount "%input_currency"
account4 income:nexo:%subaccount:interest:%input_currency
comment description:%description_, code:%code_, status:%status_, type:Airdrop, direction:%direction, taxed_as:INCOME
comment2 %date +0000,INCOME,nexo:%subaccount,%input_currency,%input_amount,USD,%usd_amount,AIRDROP
@@ -149,6 +152,7 @@ if %type ^Dividend$
account2 equity:nexo:%subaccount:conversion:USD
amount3 %usd_amount USD @@ %input_amount "%input_currency"
account3 equity:nexo:%subaccount:conversion:USD
amount4 -%input_amount "%input_currency"
account4 income:nexo:%subaccount:dividend:%input_currency
comment description:%description_, code:%code_, status:%status_, type:%type, direction:%direction, taxed_as:INCOME
comment2 %date +0000,INCOME,nexo:%subaccount,%input_currency,%input_amount,USD,%usd_amount,DIVIDEND
@@ -173,6 +177,7 @@ if %type ^Exchange Cashback$
account2 equity:nexo:%subaccount:conversion:USD
amount3 %usd_amount USD @@ %input_amount %input_currency
account3 equity:nexo:%subaccount:conversion:%input_currency
amount4 -%input_amount %input_currency
account4 income:nexo:%subaccount:exchange_cashback:%input_currency
comment description:%description_, code:%code_, status:%status_, type:%type, taxed_as:REBATE
comment2 %date +0000,BUY,nexo:%subaccount,%input_currency,%input_amount,USD,%usd_amount,,

1
container/src/hledger-flow/accounts/paypal/paypal-shared.rules
View File

@@ -136,6 +136,7 @@ if %in_ticker [a-z]
account3 assets:paypal:%subaccount:%tx_fee_ticker
amount3 -%tx_fee_value %tx_fee_ticker
account4 expenses:paypal:%subaccount:fees:%tx_fee_ticker
amount4 %tx_fee_value %tx_fee_ticker
if %in_ticker [a-z]
& %type ^BUY$