This is an automated email from the git hooks/post-receive script.
bex pushed a change to branch master in repository fedora-budget.
from 280a04b reconciliations new d40b2b0 Mechanical Cleanup
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 | 4 +- FY18/ledger/council.ldg | 18 +++-- FY18/ledger/flock.ldg | 164 +++++++++++++++++++++++++----------------- FY18/ledger/summer-coding.ldg | 12 ++-- _builder/budget2tsv | 17 ++++- 5 files changed, 136 insertions(+), 79 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 d40b2b05466c9ab523689da0cbfb5ecb4ea1cad5 Author: Brian (bex) Exelbierd bex@pobox.com Date: Wed Nov 29 14:09:34 2017 +0100
Mechanical Cleanup --- FY18/gen_reports | 4 +- FY18/ledger/council.ldg | 18 +++-- FY18/ledger/flock.ldg | 164 +++++++++++++++++++++++++----------------- FY18/ledger/summer-coding.ldg | 12 ++-- _builder/budget2tsv | 17 ++++- 5 files changed, 136 insertions(+), 79 deletions(-)
diff --git a/FY18/gen_reports b/FY18/gen_reports index e1eafc8..2f25143 100755 --- a/FY18/gen_reports +++ b/FY18/gen_reports @@ -4,13 +4,13 @@ rm *.csv
# Overall Report for Fedora -ledger -f ledger/fedora.ledger budget --depth 1 not '^External' | ../_builder/budget2tsv > overall.csv +ledger -f ledger/fedora.ledger budget --depth 1 not '^Budget'| ../_builder/budget2tsv > overall.csv if [ ! -s overall.csv ]; then ledger -f ledger/fedora.ledger budget --depth 1 | ../_builder/budget2tsv > overall.csv fi
# Source of funds -ledger -f ledger/fedora.ledger budget '^External' --flat | ../_builder/budget2tsv | cut -f1-2 > source.csv +ledger -f ledger/fedora.ledger budget '^Budget' --flat | ../_builder/budget2tsv | cut -f1-2 > source.csv
# Flock - doesn't do second levels so we need to just do the first level list and cut the first line ledger -f ledger/fedora.ledger budget '^Flock' --flat | tail -n +2 | ../_builder/budget2tsv > flock.csv diff --git a/FY18/ledger/council.ldg b/FY18/ledger/council.ldg index 04a67d1..eefefcc 100644 --- a/FY18/ledger/council.ldg +++ b/FY18/ledger/council.ldg @@ -5,6 +5,7 @@ ; 2017/04/10 Initial Quarter 1 budget (with some annual) ; Replaces Temporary Budget Allocation below ; https://lists.fedoraproject.org/archives/list/council-discuss@lists.fedorapr... + Budget:Red Hat $196000 ; budget for FY18 APAC:Unallocated -$1600 EMEA:Unallocated -$4100 LATAM:Unallocated -$1300 @@ -12,8 +13,7 @@ Flock -$85000 Mindshare:Unallocated -$9000 Diversity-Inclusion:Unallocated -$9000 - Council:Unallocated -$81750 - External:Red Hat $196000 ; budget for FY18 + Council:Unallocated
~ every 2 years ; 2017/08/03 FY18 Budgets @@ -22,13 +22,21 @@ EMEA:Unallocated -$7000 LATAM:Unallocated -$3000 NA:Unallocated -$9000 - Council:Unallocated $23000 + Council:Unallocated + +2017-03-01 * RH Funded + Budget:Red Hat $196000 + External:Red Hat -$196000
2017-03-09 * Refund from stamps.com of unspent balance - account closed on 9 Dec 2016 ; This was originally sent to nb by paper check - He transferred it to bexelbie by paypal ; Moved through to Annual Budget - Expense:Postage -$85.17 - Council:Unallocated $85.17 + External:Refund -$85.17 + Budget:Other $85.17 + +~ every 2 years + Budget:Other $85.17 + Council:Unallocated
~ every 2 years ; 2017/03/01 Council FAD diff --git a/FY18/ledger/flock.ldg b/FY18/ledger/flock.ldg index 7857728..24e8b82 100644 --- a/FY18/ledger/flock.ldg +++ b/FY18/ledger/flock.ldg @@ -1,52 +1,114 @@ ~ every 2 years ; Budget - Flock $85000 ; allocated by council - Flock $11500 ; sponsorship (see below) - Flock $3670.75 ; Registration and Extras - Flock $5622.71 ; Copays - Flock:Meeting Room -$0 ; Rental is complimentary with 320 Room Nights - Flock:Schedule -$200 ; sched.org - Flock:Photographer -$3000 - Flock:T-shirt -$2398 ; 250 T-shirts - 3 colors on 2 sides - Flock:Badges -$150 ; 300 badges - Flock:Booklet -$0 ; **MISSING** - Flock:AV -$11,256 - Flock:Bandwidth -$300 - Flock:Activities -$2000 ; Professor Wackenhammer's evening event (venue/rides) - Flock:Activities -$1471 ; Professor Wackenhammer's evening event (tent) - Bayside Tents - Flock:Food -$3000 ; Professor Wackenhammer's evening event (drinks) $250 bartenders $250 setup fee 250 people * 2 beers * $5 (craft beer) - Flock:Food -$5050 ; Professor Wackenhammer's evening event (food) Bon Me Entree + 1 option: $700 travel cost + $200 late night fee + $2140 ($2000 + 7% tax) 100 people with entree + 1 option+ $2006.25 ($12.50/pp + 7% tax) 150 people with entree + 1 option - Flock:Food -$3300 ; @ 200 people 16.50/pp (no drinks) - Flock:Food -$0 ; **MISSING** Lunch for paid registrants - Flock:Supplies -$100 - Flock:Supplies -$175 ; sched.org + Flock $85000 ; allocated by council + ; Expenses + Flock:AV -$11,256 + Flock:Activities -$2000 ; Professor Wackenhammer's evening event (venue/rides) + Flock:Activities -$1471 ; Professor Wackenhammer's evening event (tent) - Bayside Tents + Flock:Badges -$150 ; 300 badges + Flock:Bandwidth -$300 + Flock:Booklet -$0 ; **MISSING** + Flock:Food -$3000 ; Professor Wackenhammer's evening event (drinks) $250 bartenders $250 setup fee 250 people * 2 beers * $5 (craft beer) + Flock:Food -$5050 ; Professor Wackenhammer's evening event (food) Bon Me Entree + 1 option: $700 travel cost + $200 late night fee + $2140 ($2000 + 7% tax) 100 people with entree + 1 option+ $2006.25 ($12.50/pp + 7% tax) 150 people with entree + 1 option + Flock:Food -$3300 ; @ 200 people 16.50/pp (no drinks) + Flock:Food -$0 ; **MISSING** Lunch for paid registrants + Flock:Food:Sponsored Food -$5000 + Flock:Meeting Room -$0 ; Rental is complimentary with 320 Room Nights + Flock:Photographer -$3000 + Flock:Schedule -$200 ; sched.org + Flock:Supplies -$100 + Flock:Supplies -$175 ; sched.org + Flock:T-shirt -$2398 ; 250 T-shirts - 3 colors on 2 sides + Flock:Paypal Fees -$0 ; + ; Copays + Flock:Copaid Travel -$0 ; + ; Balance 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 + ; Sponsorships Committed + Budget:Flock:Sponsors $5000 ; Capital One - not yet received + Budget:Flock:Sponsors $1500 ; openSUSE - not yet received + Budget:Flock:Sponsors $5000 ; RHEL + Flock:Unallocated -$11500 + +2017-08-01 * Flock Sponsorship Paid + ; Date arbitrary + Budget:Flock:Sponsors $5000 ; RHEL + External:Flock:Sponsors -$5000
~ every 2 years ; Registration - 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 + Budget:Flock:Registration $3858.6 ; includes extras to support others + Budget:Flock:Other $27 ; Payment: Kanika via paypal 2017-08-08 * Payment for accidentally bought bus ticket see 2017-08-05 entry + Flock:Unallocated + +2017-11-06 * Registration settled + ; Registration + Budget:Flock:Registration $3858.6 ; includes extras to support others + External:Flock:Registration -$3858.60 ; Paypal + Budget:Flock:Other $27 ; Payment: Kanika via paypal 2017-08-08 * Payment for accidentally bought bus ticket see 2017-08-05 entry + External:Flock:Other -$27 ; Paypal + +2017-11-06 * Registration settled Fees + ; Registration Fees + Expense:Finance Charges $213.09 ; paypal fees + Expense:Finance Charges $1.76 ; paypal fees + Flock:Paypal Fees
~ every 2 years ; Copays - 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 + Budget:Flock:Copays $605 ; 1 * transfer paid + Budget:Flock:Copays $620 ; 2 * transfer paid + Budget:Flock:Copays $299 ; 3 * transfer paid + Budget:Flock:Copays $582.96 ; 10 * transfer paid + Budget:Flock:Copays $605 ; 12 * transfer paid + Budget:Flock:Copays $306 ; 17 * transfer paid + Budget:Flock:Copays $160 ; 20 * transfer - paid + Budget:Flock:Copays $109.20 ; 6 * paid + Budget:Flock:Copays $150 ; 7 * paid and receipt filed + Budget:Flock:Copays $209 ; 15 * paid + Budget:Flock:Copays $245 ; 13 * paid + Budget:Flock:Copays $314 ; 9 * paid + Budget:Flock:Copays $40 ; 4 * paid + Budget:Flock:Copays $48.80 ; 6 * paid + Budget:Flock:Copays $69 ; 14 * paid + Budget:Flock:Copays $92.19; 18 * paid + Budget:Flock:Copays $100 ; 16 * paid + Budget:Flock:Copays $229 ; 5 * paid + Budget:Flock:Copays $158 ; 8 * paid + Budget:Flock:Copays $66 ; 11 * reverse transfer paid to airline + Budget:Flock:Copays $140 ; 19 * reverse transfer paid to airline + Budget:Flock:Copays $100 ; 21 * reverse transfer paid to airline + Budget:Flock:Copays $357.96 ; 22 * reverse transfer paid to airline + Flock:Copaid Travel + +2017-11-06 * Copays settled + ; Copays + Budget:Flock:Copays $3287.16; Copays paid as internal RH transfers + External:Flock:Copays -$3287.16; RH transfers + Budget:Flock:Copays $663.96 ; Copays Paid directly to airline + External:Flock:Copays -$663.96 ; Paid directly to airline + Budget:Flock:Copays $119.97 ; direct paid for ticket + External:Flock:Copays -$119.97 ; direct paid for ticket + Budget:Flock:Copays $1377.02 ; Copays Received (as USD) + Budget:Flock:Copays $158.00 ; Copays Received (as EUR) + External:Flock:Copays -$1535.02 ; Paypal + +2017-09-02 * Copays/etc. Charged to Transportation + ; Payment: internal allocation + Expense:Transportation $3287.16; Copays paid as internal RH transfers + Expense:Transportation $663.96 ; Copays Paid directly to airline + Expense:Transportation $119.97 ; direct paid for ticket + Expense:Transportation $1377.02 ; Copays Received (as USD) + Expense:Transportation $158.00 ; Copays Received (as EUR) + Flock:Copaid Travel + +2017-11-06 * Copays settled Fees + ; Copays Fees + Expense:Finance Charges -$8.40 ; paypal fees + Expense:Finance Charges -$9.95 ; paypal fees + Flock:Paypal Fees
~ every 2 years ; Funding Allocations @@ -645,32 +707,6 @@ Expense:Outside Services/Training $25 Flock:Schedule -$25
-2017-09-02 * Copays/etc. owed - ; Payment: internal allocation - offset above when received - 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-14 * Nick Bebout - ham radio exam costs ; Payment: bexelbie meeting card - September 2017 Expense:Other $46.65 diff --git a/FY18/ledger/summer-coding.ldg b/FY18/ledger/summer-coding.ldg index 0eda7b6..95bc2ad 100644 --- a/FY18/ledger/summer-coding.ldg +++ b/FY18/ledger/summer-coding.ldg @@ -3,17 +3,15 @@ ;Travel Stipend $3000 ; 6 * $500 ;Mentor Summit $2200 ; 2 * $1100 ;Other Funding $3000 ; 6 * $500 - Summer Coding:Unallocated -$8200 - External:GSoC $5700 ; received on 13 Sep - External:GSoC $2500 ; not yet received - -~ every 2 years - ; Budget - Summer Coding:Unallocated $8200 + Budget:GSoC $8200 Summer Coding:LDAP Conference -$950 ; ~580 EUR original proposal Summer Coding:Mentor Summit -$2400 Summer Coding:Unallocated
+2017-09-13 * GSoC Payment 1 + Budget:GSoC $5700 + External:GSoC -$5700 + 2017-08-09 * LDAPCon Ticket for Ilias Stamatis ; Payment: bex CC - IE2563459 Expense:Trade Show $140.85 ; 120 EUR diff --git a/_builder/budget2tsv b/_builder/budget2tsv index 3d2e8f9..901ee55 100755 --- a/_builder/budget2tsv +++ b/_builder/budget2tsv @@ -16,4 +16,19 @@ # Convert remaining colons to dashes # Swap the first and second columns to put Budget before spending # Move the last column to be the first to put the category on the left -grep -v '^----' | sed 's/^ +//' | sed 's/ + /\t/g' | sed 's/ $/\t$/g' | sed 's/^$([0-9])/-$\1/' | sed 's/^$-/$/' | sed 's/0$/0%/' | sed 's/0 ([a-zA-F])/0% \1/' | sed 's/%$/%\tTotal/' | sed 's/^([-$]*[0-9.,]+\t)$-/\1$/' | sed 's/$-/-$/g' | sed 's/\t[^:\t]+:/\t/' | sed 's/:/-/g' | awk 'BEGIN{ FS="\t" } {print $2 "\t" $1 "\t" $3 "\t" $4 "\t" $5}'| awk 'BEGIN{ FS="\t" } {print $5 "\t" $1 "\t" $2 "\t" $3 "\t" $4}' +grep -v '^----' | \ + sed 's/^ +//' | \ + sed 's/ + /\t/g' | \ + sed 's/([^a-zA-Z]) ([^a-zA-Z])/\1\t\2/g' | \ + sed 's/^$([0-9])/-$\1/' | \ + sed 's/^$-/$/' | \ + sed 's/0$/0%/' | \ + sed 's/0 ([a-zA-F])/0% \1/' | \ + sed 's/%$/%\tTotal/' | \ + sed 's/^([-$]*[0-9.,]+\t)$-/\1$/' | \ + sed 's/$-/-$/g' | \ + sed 's/\t[^:\t]+:/\t/' | \ + sed 's/:/-/g' | \ + awk 'BEGIN{ FS="\t" } {print $2 "\t" $1 "\t" $3 "\t" $4 "\t" $5}'| awk 'BEGIN{ FS="\t" } {print $5 "\t" $1 "\t" $2 "\t" $3 "\t" $4}' + +#sed 's/ $/\t$/g' | \
budget-devel@lists.fedoraproject.org
-
git repository hosting