This is an automated email from the git hooks/post-receive script.
bex pushed a change to branch master in repository fedora-budget.
from acac936 clean up summer coding GSoC allocation new 4e6c2ff Changing handling of inbound flock monies
The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.
Summary of changes: FY18/gen_reports | 2 +- FY18/ledger/flock.ldg | 126 +++++++++++--------------------------------------- 2 files changed, 28 insertions(+), 100 deletions(-)
This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master in repository fedora-budget.
commit 4e6c2ffa74da69ecc4a78ff4225427ba685a471b Author: Brian (bex) Exelbierd bex@pobox.com Date: Thu Oct 19 13:00:13 2017 +0200
Changing handling of inbound flock monies --- FY18/gen_reports | 2 +- FY18/ledger/flock.ldg | 126 +++++++++++--------------------------------------- 2 files changed, 28 insertions(+), 100 deletions(-)
diff --git a/FY18/gen_reports b/FY18/gen_reports index 91a4f2d..a55c404 100755 --- a/FY18/gen_reports +++ b/FY18/gen_reports @@ -4,7 +4,7 @@ rm *.csv
# Overall Report for Fedora -ledger -f ledger/fedora.ledger budget --depth 1 not '^Annual Budget$' and not '^External$' | ../_builder/budget2tsv > overall.csv +ledger -f ledger/fedora.ledger budget --depth 1 not '^Annual Budget$' and not '^External' | ../_builder/budget2tsv > overall.csv if [ ! -s overall.csv ]; then ledger -f ledger/fedora.ledger budget --depth 1 | ../_builder/budget2tsv > overall.csv fi diff --git a/FY18/ledger/flock.ldg b/FY18/ledger/flock.ldg index 4513ac0..893b9a3 100644 --- a/FY18/ledger/flock.ldg +++ b/FY18/ledger/flock.ldg @@ -1,6 +1,7 @@ ~ every 2 years ; Budget - Flock $85000 + Flock $85000 ; allocated by council + Flock $11500 ; sponsorship (see below) Flock:Meeting Room -$0 ; Rental is complimentary with 320 Room Nights Flock:Schedule -$200 ; sched.org Flock:Photographer -$3000 @@ -17,14 +18,32 @@ Flock:Food -$0 ; **MISSING** Lunch for paid registrants Flock:Supplies -$100 Flock:Supplies -$175 ; sched.org - Flock:Unallocated:Registration $0 - Flock:Unallocated:Registration:Extra $0 - Flock:Unallocated:Registration:Paypal Fee $0 - Flock:Unallocated:Copay Owed $0 - Flock:Unallocated:Sponsorship $0 Flock:Unallocated
~ every 2 years + ; Sponsorships + Flock -$5000 ; Capital One - not yet received + Flock -$1500 ; openSUSE - not yet received + Flock -$5000 ; RHEL - received as RH internal transfer + External:Flock:Sponsors + +~ every 2 years + ; Registrations and Copays + Flock -$3858.6 ; includes extras to support others + Flock -$27 ; Payment: Kanika via paypal 2017-08-08 * Payment for accidentally bought bus ticket see 2017-08-05 entry + Flock $214.85 ; paypal fees + External:Flock:Registration $3670.75 ; Paypal + Flock -$1535.02 ; Copays Received + Flock $8.40 ; paypal fees + External:Flock:Copays $1526.62 ; Paypal + Flock -$653.13 ; Copays Paid directly to airline + External:Flock:Copays $653.13 ; Paid directly to airline + Flock -$240 ; Copays really subtracted from the payments made to traveler who booked their own tickets + External:Flock:Copays $240 + Flock -$3202.96; Copays paid as internal RH transfers + External:Flock:Copays $3202.96; RH transfers + +~ every 2 years ; Funding Allocations ; herlo@fedoraproject.org Flock:Funding:Travel -$290 @@ -544,8 +563,8 @@ 2017-08-05 * P-B Bus ; Payment: bex Meeting Card - August 2017 Expense:Transportation $27 - Flock:Funding:Bus -$27 - ; Accidentally Bought - later sold to an attendee (see Paypal) + Flock -$27 + ; Accidentally Bought - later sold to an attendee
2017-08-05 * P-B Bus ; Payment: bex Meeting Card - August 2017 @@ -561,17 +580,6 @@ ; Clinton Michael Savage ; Pravin Satpute
-2017-08-08 Sponsors - ; Flock sponsors - unbilled - Flock:Unallocated:Sponsorship $5000 ; Capital One - Flock:Unallocated:Sponsorship $1500 ; openSUSE - External:Sponsors - -2017-08-08 Sponsors - ; Flock sponsor - internal transfer - Flock:Unallocated:Sponsorship $5000 ; RHEL - submitted - External:Transfer - 2017-08-08 * Badges ; Payment: bex Meeting Card - August 2017 Flock:Badges -$52.07 @@ -637,86 +645,6 @@ Expense:Other $46.65 Flock:Supplies
-2017-09-02 * Copays/etc. owed - ; Payment: internal allocation - Flock:Unallocated:Copay Owed -$605 ; 1 * transfer paid - Flock:Unallocated:Copay Owed -$620 ; 2 * transfer paid - Flock:Unallocated:Copay Owed -$299 ; 3 * transfer paid - Flock:Unallocated:Copay Owed -$40 ; 4 * paid - Flock:Unallocated:Copay Owed -$229 ; 5 * paid - Flock:Unallocated:Copay Owed -$158 ; 6 * paid - Flock:Unallocated:Copay Owed -$150 ; 7 * paid and receipt filed - Flock:Unallocated:Copay Owed -$158 ; 8 * paid - Flock:Unallocated:Copay Owed -$314 ; 9 * paid - Flock:Unallocated:Copay Owed -$582.96 ; 10 * transfer paid - Flock:Unallocated:Copay Owed -$66 ; 11 * paid - Flock:Unallocated:Copay Owed -$605 ; 12 * transfer paid - Flock:Unallocated:Copay Owed -$245 ; 13 * paid - Flock:Unallocated:Copay Owed -$69 ; 14 * paid - Flock:Unallocated:Copay Owed -$209 ; 15 * paid - Flock:Unallocated:Copay Owed -$100 ; 16 * paid - Flock:Unallocated:Copay Owed -$306 ; 17 * paid - Flock:Unallocated:Copay Owed -$92.19; 18 * paid - Flock:Unallocated:Copay Owed -$140 ; 19 * reverse transfer paid - Flock:Unallocated:Copay Owed -$160 ; 20 * transfer - paid - Flock:Unallocated:Copay Owed -$100 ; 21 * reverse transfer paid - Flock:Unallocated:Copay Owed -$357.96 ; 22 * paid - Expense:Transportation - -2017-09-02 Paypal/External Received - ; Payment: External Receipts - Flock:Unallocated:Registration $3858.6 ; includes extras to support others - Flock:Funding:Bus $27 ; Payment: Kanika via paypal 2017-08-08 * Payment for accidentally bought bus ticket - Flock:Unallocated:Registration:Paypal Fee -$214.85 - External:Paypal -$3670.75 ; Paypal - -2017-09-02 Paypal/External Received - ; Payment: External Receipts - Flock:Unallocated:Copay Owed $40 ; 4 * paid - Flock:Unallocated:Copay Owed $109.03 ; 5 * paid - Flock:Unallocated:Copay Owed $48.8 ; 6 * paid - Flock:Unallocated:Copay Owed $150 ; 7 * paid and receipt filed - Flock:Unallocated:Copay Owed $314 ; 9 * paid - Flock:Unallocated:Copay Owed $245 ; 13 * paid - Flock:Unallocated:Copay Owed $69 ; 14 * paid - Flock:Unallocated:Copay Owed $209 ; 15 * paid - Flock:Unallocated:Copay Owed $100 ; 16 * paid - Flock:Unallocated:Copay Owed $92.19 ; 18 * paid - Flock:Unallocated:Registration:Paypal Fee -$8.40 - External:Paypal -$1368.62 ; Paypal - -2017-09-02 Paypal/External Received - ; Payment: External Receipts - Flock:Unallocated:Copay Owed $158 ; 8 * paid as 133.83 EUR - Flock:Unallocated:Registration:Paypal Fee -$0 ; expected EUR conversion fee - 8 - paid <-- waiting for final transferred amount - External:Paypal -$158 ; Paypal - -2017-09-02 Paypal/External Received - ; Payment: external only - Flock:Unallocated:Copay Owed $119.97 ; 5 * paid directly - Flock:Unallocated:Copay Owed $109.2 ; 6 * paid directly - Flock:Unallocated:Copay Owed $66 ; 11 * paid - Flock:Unallocated:Copay Owed $357.96 ; 22 * paid - External:Direct -$653.13 ; Paid directly to airline - -2017-09-02 Paypal/External Received - ; Payment: external only - Flock:Unallocated:Copay Owed $140 ; 19 * reverse transfer paid - Flock:Unallocated:Copay Owed $100 ; 21 * reverse transfer paid - External:Reverse -$240 ; Really subtracted from the payments made to traveler who booked their own tickets - -2017-09-02 Paypal/External Received - ; Payment: internal transfers - Flock:Unallocated:Registration $25 ; * transfer - Flock:Unallocated:Copay Owed $605 ; 1 * transfer paid - submitted - Flock:Unallocated:Copay Owed $620 ; 2 * transfer paid - submitted - Flock:Unallocated:Copay Owed $299 ; 3 * transfer paid - submitted - Flock:Unallocated:Copay Owed $582.96 ; 10 * transfer paid - submitted - Flock:Unallocated:Copay Owed $605 ; 12 * transfer paid - submitted - Flock:Unallocated:Copay Owed $306 ; 17 * transfer paid - submitted - Flock:Unallocated:Copay Owed $160 ; 20 * transfer - paid - submitted - External:Transfer -$3202.96; RH transfers - 2017-09-05 * Bon Me (Catering for Evening Activity) ; Payment: jmadriaga Meeting Card Expense:Meals $1523.13 ; Includes a discount because they were late
budget-devel@lists.fedoraproject.org
-
git repository hosting