From a0b2d09125d7911656fe4cb286f20643c4432281 Mon Sep 17 00:00:00 2001 From: Marek Laane Date: Sun, 12 Oct 2014 10:54:11 +0300 Subject: Updated Estonian translation --- en/about/reports/2010/index.php | 64 ---- en/about/reports/2011/index.php | 30 -- en/about/reports/2011/index2.php | 67 ---- en/about/reports/2011/mageia-accounts-2011.csv | 7 - .../reports/2011/mageia-financial-report-2011.csv | 95 ------ en/about/reports/2011/mageia-forecast-2011.csv | 16 - en/about/reports/2011/mageia-report-2011.csv | 26 -- .../2011/mageia_financial_report_2011_en.pdf | Bin 152023 -> 0 bytes .../2011/mageia_rapport_financier_2011_fr.pdf | Bin 157807 -> 0 bytes en/about/reports/2012/index.php | 32 -- .../reports/2012/mageia-financial-report-2012.csv | 96 ------ .../2012/mageia_financial_report_2012_en.pdf | Bin 340173 -> 0 bytes .../2012/mageia_rapport_financier_2012_fr.pdf | Bin 355922 -> 0 bytes en/about/reports/2013/index.php | 30 -- .../reports/2013/mageia-financial-report-2013.csv | 78 ----- en/about/reports/README.md | 17 - en/about/reports/index.php | 38 --- en/about/reports/template.php | 350 --------------------- en/about/reports/template_lib.php | 169 ---------- 19 files changed, 1115 deletions(-) delete mode 100644 en/about/reports/2010/index.php delete mode 100644 en/about/reports/2011/index.php delete mode 100644 en/about/reports/2011/index2.php delete mode 100644 en/about/reports/2011/mageia-accounts-2011.csv delete mode 100644 en/about/reports/2011/mageia-financial-report-2011.csv delete mode 100644 en/about/reports/2011/mageia-forecast-2011.csv delete mode 100644 en/about/reports/2011/mageia-report-2011.csv delete mode 100644 en/about/reports/2011/mageia_financial_report_2011_en.pdf delete mode 100644 en/about/reports/2011/mageia_rapport_financier_2011_fr.pdf delete mode 100644 en/about/reports/2012/index.php delete mode 100644 en/about/reports/2012/mageia-financial-report-2012.csv delete mode 100644 en/about/reports/2012/mageia_financial_report_2012_en.pdf delete mode 100644 en/about/reports/2012/mageia_rapport_financier_2012_fr.pdf delete mode 100644 en/about/reports/2013/index.php delete mode 100644 en/about/reports/2013/mageia-financial-report-2013.csv delete mode 100644 en/about/reports/README.md delete mode 100644 en/about/reports/index.php delete mode 100644 en/about/reports/template.php delete mode 100644 en/about/reports/template_lib.php (limited to 'en/about/reports') diff --git a/en/about/reports/2010/index.php b/en/about/reports/2010/index.php deleted file mode 100644 index e4bddf87d..000000000 --- a/en/about/reports/2010/index.php +++ /dev/null @@ -1,64 +0,0 @@ - - - - - Mageia Financial Report (2010) - - - - - - - - -

Activity Reports » 2010 Financial Report

Summary

Amount collected: EUR 8 801.66
Amount spent: EUR 1 277.77
Amount remaining: EUR 7 523.96

Financial Report

- - - - - - - - - - - - - - - -

Transaction description	Income	Outgoing
Donations and Sales
Donations by Paypal/transfer/check/cash	EUR 8 801.42
Paypal test to validate bank account	EUR 0.24
Hardware for servers
HDD for servers (dams)		EUR 921.20
Cables and other stuff for servers (dams)		EUR 17.50
Trip to Marseille for hosting at Lost-Oasis
Car rent for going to Marseille (boklm)		EUR 135.00
Gasoline for the car (dams)		EUR 63.00
Croissants for the ielo team (dams)		EUR 12.12
TGV for going back to Paris for 3 people (ennael)		EUR 128.88

Total	EUR 8 801.66	EUR 1 277.77
Balance	EUR 7 523.96

Bank accounts situation

