diff options
| -rw-r--r-- | donators.inc.php | 4 | ||||
| -rw-r--r-- | en/about/reports/2010/index.php | 1 | ||||
| -rw-r--r-- | en/about/reports/2011/index.php | 21 | ||||
| -rw-r--r-- | langs.php | 4 |
4 files changed, 17 insertions, 13 deletions
diff --git a/donators.inc.php b/donators.inc.php index eaa503d15..97dd1490d 100644 --- a/donators.inc.php +++ b/donators.inc.php @@ -179,9 +179,9 @@ $donators = array( 'Michael Smith', 'Robert J Greenwood', 'Mike Crecelius', - 'Yevgeniy Palaus', 'Julio Geraldo', - 'Aymerich Munoz Jose Ignacio' + 'Aymerich Munoz Jose Ignacio', + 'Denis Prost' ); //$html .= '<img src="/g/images/mageia_0.svg" style="position: absolute; top: 180px; width: 300px; opacity: 0.2;" />'; diff --git a/en/about/reports/2010/index.php b/en/about/reports/2010/index.php index 41d3eba54..05a76c885 100644 --- a/en/about/reports/2010/index.php +++ b/en/about/reports/2010/index.php @@ -26,6 +26,7 @@ </ul> <h2>Financial Report</h2> <table id="fr-table"><thead><tr><th>Wording of the financial transaction</th><th>Income</th><th>Outgoing</th></tr></thead><tbody><tr> + <tr><td colspan=3>Donations and sells</td></tr> <tr><td>Donations by Paypal/transfer/check/cash</td><td class="money">EUR 8 801.42</td><td> </td></tr> <tr><td>Paypal test to validate bank account</td><td class="money">EUR 0.24</td><td> </td></tr> <tr><td colspan=3>Hardware for servers</td></tr> diff --git a/en/about/reports/2011/index.php b/en/about/reports/2011/index.php index 8d49b79b0..5435988da 100644 --- a/en/about/reports/2011/index.php +++ b/en/about/reports/2011/index.php @@ -20,15 +20,18 @@ <div class="para values"> <h2>Summary</h2> <ul> - <li>Outstanding amount of 2010: EUR 7 523.96</li> - <li>Amount collected: EUR </li> - <li>Amount spent: EUR </li> - <li>Amount remaining: EUR 6 257.51</li> + <li>Outstanding amount of <a href="/en/about/reports/2010">2010</a>: EUR 7 523.96</li> + <li>Amount collected: EUR 2 974.03</li> + <li>Amount spent: EUR 3 469.75</li> + <li>Amount remaining: <?php echo $g_amount_remain; ?></li> </ul> <h2>Financial Report</h2> <table id="fr-table"><thead><tr><th>Wording of the financial transaction</th><th>Income</th><th>Outgoing</th></tr></thead><tbody><tr> + <tr><td colspan=3>Donations and sells</td></tr> + <tr><td>Donations by Paypal/transfer/check</td><td class="money">EUR 1 920.97</td><td class="money"> </td></tr> + <tr><td>Sale of Tee-Shirts</td><td class="money">EUR 1 050.00</td><td class="money"> </td></tr> <tr><td colspan=3>Cotisations + administrative tasks</td></tr> - <tr><td>Administrative cost for the birth of Magei.Org (JO)</td><td class="money"> </td><td class="money">EUR 44.00</td></tr> + <tr><td>Administrative cost for the birth of Mageia.Org (JO)</td><td class="money"> </td><td class="money">EUR 44.00</td></tr> <tr><td>April (annual cotisation)</td><td class="money"> </td><td class="money">EUR 100.00</td></tr> <tr><td>INPI brand registration for 10 years (rda)</td><td class="money"> </td><td class="money">EUR 250.00</td></tr> <tr><td>Annual interest of our savings account</td><td class="money">EUR 3.06</td><td class="money"> </td></tr> @@ -41,19 +44,19 @@ <tr><td>3 TS to donors in France (dams)</td><td> </td><td class="money">EUR 12.30</td></tr> <tr><td>2 TS to saipo for an event in France (dams)</td><td> </td><td class="money">EUR 25.00</td></tr> <tr><td colspan=3>Hardware or hosting</td></tr> - <tr><td>RAM on Gandi hosting (for blog/planet/www)</td><td> </td><td class="money">EUR 172.08</td></tr> + <tr><td>RAM on Gandi hosting (for blog/planet/www)</td><td> </td><td class="money">EUR 250.00</td></tr> <tr><td>SSL for domains on Gandi.net</td><td> </td><td class="money">EUR 215.28</td></tr> <tr><td>HDD for servers (boklm)</td><td> </td><td class="money">EUR 242.70</td></tr> <tr><td colspan=3>Travels and events</td></tr> <tr><td>Hotel + train for wobo (fosdem 2011)</td><td> </td><td class="money">EUR 166.50</td></tr> <tr><td colspan=3> </td></tr> - <tr><td>Total</td><td class="money">EUR </td><td class="money">EUR 3 391.83</td></tr> + <tr><td>Total</td><td class="money">EUR </td><td class="money">EUR 3 469.75</td></tr> <tr><td>Balance</td><td colspan=2 class="money">EUR </td></tr></tbody> </table> <h2>Bank accounts situation</h2> <ul> - <li>Paypal (non-for-profit organisation account): EUR 1 068.93</li> - <li>Main account (with checkbook and no credit card): EUR 1 185.52</li> + <li>Paypal (non-for-profit organisation account): EUR 1 364.48</li> + <li>Main account (with checkbook and no credit card): EUR 2 021.04</li> <li>Savings account (between 2% and 4% of interest): EUR 4 003.06</li> </ul> <h2>Forecast for 2011</h2> @@ -5,8 +5,8 @@ $g_app_root = realpath(dirname(__FILE__)); define('G_APP_ROOT', $g_app_root); -$g_donate_amount = 'EUR 8 800.62'; -$g_amount_remain = 'EUR 6 257.51'; +$g_donate_amount = 'EUR 11 775.69'; +$g_amount_remain = 'EUR 7 388.58'; $G_coord_assos = <<<T Assocation Mageia.Org |