From e006c6a30e4db6efaca0982d040034d0b5f44bf4 Mon Sep 17 00:00:00 2001
From: fromwheretowhere <fromwheretowhere.service@gmail.com>
Date: Wed, 8 Feb 2017 23:14:49 -0800
Subject: [PATCH 01/12] partial records on PNC in early 201701

---
 FY2017/2017-01.beancount | 32 ++++++++++++++++++++++++++++++++
 FY2017/FY2017.beancount  |  8 ++++++++
 gratipay.beancount       |  1 +
 3 files changed, 41 insertions(+)
 create mode 100644 FY2017/2017-01.beancount
 create mode 100644 FY2017/FY2017.beancount

diff --git a/FY2017/2017-01.beancount b/FY2017/2017-01.beancount
new file mode 100644
index 0000000..7ce6887
--- /dev/null
+++ b/FY2017/2017-01.beancount
@@ -0,0 +1,32 @@
+
+2017-01-01 open Expenses:Operations USD
+2017-01-01 open Income:Payout USD
+
+; date based on receipt in FD #6502. Corresponding record in pnc.csv L16
+2017-01-01  * "DigitialOcean monthly"
+    Expenses:Operations               10.00 USD
+    Assets:Operations:PNC            -10.00 USD
+
+; date based on receipt in FD #6506. pnc.csv L18
+2017-01-02  * "bounty award for HackerOne"
+    Expenses:Operations               12.00 USD
+    Assets:Operations:PNC            -12.00 USD
+
+; date based on receipt in FD #6535. pnc.csv L15
+2017-01-05  * "Freshdesk monthly"
+    Expenses:Operations               38.00 USD
+    Assets:Operations:PNC            -38.00 USD
+
+; date based on receipt in FD #6536. pnc.csv L14
+; http://gratipay.slackarchive.io/gratipay/-/1483640673.001811/1483653370.001921/1483650056001917/
+2017-01-05  * "Postage"
+    Expenses:Operations               34.15 USD
+    Assets:Operations:PNC            -34.15 USD
+
+; TODO: find receipt for pnc.csv L17
+
+; date based on receipt in FD #6530. pnc.csv L13
+2017-01-05  * "Payout"
+    Income:Payout                    -93.57 USD
+    Assets:Operations:PNC             93.57 USD
+
diff --git a/FY2017/FY2017.beancount b/FY2017/FY2017.beancount
new file mode 100644
index 0000000..c33141a
--- /dev/null
+++ b/FY2017/FY2017.beancount
@@ -0,0 +1,8 @@
+2017-01-01 open Assets:Operations:PNC USD
+
+; in order to achieve opening balance on 2017-01-01, add difference between 2883.99 and the latest balance of PNC (currently 0)
+2017-01-01 * "Opening Balance"
+    Assets:Operations:PNC           2883.99 USD
+    Equity:Owners:Chad-Whitacre    -2883.99 USD
+
+include "2017-01.beancount"
diff --git a/gratipay.beancount b/gratipay.beancount
index 9626749..85bbeb0 100644
--- a/gratipay.beancount
+++ b/gratipay.beancount
@@ -7,3 +7,4 @@ option "account_previous_earnings" "Retained-Earnings"
 option "account_current_earnings" "Current-Activity"
 
 include "FY2013/FY2013.beancount"
+include "FY2017/FY2017.beancount"

From 6a796b9208ea0bbe61a450927ebc309bcd9c04a7 Mon Sep 17 00:00:00 2001
From: fromwheretowhere <fromwheretowhere.service@gmail.com>
Date: Thu, 9 Feb 2017 23:14:19 -0800
Subject: [PATCH 02/12] add URL references; move them to metadata as @whit537
 suggests

---
 FY2017/2017-01.beancount | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/FY2017/2017-01.beancount b/FY2017/2017-01.beancount
index 7ce6887..60acc24 100644
--- a/FY2017/2017-01.beancount
+++ b/FY2017/2017-01.beancount
@@ -2,31 +2,36 @@
 2017-01-01 open Expenses:Operations USD
 2017-01-01 open Income:Payout USD
 
-; date based on receipt in FD #6502. Corresponding record in pnc.csv L16
 2017-01-01  * "DigitialOcean monthly"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6502"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L16"
     Expenses:Operations               10.00 USD
     Assets:Operations:PNC            -10.00 USD
 
-; date based on receipt in FD #6506. pnc.csv L18
 2017-01-02  * "bounty award for HackerOne"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6506"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L18"
     Expenses:Operations               12.00 USD
     Assets:Operations:PNC            -12.00 USD
 
-; date based on receipt in FD #6535. pnc.csv L15
 2017-01-05  * "Freshdesk monthly"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6535"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L15"
     Expenses:Operations               38.00 USD
     Assets:Operations:PNC            -38.00 USD
 
-; date based on receipt in FD #6536. pnc.csv L14
-; http://gratipay.slackarchive.io/gratipay/-/1483640673.001811/1483653370.001921/1483650056001917/
 2017-01-05  * "Postage"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6536"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L14"
+    note: "http://gratipay.slackarchive.io/gratipay/-/1483640673.001811/1483653370.001921/1483650056001917/"
     Expenses:Operations               34.15 USD
     Assets:Operations:PNC            -34.15 USD
 
 ; TODO: find receipt for pnc.csv L17
 
-; date based on receipt in FD #6530. pnc.csv L13
 2017-01-05  * "Payout"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6530"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L13"
     Income:Payout                    -93.57 USD
     Assets:Operations:PNC             93.57 USD
 

From 58a3e2bec2077d13ebfdd7a483a08a3d253b969e Mon Sep 17 00:00:00 2001
From: fromwheretowhere <fromwheretowhere.service@gmail.com>
Date: Fri, 10 Feb 2017 00:04:03 -0800
Subject: [PATCH 03/12] missed two receipts, otherwise PNC part done

---
 FY2017/2017-01.beancount | 73 ++++++++++++++++++++++++++++++++++++++--
 FY2017/FY2017.beancount  |  4 +--
 2 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/FY2017/2017-01.beancount b/FY2017/2017-01.beancount
index 60acc24..dfd96e7 100644
--- a/FY2017/2017-01.beancount
+++ b/FY2017/2017-01.beancount
@@ -8,6 +8,12 @@
     Expenses:Operations               10.00 USD
     Assets:Operations:PNC            -10.00 USD
 
+2017-01-01  * "MaxCDN monthly"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6479"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L17"
+    Expenses:Operations                9.95 USD
+    Assets:Operations:PNC             -9.95 USD
+
 2017-01-02  * "bounty award for HackerOne"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6506"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L18"
@@ -27,11 +33,74 @@
     Expenses:Operations               34.15 USD
     Assets:Operations:PNC            -34.15 USD
 
-; TODO: find receipt for pnc.csv L17
-
 2017-01-05  * "Payout"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6530"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L13"
     Income:Payout                    -93.57 USD
     Assets:Operations:PNC             93.57 USD
 
+2017-01-09  * "DNSimple"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6548"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L12"
+    Expenses:Operations                3.00 USD
+    Assets:Operations:PNC             -3.00 USD
+
+2017-01-09  * "Heroku monthly"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6566"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L11"
+    Expenses:Operations              105.00 USD
+    Assets:Operations:PNC           -105.00 USD
+
+; TODO: missing postage receipt for 01/13 $49.29
+2017-01-13  * "Postage"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L10"
+    Expenses:Operations               49.29 USD
+    Assets:Operations:PNC            -49.29 USD
+
+2017-01-12  * "Payout"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6592"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L9"
+    Income:Payout                    -69.13 USD
+    Assets:Operations:PNC             69.13 USD
+
+2017-01-19  * "Donation to $ustain"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6645"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L8"
+    Expenses:Operations              100.00 USD
+    Assets:Operations:PNC           -100.00 USD
+
+2017-01-19  * "Payout"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6642"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L7"
+    Income:Payout                   -116.03 USD
+    Assets:Operations:PNC            116.03 USD
+
+2017-01-23  * "Librato monthly"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6666"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L6"
+    Expenses:Operations                5.00 USD
+    Assets:Operations:PNC             -5.00 USD
+
+2017-01-26  * "Payout"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6691"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L5"
+    Income:Payout                    -50.70 USD
+    Assets:Operations:PNC             50.70 USD
+
+2017-01-28  * "iwantmyname monthly"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6666"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L4"
+    Expenses:Operations               34.00 USD
+    Assets:Operations:PNC            -34.00 USD
+
+2017-01-28  * "Transifex monthly"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6702"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L3"
+    Expenses:Operations               19.00 USD
+    Assets:Operations:PNC            -19.00 USD
+
+; TODO: no receipt in FD
+2017-01-28  * "??"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L2"
+    Expenses:Operations                1.02 USD
+    Assets:Operations:PNC             -1.02 USD
diff --git a/FY2017/FY2017.beancount b/FY2017/FY2017.beancount
index c33141a..20321fe 100644
--- a/FY2017/FY2017.beancount
+++ b/FY2017/FY2017.beancount
@@ -2,7 +2,7 @@
 
 ; in order to achieve opening balance on 2017-01-01, add difference between 2883.99 and the latest balance of PNC (currently 0)
 2017-01-01 * "Opening Balance"
