From 9b4928bfb3f941b71f37f3d34982960ea2078bfd Mon Sep 17 00:00:00 2001
From: Romain d'Alverny <rda@mageia.org>
Date: Mon, 2 Jul 2012 17:16:33 +0000
Subject: Update 2011 & 2012 reports

- simplified detailed expenses list: single date, no desc
- fixed date format (use YYYY-MM-DD now)
- removed expenses monthly summary, to be computed from detailed list now
---
 .../reports/2011/mageia-financial-report-2011.csv  | 53 ++++++++--------------
 .../reports/2012/mageia-financial-report-2012.csv  | 44 ++++++------------
 2 files changed, 34 insertions(+), 63 deletions(-)

diff --git a/en/about/reports/2011/mageia-financial-report-2011.csv b/en/about/reports/2011/mageia-financial-report-2011.csv
index ca6b574bf..7a030c948 100644
--- a/en/about/reports/2011/mageia-financial-report-2011.csv
+++ b/en/about/reports/2011/mageia-financial-report-2011.csv
@@ -69,42 +69,27 @@
 ,,,,,,
 ,,,,,,
 "# Expenses details",,,,,,
-"## Monthly summary",,,,,,
-"month","count","total amount",,,,
-1,,100,,,,
-2,,"2116,57",,,,
-3,,"54,65",,,,
-4,,215,,,,
-5,,"446,55",,,,
-6,,0,,,,
-7,,0,,,,
-8,,0,,,,
-9,,0,,,,
-10,,"2963,55",,,,
-11,,"1863,45",,,,
-12,,0,,,,
-"total",,,,,,
 ,,,,,,
 "## More details",,,,,,
-"date","invoice date","reference","category","description","amount",
-,18/09/10,,"trademark","Mageia, INPI",280,
-,20/10/10,,"infra:hardware","HDD","242,7",
-,11/11/10,,"admin","Administrative cost for Mageia.org",44,
-04/01/11,04/01/11,,"membership","April.org",100,
-04/02/11,04/02/11,,"marketing:promotional","Stickers & Tshirts FOSDEM 2011","1932,14",
-04/02/11,04/02/11,,"admin","Money box","17,93",
-06/02/11,06/02/11,,"transport/accomodation","FOSDEM 2011, 1 person","166,5",
-01/03/11,01/03/11,,"shipments","tshirts for Chemnitzer 2011","54,65",
-10/04/11,10/04/11,,"infra:hosting","SSL certificate","215,28",
-09/05/11,09/05/11,,"marketing:promotional","Posters, flyers, Solutions Linux 2011","159,25",
-17/05/11,17/05/11,,"shipments","tshirts for Solutions Linux 2011","12,3",
-26/05/11,26/05/11,,"shipments","tshirts",25,
-30/05/11,30/05/11,,"infra:hosting","Gandi hosting, RAM",250,
-25/10/11,25/10/11,,"infra:hardware","Dell server","2669,6",
-26/10/11,26/10/11,,"infra:hardware","ARM bs boards","294,05",
-14/11/11,14/11/11,,"infra:hardware","HDD (backup server)","1149,83",
-17/11/11,17/11/11,,"shipments","stickers, flyers","35,03",
-29/11/11,29/11/11,,"infra:hardware","buildsystem SSD","678,99",
+"date","category","description","amount",
+2010-09-18,"trademark","Mageia, INPI",280,
+2010-10-20,"infra:hardware","HDD","242,7",
+2010-11-11,"admin","Administrative cost for Mageia.org",44,
+2011-01-04,"membership","April.org",100,
+2011-02-04,"marketing:promotional","Stickers & Tshirts FOSDEM 2011","1932,14",
+2011-02-04,"admin","Money box","17,93",
+2011-02-06,"transport/accomodation","FOSDEM 2011, 1 person","166,5",
+2011-03-01,"shipments","tshirts for Chemnitzer 2011","54,65",
+2011-04-10,"infra:hosting","SSL certificate","215,28",
+2011-05-09,"marketing:promotional","Posters, flyers, Solutions Linux 2011","159,25",
+2011-05-17,"shipments","tshirts for Solutions Linux 2011","12,3",
+2011-05-26,"shipments","tshirts",25,
+2011-05-30,"infra:hosting","Gandi hosting, RAM",250,
+2011-10-25,"infra:hardware","Dell server","2669,6",
+2011-10-26,"infra:hardware","ARM bs boards","294,05",
+2011-11-14,"infra:hardware","HDD (backup server)","1149,83",
+2011-11-17,"shipments","stickers, flyers","35,03",
+2011-11-29,"infra:hardware","buildsystem SSD","678,99",
 ,,,,,,
 ,,,,,,
 "# That's all folks!",,,,,,