Paypal (non-for-profit organisation account): EUR 63.51
Main account (with checkbook and no credit card): EUR 1 310.24
Savings account (between 2% and 4% of interest): EUR 4 000.00
AUFML account (part to be transfered to Mageia.Org): EUR 2 150.21

Miscellaneous

Donations are mixed as at the beginning they were managed by AUFML. We had a bank transfert with all donations.
You can help Mageia.Org by doing a donation.
You can see the "thank you" page.

Contact

- Financial report published by Mageia.Org Treasurer on the 2010 Fiscal Year - Damien Lallement).
- You can contact us by sending an email to treasurer[at]mageia[dot]org.
- Last update: Mar 18 12:18:53 CET 2011. -

- - diff --git a/en/about/reports/2011/index.php b/en/about/reports/2011/index.php deleted file mode 100644 index 0af0ba638..000000000 --- a/en/about/reports/2011/index.php +++ /dev/null @@ -1,30 +0,0 @@ -Here is our financial report for 2011.

- -

Read the French, original report - or the English translation - (both are PDF documents).
Get the raw report data - (CSV document, licensed under ODbL 1.0). - The rest of this page is built from this data.

-S; - -$last_known_account_title = sprintf('Account status on December 31^st, %s', $year); - -include '../template.php'; - diff --git a/en/about/reports/2011/index2.php b/en/about/reports/2011/index2.php deleted file mode 100644 index 67f2a6b67..000000000 --- a/en/about/reports/2011/index2.php +++ /dev/null @@ -1,67 +0,0 @@ - - - - - Mageia Financial Report (2011) - - - - - - - - - -

- -

- Being redesigned – Take with a grain of salt for now.

- 'mageia-accounts-2011.csv', - 'report' => 'mageia-report-2011.csv', - 'forecast' => 'mageia-forecast-2011.csv' - )); - - $hReport = $mfr->html_report(); - $hForecast = $mfr->html_forecast(); - $hAccounts = $mfr->html_accounts(); - $hSummary = $mfr->html_summary(); - ?> -

Summary

- -

Bank accounts situation

- -

Financial Report

- -

Forecast for 2011

- -

Miscellaneous

You can download this report as a PDF file.
You can help Mageia.Org by doing a donation.
You can see the "thank you" page.

Contact

Financial report published by Damien Lallement (Mageia Treasurer on the 2011 Fiscal Year).
- You can contact him by sending an email to treasurer[at]mageia[dot]org.

