Merge pull request #213 into master

b1ed20a container: hledger-flow: finish uniform fiat subaccounts (Aaron Fiore)
This commit is contained in:
2025-08-29 13:15:37 -07:00
7 changed files with 38 additions and 38 deletions

View File

@@ -1,6 +1,6 @@
# docker-finance | modern accounting for the power-user # docker-finance | modern accounting for the power-user
# #
# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC) # Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ fields date,time,amount_,type,description,direction,subaccount
date-format %Y-%m-%d date-format %Y-%m-%d
account1 assets:ally:%subaccount account1 assets:ally:%subaccount:USD
amount %amount_ USD amount %amount_ USD
comment time:%time, type:%type, direction:%direction comment time:%time, type:%type, direction:%direction
@@ -29,33 +29,33 @@ if %direction ^OUT$
# Default assume equity # Default assume equity
if %direction ^IN$ if %direction ^IN$
account2 equity:ally:%subaccount:withdrawal account2 equity:ally:%subaccount:withdrawal:USD
# Default assume expenses # Default assume expenses
if %direction ^OUT$ if %direction ^OUT$
account2 expenses:ally:%subaccount account2 expenses:ally:%subaccount:USD
if %direction ^OUT$ if %direction ^OUT$
& %description ^Wire Transfer$ & %description ^Wire Transfer$
account2 expenses:ally:%subaccount:wire_transfer account2 expenses:ally:%subaccount:wire_transfer:USD
if %direction ^OUT$ if %direction ^OUT$
& %description ^Wire Fee$ & %description ^Wire Fee$
account2 expenses:ally:%subaccount:wire_transfer:fees account2 expenses:ally:%subaccount:wire_transfer:fees:USD
# Ally internal transfer # Ally internal transfer
if %direction ^OUT$ if %direction ^OUT$
& %description (^Internet transfer from|^Internet transfer to) & %description (^Internet transfer from|^Internet transfer to)
account2 equity:ally:%subaccount:deposit account2 equity:ally:%subaccount:deposit:USD
# Interest accounts # Interest accounts
if %direction ^IN$ if %direction ^IN$
& %description ^Interest Paid$ & %description ^Interest Paid$
account2 income:ally:%subaccount:interest account2 income:ally:%subaccount:interest:USD
# eCheck deposits # eCheck deposits
if %direction ^IN$ if %direction ^IN$
& %description ^eCheck Deposit$ & %description ^eCheck Deposit$
account2 income:ally:%subaccount:echeck account2 income:ally:%subaccount:echeck:USD
# vim: sw=2 sts=2 si ai et # vim: sw=2 sts=2 si ai et

View File

@@ -1,6 +1,6 @@
# docker-finance | modern accounting for the power-user # docker-finance | modern accounting for the power-user
# #
# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC) # Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
fields card,description,date,type,amount_,balance_,direction,subaccount fields card,description,date,type,amount_,balance_,direction,subaccount
date-format %m/%d/%y date-format %m/%d/%y
account1 assets:capital-one:%subaccount account1 assets:capital-one:%subaccount:USD
amount %amount_ USD amount %amount_ USD
comment card:%card, type:%type, direction:%direction comment card:%card, type:%type, direction:%direction
@@ -27,14 +27,14 @@ if %direction ^OUT$
# Default as equity # Default as equity
if %direction ^IN$ if %direction ^IN$
account2 equity:capital-one:%subaccount:withdrawal account2 equity:capital-one:%subaccount:withdrawal:USD
# Default as equity # Default as equity
if %direction ^OUT$ if %direction ^OUT$
account2 equity:capital-one:%subaccount:deposit account2 equity:capital-one:%subaccount:deposit:USD
if %direction ^IN$ if %direction ^IN$
& %description ^Monthly Interest Paid$ & %description ^Monthly Interest Paid$
account2 income:capital-one:%subaccount:interest account2 income:capital-one:%subaccount:interest:USD
# vim: sw=2 sts=2 si ai et # vim: sw=2 sts=2 si ai et

View File

@@ -1,6 +1,6 @@
# docker-finance | modern accounting for the power-user # docker-finance | modern accounting for the power-user
# #
# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC) # Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
fields date,date2,card,description,category,amount_,direction,subaccount fields date,date2,card,description,category,amount_,direction,subaccount
date-format %Y-%m-%d date-format %Y-%m-%d
account1 liabilities:capital-one:%subaccount account1 liabilities:capital-one:%subaccount:USD
amount %amount_ USD amount %amount_ USD
comment card:%card, category:%category, direction:%direction comment card:%card, category:%category, direction:%direction
@@ -26,9 +26,9 @@ if %direction ^OUT$
amount -%amount_ USD amount -%amount_ USD
if %direction ^IN$ if %direction ^IN$
account2 equity:capital-one:%subaccount:withdrawal account2 equity:capital-one:%subaccount:withdrawal:USD
if %direction ^OUT$ if %direction ^OUT$
account2 expenses:capital-one:%subaccount:%category account2 expenses:capital-one:%subaccount:%category:USD
# vim: sw=2 sts=2 si ai et # vim: sw=2 sts=2 si ai et

View File