-    Assets:Operations:PNC           2883.99 USD
-    Equity:Owners:Chad-Whitacre    -2883.99 USD
+    Assets:Operations:PNC           2893.99 USD
+    Equity:Owners:Chad-Whitacre    -2893.99 USD
 
 include "2017-01.beancount"

From 0e9fc065c73f820f8d884bd0fd790c38338e60ae Mon Sep 17 00:00:00 2001
From: fromwheretowhere <fromwheretowhere.service@gmail.com>
Date: Mon, 13 Feb 2017 22:22:12 -0800
Subject: [PATCH 04/12] add paypal transfers in 201701

---
 FY2017/2017-01.beancount | 35 ++++++++++++++++++++++++-----------
 FY2017/FY2017.beancount  |  6 ++++++
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/FY2017/2017-01.beancount b/FY2017/2017-01.beancount
index dfd96e7..a7d4b5d 100644
--- a/FY2017/2017-01.beancount
+++ b/FY2017/2017-01.beancount
@@ -2,6 +2,7 @@
 2017-01-01 open Expenses:Operations USD
 2017-01-01 open Income:Payout USD
 
+; the earlier date in receipt and bank statements is used for all transactions
 2017-01-01  * "DigitialOcean monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6502"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L16"
@@ -39,6 +40,12 @@
     Income:Payout                    -93.57 USD
     Assets:Operations:PNC             93.57 USD
 
+2017-01-05  * "PayPal transfer"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6573"
+    statementNewAlliance: "hhttps://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L4ttps://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L13"
+    Assets:Operations:PayPal        2000.00 USD
+    Assets:Operations:New-Alliance -2000.00 USD
+
 2017-01-09  * "DNSimple"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6548"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L12"
@@ -51,17 +58,23 @@
     Expenses:Operations              105.00 USD
     Assets:Operations:PNC           -105.00 USD
 
+2017-01-12  * "Payout"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6592"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L9"
+    Income:Payout                    -69.13 USD
+    Assets:Operations:PNC             69.13 USD
+
 ; TODO: missing postage receipt for 01/13 $49.29
 2017-01-13  * "Postage"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L10"
     Expenses:Operations               49.29 USD
     Assets:Operations:PNC            -49.29 USD
 
-2017-01-12  * "Payout"
-    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6592"
-    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L9"
-    Income:Payout                    -69.13 USD
-    Assets:Operations:PNC             69.13 USD
+2017-01-13  * "PayPal transfer"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6632"
+    statementNewAlliance: "hhttps://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L4ttps://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L13"
+    Assets:Operations:PayPal        3300.00 USD
+    Assets:Operations:New-Alliance -3300.00 USD
 
 2017-01-19  * "Donation to $ustain"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6645"
@@ -93,14 +106,14 @@
     Expenses:Operations               34.00 USD
     Assets:Operations:PNC            -34.00 USD
 
-2017-01-28  * "Transifex monthly"
-    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6702"
-    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L3"
-    Expenses:Operations               19.00 USD
-    Assets:Operations:PNC            -19.00 USD
-
 ; TODO: no receipt in FD
 2017-01-28  * "??"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L2"
     Expenses:Operations                1.02 USD
     Assets:Operations:PNC             -1.02 USD
+
+2017-01-29  * "Transifex monthly"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6702"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L3"
+    Expenses:Operations               19.00 USD
+    Assets:Operations:PNC            -19.00 USD
diff --git a/FY2017/FY2017.beancount b/FY2017/FY2017.beancount
index 20321fe..13a66ce 100644
--- a/FY2017/FY2017.beancount
+++ b/FY2017/FY2017.beancount
@@ -1,8 +1,14 @@
 2017-01-01 open Assets:Operations:PNC USD
+2017-01-01 open Assets:Operations:PayPal USD
 
 ; in order to achieve opening balance on 2017-01-01, add difference between 2883.99 and the latest balance of PNC (currently 0)
 2017-01-01 * "Opening Balance"
     Assets:Operations:PNC           2893.99 USD
     Equity:Owners:Chad-Whitacre    -2893.99 USD
 
+; TODO: fill in the real opening balance
+2017-01-01 * "Opening Balance"
+    Assets:Operations:New-Alliance 10000.00 USD
+    Equity:Owners:Chad-Whitacre   -10000.00 USD
+
 include "2017-01.beancount"

From 26780acf4c9e2631e44fd61c6e366c9a5dfe86ba Mon Sep 17 00:00:00 2001
From: fromwheretowhere <fromwheretowhere.service@gmail.com>
Date: Tue, 21 Feb 2017 23:10:39 -0800
Subject: [PATCH 05/12] add paypal open balance for 201701 and first payout

---
 FY2017/2017-01.beancount | 4 ++++
 FY2017/FY2017.beancount  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/FY2017/2017-01.beancount b/FY2017/2017-01.beancount
index a7d4b5d..314bb54 100644
--- a/FY2017/2017-01.beancount
+++ b/FY2017/2017-01.beancount
@@ -40,6 +40,10 @@
     Income:Payout                    -93.57 USD
     Assets:Operations:PNC             93.57 USD
 
+2017-01-05  * "Payout 1"
+    Assets:Operations:PayPal        -892.47 USD
+    Liabilities:Escrow               892.47 USD
+
 2017-01-05  * "PayPal transfer"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6573"
     statementNewAlliance: "hhttps://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L4ttps://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L13"
diff --git a/FY2017/FY2017.beancount b/FY2017/FY2017.beancount
index 13a66ce..2ac8d27 100644
--- a/FY2017/FY2017.beancount
+++ b/FY2017/FY2017.beancount
@@ -11,4 +11,8 @@
     Assets:Operations:New-Alliance 10000.00 USD
     Equity:Owners:Chad-Whitacre   -10000.00 USD
 
+2017-01-01 * "Opening Balance"
+    Assets:Operations:PayPal        7977.81 USD
+    Equity:Owners:Chad-Whitacre    -7977.81 USD
+
 include "2017-01.beancount"

From 860148e76b9f3135e2e47715feecfa83c0f29954 Mon Sep 17 00:00:00 2001
From: fromwheretowhere <fromwheretowhere.service@gmail.com>
Date: Tue, 21 Feb 2017 23:23:47 -0800
Subject: [PATCH 06/12] fix test by separating paypal balance into escrow and
 operations

---
 FY2017/FY2017.beancount | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/FY2017/FY2017.beancount b/FY2017/FY2017.beancount
index 2ac8d27..ac4b5e8 100644
--- a/FY2017/FY2017.beancount
+++ b/FY2017/FY2017.beancount
@@ -1,4 +1,5 @@
 2017-01-01 open Assets:Operations:PNC USD
+2017-01-01 open Assets:Escrow:PayPal USD
 2017-01-01 open Assets:Operations:PayPal USD
 
 ; in order to achieve opening balance on 2017-01-01, add difference between 2883.99 and the latest balance of PNC (currently 0)
@@ -11,8 +12,11 @@
     Assets:Operations:New-Alliance 10000.00 USD
     Equity:Owners:Chad-Whitacre   -10000.00 USD
 
+; open balance of paypal in 201701 is 7977.81. TODO: as we don't have real liability, temporarily use an estimated liability
 2017-01-01 * "Opening Balance"
-    Assets:Operations:PayPal        7977.81 USD
-    Equity:Owners:Chad-Whitacre    -7977.81 USD
+    Assets:Escrow:PayPal            6977.81 USD
+    Assets:Operations:PayPal        1000.00 USD
+    Equity:Owners:Chad-Whitacre    -1000.00 USD
+    Liabilities:Escrow             -6977.81 USD
 
 include "2017-01.beancount"

From 4010af84ff4492c3df7f2990f0ecaecc82771522 Mon Sep 17 00:00:00 2001
From: fromwheretowhere <fromwheretowhere.service@gmail.com>
Date: Tue, 21 Feb 2017 23:26:52 -0800
Subject: [PATCH 07/12] file missed in last commit

