diff options
| author | Romain d'Alverny <rda@mageia.org> | 2012-09-03 16:23:43 +0000 |
|---|---|---|
| committer | Romain d'Alverny <rda@mageia.org> | 2012-09-03 16:23:43 +0000 |
| commit | 838fa56d7c91f4163922d2822ffa9aac9ef5f925 (patch) | |
| tree | 0491639717c78b56e4a494b74c047de9a39c884d /en | |
| parent | 6bc0bf6dcd5b02640bf374c5f4b004d75d3de981 (diff) | |
| download | www-838fa56d7c91f4163922d2822ffa9aac9ef5f925.tar www-838fa56d7c91f4163922d2822ffa9aac9ef5f925.tar.gz www-838fa56d7c91f4163922d2822ffa9aac9ef5f925.tar.bz2 www-838fa56d7c91f4163922d2822ffa9aac9ef5f925.tar.xz www-838fa56d7c91f4163922d2822ffa9aac9ef5f925.zip | |
August update
Diffstat (limited to 'en')
| -rw-r--r-- | en/about/reports/2012/mageia-financial-report-2012.csv | 14 | ||||
| -rw-r--r-- | en/about/reports/template.php | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/en/about/reports/2012/mageia-financial-report-2012.csv b/en/about/reports/2012/mageia-financial-report-2012.csv index 1ec1572c7..1fa500eba 100644 --- a/en/about/reports/2012/mageia-financial-report-2012.csv +++ b/en/about/reports/2012/mageia-financial-report-2012.csv @@ -9,14 +9,14 @@ 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/08/03,,,,, +last updated,2012/09/03,,,,, 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,3670.21,,,,, -main account,148.95,,,,, -paypal,34.40,,,,, +total,4077.97,,,,, +main account,358.95,,,,, +paypal,232.16,,,,, savings account,3486.86,,,,, ,,,,,, # Income Statement,,,,,, @@ -53,7 +53,7 @@ month,count,total amount,check,transfer,paypal,cash 5,25,1374.00,100.00,555.00,719.00,0 6,14,881.00,135.00,125.00,461.00,160.00 7,13,692.67,0,430.67,262.00,0 -8,0,0,0,0,0,0 +8,13,497.00,190.00,0,307.00,0 9,0,0,0,0,0,0 10,0,0,0,0,0,0 11,0,0,0,0,0,0 @@ -80,7 +80,9 @@ date,category,description,amount, 2012-07-26,infra:hardware,2 servers,7613.14, 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,370.96, +2012-08-03,transport,Marseille DC: train+hotel for 3 people,370.96, +2012-08-26,infra:hosting,Gandi: hosting provision,100.00, +2012-08-31,bank,Paypal fees,9.24, ,,,,,, ,,,,,, # That's all folks!,,,,,, diff --git a/en/about/reports/template.php b/en/about/reports/template.php index 478a1b494..8947f961f 100644 --- a/en/about/reports/template.php +++ b/en/about/reports/template.php @@ -229,7 +229,7 @@ $expenses_total = array_sum($expenses_monthly_summary[0]); </section> <section class="para values" id="inc-state"> <h2>Income statement</h2> - <mark>TODO: full income statement. For now, check details below.</mark> + <!-- <mark>full income statement. For now, check details below.</mark>--> <table summary="Income statement" class="fr-table"> <tbody> <tr> @@ -262,6 +262,7 @@ $expenses_total = array_sum($expenses_monthly_summary[0]); </table> </section> <hr> + <!-- <section class="para values" id="balance"> <h2>Balance sheet</h2> <table class="fr-table"> @@ -297,6 +298,7 @@ $expenses_total = array_sum($expenses_monthly_summary[0]); </table> </section> <hr> + --> <section class="para values" id="expenses"> <h2>Expenses</h2> <?php $E = get_expenses($parsed['# Expenses details > ## More details']); echo $E['html']; ?> |