- - \ No newline at end of file diff --git a/en/about/reports/2011/mageia-accounts-2011.csv b/en/about/reports/2011/mageia-accounts-2011.csv deleted file mode 100644 index 7952e8010..000000000 --- a/en/about/reports/2011/mageia-accounts-2011.csv +++ /dev/null @@ -1,7 +0,0 @@ -head;Bank accounts -head;Current accounts positions -head;http://www.mageia.org/ -head;Account;Amount -;Paypal account (not-for-profit organisation account);308.13 -;Main account (with checkbook, no credit card);292.85 -;Savings account (between 2% and 4% of annual interest rate);8000 diff --git a/en/about/reports/2011/mageia-financial-report-2011.csv b/en/about/reports/2011/mageia-financial-report-2011.csv deleted file mode 100644 index 7a030c948..000000000 --- a/en/about/reports/2011/mageia-financial-report-2011.csv +++ /dev/null @@ -1,95 +0,0 @@ -"# Head",,,,,, -"title","Mageia.org financial report for year 2011",,,,, -"org","mageia.org",,,,, -"owner","mageia.org",,,,, -"manager","mageia.org treasurer",,,,, -"contact","See http://www.mageia.org/en/about/reports/",,,,, -"type","financial report",,,,, -"year",2011,,,,, -"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/05/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 on 2011/12/31",,,,,, -"total","8166,37",,,,, -"main account","413,13",,,,, -"paypal","653,24",,,,, -"savings account",7100,,,,, -,,,,,, -"# Income Statement",,,,,, -,,,,,, -"## Revenues",,,,,, -"Donations","11150,96",,,,, -"Bank interests","3,06",,,,, -"Total of revenues","11154,02",,,,, -,,,,,, -"## Expenses",,,,,, -"Hardware (servers)","5500,45",,,,, -"Events (FOSDEM, Solutions Linux)","2091,39",,,,, -"Trademark registration",280,,,,, -"Transporation & accomodation","166,5",,,,, -"Shipments","126,98",,,,, -"Assoc. Membership",100,,,,, -"Administrative fees",44,,,,, -"Total of expenses","8327,25",,,,, -,,,,,, -"Net Income","2826,77",,,,, -,,,,,, -,,,,,, -"# Balance Sheet (incomplete)",,,,,, -,,,,,, -"## Liabilities",,,,,, -"Donations","11150,96",,,,, -,,,,,, -"## Assets",,,,,, -"Trademark",280,,,,, -"Hardware, servers","TBD",,,,, -"Promotional materials","TBD",,,,, -"Cash","8166,37",,,,, -,,,,,, -,,,,,, -"# Income details",,,,,, -"## Donations monthly summary",,,,,, -"month","count","total amount","check","transfer","paypal","cash" -1,,"161,15",30,50,"81,15",0 -2,,"3907,83",0,"2360,55","687,28",860 -3,,"109,51",0,100,"9,51",0 -4,,"283,73",0,60,"223,73",0 -5,,"549,3",0,0,"549,3",0 -6,,"907,9",80,"234,5","593,4",0 -7,,"435,13",25,6,"404,13",0 -8,,"263,84",0,30,"233,84",0 -9,,"707,96",0,50,"657,96",0 -10,,"1599,94",375,240,"984,94",0 -11,,"1341,34",300,0,"1041,34",0 -12,,"508,33",0,375,"508,33",0 -,,,,,, -,,,,,, -"# Expenses details",,,,,, -,,,,,, -"## More details",,,,,, -"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/2011/mageia-forecast-2011.csv b/en/about/reports/2011/mageia-forecast-2011.csv deleted file mode 100644 index 224496c27..000000000 --- a/en/about/reports/2011/mageia-forecast-2011.csv +++ /dev/null @@ -1,16 +0,0 @@ -head;2011 Forecast; -head; -head;http://www.mageia.org/ -head;Description of planned expediture;Unit price;Quantity;Recurrence;Total price;Status -;Goodies;4500;1;1;;Pending -;April;100;1;1;;Pending -;Gandi (hosting: +1536MB of RAM);2.39;6;12;;Done (Wed Mar 30) -;Dedibox (build ISO);14.99;1;12;;Pending -;Internet domains;15;7;1;;Pending -;Fiona (backup server);1500;1;1;;Pending -;2 new nodes for BS;2500;2;1;;Pending -;Event box;1500;1;1;;Pending -;Event travel;1000;1;2;;Pending -;HW for spare;3000;1;1;;Pending -;Brand registration;250;1;1;;Pending -;Reserve fund;4000;1;1;;Pending \ No newline at end of file diff --git a/en/about/reports/2011/mageia-report-2011.csv b/en/about/reports/2011/mageia-report-2011.csv deleted file mode 100644 index 9bd8230a8..000000000 --- a/en/about/reports/2011/mageia-report-2011.csv +++ /dev/null @@ -1,26 +0,0 @@ -head;Financial report -head;Lists transactions that happened on Mageia.Org accounts -head;http://www.mageia.org/ -head;Date;Transaction description;Outgoing;Income -cat;Donations and sales -;;Donations via Paypal/transfer/check;;1920.97; -;;Sale of T-shirts;;1050; -cat;Fees and Administrative costs -;;Administrative costs for the birth of Mageia.Org (JO);44; -;;April (annual fee);100; -;;INPI brand registration for 10 years (rda);250; -;;Annual interest of our savings account;;3.06 -cat;Goodies and accessories -;;Posters and flyers for Solutions Linux (rda);159.25; -;;Stickers and T-shirts for FOSDEM;1932.14; -;;Money box (dams);17.93; -cat;Shipments -;;40 TS to wobo for Chemnitzer Linuxtage;54.65; -;;3 TS to donors in France (dams);12.30; -;;2 TS to saipo for Dijon event in France (dams);25; -cat;Hardware and hosting -;;RAM on Gandi.net hosting (for blog/planet/www);250; -;;SSL for domains on Gandi.net;215.28; -;;HDD for servers (boklm);242.70; -cat;Travel and events -;;Hotel + train for wobo (FOSDEM 2011);166.50; \ No newline at end of file diff --git a/en/about/reports/2011/mageia_financial_report_2011_en.pdf b/en/about/reports/2011/mageia_financial_report_2011_en.pdf deleted file mode 100644 index e4ffcdb57..000000000 Binary files a/en/about/reports/2011/mageia_financial_report_2011_en.pdf and /dev/null differ diff --git a/en/about/reports/2011/mageia_rapport_financier_2011_fr.pdf b/en/about/reports/2011/mageia_rapport_financier_2011_fr.pdf deleted file mode 100644 index c86f48eca..000000000 Binary files a/en/about/reports/2011/mageia_rapport_financier_2011_fr.pdf and /dev/null differ diff --git a/en/about/reports/2012/index.php b/en/about/reports/2012/index.php deleted file mode 100644 index 3cec931eb..000000000 --- a/en/about/reports/2012/index.php +++ /dev/null @@ -1,32 +0,0 @@ - -