---
 FY2017/2017-01.beancount | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FY2017/2017-01.beancount b/FY2017/2017-01.beancount
index 314bb54..290e060 100644
--- a/FY2017/2017-01.beancount
+++ b/FY2017/2017-01.beancount
@@ -41,7 +41,7 @@
     Assets:Operations:PNC             93.57 USD
 
 2017-01-05  * "Payout 1"
-    Assets:Operations:PayPal        -892.47 USD
+    Assets:Escrow:PayPal            -892.47 USD
     Liabilities:Escrow               892.47 USD
 
 2017-01-05  * "PayPal transfer"

From 54b0ca6c862d841078209d2c3f220e9258ccf1b5 Mon Sep 17 00:00:00 2001
From: fromwheretowhere <fromwheretowhere.service@gmail.com>
Date: Wed, 22 Feb 2017 21:49:39 -0800
Subject: [PATCH 08/12] finish new-alliance and paypal transactions. pnc and
 paypal balances checked

---
 FY2017/2017-01.beancount | 96 +++++++++++++++++++++++++++++++++++++---
 FY2017/FY2017.beancount  |  6 +--
 2 files changed, 93 insertions(+), 9 deletions(-)

diff --git a/FY2017/2017-01.beancount b/FY2017/2017-01.beancount
index 290e060..7dfbc66 100644
--- a/FY2017/2017-01.beancount
+++ b/FY2017/2017-01.beancount
@@ -1,5 +1,6 @@
 
 2017-01-01 open Expenses:Operations USD
+2017-01-01 open Expenses:Fees:PayPal USD
 2017-01-01 open Income:Payout USD
 
 ; the earlier date in receipt and bank statements is used for all transactions
@@ -21,6 +22,10 @@
     Expenses:Operations               12.00 USD
     Assets:Operations:PNC            -12.00 USD
 
+2017-01-03  * "Braintree funding"
+    Assets:Escrow:New-Alliance       121.78 USD
+    Liabilities:Escrow              -121.78 USD
+
 2017-01-05  * "Freshdesk monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6535"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L15"
@@ -40,15 +45,26 @@
     Income:Payout                    -93.57 USD
     Assets:Operations:PNC             93.57 USD
 
-2017-01-05  * "Payout 1"
-    Assets:Escrow:PayPal            -892.47 USD
+; TODO: one pending: $0.52 not reversed right after
+2017-01-05  * "Mass payout 1"
     Liabilities:Escrow               892.47 USD
+    Expenses:Fees:PayPal              15.11 USD
+    Assets:Operations:PayPal         -15.11 USD
+    Assets:Escrow:PayPal            -892.47 USD
 
 2017-01-05  * "PayPal transfer"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6573"
     statementNewAlliance: "hhttps://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L4ttps://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L13"
-    Assets:Operations:PayPal        2000.00 USD
-    Assets:Operations:New-Alliance -2000.00 USD
+    Assets:Escrow:PayPal            2000.00 USD
+    Assets:Escrow:New-Alliance     -2000.00 USD
+
+2017-01-06  * "Braintree funding"
+    Assets:Escrow:New-Alliance       636.94 USD
+    Liabilities:Escrow              -636.94 USD
+
+2017-01-09  * "Braintree funding"
+    Assets:Escrow:New-Alliance       135.54 USD
+    Liabilities:Escrow              -135.54 USD
 
 2017-01-09  * "DNSimple"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6548"
@@ -62,12 +78,29 @@
     Expenses:Operations              105.00 USD
     Assets:Operations:PNC           -105.00 USD
 
+; TBD: do we need to put here additional details 1/11/17 in PayPal statement?
+2017-01-11  * "General Payment"
+    Expenses:Operations                0.15 USD
+    Assets:Operations:PayPal          -0.15 USD
+
+2017-01-12  * "Mass payout 2"
+    Liabilities:Escrow              1304.39 USD
+    Expenses:Fees:PayPal              13.36 USD
+    Assets:Operations:PayPal         -13.36 USD
+    Assets:Escrow:PayPal           -1304.39 USD
+
 2017-01-12  * "Payout"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6592"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L9"
     Income:Payout                    -69.13 USD
     Assets:Operations:PNC             69.13 USD
 
+; TBD: donation or escrow? do we need details like 1/11?
+2017-01-13  * "General Payment"
+    Assets:Operations:PayPal          73.50 USD
+    Expenses:Fees:PayPal               2.50 USD
+    Income:Payout                    -76.00 USD
+
 ; TODO: missing postage receipt for 01/13 $49.29
 2017-01-13  * "Postage"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L10"
@@ -77,8 +110,21 @@
 2017-01-13  * "PayPal transfer"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6632"
     statementNewAlliance: "hhttps://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L4ttps://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L13"
-    Assets:Operations:PayPal        3300.00 USD
-    Assets:Operations:New-Alliance -3300.00 USD
+    Assets:Escrow:PayPal            3300.00 USD
+    Assets:Escrow:New-Alliance     -3300.00 USD
+
+; payment pending since 1/12 got reversed
+2017-01-14  * "Mass Pay Reversal"
+    Assets:Escrow:PayPal               0.59 USD
+    Liabilities:Escrow                -0.59 USD
+
+2017-01-16  * "Braintree funding"
+    Assets:Escrow:New-Alliance       615.76 USD
+    Liabilities:Escrow              -615.76 USD
+
+2017-01-18  * "Braintree funding"
+    Assets:Escrow:New-Alliance       142.05 USD
+    Liabilities:Escrow              -142.05 USD
 
 2017-01-19  * "Donation to $ustain"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6645"
@@ -86,24 +132,58 @@
     Expenses:Operations              100.00 USD
     Assets:Operations:PNC           -100.00 USD
 
+2017-01-19  * "Mass payout 3"
+    Liabilities:Escrow               838.74 USD
+    Expenses:Fees:PayPal              13.87 USD
+    Assets:Operations:PayPal         -13.87 USD
+    Assets:Escrow:PayPal            -838.74 USD
+
 2017-01-19  * "Payout"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6642"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L7"
     Income:Payout                   -116.03 USD
     Assets:Operations:PNC            116.03 USD
 
+2017-01-20  * "Braintree funding"
+    Assets:Escrow:New-Alliance       720.78 USD
+    Liabilities:Escrow              -720.78 USD
+
+; TODO: why is it not equal to the pending amount 0.49 this time?
+2017-01-21  * "Mass Pay Reversal"
+    Assets:Escrow:PayPal               0.88 USD
+    Liabilities:Escrow                -0.88 USD
+
 2017-01-23  * "Librato monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6666"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L6"
     Expenses:Operations                5.00 USD
     Assets:Operations:PNC             -5.00 USD
 
+2017-01-21  * "Mass payout 4"
+    Liabilities:Escrow               655.80 USD
+    Expenses:Fees:PayPal              11.51 USD
+    Assets:Operations:PayPal         -11.51 USD
+    Assets:Escrow:PayPal            -655.80 USD
+
+2017-01-23  * "Braintree funding"
+    Assets:Escrow:New-Alliance       145.30 USD
+    Liabilities:Escrow              -145.30 USD
+
 2017-01-26  * "Payout"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6691"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L5"
     Income:Payout                    -50.70 USD
     Assets:Operations:PNC             50.70 USD
 
+2017-01-27  * "Braintree funding"
+    Assets:Escrow:New-Alliance       536.40 USD
+    Liabilities:Escrow              -536.40 USD
+
+; TODO: why is it not equal to the pending amount 0.59 this time?
+2017-01-28  * "Mass Pay Reversal"
+    Assets:Escrow:PayPal               2.16 USD
+    Liabilities:Escrow                -2.16 USD
+
 2017-01-28  * "iwantmyname monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6666"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L4"
@@ -121,3 +201,7 @@
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L3"
     Expenses:Operations               19.00 USD
     Assets:Operations:PNC            -19.00 USD
+
+2017-01-03  * "Braintree funding"
+    Assets:Escrow:New-Alliance       134.04 USD
+    Liabilities:Escrow              -134.04 USD
diff --git a/FY2017/FY2017.beancount b/FY2017/FY2017.beancount
index ac4b5e8..c57facb 100644
--- a/FY2017/FY2017.beancount
+++ b/FY2017/FY2017.beancount
@@ -7,10 +7,10 @@
     Assets:Operations:PNC           2893.99 USD
     Equity:Owners:Chad-Whitacre    -2893.99 USD
 
-; TODO: fill in the real opening balance
+; TODO: fill in the real opening balance (escrow part and operation part)
 2017-01-01 * "Opening Balance"
