From 75dfa4c2cd18f5202d45043fc3eae77041d4fb0f Mon Sep 17 00:00:00 2001 From: Kwesi Aguillera Date: Wed, 26 Apr 2017 11:37:04 -0400 Subject: [PATCH 1/2] Restructure account names other than assets account. --- FY2013/2012-06.beancount | 43 ++++++++++++++++++++-------------------- FY2013/FY2013.beancount | 1 + 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/FY2013/2012-06.beancount b/FY2013/2012-06.beancount index a767766..b970ea2 100644 --- a/FY2013/2012-06.beancount +++ b/FY2013/2012-06.beancount @@ -7,12 +7,11 @@ ; Samurai was our first payment processor. 2012-06-01 open Assets:Samurai:Escrow USD 2012-06-01 open Assets:Samurai:Operations USD -2012-06-01 open Income:Samurai:Fees USD -2012-06-01 open Expenses:Samurai:Fees USD +2012-06-01 open Income:Fees:Samurai USD ; Unfortunately, they proved unreliable. -2012-06-01 open Income:Samurai:Errors USD -2012-06-01 open Expenses:Samurai:Errors USD +2012-06-01 open Income:Errors:Samurai USD +2012-06-01 open Expenses:Other:Errors USD ; This is the big one. We are holding your money! 2012-06-01 open Liabilities:Escrow USD @@ -24,23 +23,23 @@ 2012-06-01 * "We charged participants via Samurai." Assets:Samurai:Escrow 2.96 USD Assets:Samurai:Operations 0.34 USD - Income:Samurai:Fees -0.34 USD + Income:Fees:Samurai -0.34 USD Liabilities:Escrow -2.96 USD 2012-06-04 * "Samurai settled with us. We expected 3.30, but saw 7.56: an overpayment of 4.26." Assets:New-Alliance:Escrow 2.96 USD Assets:New-Alliance:Operations 0.34 USD Assets:New-Alliance:Operations 4.26 USD - Income:Samurai:Errors -4.26 USD + Income:Errors:Samurai -4.26 USD Assets:Samurai:Operations -0.34 USD Assets:Samurai:Escrow -2.96 USD 2012-06-04 * "Samurai withdrew funds." - Expenses:Samurai:Fees 0.08 USD + Expenses:Other:Fees 0.08 USD Assets:New-Alliance:Operations -0.08 USD 2012-06-04 * "Samurai withdrew more funds for some reason." - Expenses:Samurai:Fees 31.35 USD + Expenses:Other:Fees 31.35 USD Assets:New-Alliance:Operations -31.35 USD @@ -50,7 +49,7 @@ 2012-06-08 * "We charged participants via Samurai." Assets:Samurai:Escrow 23.17 USD Assets:Samurai:Operations 2.11 USD - Income:Samurai:Fees -2.11 USD + Income:Fees:Samurai -2.11 USD Liabilities:Escrow -23.17 USD 2012-06-11 * "Samurai settled AMEX charges with us. We expected 0.61, and we saw 0.61." @@ -62,13 +61,13 @@ 2012-06-11 * "Samurai settled VISA/MC. We expected 24.67, but saw 24.11: an underpayment of 0.56." Assets:New-Alliance:Escrow 22.69 USD Assets:New-Alliance:Operations 1.98 USD - Expenses:Samurai:Errors 0.56 USD + Expenses:Other:Fees 0.56 USD Assets:New-Alliance:Operations -0.56 USD Assets:Samurai:Operations -1.98 USD Assets:Samurai:Escrow -22.69 USD 2012-06-11 * "Samurai withdrew funds." - Expenses:Samurai:Fees 2.00 USD + Expenses:Other:Fees 2.00 USD Assets:New-Alliance:Operations -2.00 USD @@ -78,29 +77,29 @@ 2012-06-15 * "We charged participants via Samurai." Assets:Samurai:Escrow 1.36 USD Assets:Samurai:Operations 0.69 USD - Income:Samurai:Fees -0.69 USD + Income:Fees:Samurai -0.69 USD Liabilities:Escrow -1.36 USD ; Our first payout! ; ----------------- ; Chad took money out of his pocket and put it in Steve Klabnik's hand. -2012-06-15 open Assets:Escrow:Cash USD +2012-06-15 open Assets:Cash:Escrow USD 2012-06-15 * "Chad increased our escrow with cash from his pocket, pushing above what we need." - Assets:Escrow:Cash 1.50 USD + Assets:Cash:Escrow 1.50 USD Equity:Owners:Chad-Whitacre -1.50 USD 2012-06-15 * "Let's bleed off the excess escrow over to operations(!?)." Assets:New-Alliance:Operations 1.50 USD Assets:New-Alliance:Escrow -1.50 USD 2012-06-15 * "Now we can do the payout ..." Liabilities:Escrow 1.50 USD - Assets:Escrow:Cash -1.50 USD + Assets:Cash:Escrow -1.50 USD 2012-06-18 * "Samurai settled with us. We expected 2.05, but saw 2.01: an underpayment of 0.04." Assets:New-Alliance:Escrow 1.36 USD Assets:New-Alliance:Operations 0.69 USD - Expenses:Samurai:Errors 0.04 USD + Expenses:Other:Fees 0.04 USD Assets:New-Alliance:Operations -0.04 USD Assets:Samurai:Operations -0.69 USD Assets:Samurai:Escrow -1.36 USD @@ -111,14 +110,14 @@ 2012-06-15 open Assets:Stripe:Operations USD 2012-06-15 open Income:Testing USD -2012-06-15 open Expenses:Stripe:Fees USD +2012-06-15 open Expenses:Fees:Stripe USD 2012-06-15 * "We charged Chad via Stripe." Assets:Stripe:Operations 0.54 USD Income:Testing -0.54 USD 2012-06-22 * "Stripe withheld their fee." - Expenses:Stripe:Fees 0.32 USD + Expenses:Fees:Stripe 0.32 USD Assets:Stripe:Operations -0.32 USD 2012-06-22 * "Stripe settled the net to us." @@ -131,7 +130,7 @@ ; Let's set it up to use for payday. 2012-06-22 open Assets:Stripe:Escrow USD -2012-06-22 open Income:Stripe:Fees USD +2012-06-22 open Income:Fees:Stripe USD ; Gittip Payday 3 @@ -140,13 +139,13 @@ 2012-06-22 * "We charged participants via Stripe." Assets:Stripe:Escrow 20.67 USD Assets:Stripe:Operations 4.62 USD - Income:Stripe:Fees -4.62 USD + Income:Fees:Stripe -4.62 USD Liabilities:Escrow -20.67 USD 2012-06-28 * "Stripe settled the net to us." Assets:New-Alliance:Escrow 20.67 USD Assets:New-Alliance:Operations 0.30 USD - Expenses:Stripe:Fees 4.32 USD + Expenses:Fees:Stripe 4.32 USD Assets:Stripe:Operations -4.32 USD Assets:Stripe:Operations -0.30 USD Assets:Stripe:Escrow -20.67 USD @@ -158,7 +157,7 @@ 2012-06-29 * "We charged participants via Stripe." Assets:Stripe:Escrow 95.24 USD Assets:Stripe:Operations 15.76 USD - Income:Stripe:Fees -15.76 USD + Income:Fees:Stripe -15.76 USD Liabilities:Escrow -95.24 USD diff --git a/FY2013/FY2013.beancount b/FY2013/FY2013.beancount index 4907236..246fb35 100644 --- a/FY2013/FY2013.beancount +++ b/FY2013/FY2013.beancount @@ -4,6 +4,7 @@ 2012-06-01 open Assets:New-Alliance USD 2012-06-01 open Assets:New-Alliance:Operations USD 2012-06-01 open Equity:Owners:Chad-Whitacre USD +2012-06-01 open Expenses:Other:Fees USD 2012-06-01 * "Opening Balance" Assets:New-Alliance:Operations 102.45 USD From ce3d10fe6e57c094a4ee9d5d730e3af0d37ace72 Mon Sep 17 00:00:00 2001 From: Chad Whitacre Date: Wed, 26 Apr 2017 13:51:47 -0400 Subject: [PATCH 2/2] Standardize on Expense:Other:{Fees,Errors}:* --- FY2013/2012-06.beancount | 19 ++++++++++--------- FY2013/FY2013.beancount | 1 - 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/FY2013/2012-06.beancount b/FY2013/2012-06.beancount index b970ea2..18bdc1d 100644 --- a/FY2013/2012-06.beancount +++ b/FY2013/2012-06.beancount @@ -8,10 +8,11 @@ 2012-06-01 open Assets:Samurai:Escrow USD 2012-06-01 open Assets:Samurai:Operations USD 2012-06-01 open Income:Fees:Samurai USD +2012-06-01 open Expenses:Other:Fees:Samurai USD ; Unfortunately, they proved unreliable. 2012-06-01 open Income:Errors:Samurai USD -2012-06-01 open Expenses:Other:Errors USD +2012-06-01 open Expenses:Other:Errors:Samurai USD ; This is the big one. We are holding your money! 2012-06-01 open Liabilities:Escrow USD @@ -35,11 +36,11 @@ Assets:Samurai:Escrow -2.96 USD 2012-06-04 * "Samurai withdrew funds." - Expenses:Other:Fees 0.08 USD + Expenses:Other:Fees:Samurai 0.08 USD Assets:New-Alliance:Operations -0.08 USD 2012-06-04 * "Samurai withdrew more funds for some reason." - Expenses:Other:Fees 31.35 USD + Expenses:Other:Fees:Samurai 31.35 USD Assets:New-Alliance:Operations -31.35 USD @@ -61,13 +62,13 @@ 2012-06-11 * "Samurai settled VISA/MC. We expected 24.67, but saw 24.11: an underpayment of 0.56." Assets:New-Alliance:Escrow 22.69 USD Assets:New-Alliance:Operations 1.98 USD - Expenses:Other:Fees 0.56 USD + Expenses:Other:Fees:Samurai 0.56 USD Assets:New-Alliance:Operations -0.56 USD Assets:Samurai:Operations -1.98 USD Assets:Samurai:Escrow -22.69 USD 2012-06-11 * "Samurai withdrew funds." - Expenses:Other:Fees 2.00 USD + Expenses:Other:Fees:Samurai 2.00 USD Assets:New-Alliance:Operations -2.00 USD @@ -99,7 +100,7 @@ 2012-06-18 * "Samurai settled with us. We expected 2.05, but saw 2.01: an underpayment of 0.04." Assets:New-Alliance:Escrow 1.36 USD Assets:New-Alliance:Operations 0.69 USD - Expenses:Other:Fees 0.04 USD + Expenses:Other:Fees:Samurai 0.04 USD Assets:New-Alliance:Operations -0.04 USD Assets:Samurai:Operations -0.69 USD Assets:Samurai:Escrow -1.36 USD @@ -110,14 +111,14 @@ 2012-06-15 open Assets:Stripe:Operations USD 2012-06-15 open Income:Testing USD -2012-06-15 open Expenses:Fees:Stripe USD +2012-06-15 open Expenses:Other:Fees:Stripe USD 2012-06-15 * "We charged Chad via Stripe." Assets:Stripe:Operations 0.54 USD Income:Testing -0.54 USD 2012-06-22 * "Stripe withheld their fee." - Expenses:Fees:Stripe 0.32 USD + Expenses:Other:Fees:Stripe 0.32 USD Assets:Stripe:Operations -0.32 USD 2012-06-22 * "Stripe settled the net to us." @@ -145,7 +146,7 @@ 2012-06-28 * "Stripe settled the net to us." Assets:New-Alliance:Escrow 20.67 USD Assets:New-Alliance:Operations 0.30 USD - Expenses:Fees:Stripe 4.32 USD + Expenses:Other:Fees:Stripe 4.32 USD Assets:Stripe:Operations -4.32 USD Assets:Stripe:Operations -0.30 USD Assets:Stripe:Escrow -20.67 USD diff --git a/FY2013/FY2013.beancount b/FY2013/FY2013.beancount index 246fb35..4907236 100644 --- a/FY2013/FY2013.beancount +++ b/FY2013/FY2013.beancount @@ -4,7 +4,6 @@ 2012-06-01 open Assets:New-Alliance USD 2012-06-01 open Assets:New-Alliance:Operations USD 2012-06-01 open Equity:Owners:Chad-Whitacre USD -2012-06-01 open Expenses:Other:Fees USD 2012-06-01 * "Opening Balance" Assets:New-Alliance:Operations 102.45 USD