From c24c3bdb873ce7fb85c61f5ff28d4b68067b1b08 Mon Sep 17 00:00:00 2001 From: Tester Date: Aug 15 2017 09:12:13 +0000 Subject: site update --- diff --git a/budget/FY18/apac.html b/budget/FY18/apac.html index fecd70d..c64ee65 100644 --- a/budget/FY18/apac.html +++ b/budget/FY18/apac.html @@ -169,16 +169,9 @@ type="text/css" rel="stylesheet" />

FY17 Expenses

-

$1,114.79

-

0

-

$1,114.79

-

0%

-

Q1

- - -

$4,000.00

+

$5,114.79

0

-

$4,000.00

+

$5,114.79

0%

Unallocated

@@ -207,15 +200,6 @@ type="text/css" rel="stylesheet" /> Budget Category - - -

$1,114.79

-

0

-

$1,114.79

-

0%

-

Unallocated

- - diff --git a/budget/FY18/emea.html b/budget/FY18/emea.html index 3955bef..9b72b03 100644 --- a/budget/FY18/emea.html +++ b/budget/FY18/emea.html @@ -162,23 +162,23 @@ type="text/css" rel="stylesheet" /> -

$3,316.00

$3,214.58

-

$101.42

-

97%

+

$3,214.58

+

0

+

100%

Q1

-

$965.00

+

$2,000.00

$8.05

-

$956.95

-

1%

+

$1,991.95

+

0%

Q2

-

$6,819.00

+

$5,885.42

0

-

$6,819.00

+

$5,885.42

0%

Unallocated

@@ -209,15 +209,22 @@ type="text/css" rel="stylesheet" /> -

$3,316.00

$3,214.58

-

$101.42

-

97%

+

$3,214.58

+

0

+

100%

Total

+

$101.42

+

0

+

-$101.42

+

0%

+

Unallocated

+ +

$342.00

$342.84

-$0.84

@@ -300,15 +307,22 @@ type="text/css" rel="stylesheet" /> -

$965.00

+

$2,000.00

$8.05

-

$956.95

-

1%

+

$1,991.95

+

0%

Total

+

$1,035.00

+

0

+

$1,035.00

+

0%

+

Unallocated

+ +

$285.00

$8.05

$276.95

diff --git a/budget/FY18/latam.html b/budget/FY18/latam.html index dffd841..5ec17d3 100644 --- a/budget/FY18/latam.html +++ b/budget/FY18/latam.html @@ -162,23 +162,23 @@ type="text/css" rel="stylesheet" /> -

$670.00

$1,828.58

-

-$1,158.58

-

273%

+

$1,828.58

+

0

+

100%

Q1

-

$1,240.00

+

$3,000.00

0

-

$1,240.00

+

$3,000.00

0

Q2

-

$2,390.00

+

$528.58

0

-

$2,390.00

+

-$528.58

0

Unallocated

@@ -209,33 +209,40 @@ type="text/css" rel="stylesheet" /> -

$670.00

$1,828.58

-

-$1,158.58

-

273%

+

$1,828.58

+

0

+

100%

Total

+

$64.75

0

+

-$64.75

+

0

+

Unallocated

+ + +

$174.33

$174.33

-

-$174.33

0

+

100%

Q1-Cs50xni

-

0

$735.06

-

-$735.06

+

$735.06

0

+

100%

Q1-Flisol

-

0

+

$313.94

$313.95

-

-$313.95

-

0

+

-$0.01

+

100%

Q1-InstallFest

@@ -279,15 +286,22 @@ type="text/css" rel="stylesheet" /> -

$1,240.00

+

$3,000.00

0

-

$1,240.00

+

$3,000.00

0%

Total

+

$1,760.00

+

0

+

$1,760.00

+

0

+

Unallocated

+ +

$1,020.00

0

$1,020.00

diff --git a/budget/FY18/na.html b/budget/FY18/na.html index 7465d7f..5288013 100644 --- a/budget/FY18/na.html +++ b/budget/FY18/na.html @@ -162,30 +162,30 @@ type="text/css" rel="stylesheet" /> -

$9,000.00

$4,338.76

-

$4,661.24

-

48%

+

$4,338.76

+

0

+

100%

Q1

-

$2,150.00

+

$1,750.00

$951.11

-

$1,198.89

-

44%

+

$798.89

+

54%

Q2

-

$2,500.00

+

$2,900.00

0

-

$2,500.00

+

$2,900.00

0

Q3

-

$400.00

+

$4,261.24

0

-

-$400.00

+

$4,261.24

0