Read the French, original report - or the English translation - (both are PDF documents).

Get the raw report data - (CSV document, licensed under ODbL 1.0). - The rest of this page is built from this data.

You may also want to check out our general report for 2012.

- -S; - -$last_known_account_title = sprintf('Account status on December 31^st, %s', $year); - -include '../template.php'; - diff --git a/en/about/reports/2012/mageia-financial-report-2012.csv b/en/about/reports/2012/mageia-financial-report-2012.csv deleted file mode 100644 index c9963799c..000000000 --- a/en/about/reports/2012/mageia-financial-report-2012.csv +++ /dev/null @@ -1,96 +0,0 @@ -# Head -title,Mageia.org financial report for year 2012,,,,, -org,mageia.org,,,,, -owner,mageia.org,,,,, -manager,mageia.org treasurer,,,,, -contact,See http://www.mageia.org/en/about/reports/,,,,, -type,financial report,,,,, -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,2013/01/29,,,,, -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,8423.07,,,,, -main account,2191.13,,,,, -paypal,828.81,,,,, -savings account,5403.13,,,,, -,,,,,, -# Income Statement,,,,,, -,,,,,, -## Revenues,,,,,, -Donations,0,,,,, -Bank interests,0,,,,, -Total of revenues,0,,,,, -,,,,,, -## Expenses,,,,,, -Total of expenses,0,,,,, -,,,,,, -Net Income,0,,,,, -,,,,,, -,,,,,, -# Balance Sheet (incomplete),,,,,, -,,,,,, -## Liabilities,,,,,, -Donations,0,,,,, -,,,,,, -## Assets,,,,,, -Hardware, servers,TBD,,,,, -Promotional materials,TBD,,,,, -Cash,0,,,,, -,,,,,, -,,,,,, -# Income details,,,,,, -## Donations monthly summary,,,,,, -month,count,total amount,check,transfer,paypal,cash -1,19,624.48,0,80.0,544.48,0 -2,15,630.00,0,200.00,430.00,0 -3,9,684.13,0,423.13,261.00,0 -4,10,610.00,0,100.00,510.00,0 -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,13,497.00,190.00,0,307.00,0 -9,28,1251.80,90.00,450.00,801.80,0 -10,24,1838.00,100.00,810.00,928.00,0 -11,9,257.00,0,0,257.00,0 -12,15,732.00,0,267.00,465.00,0 -,,,,,, -,,,,,, -# Expenses details,,,,,, -,,,,,, -## More details,,,,,, -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, -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 people,370.96, -2012-08-25,transport,Marseille DC: hotel complement,30.00, -2012-08-25,transport,Marseille DC: metro,12.80, -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-27,infra:hosting,Online,279.82, -2012-09-30,bank,Paypal fees,18.09, -2012-10-31,bank,Paypal fees,20.21, -2012-11-30,bank,Paypal fees,7.16, -2012-12-31,bank,Paypal fees,9.69 -,,,,,, -,,,,,, -# That's all folks!,,,,,, diff --git a/en/about/reports/2012/mageia_financial_report_2012_en.pdf b/en/about/reports/2012/mageia_financial_report_2012_en.pdf deleted file mode 100644 index 4cbd91982..000000000 Binary files a/en/about/reports/2012/mageia_financial_report_2012_en.pdf and /dev/null differ diff --git a/en/about/reports/2012/mageia_rapport_financier_2012_fr.pdf b/en/about/reports/2012/mageia_rapport_financier_2012_fr.pdf deleted file mode 100644 index 5216f59f3..000000000 Binary files a/en/about/reports/2012/mageia_rapport_financier_2012_fr.pdf and /dev/null differ diff --git a/en/about/reports/2013/index.php b/en/about/reports/2013/index.php deleted file mode 100644 index 71046e497..000000000 --- a/en/about/reports/2013/index.php +++ /dev/null @@ -1,30 +0,0 @@ - -

