This is an automated email from the git hooks/post-receive script.
bex pushed a change to branch master in repository fedora-budget.
from 88e16d1 Allocate Q2 budget new 307fc8d Correcting syntax errors in EMEA budget new c79b503 Flock updates new 2891bed Adding Fedora Women Day budget new aeeb1da Adding summer coding
The 4 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 | 5 ++++- FY18/ledger/council.ldg | 4 ++-- FY18/ledger/diversity.ldg | 7 +++++++ FY18/ledger/emea.ldg | 10 +++++----- FY18/ledger/flock.ldg | 20 ++++++++++++++++---- FY18/ledger/summer-coding.ldg | 26 ++++++++++++++++++++++++++ FY18/{overall.adoc => summer-coding.adoc} | 11 +++++------ _topic_map.yml | 2 ++ 8 files changed, 67 insertions(+), 18 deletions(-) create mode 100644 FY18/ledger/diversity.ldg create mode 100644 FY18/ledger/summer-coding.ldg copy FY18/{overall.adoc => summer-coding.adoc} (61%)
This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master in repository fedora-budget.
commit 307fc8d7ba56e5b014fe351576ff096b2aedd4d4 Author: Brian Exelbierd bexelbie@dhcp129-58.brq.redhat.com Date: Mon Aug 14 16:58:53 2017 +0200
Correcting syntax errors in EMEA budget --- FY18/ledger/emea.ldg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/FY18/ledger/emea.ldg b/FY18/ledger/emea.ldg index 9d71f61..243b3c2 100644 --- a/FY18/ledger/emea.ldg +++ b/FY18/ledger/emea.ldg @@ -19,15 +19,15 @@ EMEA:Q1:DORS/CLUC 2017 -$315 EMEA:Q1:Swag Production -$278 EMEA:Q1:Pending Tickets From FY17 -$291 + EMEA:Q1 $124.33 ; Balancing entry to zero our Quarter 1 and return excess to Unallocated + EMEA:Unallocated -$124.33
+~ every 2 years + ; Budget EMEA:Q2 $2000 EMEA:Q2:F26 Parties -$285 EMEA:Q2:FrOSCon 2017 -$680 - -~every 2 years - ; Balancing entry to zero our Quarter 1 and return excess to Unallocated - EMEA:Q1 $124.33 - EMEA:Unallocated -$124.33 + EMEA:Q2
2017-03-23 * Jona Airfare for Free Software Activity Day Milan ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/4
This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master in repository fedora-budget.
commit c79b50371794a7233d0feb5663e66a2d1ae00fca Author: Brian Exelbierd bexelbie@dhcp129-58.brq.redhat.com Date: Mon Aug 14 16:59:07 2017 +0200
Flock updates --- FY18/ledger/flock.ldg | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/FY18/ledger/flock.ldg b/FY18/ledger/flock.ldg index 830bd31..41dc983 100644 --- a/FY18/ledger/flock.ldg +++ b/FY18/ledger/flock.ldg @@ -8,7 +8,7 @@ Flock:Badges -$150 ; 300 badges Flock:Booklet -$0 ; **MISSING** Flock:AV -$11,256 - Flock:Bandwidth -$0 ; **MISSING** Needed? + 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) @@ -218,7 +218,7 @@ Expense:Lodging $10000 ; Deposit Flock:Funding:Lodging -$10000
-2017-07-21 Bon Mi (Catering for Evening Activity) +2017-07-21 Bon Me (Catering for Evening Activity) ; Payment: jmadriaga Meeting Card Expense:Meals $1000 ; Deposit Flock:Food -$1000 @@ -519,6 +519,16 @@ Flock:Funding:Bus -$27 External
+2017-08-09 Lanyards + ; Payment: jmadriaga meeting card + Flock:Badges -$91.08 + External + +2017-08-11 Professional Bartending Service + ; Payment: jmadriaga meeting card + Expense:Meals -$500 ; setup plus bartenders drinks on consumption + Flock:Food + 2017-07-01 Copays/etc. owed Flock:Unallocated:Copay Owed -$605 ; 1 - transfer paid Flock:Unallocated:Copay Owed -$620 ; 2 - transfer paid @@ -534,9 +544,9 @@ 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 + Flock:Unallocated:Copay Owed -$209 ; 15 - paid Flock:Unallocated:Copay Owed -$100 ; 16 - paid - Flock:Unallocated:Copay Owed -$306 ; 17 + 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 @@ -566,7 +576,9 @@ 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 - transfer 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
This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master in repository fedora-budget.
commit 2891bedcc5c9116468b290b25e2718fb569b87dd Author: Brian Exelbierd bexelbie@dhcp129-58.brq.redhat.com Date: Mon Aug 14 16:59:23 2017 +0200
Adding Fedora Women Day budget
Also made Diversity and Mindshare csv generation fixes --- FY18/gen_reports | 5 ++++- FY18/ledger/council.ldg | 4 ++-- FY18/ledger/diversity.ldg | 7 +++++++ 3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/FY18/gen_reports b/FY18/gen_reports index 0e96881..4f3d210 100755 --- a/FY18/gen_reports +++ b/FY18/gen_reports @@ -12,6 +12,9 @@ fi # 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
+# Summer Coding +ledger -f ledger/fedora.ledger budget '^Summer Coding' --flat | tail -n +2 | ../_builder/budget2tsv > summer-coding.csv + # FADs ledger -f ledger/fedora.ledger budget '^FADs' and not '^FADs$' --depth 2 --flat | ../_builder/budget2tsv > fads.csv if [ ! -s fads.csv ]; then @@ -19,7 +22,7 @@ if [ ! -s fads.csv ]; then fi
# Diversity & Inclusion - 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 '^D&I' --flat | tail -n +2 | ../_builder/budget2tsv > mindshare.csv +ledger -f ledger/fedora.ledger budget '^Diversity-Inclusion' --flat | tail -n +2 | ../_builder/budget2tsv > d-i.csv
# Mindshare - 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 '^Mindshare' --flat | tail -n +2 | ../_builder/budget2tsv > mindshare.csv diff --git a/FY18/ledger/council.ldg b/FY18/ledger/council.ldg index 2d7709e..4203f84 100644 --- a/FY18/ledger/council.ldg +++ b/FY18/ledger/council.ldg @@ -10,8 +10,8 @@ LATAM:Unallocated -$1300 NA:Unallocated -$4250 Flock -$85000 - Mindshare -$9000 - Diversity-Inclusion -$9000 + Mindshare:Unallocated -$9000 + Diversity-Inclusion:Unallocated -$9000 Council:Unallocated -$81750 Annual Budget $196000
diff --git a/FY18/ledger/diversity.ldg b/FY18/ledger/diversity.ldg new file mode 100644 index 0000000..4eac335 --- /dev/null +++ b/FY18/ledger/diversity.ldg @@ -0,0 +1,7 @@ +~ every 2 years + ; Budget + Diversity-Inclusion:Unallocated $9000 + Diversity-Inclusion:FWD:Bangalore -$155 + Diversity-Inclusion:FWD:Pune -$90 + Diversity-Inclusion:FWD:Aurangabad -$55 + Diversity-Inclusion:Unallocated
This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master in repository fedora-budget.
commit aeeb1da945c39aea96480f125f9299fcaac11127 Author: Brian Exelbierd bexelbie@dhcp129-58.brq.redhat.com Date: Mon Aug 14 17:00:07 2017 +0200
Adding summer coding --- FY18/ledger/summer-coding.ldg | 26 ++++++++++++++++++++++++++ FY18/summer-coding.adoc | 12 ++++++++++++ _topic_map.yml | 2 ++ 3 files changed, 40 insertions(+)
diff --git a/FY18/ledger/summer-coding.ldg b/FY18/ledger/summer-coding.ldg new file mode 100644 index 0000000..93a9fd8 --- /dev/null +++ b/FY18/ledger/summer-coding.ldg @@ -0,0 +1,26 @@ +~ every 2 years + ; Budget + Summer Coding:LDAP:Travel -$290 ; ~230 EUR + Summer Coding:LDAP:Lodging -$270 ; ~230 EUR + Summer Coding:LDAP:Conference -$140 ; ~120 EUR + Summer Coding:Flock -$1500 ; David Silva + Summer Coding:Flock -$1300 ; David Labsky + Summer Coding:Unallocated + +2017-08-01 Google Summer of Code Support (date is approximate) + Summer Coding:Unallocated $8200 + ;Travel Stipend $3000 ; 6 * $500 + ;Mentor Summit $2200 ; 2 * $1100 + ;Other Funding $3000 ; 6 * $500 + External + +2017-08-09 LDAPCon Ticket for Ilias Stamatis + ; Payment: bex CC + Expense:Trade Show $140.85 ; 120 EUR + Summer Coding:LDAP:Conference -$140.85 + +2017-08-10 LDAPCon Flight for Ilias Stamatis + ; Payment: bex Meeting Card + Expense:Transportation $289.70 + Expense:Transportation:Agent Fee $38.00 + Summer Coding:LDAP:Travel -$327.70 diff --git a/FY18/summer-coding.adoc b/FY18/summer-coding.adoc new file mode 100644 index 0000000..aea22fd --- /dev/null +++ b/FY18/summer-coding.adoc @@ -0,0 +1,12 @@ +Summer Coding +============= + +Summer Coding Budget Report +--------------------------- + +[caption="", format="csv", separator=" ", cols="4*>,1", options="header, footer"] +.All amounts are in US Dollars +|=== +Budget Spent So Far Remaining Budget Percent Spent Budget Category +include::FY18/summer-coding.csv[] +|=== diff --git a/_topic_map.yml b/_topic_map.yml index 1147d13..d2293be 100644 --- a/_topic_map.yml +++ b/_topic_map.yml @@ -60,6 +60,8 @@ Topics: File: events - Name: FADs Budget File: fads + - Name: Summer Coding Budget + File: summer-coding - Name: Council and Other Expenses File: council ---
budget-devel@lists.fedoraproject.org
-
git repository hosting