@@ -1,6 +1,6 @@
# docker-finance | modern accounting for the power-user # docker-finance | modern accounting for the power-user
# #
# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC) # Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
fields details,date,description,amount_,type,balance_,code_,direction,subaccount fields details,date,description,amount_,type,balance_,code_,direction,subaccount
date-format %m/%d/%Y date-format %m/%d/%Y
account1 assets:chase:%subaccount account1 assets:chase:%subaccount:USD
amount %amount_ USD amount %amount_ USD
comment details:%details, type:%type, direction:%direction comment details:%details, type:%type, direction:%direction
@@ -27,23 +27,23 @@ if %code_ [a-z0-9]
# Default IN as equity # Default IN as equity
if %direction ^IN$ if %direction ^IN$
account2 equity:chase:%subaccount:withdrawal account2 equity:chase:%subaccount:withdrawal:USD
# Income # Income
if %direction ^IN$ if %direction ^IN$
& %description CHECK DEPOSIT & %description CHECK DEPOSIT
account2 income:chase:%subaccount account2 income:chase:%subaccount:USD
if %direction ^OUT$ if %direction ^OUT$
amount -%amount_ USD amount -%amount_ USD
# Default OUT as expenses # Default OUT as expenses
if %direction ^OUT$ if %direction ^OUT$
account2 expenses:chase:%subaccount account2 expenses:chase:%subaccount:USD
# Default ACH Debit as equity transfers # Default ACH Debit as equity transfers
if %direction ^OUT$ if %direction ^OUT$
& %type ^ACH_DEBIT$ & %type ^ACH_DEBIT$
account2 equity:chase:%subaccount:deposit account2 equity:chase:%subaccount:deposit:USD
# vim: sw=2 sts=2 si ai et # vim: sw=2 sts=2 si ai et

View File

@@ -1,6 +1,6 @@
# docker-finance | modern accounting for the power-user # docker-finance | modern accounting for the power-user
# #
# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC) # Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -21,16 +21,16 @@ date-format %m/%d/%Y
description %description_ description %description_
comment category:%category, type:%type comment category:%category, type:%type
account1 liabilities:chase:%subaccount account1 liabilities:chase:%subaccount:USD
amount %amount_ USD amount %amount_ USD
# Default IN equity # Default IN equity
if %direction ^IN$ if %direction ^IN$
account2 equity:chase:%subaccount:withdrawal account2 equity:chase:%subaccount:withdrawal:USD
# Default OUT expenses # Default OUT expenses
if %direction ^OUT$ if %direction ^OUT$
amount -%amount_ USD amount -%amount_ USD
account2 expenses:chase:%subaccount:%category account2 expenses:chase:%subaccount:%category:USD
# vim: sw=2 sts=2 si ai et # vim: sw=2 sts=2 si ai et

View File

@@ -1,6 +1,6 @@
# docker-finance | modern accounting for the power-user # docker-finance | modern accounting for the power-user
# #
# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC) # Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -18,30 +18,30 @@
fields date,description,type,amount_,balance_,direction,subaccount fields date,description,type,amount_,balance_,direction,subaccount
date-format %m/%d/%Y date-format %m/%d/%Y
account1 assets:discover:%subaccount account1 assets:discover:%subaccount:USD
amount %amount_ USD amount %amount_ USD
comment direction:%direction comment direction:%direction
# Default IN equity # Default IN equity
if %direction ^IN$ if %direction ^IN$
account2 equity:discover:%subaccount:withdrawal account2 equity:discover:%subaccount:withdrawal:USD
# Income # Income
if %direction ^IN$ if %direction ^IN$
& %description (^Check Deposit$|^Early Pay ACH) & %description (^Check Deposit$|^Early Pay ACH)
account2 income:discover:%subaccount account2 income:discover:%subaccount:USD
if %direction ^OUT$ if %direction ^OUT$
amount -%amount_ USD amount -%amount_ USD
# Default OUT as expenses # Default OUT as expenses
if %direction ^OUT$ if %direction ^OUT$
account2 expenses:discover:%subaccount account2 expenses:discover:%subaccount:USD
# Default ACH Withdrawals as equity transfers # Default ACH Withdrawals as equity transfers
if %direction ^OUT$ if %direction ^OUT$
& %description ^ACH Withdrawal & %description ^ACH Withdrawal
account2 equity:discover:%subaccount:deposit account2 equity:discover:%subaccount:deposit:USD
# vim: sw=2 sts=2 si ai et # vim: sw=2 sts=2 si ai et

View File

@@ -1,6 +1,6 @@
# docker-finance | modern accounting for the power-user # docker-finance | modern accounting for the power-user
# #
# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC) # Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -19,18 +19,18 @@ fields date,date2,description,amount_,type,direction,subaccount
date-format %m/%d/%Y date-format %m/%d/%Y
account1 liabilities:discover:%subaccount account1 liabilities:discover:%subaccount:USD
amount %amount_ USD amount %amount_ USD
comment type:%type, direction:%direction comment type:%type, direction:%direction
# Default equity # Default equity
if %direction ^IN$ if %direction ^IN$
account2 equity:discover:%subaccount:withdrawal:%type account2 equity:discover:%subaccount:withdrawal:%type:USD
# Default expenses # Default expenses
if %direction ^OUT$ if %direction ^OUT$
amount -%amount_ USD amount -%amount_ USD
account2 expenses:discover:%subaccount:%type account2 expenses:discover:%subaccount:%type:USD
# vim: sw=2 sts=2 si ai et # vim: sw=2 sts=2 si ai et