diff --git a/en/about/reports/2012/mageia-financial-report-2012.csv b/en/about/reports/2012/mageia-financial-report-2012.csv
index 30ab44240..38b667bfa 100644
--- a/en/about/reports/2012/mageia-financial-report-2012.csv
+++ b/en/about/reports/2012/mageia-financial-report-2012.csv
@@ -27,7 +27,7 @@ Bank interests,0,,,,,
 Total of revenues,4863.61,,,,,
 ,,,,,,
 ## Expenses,,,,,,
-Total of expenses,2080.15,,,,,
+Total of expenses,2209.74,,,,,
 ,,,,,,
 Net Income,0,,,,,
 ,,,,,,
@@ -61,36 +61,22 @@ month,count,total amount,check,transfer,paypal,cash
 ,,,,,,
 ,,,,,,
 # Expenses details,,,,,,
-## Monthly summary,,,,,,
-month,count,total amount,,,,
-1,4,745.16,0,,,
-2,2,779.18,0,,,
-3,2,150.43,0,,,
-4,1,9.94,0,,,
-5,1,17.4,0,,,
-6,1,375.87,0,,,
-7,1,2.17,0,,,
-8,0,0,0,,,
-9,0,0,0,,,
-10,0,0,0,,,
-11,0,0,0,,,
-12,0,0,0,,,
-total,,,,,,
 ,,,,,,
 ## More details,,,,,,
-date,invoice date,reference,category,description,amount,
-31/01/12,31/01/12,,bank,Paypal fees,13.87,
-13/01/12,13/01/12,,transport,Datacenter: train to Marseille,284.00,
-13/01/12,13/01/12,,asso,Cotisation April.org,100.00,
-28/01/12,28/01/12,,transport,FOSDEM: plane for Thomas/tmb,347.29,
-13/02/12,01/02/12,,marketing:merchandising,FOSDEM: refund for Patricia/Trish,768.66,
-29/02/12,29/02/12,,bank,Paypal fees,10.52,
-12/03/12,01/03/12,,bank,Transfer change fees,143.92,
-31/03/12,31/03/12,,bank,Paypal fees,6.51,
-30/04/12,30/04/12,,bank,Paypal fees,9.94,
-31/05/12,31/05/12,,bank,Paypal fees,17.4,
-05/06/12,05/06/12,,infra:hardware,2 routers,375.87,
-31/06/12,31/06/12,,bank,Paypal fees,9.72,
+date,category,description,amount,
+2012-01-13,transport,Datacenter: train to Marseille,284.00,
+2012-01-13,asso,Cotisation April.org,100.00,
+2012-01-28,transport,FOSDEM: plane for Thomas/tmb,347.29,
+2012-01-30,infra:hardware,various purchases for ARM BS,129.59,
+2012-01-31,bank,Paypal fees,13.87,
+2012-02-13,marketing:merchandising,FOSDEM: refund for Patricia/Trish,767.66,
+2012-02-29,bank,Paypal fees,10.52,
+2012-03-12,bank,Transfer change fees,143.92,
+2012-03-31,bank,Paypal fees,6.51,
+2012-04-30,bank,Paypal fees,9.94,
+2012-05-31,bank,Paypal fees,17.4,
+2012-06-05,infra:hardware,2 routers,375.87,
+2012-06-31,bank,Paypal fees,9.72,
 ,,,,,,
 ,,,,,,
 # That's all folks!,,,,,,
-- 
cgit v1.2.1