-    Assets:Operations:New-Alliance 10000.00 USD
-    Equity:Owners:Chad-Whitacre   -10000.00 USD
+    Assets:Escrow:New-Alliance     10000.00 USD
+    Liabilities:Escrow            -10000.00 USD
 
 ; open balance of paypal in 201701 is 7977.81. TODO: as we don't have real liability, temporarily use an estimated liability
 2017-01-01 * "Opening Balance"

From 64d05d32ffdc19d0f7e30760684131bef8f3dbe8 Mon Sep 17 00:00:00 2001
From: fromwheretowhere <fromwheretowhere.service@gmail.com>
Date: Thu, 23 Feb 2017 22:30:53 -0800
Subject: [PATCH 09/12] minor reformating, and reorder by time

---
 FY2017/2017-01.beancount | 84 ++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/FY2017/2017-01.beancount b/FY2017/2017-01.beancount
index 7dfbc66..043eff6 100644
--- a/FY2017/2017-01.beancount
+++ b/FY2017/2017-01.beancount
@@ -4,204 +4,204 @@
 2017-01-01 open Income:Payout USD
 
 ; the earlier date in receipt and bank statements is used for all transactions
-2017-01-01  * "DigitialOcean monthly"
+2017-01-01 * "DigitialOcean monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6502"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L16"
     Expenses:Operations               10.00 USD
     Assets:Operations:PNC            -10.00 USD
 
-2017-01-01  * "MaxCDN monthly"
+2017-01-01 * "MaxCDN monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6479"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L17"
     Expenses:Operations                9.95 USD
     Assets:Operations:PNC             -9.95 USD
 
-2017-01-02  * "bounty award for HackerOne"
+2017-01-02 * "bounty award for HackerOne"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6506"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L18"
     Expenses:Operations               12.00 USD
     Assets:Operations:PNC            -12.00 USD
 
-2017-01-03  * "Braintree funding"
+2017-01-03 * "Braintree funding"
     Assets:Escrow:New-Alliance       121.78 USD
     Liabilities:Escrow              -121.78 USD
 
-2017-01-05  * "Freshdesk monthly"
+2017-01-05 * "Freshdesk monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6535"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L15"
     Expenses:Operations               38.00 USD
     Assets:Operations:PNC            -38.00 USD
 
-2017-01-05  * "Postage"
+2017-01-05 * "Postage"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6536"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L14"
     note: "http://gratipay.slackarchive.io/gratipay/-/1483640673.001811/1483653370.001921/1483650056001917/"
     Expenses:Operations               34.15 USD
     Assets:Operations:PNC            -34.15 USD
 
-2017-01-05  * "Payout"
+2017-01-05 * "Payout"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6530"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L13"
     Income:Payout                    -93.57 USD
     Assets:Operations:PNC             93.57 USD
 
 ; TODO: one pending: $0.52 not reversed right after
-2017-01-05  * "Mass payout 1"
+2017-01-05 * "Mass payout 1"
     Liabilities:Escrow               892.47 USD
     Expenses:Fees:PayPal              15.11 USD
     Assets:Operations:PayPal         -15.11 USD
     Assets:Escrow:PayPal            -892.47 USD
 
-2017-01-05  * "PayPal transfer"
+2017-01-05 * "PayPal transfer"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6573"
     statementNewAlliance: "hhttps://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L4ttps://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L13"
     Assets:Escrow:PayPal            2000.00 USD
     Assets:Escrow:New-Alliance     -2000.00 USD
 
-2017-01-06  * "Braintree funding"
+2017-01-06 * "Braintree funding"
     Assets:Escrow:New-Alliance       636.94 USD
     Liabilities:Escrow              -636.94 USD
 
-2017-01-09  * "Braintree funding"
+2017-01-09 * "Braintree funding"
     Assets:Escrow:New-Alliance       135.54 USD
     Liabilities:Escrow              -135.54 USD
 
-2017-01-09  * "DNSimple"
+2017-01-09 * "DNSimple"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6548"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L12"
     Expenses:Operations                3.00 USD
     Assets:Operations:PNC             -3.00 USD
 
-2017-01-09  * "Heroku monthly"
+2017-01-09 * "Heroku monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6566"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L11"
     Expenses:Operations              105.00 USD
     Assets:Operations:PNC           -105.00 USD
 
 ; TBD: do we need to put here additional details 1/11/17 in PayPal statement?
-2017-01-11  * "General Payment"
+2017-01-11 * "General Payment"
     Expenses:Operations                0.15 USD
     Assets:Operations:PayPal          -0.15 USD
 
-2017-01-12  * "Mass payout 2"
+2017-01-12 * "Mass payout 2"
     Liabilities:Escrow              1304.39 USD
     Expenses:Fees:PayPal              13.36 USD
     Assets:Operations:PayPal         -13.36 USD
     Assets:Escrow:PayPal           -1304.39 USD
 
-2017-01-12  * "Payout"
+2017-01-12 * "Payout"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6592"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L9"
     Income:Payout                    -69.13 USD
     Assets:Operations:PNC             69.13 USD
 
 ; TBD: donation or escrow? do we need details like 1/11?
-2017-01-13  * "General Payment"
+2017-01-13 * "General Payment"
     Assets:Operations:PayPal          73.50 USD
     Expenses:Fees:PayPal               2.50 USD
     Income:Payout                    -76.00 USD
 
 ; TODO: missing postage receipt for 01/13 $49.29
-2017-01-13  * "Postage"
+2017-01-13 * "Postage"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L10"
     Expenses:Operations               49.29 USD
     Assets:Operations:PNC            -49.29 USD
 
-2017-01-13  * "PayPal transfer"
+2017-01-13 * "PayPal transfer"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6632"
     statementNewAlliance: "hhttps://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L4ttps://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L13"
     Assets:Escrow:PayPal            3300.00 USD
     Assets:Escrow:New-Alliance     -3300.00 USD
 
 ; payment pending since 1/12 got reversed
-2017-01-14  * "Mass Pay Reversal"
+2017-01-14 * "Mass Pay Reversal"
     Assets:Escrow:PayPal               0.59 USD
     Liabilities:Escrow                -0.59 USD
 
-2017-01-16  * "Braintree funding"
+2017-01-16 * "Braintree funding"
     Assets:Escrow:New-Alliance       615.76 USD
     Liabilities:Escrow              -615.76 USD
 
-2017-01-18  * "Braintree funding"
+2017-01-18 * "Braintree funding"
     Assets:Escrow:New-Alliance       142.05 USD
     Liabilities:Escrow              -142.05 USD
 
-2017-01-19  * "Donation to $ustain"
+2017-01-19 * "Donation to $ustain"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6645"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L8"
     Expenses:Operations              100.00 USD
     Assets:Operations:PNC           -100.00 USD
 
-2017-01-19  * "Mass payout 3"
+2017-01-19 * "Mass payout 3"
     Liabilities:Escrow               838.74 USD
     Expenses:Fees:PayPal              13.87 USD
     Assets:Operations:PayPal         -13.87 USD
     Assets:Escrow:PayPal            -838.74 USD
 
-2017-01-19  * "Payout"
+2017-01-19 * "Payout"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6642"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L7"
     Income:Payout                   -116.03 USD
     Assets:Operations:PNC            116.03 USD
 
-2017-01-20  * "Braintree funding"
+2017-01-20 * "Braintree funding"
     Assets:Escrow:New-Alliance       720.78 USD
     Liabilities:Escrow              -720.78 USD
 
 ; TODO: why is it not equal to the pending amount 0.49 this time?
-2017-01-21  * "Mass Pay Reversal"
+2017-01-21 * "Mass Pay Reversal"
     Assets:Escrow:PayPal               0.88 USD
     Liabilities:Escrow                -0.88 USD
 
-2017-01-23  * "Librato monthly"
-    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6666"
-    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L6"
-    Expenses:Operations                5.00 USD
-    Assets:Operations:PNC             -5.00 USD
-
-2017-01-21  * "Mass payout 4"
+2017-01-21 * "Mass payout 4"
     Liabilities:Escrow               655.80 USD
     Expenses:Fees:PayPal              11.51 USD
     Assets:Operations:PayPal         -11.51 USD
     Assets:Escrow:PayPal            -655.80 USD
 
-2017-01-23  * "Braintree funding"
+2017-01-23 * "Librato monthly"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6666"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L6"
+    Expenses:Operations                5.00 USD
+    Assets:Operations:PNC             -5.00 USD
+
+2017-01-23 * "Braintree funding"
     Assets:Escrow:New-Alliance       145.30 USD
     Liabilities:Escrow              -145.30 USD
 
