This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master
in repository fedora-budget.
commit 070e92a5afd2bc7762b9362ee3d484e9018ca0c8
Author: Brian (bex) Exelbierd <bex(a)pobox.com>
Date: Thu Oct 19 13:52:49 2017 +0200
Add source of funds reporting
---
FY18/gen_reports | 5 ++++-
FY18/ledger/council.ldg | 2 +-
FY18/overall.adoc | 11 +++++++++++
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/FY18/gen_reports b/FY18/gen_reports
index a55c404..e1eafc8 100755
--- a/FY18/gen_reports
+++ b/FY18/gen_reports
@@ -4,11 +4,14 @@
rm *.csv
# Overall Report for Fedora
-ledger -f ledger/fedora.ledger budget --depth 1 not '^Annual Budget$' and not
'^External' | ../_builder/budget2tsv > overall.csv
+ledger -f ledger/fedora.ledger budget --depth 1 not '^External' |
../_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
+
# 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 a6a563d..04a67d1 100644
--- a/FY18/ledger/council.ldg
+++ b/FY18/ledger/council.ldg
@@ -13,7 +13,7 @@
Mindshare:Unallocated -$9000
Diversity-Inclusion:Unallocated -$9000
Council:Unallocated -$81750
- Annual Budget $196000
+ External:Red Hat $196000 ; budget for FY18
~ every 2 years
; 2017/08/03 FY18 Budgets
diff --git a/FY18/overall.adoc b/FY18/overall.adoc
index 963e233..809298f 100644
--- a/FY18/overall.adoc
+++ b/FY18/overall.adoc
@@ -12,4 +12,15 @@ include::FY18/overall.csv[]
|===
+Source of Budget Report
+-----------------------
+
+[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Source Amount
+include::FY18/source.csv[]
+|===
+
+
Built on: {localdatetime}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.