This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master in repository fedora-budget.
commit 2bd5dd6ac1258549e299befb52095841d810f348 Author: Brian Exelbierd bexelbie@dhcp129-58.brq.redhat.com Date: Tue Aug 15 11:06:44 2017 +0200
Updated docs with sweep entries and added them --- FY18/ledger/apac.ldg | 4 ++-- FY18/ledger/emea.ldg | 5 +++-- FY18/ledger/latam.ldg | 15 ++++++++------- FY18/ledger/na.ldg | 9 +++++---- docs/faq_budgeting.adoc | 38 ++++++++++++++++++++++++++++++++++++-- 5 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/FY18/ledger/apac.ldg b/FY18/ledger/apac.ldg index 29131d4..e2ec206 100644 --- a/FY18/ledger/apac.ldg +++ b/FY18/ledger/apac.ldg @@ -2,11 +2,11 @@ ; Budget APAC:Unallocated $5600 APAC:FY17 Expenses -$485.21 - APAC:Q1 -$1114.79 + APAC:Q1 -$0 APAC:Q2 -$0 APAC:Q3 -$0 APAC:Q4 -$0 - APAC:Unallocated -$4000 + APAC:Unallocated
2017-05-31 * Funding Request for Tenzin Chokden Nullcon 2017 ; Ticket: https://fedorahosted.org/fedora-apac/ticket/264 diff --git a/FY18/ledger/emea.ldg b/FY18/ledger/emea.ldg index 73cced5..a3e788b 100644 --- a/FY18/ledger/emea.ldg +++ b/FY18/ledger/emea.ldg @@ -5,7 +5,7 @@ EMEA:Q2 -$2000 EMEA:Q3 -$0 EMEA:Q4 -$0 - EMEA:Unallocated -$5784 + EMEA:Unallocated
~ every 2 years ; Budget @@ -19,6 +19,7 @@ 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 @@ -26,7 +27,7 @@ EMEA:Q2 $2000 EMEA:Q2:F26 Parties -$285 EMEA:Q2:FrOSCon 2017 -$680 - EMEA:Unallocated + EMEA:Q2
2017-03-23 * Jona Airfare for Free Software Activity Day Milan ; Ticket: https://pagure.io/ambassadors-emea/funding_requests/issue/4 diff --git a/FY18/ledger/latam.ldg b/FY18/ledger/latam.ldg index a88a62c..dff98df 100644 --- a/FY18/ledger/latam.ldg +++ b/FY18/ledger/latam.ldg @@ -2,20 +2,21 @@ ; Budget LATAM:Unallocated $4300 LATAM:Q1 -$1300 - LATAM:Q2 -$0 + LATAM:Q2 -$3000 LATAM:Q3 -$0 LATAM:Q4 -$0 - LATAM:Unallocated -$3000 + LATAM:Unallocated
~ every 2 years ; Budget LATAM:Q1 $1300 LATAM:Q1:LinuxPlaya -$606 - LATAM:Q1:Cs50xni -$0 - LATAM:Q1:Flisol -$0 + LATAM:Q1:Cs50xni -$174.33 + LATAM:Q1:Flisol -$735.06 LATAM:Q1:CryptoRave -$0 LATAM:Q1:SASO Conf -$64 - LATAM:Q1:InstallFest -$0 + LATAM:Q1:InstallFest -$313.94 + LATAM:Q1 $64.75 ; quarter end sweep LATAM:Unallocated
~ every 2 years @@ -27,7 +28,7 @@ LATAM:Q2:CONECIT -$1020 LATAM:Q2:Flock -$160 LATAM:Q2:Zamora Teran -$60 - LATAM:Unallocated + LATAM:Q2
~ every 2 years ; Budget @@ -37,7 +38,7 @@ LATAM:Q3:Latinoware -$0 LATAM:Q3:DevConf Panama -$0 ; Event Cancelled LATAM:Q3:PampaSeg -$0 - LATAM:Unallocated + LATAM:Q3
2017-03-23 * Fedora Ambassador Card (March: Cross ; Payment: CC-LATAM diff --git a/FY18/ledger/na.ldg b/FY18/ledger/na.ldg index f511a36..9c9bf85 100644 --- a/FY18/ledger/na.ldg +++ b/FY18/ledger/na.ldg @@ -3,9 +3,9 @@ NA:Unallocated $13250 NA:Q1 -$9000 NA:Q2 -$1750 - NA:Q3 -$2500 + NA:Q3 -$2900 ; increased for FossCon because of Q1 underspend NA:Q4 -$0 - NA:Unallocated -$0 + NA:Unallocated
~ every 2 years ; Budget @@ -14,6 +14,7 @@ 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 @@ -21,13 +22,13 @@ NA:Q2 $1750 NA:Q2:Fosscon -$400 ; https://pagure.io/ambassadors-na/tasks/issue/183 NA:Q2:Hackmit2017 -$1750 ; https://pagure.io/ambassadors-na/tasks/issue/184 - NA:Unallocated + NA:Q2
~ every 2 years ; Budget NA:Q3 $2500 NA:Q3:Ohio Linux Fest -$2500 ; Ticket: https://pagure.io/ambassadors-na/tasks/issue/179 - NA:Unallocated + NA:Q3
2017-07-20 Self Material and Fuel expense ; Payment: award CC diff --git a/docs/faq_budgeting.adoc b/docs/faq_budgeting.adoc index 65ea32f..07ecf46 100644 --- a/docs/faq_budgeting.adoc +++ b/docs/faq_budgeting.adoc @@ -48,8 +48,11 @@ Sub-budgeting is pretty simple. It can be done in the file used by the specific NA:Q2 -$7350 NA:Q3 -$7350 NA:Q4 -$7350 + NA:Unallocated <1> ```
+<1> This line just collects any unallocated monies so your transaction will balance. + It works the same way as the council budget in the previous question. Notice that the order of the lines didn't matter. Here they wrote the positive number first because it made sense to that region to think, "we had this money and we split it up like this." Again, everything adds to $0.
This can even be split further. Here is what an optional quarterly event budget might look like. This time the example is from EMEA. @@ -68,9 +71,11 @@ This can even be split further. Here is what an optional quarterly event budget EMEA:Q1:OSCAL 2016 -$484 EMEA:Q1:Swag -$1817 EMEA:Q1:Postage -$303 - EMEA:Unallocated + EMEA:Unallocated <1> ```
+<1> This line has no amount because it is automatically calculated (or elided). This line is *Unallocated* because the quarter has ended and we want to sweep any remaining budget back to the main pot. See below for more details. + What if something gets budgeted and then we change our mind? ------------------------------------------------------------
@@ -120,6 +125,7 @@ Here is an example, Using LATAM and some ficticious numbers: LATAM:Q2 -$4000 LATAM:Q3 -$4000 LATAM:Q4 -$4000 + LATAM:Unallocated ```
The entry above divides the LATAM budget into quarterly budgets. @@ -134,9 +140,11 @@ Each quarter is broken down as follows LATAM:Q1:Flisol -$750 LATAM:Q1:CryptoRave -$0 ; event cancelled LATAM:Q1:SASO Conf -$1000 ; we usually do this - not yet approved - LATAM:Unallocated ; Leave blank it will automatically move unallocated money back to the main pot + LATAM:Q1 <1> ```
+<1> This line has no amount because it is automatically calculated (or elided). This line is *Q1* because the quarter has not yet ended and we want to keep any remaining budget in the quarter. See below for more details. + Here we have broken down a single budget quarter. Three events have been voted on and approved by the LATAM ambassadors. These are UNSACC LinuxPlaya, Cs50xni, and Flisol. @@ -152,3 +160,29 @@ This event isn't approved yet and hasn't got a LATAM sponsor. It exists in this entry as a planning reminder. If the LATAM ambassadors start to run out of money making decisions on these kinds of events can help make decision about what trade-offs to make or whether to ask for more money. + +Are there any Quarter end activities? +------------------------------------- + +At the end of the quarter we want to sweep any unallocated budget back into the main budget pot for reuse. To do this, change the last entry for the quarterly budget from `Region:Q#` to `Region:Unallocated`. The amount is automatically calculated. + +Once you have processed all transactions for the end of the quarter, you may want to sweep the unspent money back as well. The easiest way to do this is to add as sweep line, as indicated below. The benefit of the sweep line is that it moves any unspent money back into the main unallocated pot so you can use it in future quarters. + +``` + ~ every 2 years + ; Budget + EMEA:Q1 $3316 + EMEA:Q1:PyCon SK 2017 -$465 + EMEA:Q1:CLT 2017 -$342 + EMEA:Q1:FSAD-Milan 2017 -$175 + EMEA:Q1:Linux Weekend Tirana 2017 -$140 + EMEA:Q1:OSCAL 2017 -$1310 + EMEA:Q1:S.A.M.O.S 2017 -$0 ; Event Cancelled + 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 <1> + EMEA:Unallocated +``` + +<1> this is this is the quarterly sweep line. The number comes from the unspent report on [budget website](https://budget.fedoraproject.org/).