-2017-01-26  * "Payout"
+2017-01-26 * "Payout"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6691"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L5"
     Income:Payout                    -50.70 USD
     Assets:Operations:PNC             50.70 USD
 
-2017-01-27  * "Braintree funding"
+2017-01-27 * "Braintree funding"
     Assets:Escrow:New-Alliance       536.40 USD
     Liabilities:Escrow              -536.40 USD
 
 ; TODO: why is it not equal to the pending amount 0.59 this time?
-2017-01-28  * "Mass Pay Reversal"
+2017-01-28 * "Mass Pay Reversal"
     Assets:Escrow:PayPal               2.16 USD
     Liabilities:Escrow                -2.16 USD
 
-2017-01-28  * "iwantmyname monthly"
+2017-01-28 * "iwantmyname monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6666"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L4"
     Expenses:Operations               34.00 USD
     Assets:Operations:PNC            -34.00 USD
 
 ; TODO: no receipt in FD
-2017-01-28  * "??"
+2017-01-28 * "??"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L2"
     Expenses:Operations                1.02 USD
     Assets:Operations:PNC             -1.02 USD
 
-2017-01-29  * "Transifex monthly"
+2017-01-29 * "Transifex monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6702"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L3"
     Expenses:Operations               19.00 USD
     Assets:Operations:PNC            -19.00 USD
 
-2017-01-03  * "Braintree funding"
+2017-01-03 * "Braintree funding"
     Assets:Escrow:New-Alliance       134.04 USD
     Liabilities:Escrow              -134.04 USD

From f876c13f1cbc98ab835e37c60d58aadb6338cfc1 Mon Sep 17 00:00:00 2001
From: Kwesi Aguillera <kaguillera@gmail.com>
Date: Thu, 13 Apr 2017 13:41:41 -0400
Subject: [PATCH 10/12] Made changes suggested in the review

---
 FY2017/2017-01.beancount | 20 ++++++++------------
 FY2017/FY2017.beancount  |  3 +++
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/FY2017/2017-01.beancount b/FY2017/2017-01.beancount
index 043eff6..920da1e 100644
--- a/FY2017/2017-01.beancount
+++ b/FY2017/2017-01.beancount
@@ -1,8 +1,4 @@
 
-2017-01-01 open Expenses:Operations USD
-2017-01-01 open Expenses:Fees:PayPal USD
-2017-01-01 open Income:Payout USD
-
 ; the earlier date in receipt and bank statements is used for all transactions
 2017-01-01 * "DigitialOcean monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6502"
@@ -39,10 +35,10 @@
     Expenses:Operations               34.15 USD
     Assets:Operations:PNC            -34.15 USD
 
-2017-01-05 * "Payout"
+2017-01-05 * "Income from Gratipay for Gratipay Team"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6530"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L13"
-    Income:Payout                    -93.57 USD
+    Income:Gratipay                  -93.57 USD
     Assets:Operations:PNC             93.57 USD
 
 ; TODO: one pending: $0.52 not reversed right after
@@ -89,10 +85,10 @@
     Assets:Operations:PayPal         -13.36 USD
     Assets:Escrow:PayPal           -1304.39 USD
 
-2017-01-12 * "Payout"
+2017-01-12 * "Income from Gratipay for Gratipay Team"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6592"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L9"
-    Income:Payout                    -69.13 USD
+    Income:Gratipay                  -69.13 USD
     Assets:Operations:PNC             69.13 USD
 
 ; TBD: donation or escrow? do we need details like 1/11?
@@ -138,10 +134,10 @@
     Assets:Operations:PayPal         -13.87 USD
     Assets:Escrow:PayPal            -838.74 USD
 
-2017-01-19 * "Payout"
+2017-01-19 * "Income from Gratipay for Gratipay Team"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6642"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L7"
-    Income:Payout                   -116.03 USD
+    Income:Gratipay                   -116.03 USD
     Assets:Operations:PNC            116.03 USD
 
 2017-01-20 * "Braintree funding"
@@ -169,10 +165,10 @@
     Assets:Escrow:New-Alliance       145.30 USD
     Liabilities:Escrow              -145.30 USD
 
-2017-01-26 * "Payout"
+2017-01-26 * "Income from Gratipay for Gratipay Team"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6691"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L5"
-    Income:Payout                    -50.70 USD
+    Income:Gratipay                  -50.70 USD
     Assets:Operations:PNC             50.70 USD
 
 2017-01-27 * "Braintree funding"
diff --git a/FY2017/FY2017.beancount b/FY2017/FY2017.beancount
index c57facb..9dd648e 100644
--- a/FY2017/FY2017.beancount
+++ b/FY2017/FY2017.beancount
@@ -1,6 +1,9 @@
 2017-01-01 open Assets:Operations:PNC USD
 2017-01-01 open Assets:Escrow:PayPal USD
 2017-01-01 open Assets:Operations:PayPal USD
+2017-01-01 open Expenses:Operations USD
+2017-01-01 open Expenses:Fees:PayPal USD
+2017-01-01 open Income:Funding:PNC USD
 
 ; in order to achieve opening balance on 2017-01-01, add difference between 2883.99 and the latest balance of PNC (currently 0)
 2017-01-01 * "Opening Balance"

From a9a85e2d2e39b6e0e710b2f956b4dfb3c66e672e Mon Sep 17 00:00:00 2001
From: Kwesi Aguillera <kaguillera@gmail.com>
Date: Fri, 21 Apr 2017 10:34:16 -0400
Subject: [PATCH 11/12] Reworked 2017-01 with new assets account name
 structure.

---
 FY2017/2017-01.beancount | 348 ++++++++++++++++++++++++++-------------
 FY2017/FY2017.beancount  |  54 ++++--
 2 files changed, 275 insertions(+), 127 deletions(-)

diff --git a/FY2017/2017-01.beancount b/FY2017/2017-01.beancount
index 920da1e..a194f3f 100644
--- a/FY2017/2017-01.beancount
+++ b/FY2017/2017-01.beancount
@@ -1,203 +1,317 @@
 
 ; the earlier date in receipt and bank statements is used for all transactions
-2017-01-01 * "DigitialOcean monthly"
+2017-01-03 * "DigitialOcean monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6502"
-    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L16"
-    Expenses:Operations               10.00 USD
-    Assets:Operations:PNC            -10.00 USD
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L18"
+    Expenses:Other:Hosting            10.00 USD
+    Assets:PNC:Operations            -10.00 USD
 
-2017-01-01 * "MaxCDN monthly"
+2017-01-03 * "MaxCDN/NETDNA/StackPath monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6479"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L17"
-    Expenses:Operations                9.95 USD
-    Assets:Operations:PNC             -9.95 USD
+    Expenses:Other:Hosting             9.95 USD
+    Assets:PNC:Operations             -9.95 USD
 
-2017-01-02 * "bounty award for HackerOne"
+2017-01-03 * "Bounty award for HackerOne"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6506"
-    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L18"
-    Expenses:Operations               12.00 USD
-    Assets:Operations:PNC            -12.00 USD
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L16"
+    Expenses:Other:Hosting            12.00 USD
+    Assets:PNC:Operations            -12.00 USD
 
-2017-01-03 * "Braintree funding"
-    Assets:Escrow:New-Alliance       121.78 USD
-    Liabilities:Escrow              -121.78 USD
+2017-01-03 * "Braintree settled remainder of payday #239"   
+    statementBraintree: "https://github.com/gratipay/logs/blob/master/statements/2017/01/braintree.csv#L2"
+    statementNewAlliance: "https://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L2"
+    Assets:New-Alliance:Escrow       121.78 USD
+    Expenses:Other:Fees                4.55 USD
+    Assets:Braintree:Operations       -4.55 USD
+    Assets:Braintree:Escrow         -121.78 USD
 
-2017-01-05 * "Freshdesk monthly"
-    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6535"
-    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L15"
-    Expenses:Operations               38.00 USD
-    Assets:Operations:PNC            -38.00 USD
 
-2017-01-05 * "Postage"
-    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6536"
-    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L14"
-    note: "http://gratipay.slackarchive.io/gratipay/-/1483640673.001811/1483653370.001921/1483650056001917/"
-    Expenses:Operations               34.15 USD
-    Assets:Operations:PNC            -34.15 USD
+; Gratipay Payday 240
+; ===================
+
+2017-01-05 * "We charged participants via Braintree"
+    paydaylog: "https://github.com/gratipay/logs/blob/master/payday/gratipay-240.log"
+    Assets:Braintree:Escrow          772.08 USD
+    Assets:Braintree:Operations       35.88 USD
+    Income:Fees:Braintree            -35.88 USD
+    Liabilities:Escrow              -772.08 USD
 
 2017-01-05 * "Income from Gratipay for Gratipay Team"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6530"
