aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain d'Alverny <rda@mageia.org>2012-09-12 14:46:39 +0000
committerRomain d'Alverny <rda@mageia.org>2012-09-12 14:46:39 +0000
commite1b06ee6ba46b5aa4d3c95386c364814131686c8 (patch)
treee700305c57a044c85edf2eb783eb92d53dce80bd
parent6312a7d8cff8bc1df7f85db64695bb37b1e6a017 (diff)
downloadwww-e1b06ee6ba46b5aa4d3c95386c364814131686c8.tar
www-e1b06ee6ba46b5aa4d3c95386c364814131686c8.tar.gz
www-e1b06ee6ba46b5aa4d3c95386c364814131686c8.tar.bz2
www-e1b06ee6ba46b5aa4d3c95386c364814131686c8.tar.xz
www-e1b06ee6ba46b5aa4d3c95386c364814131686c8.zip
fi report update
-rw-r--r--donators.inc.php30
-rw-r--r--en/about/reports/2012/index.php2
-rw-r--r--en/about/reports/2012/mageia-financial-report-2012.csv15
3 files changed, 39 insertions, 8 deletions
diff --git a/donators.inc.php b/donators.inc.php
index daf278553..f05ec8241 100644
--- a/donators.inc.php
+++ b/donators.inc.php
@@ -352,7 +352,35 @@ $donators = array(
'OSWALD UND ADOLFINE KROP',
'KINDL, TOMAS, JUDR.',
'LYONESS EUROPE AG',
- 'MME NOOT & NEE HUYGHE'
+ 'MME NOOT & NEE HUYGHE',
+ 'Jonathan Statler',
+ 'Bob McCreadie',
+ 'Peter Mains',
+ 'Andrew Toller',
+ 'Jose Luis Monzonis Cabrera',
+ 'Stéphane Couturier',
+ 'Jan-Gunnar Pihlgren',
+ 'Jean Sié',
+ 'Serge Moreau',
+ 'Bert Aerts',
+ 'Adrien Guichard',
+ 'Julien Simon',
+ 'Mikael Hilger',
+ 'Nicolas Gandriau',
+ 'Kenneth Marsol Llop',
+ 'Felipe Valladolid Gonzalo',
+ 'Jean-François Ansard',
+ 'Jose Paulo Batista Silva',
+ 'Marco Rossi',
+ 'Patrice Riant',
+ 'Thomas Faber',
+ 'Eric Barbero',
+ 'Denis Marcq',
+ 'Michel Renaud',
+ 'Anh-Tuan Nguyen-Pham',
+ 'Christian Fischer',
+ 'Philippe Pieyre',
+ 'Jean Monnard'
);
/* Last updated:
Paypal: July, 26
diff --git a/en/about/reports/2012/index.php b/en/about/reports/2012/index.php
index 865ade36e..4bdeb2f2a 100644
--- a/en/about/reports/2012/index.php
+++ b/en/about/reports/2012/index.php
@@ -11,7 +11,7 @@ $js_options_hAxis = '{title: "2012"}';
$js_data2_values = <<<S
['2010', 8801.66, 1277.77],
['2011', 11154.02, 8327.25],
- ['2012', 5993.28, 10347.99]
+ ['2012', 6963.28, 10430.36]
S;
$intro = <<<S
diff --git a/en/about/reports/2012/mageia-financial-report-2012.csv b/en/about/reports/2012/mageia-financial-report-2012.csv
index 1fa500eba..82501578d 100644
--- a/en/about/reports/2012/mageia-financial-report-2012.csv
+++ b/en/about/reports/2012/mageia-financial-report-2012.csv
@@ -9,15 +9,15 @@ year,2012,,,,,
currency,EUR,,,,,
url,http://www.mageia.org/en/about/reports/,,,,,
licence,ODbL-1.0,This financial report data is made available under the Open Database License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in individual contents of the database are licensed under the Database Contents License: http://opendatacommons.org/licenses/dbcl/1.0/,,,,
-last updated,2012/09/03,,,,,
+last updated,2012/09/11,,,,,
comment,This is a first attempt to provide open and direct access to Mageia financial data. We will try to improve on it, feel free to suggest improvements in format, detail, presentation.,,,,,
,,,,,,
,,,,,,
# Account balance,,,,,,
-total,4077.97,,,,,
-main account,358.95,,,,,
-paypal,232.16,,,,,
-savings account,3486.86,,,,,
+total,4991.53,,,,,
+main account,663.95,,,,,
+paypal,140.72,,,,,
+savings account,4115.93,,,,,
,,,,,,
# Income Statement,,,,,,
,,,,,,
@@ -54,7 +54,7 @@ month,count,total amount,check,transfer,paypal,cash
6,14,881.00,135.00,125.00,461.00,160.00
7,13,692.67,0,430.67,262.00,0
8,13,497.00,190.00,0,307.00,0
-9,0,0,0,0,0,0
+9,20,970.00,0,450.00,520.00,0
10,0,0,0,0,0,0
11,0,0,0,0,0,0
12,0,0,0,0,0,0
@@ -81,8 +81,11 @@ date,category,description,amount,
2012-07-31,bank,Paypal fees,7.72,
2012-08-01,infra:hosting,Gandi: domain names renewal,30.64,
2012-08-03,transport,Marseille DC: train+hotel for 3 people,370.96,
+2012-08-25,transport,Marseille DC: hotel complement,30.00,
+2012-08-25,infra:hardware,wires,40.93,
2012-08-26,infra:hosting,Gandi: hosting provision,100.00,
2012-08-31,bank,Paypal fees,9.24,
+2012-09-11,bank,Paypal fees,11.44,
,,,,,,
,,,,,,
# That's all folks!,,,,,,