This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master
in repository fedora-budget.
commit f653ed11ae8a01458a5ae7019533cb0e835beb85
Author: Brian (bex) Exelbierd <bex(a)pobox.com>
Date: Wed Feb 21 13:24:08 2018 +0100
Reconciles and Mindshare
Also fixed Mindshare generation
---
FY18/gen_reports | 3 +++
FY18/ledger/apac.ldg | 17 +++++++-------
FY18/ledger/council.ldg | 23 +++++++++++++++++--
FY18/ledger/diversity.ldg | 18 ++++++++++++---
FY18/ledger/emea.ldg | 58 +++++++++++++++++++++++++++++++++++++++--------
FY18/ledger/fad.ldg | 50 ++++++++++++++++++++++++++++++++++++----
FY18/ledger/flock.ldg | 4 ++--
FY18/ledger/latam.ldg | 7 ++++--
FY18/ledger/mindshare.ldg | 32 ++++++++++++++++++++++++++
FY18/ledger/na.ldg | 4 +++-
10 files changed, 185 insertions(+), 31 deletions(-)
diff --git a/FY18/gen_reports b/FY18/gen_reports
index 2f25143..048f662 100755
--- a/FY18/gen_reports
+++ b/FY18/gen_reports
@@ -29,6 +29,9 @@ ledger -f ledger/fedora.ledger budget '^Diversity-Inclusion'
--flat | tail -n +1
# 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
+if [ ! -s mindshare.csv ]; then
+ ledger -f ledger/fedora.ledger budget '^Mindshare' --flat |
../_builder/budget2tsv > mindshare.csv
+fi
# Council and Other Expenses
ledger -f ledger/fedora.ledger budget '^Council' and not '^Council$'
--flat | ../_builder/budget2tsv > council.csv
diff --git a/FY18/ledger/apac.ldg b/FY18/ledger/apac.ldg
index dde5ee5..08bc046 100644
--- a/FY18/ledger/apac.ldg
+++ b/FY18/ledger/apac.ldg
@@ -4,6 +4,7 @@
APAC:FY17 Expenses -$582.69
APAC:Q1 -$0
APAC:Q2 -$1000
+ APAC:Q2 $411.20 ; quarter end sweep
APAC:Q3 -$0
APAC:Q4 -$1000
APAC:Unallocated
@@ -54,28 +55,28 @@
Expense:Meals $80.25
APAC:Q2:F26 RP -$80.25
-2018-02-07 Document Freedom Day
+2018-02-07 * Document Freedom Day
; Ticket:
https://pagure.io/ambassadors-apac/issue/223
- ; Payment: bex CC - February 2018
+ ; Payment: IE2751874 - bex CC February
Expense:Meals $97.48 ; 128.75 SGD
APAC:FY17 Expenses -$97.48
-2018-02-12 Translation Sprint
+2018-02-12 * Translation Sprint
; Ticket:
https://pagure.io/ambassadors-apac/issue/284
- ; Payment: bex CC - February 2018
+ ; Payment: IE2751874 - bex CC February
Expense:Meals $93.95
Expense:Meals:Paypal $3.66
APAC:Q4:Trans-sprint -$97.61
-2018-02-12 Fedora RP Taiwan
+2018-02-12 * Fedora RP Taiwan
; Ticket
https://pagure.io/ambassadors-apac/issue/280
- ; Payment: bex CC - February 2018
+ ; Payment: IE2751874 - bex CC February
Expense:Meals $31.45 ; 878 TWD + Paypal fees = 922 TWD
APAC:Q4:F27 RP -$31.45
-2018-02-12 Fedora RP Taiwan
+2018-02-12 * Fedora RP Taiwan
; Ticket
https://pagure.io/ambassadors-apac/issue/279
- ; Payment: bex CC - February 2018
+ ; Payment: IE2751874 - bex CC February
Expense:Meals $57.64 ; 3570 INR + Transferwise fees
APAC:Q4:F27 RP -$57.64
diff --git a/FY18/ledger/council.ldg b/FY18/ledger/council.ldg
index eb2ff94..5f5bd2b 100644
--- a/FY18/ledger/council.ldg
+++ b/FY18/ledger/council.ldg
@@ -11,6 +11,7 @@
LATAM:Unallocated -$1300
NA:Unallocated -$4250
Flock -$85000
+ Flock $12,558.81 ; underspend sweep
Mindshare:Unallocated -$9000
Diversity-Inclusion:Unallocated -$9000
Council:Unallocated
@@ -22,6 +23,7 @@
EMEA:Unallocated -$7000
LATAM:Unallocated -$3000
NA:Unallocated -$9000
+ Council:Other $166.80 ; underspend sweep
Council:Unallocated
2017-03-01 * RH Funded
@@ -136,8 +138,8 @@
~ every 2 years
; 2018/02/08 Microphone
; Ticket:
https://pagure.io/Fedora-Council/tickets/issue/179
- Council:Other:Microphone $100
- Council:Unallocated -$100
+ Council:Other:Microphone -$100
+ Council:Unallocated $100
2018-02-08 Microphone for podcasts
; Ticket:
https://pagure.io/Fedora-Council/tickets/issue/179
@@ -151,7 +153,24 @@
Council:Other:Fedora Loves .NET -$642.84
~ every 2 years
+ ; 2018/02/08 Microphone
+ ; Ticket:
https://pagure.io/Fedora-Council/tickets/issue/179
+ Council:Other:GrimoireCon -$126.80
+ Council:Unallocated $126.80
+
+2018-02-14 * Grimoire Con separate expenses
+ ; Payment: IE2736424 - Radka Janekova
+ Expense:Meals $99.54 ; 80.50 EUR
+ Expense:Transportation $27.26
+ Council:Other:GrimoireCon -$126.80
+
+~ every 2 years
; 2018/02/15 Additional funds for Outreachy
; Ticket:
https://pagure.io/Fedora-Council/tickets/issue/184
Diversity-Inclusion:Unallocated -$6500
Council:Unallocated $6500
+
+~ every 2 years
+ ; Sweep in underspend from Summer Coding
+ Summer Coding:Unallocated $2,445.70
+ Council:Unallocated
diff --git a/FY18/ledger/diversity.ldg b/FY18/ledger/diversity.ldg
index bf3e16a..3acaa44 100644
--- a/FY18/ledger/diversity.ldg
+++ b/FY18/ledger/diversity.ldg
@@ -12,6 +12,7 @@
Diversity-Inclusion:FWD:Lima -$79
Diversity-Inclusion:FWD:Stickers -$600
Diversity-Inclusion:Outreachy -$13000
+ Diversity-Inclusion:RGSoC -$1000
Diversity-Inclusion:Unallocated
2017-08-16 * Airfare for Amita Sharma
@@ -71,8 +72,13 @@
Expense:Meals $55.49
Diversity-Inclusion:FWD:Managua -$55.49
-2018-01-23 Fedora Women's Day Albania
- ; Payment: bex CC
+2018-01-23 * Fedora Women's Day Pune
+ ; Payment: IE2728294 - bex CC
+ Expense:Meals $19.99
+ Diversity-Inclusion:FWD:Pune -$19.99
+
+2018-01-23 * Fedora Women's Day Albania
+ ; Payment: IE2728294 - bex CC
Expense:Meals $62.44 ; 51.04 EUR
Diversity-Inclusion:FWD:Tirana -$62.44
Expense:Transportation $18.35 ; 15 EUR
@@ -83,7 +89,13 @@
Expense:Contributions/Donations $6500
Diversity-Inclusion:Outreachy -$6500
-2018-02-12 Software Conservancy - Outreachy
+2018-02-12 * Software Conservancy - Outreachy
; Payment: Invoice - PO 1010070717 - Spring 2018
Expense:Contributions/Donations $6500
Diversity-Inclusion:Outreachy -$6500
+
+2018-02-16 * Rails Girls Summer of Code Sponsorship
+ ; Payment: IE2751874 - bex CC February
+ ; Ticket:
https://pagure.io/fedora-diversity/issue/50
+ Expense:Trade Show $1000
+ Diversity-Inclusion:RGSoC -$1000
diff --git a/FY18/ledger/emea.ldg b/FY18/ledger/emea.ldg
index afb646d..be2e069 100644
--- a/FY18/ledger/emea.ldg
+++ b/FY18/ledger/emea.ldg
@@ -3,8 +3,11 @@
EMEA:Unallocated $11100
EMEA:Unallocated $5000 ; increase from
https://pagure.io/Fedora-Council/tickets/issue/163
EMEA:Q1 -$3316
+ EMEA:Q1 $101.42 ; quarter end sweep
EMEA:Q2 -$2125
+ EMEA:Q2 -$118.96 ; overrage
EMEA:Q3 -$330
+ EMEA:Q3 -$213.35 ; overrage
EMEA:Q4 -$10065
EMEA:Unallocated
@@ -20,7 +23,6 @@
EMEA:Q1:DORS/CLUC 2017 -$315
EMEA:Q1:Swag Production -$278
EMEA:Q1:Pending Tickets From FY17 -$291
- EMEA:Q1 $101.42 ; quarter end sweep
EMEA:Unallocated
~ every 2 years
@@ -339,29 +341,67 @@
Expense:Other Marketing Costs $202.49 ; 158.63 EUR
EMEA:Q3:34C3
-2018-02-12 Nemanja for DevConf
- ; Payment: bex CC
+2018-02-12 * Nemanja for DevConf
+ ; Payment: IE2751900 - bex CC February
; Ticket:
https://pagure.io/ambassadors-emea/funding_requests/issue/49
Expense:Transportation $218.61 ; 178.41 EUR
EMEA:Q4:DevConf -$218.61
-2018-02-12 Visa fee for DevConf - Sachin
- ; Payment: bex CC
+2018-02-12 * Visa fee for DevConf - Sachin
+ ; Payment: IE2751900 - bex CC February
Expense:Transportation $96.52
EMEA:Q4:DevConf -$96.52
-2018-02-14 Mitzelos @ FOSDEM
+2018-02-14 * Mitzelos @ FOSDEM
+ ; Payment: IE2751900 - bex CC February
; Ticket:
https://pagure.io/ambassadors-emea/funding_requests/issue/55
- ; Payment: bex CC - February
Expense:Airfare $281.05 ; 227.30 EUR
Expense:Transportation $76.36 ; 61.76 EUR
Expense:Transportation:Paypal $12.59 ; 10.18 EUR
EMEA:Q4:FOSDEM 2018 -$370
-2018-02-14 Balla @ FOSDEM
+2018-02-14 * Balla @ FOSDEM
; Ticket:
https://pagure.io/ambassadors-emea/funding_requests/issue/38
- ; Payment: bex CC - February
+ ; Payment: IE2751900 - bex CC February
Expense:Airfare $234.93 ; 190 EUR
Expense:Transportation $22.26 ; 18 EUR
Expense:Transportation:Paypal $9.17 ; 7.42 EUR
EMEA:Q4:FOSDEM 2018 -$266.36
+
+2018-02-14 * Janekova @ FOSDEM
+ ; Ticket:
https://pagure.io/ambassadors-emea/funding_requests/issue/36
+ ; Payment: IE2736424 - Radka Janekova
+ Expense:Airfare $301.83 ; 244.11 EUR
+ Expense:Transportation $62.55 ; 21 EUR + 751 CZK
+ Expense:Transportation $55.65 ; 45.01 EUR Uber
+ Expense:Lodging $19.78 ; 16 EUR
+ EMEA:Q4:FOSDEM 2018 -$439.81
+
+2018-01-29 * Fedora/CentOS Bags for FOSDEM
+ ; Payment: Direct Bill
+ Expense:Trade Show $1904.57 ; 50% of 77376 CZK
+ EMEA:Q4:Swag Production -$1904.57
+
+2018-02-14 * Seriografika - stickers for EMEA
+ ; Payment: Direct Bill
+ ; Ticket:
+ Expense:Trade Show $556.73 ; EUR450,80
+ EMEA:Q4:Swag Production -$556.73
+
+2018-02-16 * Azizaj @ Fosdem
+ ; Ticket:
https://pagure.io/ambassadors-emea/funding_requests/issue/37
+ ; Payment: IE2751900 - bex CC February
+ Expense:Transporation $31.20 ; 25 EUR
+ EMEA:Q4:FOSDEM 2018 -$31.20
+
+2018-02-16 * Castillo @ Fosdem
+ ; Ticket:
https://pagure.io/ambassadors-emea/funding_requests/issue/50
+ ; Payment: IE2751900 - bex CC February
+ Expense:Transporation $168.99
+ EMEA:Q4:FOSDEM 2018 -$168.99
+
+2018-02-16 * Chauvet @ Fosdem
+ ; Ticket:
https://pagure.io/ambassadors-emea/funding_requests/issue/52
+ ; Payment: IE2751900 - bex CC February
+ Expense:Airfare $111.49 ; 89.32 EUR
+ EMEA:Q4:FOSDEM 2018 -$111.49
diff --git a/FY18/ledger/fad.ldg b/FY18/ledger/fad.ldg
index 6fda711..e79bbe5 100644
--- a/FY18/ledger/fad.ldg
+++ b/FY18/ledger/fad.ldg
@@ -6,9 +6,10 @@
FADs:Council -$376.56 ; additional TICKET:
https://pagure.io/Fedora-Council/tickets/issue/124
FADs:LATAM -$5000 ; TICKET:
https://pagure.io/Fedora-Council/tickets/issue/116
FADs:LATAM -$1000 ; additional TICKET:
https://pagure.io/Fedora-Council/tickets/issue/124
- FADs:LATAM $601.21 ; Sweep of underspend
+ FADs:LATAM $601.80 ; Sweep of underspend
FADs:G11N -$6800 ; TICKET:
https://pagure.io/Fedora-Council/tickets/issue/137
FADs:G11N -$1200 ; Potential airfare overruns
+ FADs:G11N $522.03 ; underspend sweep
FADs:CommOps -$2635 ; TICKET:
https://pagure.io/Fedora-Council/tickets/issue/159 + $600 in underspend
FADs:CommOps -$600 ; TICKET:
https://pagure.io/Fedora-Council/tickets/issue/159 + $600 in underspend <-- this is
underspend
FADs:Docs -$10385 ; TICKET:
https://pagure.io/Fedora-Council/tickets/issue/174
@@ -226,12 +227,12 @@
Expense:Lodging $799.1 ; 16575.02 CZK
FADs:CommOps -$799.1
-2018-01-23 Bus for Jona Azizaj
- ; Payment: bex CC
+2018-01-23 * Bus for Jona Azizaj
+ ; Payment: IE2728279 - bex
Expense:Transportation $19.57 ; 16 EUR
FADs:CommOps -$19.57
-2018-01-24 Bus for Justin Flory
+2018-01-24 * Bus for Justin Flory
; Payment: bex CC
Expense:Transportation $19.57 ; 16 EUR
FADs:CommOps -$19.57
@@ -265,3 +266,44 @@
; Payment: IE2728279 - bex
Expense:Business Meals $25.43 ; 516 CZK
FADs:CommOps -$25.43
+
+2018-02-13 * Flight - Marr
+ ; Payment: IE2751900 - bex CC February
+ Expense:Airfare $2378.41
+ FADs:Docs -$2378.41
+
+2018-02-13 Flight - Mayorga
+ ; Payment: bex CC - February
+ Expense:Airfare $1435.08
+ FADs:Docs -$1435.08
+
+2018-02-14 * Flight - Smith
+ ; Payment: IE2751900 - bex CC February
+ Expense:Airfare $1878.01
+ FADs:Docs -$1878.01
+
+2018-02-14 * Bus - Mayorga (reduces flight)
+ ; Payment: IE2751900 - bex CC February
+ Expense:Transportation $32.02
+ FADs:Docs -$32.02
+
+2018-02-14 * Train - Mayorga (reduces flight)
+ ; Payment: IE2751900 - bex CC February
+ Expense:Transportation $66.71
+ FADs:Docs -$66.71
+
+2018-02-16 * Justin Flory Bus Ticket (reduces airfare)
+ ; Payment: IE2751900 - bex CC February
+ Expense:Transportation $39.78
+ FADs:Docs -$39.78
+
+2018-02-14 * CommOps Food Expense
+ ; Payment: IE2736424 - Radka Janekova
+ Expense:Meals $60.80 ; 1235 CZK
+ FADs:CommOps -$60.80
+
+2018-02-14 Flight - Assam
+ ; Payment: Pcard - February
+ Expense:Airfare $1721.01
+ FADs:Docs -$1721.01
+
diff --git a/FY18/ledger/flock.ldg b/FY18/ledger/flock.ldg
index bcce68f..3ce41fb 100644
--- a/FY18/ledger/flock.ldg
+++ b/FY18/ledger/flock.ldg
@@ -826,8 +826,8 @@
Expense:Transportation $388.15 ; lodging @ Flock
Flock:Funding:Other -$2153.26
-2018-02-07 Copay Corrections
- ; Payment: bex CC - February 2018
+2018-02-07 * Copay Corrections
+ ; Payment: IE2751874 - bex CC February
; Ticket:
https://pagure.io/fedora-budget/issue/44
; Ticket:
https://pagure.io/fedora-budget/issue/45
External:Flock:Copays $202 ; Paypal
diff --git a/FY18/ledger/latam.ldg b/FY18/ledger/latam.ldg
index dc2176e..e93b403 100644
--- a/FY18/ledger/latam.ldg
+++ b/FY18/ledger/latam.ldg
@@ -3,8 +3,11 @@
LATAM:Unallocated $4300
LATAM:Unallocated $10000 ; increase from
https://pagure.io/Fedora-Council/tickets/issue/175
LATAM:Q1 -$2200
+ LATAM:Q1 -$214.78 ; overspend
LATAM:Q2 -$1100
+ LATAM:Q2 $699.18 ; underspend sweep
LATAM:Q3 -$1000
+ LATAM:Q3 $427.58 ; underspend sweep
LATAM:Q4 -$10000
LATAM:Unallocated
@@ -224,9 +227,9 @@
Expense:Transportation:Bus $22.66 ; 65.53 BRL
LATAM:Q3:Linux Day -$32.00
-2018-02-14 Lanyard Depot
+2018-02-14 * Lanyard Depot
; Ticket:
https://pagure.io/ambassadors-latam/tasks/issue/406
- ; Payment: bex CC - February
+ ; Payment: IE2751874 - bex CC February
Expense:Trade Show $2625 ; lanyards
LATAM:Q4:Swag -$2625
diff --git a/FY18/ledger/mindshare.ldg b/FY18/ledger/mindshare.ldg
new file mode 100644
index 0000000..dcc6e3b
--- /dev/null
+++ b/FY18/ledger/mindshare.ldg
@@ -0,0 +1,32 @@
+~ every 2 years
+ ; Budget
+ Mindshare:Unallocated $9000
+ Mindshare:FAD -$9000
+ Mindshare:Unallocated
+
+2018-02-13 * Vueling
+ ; Payment: IE2751900 - bex CC February
+ ; Transfers from Docs FAD
+ Expense:Airfare $726.95 ; 587.92 EUR
+ Mindshare:FAD -$726.95
+
+2018-02-14 Flight - Bebout
+ ; Payment: PCard - February
+ Expense:Airfare $1950.31
+ Mindshare:FAD -$1950.31
+
+2018-02-14 Flight - Flory
+ ; Payment: PCard - February
+ Expense:Airfare $1656.91
+ Mindshare:FAD -$1656.91
+
+2018-02-16 Flight - Lucnea
+ ; Payment: PCard - February
+ Expense:Airfare $1303.16
+ Mindshare:FAD -$1303.16
+
+2018-02-16 * Vueling
+ ; Payment: IE2751900 - bex CC February
+ ; Transfer from Docs FAD
+ Expense:Airfare $195.94 ; 156.98 EUR
+ Mindshare:FAD -$195.94
diff --git a/FY18/ledger/na.ldg b/FY18/ledger/na.ldg
index f60a082..31c9b6e 100644
--- a/FY18/ledger/na.ldg
+++ b/FY18/ledger/na.ldg
@@ -2,8 +2,11 @@
; Budget
NA:Unallocated $13250
NA:Q1 -$9000
+ NA:Q1 $4661.24 ; under spend sweep
NA:Q2 -$1750
+ NA:Q2 -$496.37 ; under spend sweep
NA:Q3 -$2900 ; increased for FossCon
because of Q1 underspend
+ NA:Q3 -$596.96 ; under spend sweep
NA:Q4 -$2500
NA:Unallocated
@@ -14,7 +17,6 @@
NA:Q1:LFNW -$2500 ;
https://pagure.io/ambassadors-na/tasks/issue/167
NA:Q1:Bitcamp -$1500 ;
https://pagure.io/ambassadors-na/tasks/issue/157
NA:Q1:SELF -$2500 ;
https://pagure.io/ambassadors-na/tasks/issue/171
- NA:Q1 $4661.24 ; sweep
NA:Unallocated
~ every 2 years
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.