-    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L13"
+    statementPayPal: "TODO"
     Income:Gratipay                  -93.57 USD
-    Assets:Operations:PNC             93.57 USD
+    Assets:PayPal:Income              93.57 USD
 
 ; TODO: one pending: $0.52 not reversed right after
-2017-01-05 * "Mass payout 1"
-    Liabilities:Escrow               892.47 USD
-    Expenses:Fees:PayPal              15.11 USD
-    Assets:Operations:PayPal         -15.11 USD
-    Assets:Escrow:PayPal            -892.47 USD
-
-2017-01-05 * "PayPal transfer"
+2017-01-05 * "Masspay payout to Teams (Payday #240)"
+    masspayLog: "https://github.com/gratipay/logs/blob/master/masspay/2017-01-05.report.paypal.csv"
+    statementPayPal: "TODO"
+    Liabilities:Escrow               907.58 USD
+    Expenses:Other:Fees               15.11 USD
+    Assets:PayPal:Operations         -15.11 USD
+    Assets:PayPal:Escrow            -892.47 USD
+
+2017-01-06 * "PayPal transfer to replenish New-Alliance for payouts"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6573"
-    statementNewAlliance: "hhttps://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L4ttps://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L13"
-    Assets:Escrow:PayPal            2000.00 USD
-    Assets:Escrow:New-Alliance     -2000.00 USD
-
-2017-01-06 * "Braintree funding"
-    Assets:Escrow:New-Alliance       636.94 USD
-    Liabilities:Escrow              -636.94 USD
+    statementNewAlliance: "https://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L3"
+    Assets:PayPal:Escrow            2000.00 USD
+    Assets:New-Alliance:Escrow     -2000.00 USD
+
+2017-01-06 * "Braintree settle Payday #240 Part 1"
+    statementBraintree: "https://github.com/gratipay/logs/blob/master/statements/2017/01/braintree.csv#L5"
+    statementNewAlliance: "https://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L4"
+    Assets:New-Alliance:Escrow       636.94 USD
+    Expenses:Other:Fees               30.22 USD
+    Assets:Braintree:Operations      -30.22 USD
+    Assets:Braintree:Escrow         -636.94 USD
+
+2017-01-06 * "Freshdesk monthly Subscription"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6535"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L15"
+    Expenses:Other:Hosting            38.00 USD
+    Assets:PNC:Operations            -38.00 USD
 
-2017-01-09 * "Braintree funding"
-    Assets:Escrow:New-Alliance       135.54 USD
-    Liabilities:Escrow              -135.54 USD
+2017-01-06 * "USPS Postage"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6536"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L14"
+    note: "http://gratipay.slackarchive.io/gratipay/-/1483640673.001811/1483653370.001921/1483650056001917/"
+    Expenses:Advertising              34.15 USD
+    Assets:PNC:Operations            -34.15 USD
+
+; $0.40 Remain in the Income:Fees:Braintree account
+2017-01-09 * "Braintree settle Payday #240 Part 2"
+    statementBraintree: "https://github.com/gratipay/logs/blob/master/statements/2017/01/braintree.csv#L6"
+    statementNewAlliance: "https://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L5"
+    Assets:New-Alliance:Escrow       135.54 USD
+    Expenses:Other:Fees                5.26 USD
+    Assets:Braintree:Operations       -5.26 USD
+    Assets:Braintree:Escrow         -135.54 USD
+
+2017-01-09 * "Gratipay income moved to PNC account"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6530"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L13"
+    Assets:PayPal:Income             -93.57 USD
+    Assets:PNC:Operations             93.57 USD
 
-2017-01-09 * "DNSimple"
+2017-01-09 * "DNSimple Payment"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6548"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L12"
-    Expenses:Operations                3.00 USD
-    Assets:Operations:PNC             -3.00 USD
+    Expenses:Other:Hosting             3.00 USD
+    Assets:PNC:Operations             -3.00 USD
 
-2017-01-09 * "Heroku monthly"
+2017-01-09 * "Heroku monthly payment"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6566"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L11"
-    Expenses:Operations              105.00 USD
-    Assets:Operations:PNC           -105.00 USD
+    Expenses:Other:Hosting           105.00 USD
+    Assets:PNC:Operations           -105.00 USD
 
 ; TBD: do we need to put here additional details 1/11/17 in PayPal statement?
-2017-01-11 * "General Payment"
-    Expenses:Operations                0.15 USD
-    Assets:Operations:PayPal          -0.15 USD
+2017-01-11 * "General Payment to PayPal"
+    Expenses:Other:Fees                0.15 USD
+    Assets:PayPal:Operations          -0.15 USD
+
+
+; Gratipay Payday 241
+; ===================
+
+2017-01-12 * "We charged participants via Braintree"
+    paydaylog: "https://github.com/gratipay/logs/blob/master/payday/gratipay-241.log"
+    Assets:Braintree:Escrow          757.35 USD
+    Assets:Braintree:Operations       37.32 USD
+    Income:Fees:Braintree            -37.32 USD
+    Liabilities:Escrow              -757.35 USD
 
-2017-01-12 * "Mass payout 2"
-    Liabilities:Escrow              1304.39 USD
-    Expenses:Fees:PayPal              13.36 USD
-    Assets:Operations:PayPal         -13.36 USD
-    Assets:Escrow:PayPal           -1304.39 USD
+2017-01-12 * "Masspay payout to Teams (Payday #241)"
+    masspayLog: "https://github.com/gratipay/logs/blob/master/masspay/2017-01-12.report.paypal.csv"
+    Liabilities:Escrow              1317.75 USD
+    Expenses:Other:Fees               13.36 USD
+    Assets:PayPal:Operations         -13.36 USD
+    Assets:PayPal:Escrow           -1304.39 USD
 
 2017-01-12 * "Income from Gratipay for Gratipay Team"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6592"
-    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L9"
+    statementPayPal: "TODO"
     Income:Gratipay                  -69.13 USD
-    Assets:Operations:PNC             69.13 USD
+    Assets:PayPal:Income              69.13 USD
+
 
-; TBD: donation or escrow? do we need details like 1/11?
+; TBD: donation or escrow? do we need details like 1/11? **NEED TO CHECK**
 2017-01-13 * "General Payment"
-    Assets:Operations:PayPal          73.50 USD
-    Expenses:Fees:PayPal               2.50 USD
-    Income:Payout                    -76.00 USD
+    Assets:PayPal:Operations          73.50 USD
+    Expenses:Other:Fees                2.50 USD
+    Income:Gratipay                  -76.00 USD
 
 ; TODO: missing postage receipt for 01/13 $49.29
 2017-01-13 * "Postage"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L10"
-    Expenses:Operations               49.29 USD
-    Assets:Operations:PNC            -49.29 USD
+    Expenses:Advertising              49.29 USD
+    Assets:PNC:Operations            -49.29 USD
 
-2017-01-13 * "PayPal transfer"
+2017-01-13 * "PayPal transfer to replenish New-Alliance for payouts i.e. Shuffle"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6632"
     statementNewAlliance: "hhttps://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L4ttps://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L13"
-    Assets:Escrow:PayPal            3300.00 USD
-    Assets:Escrow:New-Alliance     -3300.00 USD
+    Assets:PayPal:Escrow            3300.00 USD
+    Assets:New-Alliance:Escrow     -3300.00 USD
 
 ; payment pending since 1/12 got reversed
 2017-01-14 * "Mass Pay Reversal"
-    Assets:Escrow:PayPal               0.59 USD
+    Assets:PayPal:Escrow               0.59 USD
     Liabilities:Escrow                -0.59 USD
 
-2017-01-16 * "Braintree funding"
-    Assets:Escrow:New-Alliance       615.76 USD
-    Liabilities:Escrow              -615.76 USD
+2017-01-16 * "Braintree settle Payday #241 Part 1"
+    statementBraintree: "https://github.com/gratipay/logs/blob/master/statements/2017/01/braintree.csv#L10"
+    statementNewAlliance: "https://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L7"
+    Assets:New-Alliance:Escrow       615.76 USD
+    Expenses:Other:Fees               31.11 USD
+    Assets:Braintree:Operations      -31.11 USD
+    Assets:Braintree:Escrow         -615.76 USD
 