Get the raw report data - (CSV document, licensed under ODbL 1.0). - The rest of this page is built from this data.

- -S; - -$last_known_account_title = sprintf('Account status on December 31^st, %s', $year); -$last_known_account_title = sprintf('Account status'); - -include '../template.php'; - diff --git a/en/about/reports/2013/mageia-financial-report-2013.csv b/en/about/reports/2013/mageia-financial-report-2013.csv deleted file mode 100644 index a90ef0aa6..000000000 --- a/en/about/reports/2013/mageia-financial-report-2013.csv +++ /dev/null @@ -1,78 +0,0 @@ -# Head -title,Mageia.org financial report for year 2012,,,,, -org,mageia.org,,,,, -owner,mageia.org,,,,, -manager,mageia.org treasurer,,,,, -contact,See http://www.mageia.org/en/about/reports/,,,,, -type,financial report,,,,, -year,2013,,,,, -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,2013/01/29,,,,, -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,8660.87,,,,, -main account,1997.26,,,,, -paypal,1125.12,,,,, -savings account,5538.49,,,,, -,,,,,, -# Income Statement,,,,,, -,,,,,, -## Revenues,,,,,, -Donations,0,,,,, -Bank interests,0,,,,, -Total of revenues,0,,,,, -,,,,,, -## Expenses,,,,,, -Total of expenses,0,,,,, -,,,,,, -Net Income,0,,,,, -,,,,,, -,,,,,, -# Balance Sheet (incomplete),,,,,, -,,,,,, -## Liabilities,,,,,, -Donations,0,,,,, -,,,,,, -## Assets,,,,,, -Hardware, servers,TBD,,,,, -Promotional materials,TBD,,,,, -Cash,0,,,,, -,,,,,, -,,,,,, -# Income details,,,,,, -## Donations monthly summary,,,,,, -month,count,total amount,check,transfer,paypal,cash -1,10,706.07,50.0,350.0,306.07,0, -2,0,0.0,0.0,0.0,0.0,0.0, -3,0,0.0,0.0,0.0,0.0,0.0, -4,0,0.0,0.0,0.0,0.0,0.0, -5,0,0.0,0.0,0.0,0.0,0.0, -6,0,0.0,0.0,0.0,0.0,0.0, -7,0,0.0,0.0,0.0,0.0,0.0, -8,0,0.0,0.0,0.0,0.0,0.0, -9,0,0.0,0.0,0.0,0.0,0.0, -10,0,0.0,0.0,0.0,0.0,0.0, -11,0.0,0.0,0.0,0.0,0.0,0.0, -12,0.0,0.0,0.0,0.0,0.0,0.0, - -## Other revenues -date,description,amount -2013-01-01,2012 saving interests,135.36 - -,,,,,, -,,,,,, -# Expenses details,,,,,, -,,,,,, -## More details,,,,,, -date,category,description,amount, -2013-01-24,infra:hardware,upgrade storage disks,563.87, -2013-01-31,bank,Paypal fees,9.76, -2013-02-01,marketing:tshirts,T-Shirts,2126.49, - -,,,,,, -,,,,,, -# That's all folks!,,,,,, diff --git a/en/about/reports/README.md b/en/about/reports/README.md deleted file mode 100644 index b47918444..000000000 --- a/en/about/reports/README.md +++ /dev/null @@ -1,17 +0,0 @@ - - - - -1) go to bank account - - - note current level - - note all operations in the past months - - count all donations, by chq, cash or transfer - - note names of all donators - -2) go to paypal account - - - note current level - - note all operations in the past months - - count all donations, by paypal or by transfer - - note names of all donators \ No newline at end of file diff --git a/en/about/reports/index.php b/en/about/reports/index.php deleted file mode 100644 index 406e11ab7..000000000 --- a/en/about/reports/index.php +++ /dev/null @@ -1,38 +0,0 @@ - - - - - <?php _g('Mageia activity & financial reports')?> - - - - - - - - -