Unallocated

@@ -216,15 +216,22 @@ type="text/css" rel="stylesheet" /> -

$9,000.00

$4,338.76

-

$4,661.24

-

48%

+

$4,338.76

+

0

+

100%

Total

+

$4,661.24

+

0

+

-$4,661.24

+

0

+

Unallocated

+ +

$1,500.00

$1,209.16

$290.84

@@ -279,10 +286,10 @@ type="text/css" rel="stylesheet" /> -

$2,150.00

+

$1,750.00

$951.11

-

$1,198.89

-

44%

+

$798.89

+

54%

Total

@@ -290,6 +297,13 @@ type="text/css" rel="stylesheet" />

$400.00

0

+

-$400.00

+

0

+

Unallocated

+ + +

$400.00

+

0

$400.00

0

Q2-Fosscon

@@ -328,15 +342,22 @@ type="text/css" rel="stylesheet" /> -

$2,500.00

+

$2,900.00

0

-

$2,500.00

+

$2,900.00

0%

Total

+

$400.00

+

0

+

$400.00

+

0

+

Unallocated

+ +

$2,500.00

0

$2,500.00

diff --git a/budget/docs/faq_budgeting.html b/budget/docs/faq_budgeting.html index 9405e72..c4ec072 100644 --- a/budget/docs/faq_budgeting.html +++ b/budget/docs/faq_budgeting.html @@ -206,9 +206,18 @@ type="text/css" rel="stylesheet" /> NA:Q1 -$7350 NA:Q2 -$7350 NA:Q3 -$7350 - NA:Q4 -$7350 + NA:Q4 -$7350 + NA:Unallocated (1) +
+ + + + + +
1This 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.

@@ -230,8 +239,16 @@ type="text/css" rel="stylesheet" /> EMEA:Q1:OSCAL 2016 -$484 EMEA:Q1:Swag -$1817 EMEA:Q1:Postage -$303 - EMEA:Unallocated + EMEA:Unallocated (1) + +
+ + + + + +
1This 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.
@@ -296,7 +313,8 @@ or underspend.

LATAM:Q1 -$4000 LATAM:Q2 -$4000 LATAM:Q3 -$4000 - LATAM:Q4 -$4000 + LATAM:Q4 -$4000 + LATAM:Unallocated
@@ -313,8 +331,16 @@ 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) +
+
+ + + + + +
1This 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 @@ -337,6 +363,43 @@ 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
+
+
+
+ + + + + +
1this is this is the quarterly sweep line. The number comes from the unspent report on [budget website](https://budget.fedoraproject.org/).
+
+
+
diff --git a/sitemap.xml b/sitemap.xml index 748467d..5b5cf32 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -1 +1 @@ -http://209.132.179.16:3000/2017-08-15T08:39:45+00:00always1.0http://209.132.179.16:3000/budget/FY15/README.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY16/README.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY17/README.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY17/apac.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY17/d-i.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY17/emea.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY17/events.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY17/fads.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY17/latam.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY17/na.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY17/overall.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY18/README.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY18/apac.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY18/council.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY18/d-i.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY18/emea.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY18/events.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY18/fads.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY18/latam.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY18/mindshare.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY18/na.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY18/overall.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/FY18/summer-coding.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/docs/faq_budgeting.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/docs/faq_entries.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/docs/faq_general.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/docs/flock_funding_faq.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/docs/index.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/budget/docs/reimbursement.html2017-08-15T08:39:45+00:00daily0.5http://209.132.179.16:3000/index.html2017-08-15T08:39:45+00:00daily0.5 \ No newline at end of file +http://209.132.179.16:3000/2017-08-15T09:12:11+00:00always1.0http://209.132.179.16:3000/budget/FY15/README.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY16/README.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY17/README.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY17/apac.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY17/d-i.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY17/emea.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY17/events.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY17/fads.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY17/latam.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY17/na.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY17/overall.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY18/README.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY18/apac.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY18/council.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY18/d-i.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY18/emea.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY18/events.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY18/fads.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY18/latam.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY18/mindshare.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY18/na.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY18/overall.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/FY18/summer-coding.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/docs/faq_budgeting.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/docs/faq_entries.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/docs/faq_general.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/docs/flock_funding_faq.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/docs/index.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/budget/docs/reimbursement.html2017-08-15T09:12:11+00:00daily0.5http://209.132.179.16:3000/index.html2017-08-15T09:12:11+00:00daily0.5 \ No newline at end of file