-2017-01-18 * "Braintree funding"
-    Assets:Escrow:New-Alliance       142.05 USD
-    Liabilities:Escrow              -142.05 USD
+2017-01-17 * "Gratipay Income transfered to PNC Account"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6592"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L9"
+    Assets:PayPal:Income             -69.13 USD
+    Assets:PNC:Operations             69.13 USD
+
+; $0.46 remain in the Income:Fees:Braintree
+2017-01-18 * "Braintree settle Payday #241 Part 2"
+    statementBraintree: "https://github.com/gratipay/logs/blob/master/statements/2017/01/braintree.csv#L11"
+    statementNewAlliance: "https://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L8"
+    Assets:New-Alliance:Escrow       142.05 USD
+    Expenses:Other:Fees                5.75 USD
+    Assets:Braintree:Operations       -5.75 USD
+    Assets:Braintree:Escrow         -142.05 USD
 
 2017-01-19 * "Donation to $ustain"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6645"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L8"
-    Expenses:Operations              100.00 USD
-    Assets:Operations:PNC           -100.00 USD
+    Expenses:Advertising  100.00 USD
+    Assets:PNC:Operations           -100.00 USD
+
+; Gratipay Payday 242
+; ===================
+
+2017-01-19 * "We charged participants via Braintree"
+    paydaylog: "https://github.com/gratipay/logs/blob/master/payday/gratipay-242.log"
+    Assets:Braintree:Escrow          865.55 USD
+    Assets:Braintree:Operations       43.38 USD
+    Income:Fees:Braintree            -43.38 USD
+    Liabilities:Escrow              -865.55 USD
 
-2017-01-19 * "Mass payout 3"
+2017-01-19 * "Masspay payout to Teams (Payday #242)"
+    masspayLog: "https://github.com/gratipay/logs/blob/master/masspay/2017-01-19.report.paypal.csv"
     Liabilities:Escrow               838.74 USD
-    Expenses:Fees:PayPal              13.87 USD
-    Assets:Operations:PayPal         -13.87 USD
-    Assets:Escrow:PayPal            -838.74 USD
+    Expenses:Other:Fees               13.87 USD
+    Assets:PayPal:Operations         -13.87 USD
+    Assets:PayPal:Escrow            -838.74 USD
 
 2017-01-19 * "Income from Gratipay for Gratipay Team"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6592"
+    statementPayPal: "TODO"
+    Income:Gratipay                 -116.03 USD
+    Assets:PayPal:Income             116.03 USD
+
+2017-01-23 * "Gratipay Income transfered to PNC Account"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6642"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L7"
-    Income:Gratipay                   -116.03 USD
-    Assets:Operations:PNC            116.03 USD
-
-2017-01-20 * "Braintree funding"
-    Assets:Escrow:New-Alliance       720.78 USD
+    Assets:PayPal:Income            -116.03 USD
+    Assets:PNC:Operations            116.03 USD
+
+2017-01-20 * "Braintree settle Payday #242 Part 1"
+    statementBraintree: "https://github.com/gratipay/logs/blob/master/statements/2017/01/braintree.csv#L14"
+    statementNewAlliance: "https://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L9"
+    Assets:New-Alliance:Escrow       720.78 USD
+    Expenses:Other:Fees               36.99 USD
+    Assets:Braintree:Operations      -36.99 USD
     Liabilities:Escrow              -720.78 USD
 
+; $0.53 Remain in the Income:Fees:Braintree account
+2017-01-23 * "Braintree settle Payday #242 Part 2"
+    statementBraintree: "https://github.com/gratipay/logs/blob/master/statements/2017/01/braintree.csv#L15"
+    statementNewAlliance: "https://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L10"
+    Assets:New-Alliance:Escrow       145.30 USD
+    Expenses:Other:Fees                5.86 USD
+    Assets:Braintree:Operations       -5.86 USD
+    Liabilities:Escrow              -145.30 USD
+
 ; TODO: why is it not equal to the pending amount 0.49 this time?
 2017-01-21 * "Mass Pay Reversal"
-    Assets:Escrow:PayPal               0.88 USD
+    Assets:PayPal:Escrow               0.88 USD
     Liabilities:Escrow                -0.88 USD
 
-2017-01-21 * "Mass payout 4"
-    Liabilities:Escrow               655.80 USD
-    Expenses:Fees:PayPal              11.51 USD
-    Assets:Operations:PayPal         -11.51 USD
-    Assets:Escrow:PayPal            -655.80 USD
-
 2017-01-23 * "Librato monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6666"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L6"
-    Expenses:Operations                5.00 USD
-    Assets:Operations:PNC             -5.00 USD
+    Expenses:Other:Hosting          5.00 USD
+    Assets:PNC:Operations             -5.00 USD
 
-2017-01-23 * "Braintree funding"
-    Assets:Escrow:New-Alliance       145.30 USD
-    Liabilities:Escrow              -145.30 USD
+
+; Gratipay Payday 243
+; ===================
+
+2017-01-26 * "We charged participants via Braintree"
+    paydaylog: "https://github.com/gratipay/logs/blob/master/payday/gratipay-243.log"
+    Assets:Braintree:Escrow          670.08 USD
+    Assets:Braintree:Operations       31.60 USD
+    Income:Fees:Braintree            -31.60 USD
+    Liabilities:Escrow              -670.08 USD
+
+2017-01-26 * "Masspay payout to Teams (Payday #243)"
+    masspayLog: "https://github.com/gratipay/logs/blob/master/masspay/2017-01-26.report.paypal.csv"
+    Liabilities:Escrow               655.80 USD
+    Expenses:Other:Fees               11.51 USD
+    Assets:PayPal:Operations         -11.51 USD
+    Assets:PayPal:Escrow            -655.80 USD
 
 2017-01-26 * "Income from Gratipay for Gratipay Team"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6691"
-    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L5"
+    statementPnc: "TBD"
     Income:Gratipay                  -50.70 USD
-    Assets:Operations:PNC             50.70 USD
+    Assets:PayPal:Income              50.70 USD
+
+2017-01-30 * "Gratipay Income transfered to PNC Account"
+    freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6642"
+    statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L5"
+    Assets:PayPal:Income             -50.70 USD
+    Assets:PNC:Operations             50.70 USD
 
-2017-01-27 * "Braintree funding"
-    Assets:Escrow:New-Alliance       536.40 USD
-    Liabilities:Escrow              -536.40 USD
+2017-01-27 * "Braintree settle Payday #243 Part 1"
+    statementBraintree: "https://github.com/gratipay/logs/blob/master/statements/2017/01/braintree.csv#L19"
+    statementNewAlliance: "https://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L11"
+    Assets:New-Alliance:Escrow       536.40 USD
+    Expenses:Other:Fees               26.03 USD
+    Assets:Braintree:Operations      -26.03 USD
+    Assets:Braintree:Escrow         -536.40 USD
 
 ; TODO: why is it not equal to the pending amount 0.59 this time?
 2017-01-28 * "Mass Pay Reversal"
-    Assets:Escrow:PayPal               2.16 USD
+    Assets:PayPal:Escrow               2.16 USD
     Liabilities:Escrow                -2.16 USD
 
-2017-01-28 * "iwantmyname monthly"
+2017-01-30 * "iwantmyname monthly payment"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6666"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L4"
-    Expenses:Operations               34.00 USD
-    Assets:Operations:PNC            -34.00 USD
+    Expenses:Other:Fees               34.00 USD
+    Assets:PNC:Operations            -34.00 USD
 
 ; TODO: no receipt in FD
-2017-01-28 * "??"
+2017-01-30 * "PNC Bank Service Fees??"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L2"
-    Expenses:Operations                1.02 USD
-    Assets:Operations:PNC             -1.02 USD
+    Expenses:Other:Misc                1.02 USD
+    Assets:PNC:Operations             -1.02 USD
 
-2017-01-29 * "Transifex monthly"
+2017-01-30 * "Transifex monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6702"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L3"
-    Expenses:Operations               19.00 USD
-    Assets:Operations:PNC            -19.00 USD
-
-2017-01-03 * "Braintree funding"
-    Assets:Escrow:New-Alliance       134.04 USD
+    Expenses:Other:Hosting         19.00 USD
+    Assets:PNC:Operations            -19.00 USD
+
+; $0.36 remain in the Income:Fees:Braintree account
+2017-01-30 * "Braintree settle Payday #243 Part 2"
+    statementBraintree: "https://github.com/gratipay/logs/blob/master/statements/2017/01/braintree.csv#L20"
+    statementNewAlliance: "https://github.com/gratipay/logs/blob/master/statements/2017/01/new-alliance.csv#L12"
+    Assets:New-Alliance:Escrow       134.04 USD
+    Expenses:Other:Fees                5.21 USD
+    Assets:Braintree:Operations       -5.21 USD
     Liabilities:Escrow              -134.04 USD