- -

2014: %s.', array('', ' ' . _r('(in progress)')));?>

2013: %s.', array('', ''));?>

2012: %s.', array('', ''));?>

2011: Moral report (in French & English), financial report.')?>
2010: financial report.')?>

- - diff --git a/en/about/reports/template.php b/en/about/reports/template.php deleted file mode 100644 index 2cd6e6aeb..000000000 --- a/en/about/reports/template.php +++ /dev/null @@ -1,350 +0,0 @@ - 'January', 2 => 'February', 3 => 'March', - 4 => 'April', 5 => 'May', 6 => 'June', - 7 => 'July', 8 => 'August', 9 => 'September', - 10 => 'October', 11 => 'November', 12 => 'December' -); - -/** - * Format numbers after ISO_31 recommandation, - * using the comma as decimal sep. - * See http://en.wikipedia.org/wiki/ISO_31-0#Numbers - * - * @param float $n decimal number - * @param char $dec_sep - * - * @return string -*/ -function _report_number_format($n, $dec_sep = ',') -{ - return str_replace('#', ' ', number_format($n, 2, $dec_sep, '#')); -} - -$data = file($source_csv); -$parsed = array(); - -foreach ($data as $l) { - if (trim($l) == ',,,,,,') - continue; - - $l = str_getcsv(str_replace(array(',,,', ",\n"), '', $l)); - if (substr($l[0], 0, 2) == '# ') { - $tag = $l[0]; - $parent = $tag; - } elseif (substr($l[0], 0, 2) == '##') { - $tag = $parent . ' > ' . $l[0]; - } else { - $parsed[$tag][] = $l; - } -} - -foreach ($parsed as $tag => $values) { - $val2 = array(); - $tag2 = strtolower($tag); - $teststr = strlen($tag) > 12 ? substr($tag2, 0, 13) : null; - foreach ($values as $v) { - if ($tag2 == "# head" - || $teststr == "# account bal" - || $teststr == "# income stat" - || $teststr == "# balance she" - || $tag2 == '## expenses' - || $tag2 == '## revenues' - || $tag2 == '## liabilities' - || $tag2 == '## assets') { - $val2[$v[0]] = $v[1]; - } else { - $val2[] = $v; - } - } - - $parsed[$tag] = $val2; -} -$flow = array(); - -$list = array_fill(1, 12, 0); -$count = array_fill(1, 12, 0); -$tmp = $parsed['# Expenses details > ## More details']; -array_shift($tmp); -foreach ($tmp as $line) { - if (count($line) < 4) - continue; - - $month = date('n', strtotime($line[0])); - $list[$month] += $line[3]; // amount - $count[$month] += 1; -} -$expenses_monthly_summary = array($list, $count); - -$flow = array( - 'expenses' => $list, - 'expenses_op' => $count, - 'revenue' => null, - 'revenue_op' => null -); - -$list = array(); -$count = array(); - -// FIXME take ## Other revenues lines into account. -foreach ($parsed['# Income details > ## Donations monthly summary'] as $line) { - if (count($line) < 3) - continue; - - $list[] = $line[2]; - $count[] = $line[1]; -} - -unset($list[0]); -unset($list[13]); -unset($count[0]); -unset($count[13]); - -$flow['revenue'] = $list; -$flow['revenue_op'] = $count; - -include 'template_lib.php'; - -$R = get_revenues($parsed['# Income details > ## Donations monthly summary'], $_months); -$expenses_total = array_sum($expenses_monthly_summary[0]); - - -?> - - - - Mageia.org <?php echo $year; ?> Financial Report - - - - - - - - - - - - -

Activity Reports » Financial Report

- -

- - - -

Cash flow

Income statement

- - - - - - - - - - - - - - - - - 0): - ?> - - - - - - - - - - -

Revenues
Expenses
Net Income			Net Loss

- -

Expenses

- ## More details']); echo $E['html']; ?> -

Income, donations