+
diff --git a/FY2017/FY2017.beancount b/FY2017/FY2017.beancount
index 9dd648e..02850dc 100644
--- a/FY2017/FY2017.beancount
+++ b/FY2017/FY2017.beancount
@@ -1,24 +1,58 @@
-2017-01-01 open Assets:Operations:PNC USD
-2017-01-01 open Assets:Escrow:PayPal USD
-2017-01-01 open Assets:Operations:PayPal USD
-2017-01-01 open Expenses:Operations USD
-2017-01-01 open Expenses:Fees:PayPal USD
-2017-01-01 open Income:Funding:PNC USD
+2017-01-01 open Assets:PNC:Operations USD
+2017-01-01 open Assets:PayPal:Escrow USD
+2017-01-01 open Assets:PayPal:Operations USD
+2017-01-01 open Assets:PayPal:Income USD
+2017-01-01 open Assets:Braintree:Operations USD
+2017-01-01 open Assets:Braintree:Escrow USD
+2017-01-01 open Assets:New-Alliance:Operations USD
+2017-01-01 open Assets:New-Alliance:Escrow USD
+2017-01-01 open Income:Gratipay USD
+2017-01-01 open Income:Fees:Braintree USD
+
+; Advertising - e.g. Business Cards, internet, radio, and TV ads 
+2017-01-01 open Expenses:Advertising USD
+
+; Equipment Rental - e.g. Van or Truck rental or office equipment
+2017-01-01 open Expenses:Equipment USD
+
+; Legal or Professional - e.g. Fees paid to an attorney or other professional
+2017-01-01 open Expenses:Services USD
+
+; Local Transportation - e.g. Parking, tolls, or taxis
+2017-01-01 open Expenses:Transport USD
+
+; Meals and Entertainment - e.g. Meals while traveling, lunch with client.
+2017-01-01 open Expenses:Meals-and-Entertainment USD
+
+; Hosting and Development Expense - e.g. Heroku, Travis, Github, etc. 
+2017-01-01 open Expenses:Other:Hosting USD
+
+; Fees for Transferring Money - e.g. Samurai, Paypal, Balanced, Braintree, etc. 
+2017-01-01 open Expenses:Other:Fees USD
+
+; Other Business Expense - e.g. Cell phone, dues, subscriptions, and training 
+2017-01-01 open Expenses:Other:Misc  USD
+
+; Overnight Travel Expense - e.g. Transportation costs, internet, phone or fax charges, and tips
+2017-01-01 open Expenses:Travel USD
+
+; Supplies - e.g. printer ink and printer paper
+2017-01-01 open Expenses:Supplies USD
 
 ; in order to achieve opening balance on 2017-01-01, add difference between 2883.99 and the latest balance of PNC (currently 0)
 2017-01-01 * "Opening Balance"
-    Assets:Operations:PNC           2893.99 USD
+    Assets:PNC:Operations           2893.99 USD
     Equity:Owners:Chad-Whitacre    -2893.99 USD
 
 ; TODO: fill in the real opening balance (escrow part and operation part)
 2017-01-01 * "Opening Balance"
-    Assets:Escrow:New-Alliance     10000.00 USD
+    Assets:New-Alliance:Escrow     10000.00 USD
     Liabilities:Escrow            -10000.00 USD
 
 ; open balance of paypal in 201701 is 7977.81. TODO: as we don't have real liability, temporarily use an estimated liability
 2017-01-01 * "Opening Balance"
-    Assets:Escrow:PayPal            6977.81 USD
-    Assets:Operations:PayPal        1000.00 USD
+    Assets:PayPal:Escrow            6977.81 USD
+    Assets:PayPal:Operations        1000.00 USD
     Equity:Owners:Chad-Whitacre    -1000.00 USD
     Liabilities:Escrow             -6977.81 USD
 

From 9c6113017b123bf2bcc9decb7c8a49658747b0fc Mon Sep 17 00:00:00 2001
From: Kwesi Aguillera <kaguillera@gmail.com>
Date: Fri, 21 Apr 2017 14:45:48 -0400
Subject: [PATCH 12/12] Ensured that the 2017-01.beancount pass testing

---
 FY2017/2017-01.beancount | 26 +++++++++-----------------
 FY2017/FY2017.beancount  |  5 +++--
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/FY2017/2017-01.beancount b/FY2017/2017-01.beancount
index a194f3f..d916ec8 100644
--- a/FY2017/2017-01.beancount
+++ b/FY2017/2017-01.beancount
@@ -47,10 +47,8 @@
 2017-01-05 * "Masspay payout to Teams (Payday #240)"
     masspayLog: "https://github.com/gratipay/logs/blob/master/masspay/2017-01-05.report.paypal.csv"
     statementPayPal: "TODO"
-    Liabilities:Escrow               907.58 USD
-    Expenses:Other:Fees               15.11 USD
-    Assets:PayPal:Operations         -15.11 USD
-    Assets:PayPal:Escrow            -892.47 USD
+    Liabilities:Escrow                907.06 USD
+    Assets:PayPal:Escrow            -907.06 USD
 
 2017-01-06 * "PayPal transfer to replenish New-Alliance for payouts"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6573"
@@ -124,10 +122,8 @@
 
 2017-01-12 * "Masspay payout to Teams (Payday #241)"
     masspayLog: "https://github.com/gratipay/logs/blob/master/masspay/2017-01-12.report.paypal.csv"
-    Liabilities:Escrow              1317.75 USD
-    Expenses:Other:Fees               13.36 USD
-    Assets:PayPal:Operations         -13.36 USD
-    Assets:PayPal:Escrow           -1304.39 USD
+    Liabilities:Escrow               1317.75 USD
+    Assets:PayPal:Escrow           -1317.75 USD
 
 2017-01-12 * "Income from Gratipay for Gratipay Team"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6592"
@@ -200,10 +196,8 @@
 
 2017-01-19 * "Masspay payout to Teams (Payday #242)"
     masspayLog: "https://github.com/gratipay/logs/blob/master/masspay/2017-01-19.report.paypal.csv"
-    Liabilities:Escrow               838.74 USD
-    Expenses:Other:Fees               13.87 USD
-    Assets:PayPal:Operations         -13.87 USD
-    Assets:PayPal:Escrow            -838.74 USD
+    Liabilities:Escrow                852.61 USD
+    Assets:PayPal:Escrow            -852.61 USD
 
 2017-01-19 * "Income from Gratipay for Gratipay Team"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6592"
@@ -242,7 +236,7 @@
 2017-01-23 * "Librato monthly"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6666"
     statementPnc: "https://github.com/gratipay/logs/blob/master/statements/2017/01/pnc.csv#L6"
-    Expenses:Other:Hosting          5.00 USD
+    Expenses:Other:Hosting             5.00 USD
     Assets:PNC:Operations             -5.00 USD
 
 
@@ -258,10 +252,8 @@
 
 2017-01-26 * "Masspay payout to Teams (Payday #243)"
     masspayLog: "https://github.com/gratipay/logs/blob/master/masspay/2017-01-26.report.paypal.csv"
-    Liabilities:Escrow               655.80 USD
-    Expenses:Other:Fees               11.51 USD
-    Assets:PayPal:Operations         -11.51 USD
-    Assets:PayPal:Escrow            -655.80 USD
+    Liabilities:Escrow                666.72 USD
+    Assets:PayPal:Escrow             -666.72 USD
 
 2017-01-26 * "Income from Gratipay for Gratipay Team"
     freshdesk: "https://gratipay.freshdesk.com/helpdesk/tickets/6691"
diff --git a/FY2017/FY2017.beancount b/FY2017/FY2017.beancount
index 02850dc..9ca0286 100644
--- a/FY2017/FY2017.beancount
+++ b/FY2017/FY2017.beancount
@@ -4,8 +4,6 @@
 2017-01-01 open Assets:PayPal:Income USD
 2017-01-01 open Assets:Braintree:Operations USD
 2017-01-01 open Assets:Braintree:Escrow USD
-2017-01-01 open Assets:New-Alliance:Operations USD
-2017-01-01 open Assets:New-Alliance:Escrow USD
 2017-01-01 open Income:Gratipay USD
 2017-01-01 open Income:Fees:Braintree USD
 
@@ -39,6 +37,9 @@
 ; Supplies - e.g. printer ink and printer paper
 2017-01-01 open Expenses:Supplies USD
 
+; Team-Payouts - Payout to the Teams
+2017-01-01 open Expenses:Team-Payouts USD
+
 ; in order to achieve opening balance on 2017-01-01, add difference between 2883.99 and the latest balance of PNC (currently 0)
 2017-01-01 * "Opening Balance"
     Assets:PNC:Operations           2893.99 USD