- -

Return to top

- - - - diff --git a/en/about/reports/template_lib.php b/en/about/reports/template_lib.php deleted file mode 100644 index 419ff103c..000000000 --- a/en/about/reports/template_lib.php +++ /dev/null @@ -1,169 +0,0 @@ -'; - $html .= ''; - - $line = array_shift($v); - $sums = array(); - - $html .= sprintf('', - $line[0], $line[1], - $line[2], $line[3], - $line[4], - $line[5]); - - foreach ($v as $line) { - if (count($line) < 2) - continue; - - $html .= sprintf('', - date('Y-M-d', strtotime($line[0])), $line[1], - $line[2], - _report_number_format($line[3])); - - $cat = explode(':', $line[1]); - $sums[$cat[0]] += $line[3]; - $sums['total'] += $line[3]; - } - - $html .= ' - - - - -

%s	%s	%s	%s
%s	%s	%s	%s
Total:			' . _report_number_format($sums['total']) . '

'; - - unset($sums['total']); - arsort($sums); - foreach ($sums as $k => $v) - $sums[$k] = "['{$k}', $v]"; - - $values = implode(', ', $sums); - $html .= << - google.setOnLoadCallback(drawChartExpenses); - function drawChartExpenses() { - var data = new google.visualization.DataTable(); - data.addColumn('string', 'Source'); - data.addColumn('number', 'Amount'); - data.addRows([{$values}]); - var options = {'title':'Expenses by category', - 'width':400, - 'height':300}; - - var chart = new google.visualization.PieChart(document.getElementById('expenses-cats-pie')); - chart.draw(data, options); - } - -H; - - return array('html' => $html); -} - -/** - * @param string $v - * - * @return array('html' => string, 'data' => mixed) -*/ -function get_revenues($v, $_months) -{ - $html = '

'; - $html .= ''; - - $line = array_shift($v); - $html .= sprintf(' - - ', - $line[0], $line[1], $line[2], - $line[3], - $line[4], - $line[5], $line[6]); - - $html .= ''; - - $sums = array( - 'count' => 0, - 'total' => 0, - 'check' => 0, - 'xfer' => 0, - 'paypal' => 0, - 'cash' => 0 - ); - - foreach ($v as $line) { - if (count($line) < 2) - continue; - - $html .= sprintf(' - - - - - - ', - $_months[$line[0]], - $line[1], - _report_number_format($line[2]), - _report_number_format($line[3]), - _report_number_format($line[4]), - _report_number_format($line[5]), - _report_number_format($line[6]), - $line[1] > 0 ? _report_number_format($line[2] / $line[1]) : '' - ); - - $sums['count'] += $line[1]; - $sums['total'] += $line[2]; - $sums['check'] += $line[3]; - $sums['xfer'] += $line[4]; - $sums['paypal'] += $line[5]; - $sums['cash'] += $line[6]; - } - $html .= ''; - $html .= sprintf(' - - - - - - - ', - $sums['count'], - _report_number_format($sums['total']), - _report_number_format($sums['check']), - _report_number_format($sums['xfer']), - _report_number_format($sums['paypal']), - _report_number_format($sums['cash']), - $sums['count'] > 0 ? _report_number_format($sums['total'] / $sums['count']) : '' - ); - $total_revenues = $sums['total']; - $html .= '

%s	%s	%s	%s	%s	%s	%s	average
%s	%s	%s	%s	%s	%s	%s	%s
Total	%s	%s	%s	%s	%s	%s	%s

'; - - $html .= << - google.setOnLoadCallback(drawChart); - function drawChart() { - var data = new google.visualization.DataTable(); - data.addColumn('string', 'Source'); - data.addColumn('number', 'Amount'); - data.addRows([ - ['Paypal', {$sums['paypal']}], - ['Bank transfer', {$sums['xfer']}], - ['Check', {$sums['check']}], - ['Cash', {$sums['cash']}], - ]); - - var options = {'title':'Donations by source', - 'width':400, - 'height':300}; - - var chart = new google.visualization.PieChart(document.getElementById('income-pie')); - chart.draw(data, options); - } - -S; - - return array('html' => $html, 'data' => array('total' => $total_revenues)); -} \ No newline at end of file -- cgit v1.2.1