diff options
| author | Damien Lallement <dams@mageia.org> | 2011-10-24 12:52:55 +0000 |
|---|---|---|
| committer | Damien Lallement <dams@mageia.org> | 2011-10-24 12:52:55 +0000 |
| commit | f7126de2dc20de3f3c7f8ca8aa2ccf7a6a2edb56 (patch) | |
| tree | 6fe8456c181745634e8e6c805578a6f8e591cf47 | |
| parent | a3672448bd527730860bcd5a2bb967bc3b8290b2 (diff) | |
| download | www-f7126de2dc20de3f3c7f8ca8aa2ccf7a6a2edb56.tar www-f7126de2dc20de3f3c7f8ca8aa2ccf7a6a2edb56.tar.gz www-f7126de2dc20de3f3c7f8ca8aa2ccf7a6a2edb56.tar.bz2 www-f7126de2dc20de3f3c7f8ca8aa2ccf7a6a2edb56.tar.xz www-f7126de2dc20de3f3c7f8ca8aa2ccf7a6a2edb56.zip | |
- update donors list
- update forecast
- update bank accounts situation
| -rw-r--r-- | donators.inc.php | 10 | ||||
| -rw-r--r-- | en/about/reports/2011/index.php | 13 |
2 files changed, 15 insertions, 8 deletions
diff --git a/donators.inc.php b/donators.inc.php index 85a35573b..075736994 100644 --- a/donators.inc.php +++ b/donators.inc.php @@ -242,7 +242,15 @@ $donators = array( 'Marcoi Pirotta', 'Antonio Pessoa', 'Frédéric Bonnaud', - 'Jose Luis Monzonis Cabrera' + 'Jose Luis Monzonis Cabrera', + 'Sylvain Goumas', + 'Jean Sié', + 'Bjarne Thomsen', + 'Daniel Pfenniger', + 'Alain Déchamps', + 'Jens Jablonski', + 'Rafal Artur Prasal', + 'Jean-Jacques Barret' ); //$html .= '<img src="/g/images/mageia_0.svg" style="position: absolute; top: 180px; width: 300px; opacity: 0.2;" />'; diff --git a/en/about/reports/2011/index.php b/en/about/reports/2011/index.php index 513ef085f..25217cc2d 100644 --- a/en/about/reports/2011/index.php +++ b/en/about/reports/2011/index.php @@ -54,26 +54,25 @@ </table> <h2>Bank accounts situation</h2> <ul> - <li>Paypal (non-for-profit organisation account): EUR 277.29</li> - <li>Main account (with checkbook and no credit card): EUR 698.60</li> - <li>Savings account (between 2% and 4% of interest): EUR 9 000</li> + <li>Paypal (non-for-profit organisation account): EUR 775.35</li> + <li>Main account (with checkbook and no credit card): EUR 808.60</li> + <li>Savings account (between 2% and 4% of interest): EUR 6 330,40</li> </ul> <h2>Forecast for 2011</h2> <table id="fr-table"><thead><tr><th>Description of planned expenditure</th><th>Unit Price</th><th>Quantity</th><th>Recurrence</th><th>Total Price</th><th>Status</th></tr></thead><tbody><tr> <tr><td>Goodies</td><td class="money">EUR 4 500.00</td><td class="money">1</td><td class="money">1</td><td class="money">EUR 4 500.00</td><td>pending</td></tr> <tr><td>April</td><td class="money">EUR 100.00</td><td class="money">1</td><td class="money">1</td><td class="money">EUR 100.00</td><td>pending</td></tr> <tr><td>Gandi (hosting: +1536 MB of RAM)</td><td class="money">EUR 2.39</td><td class="money">6</td><td class="money">12</td><td class="money">EUR 172.08</td><td>done (Wed Mar 30)</td></tr> - <tr><td>Dedibox (build iso)</td><td class="money">EUR 14.99</td><td class="money">1</td><td class="money">12</td><td class="money">EUR 179.88</td><td>pending</td></tr> <tr><td>Internet domains</td><td class="money">EUR 15.00</td><td class="money">7</td><td class="money">1</td><td class="money">EUR 105.00</td><td>pending</td></tr> - <tr><td>Fiona (backup server)</td><td class="money">EUR 1 500.00</td><td class="money">1</td><td class="money">1</td><td class="money">EUR 1 500.00</td><td>pending</td></tr> - <tr><td>2 new nodes for BS</td><td class="money">EUR 2 500.00</td><td class="money">2</td><td class="money">1</td><td class="money">EUR 5 000.00</td><td>pending</td></tr> + <tr><td>HDD for Fiona (backup server)</td><td class="money">EUR 205.00</td><td class="money">4</td><td class="money">1</td><td class="money">EUR 820.00</td><td>pending</td></tr> + <tr><td>1 new server for BS (QA & packagers)</td><td class="money">EUR 2 669.60</td><td class="money">1</td><td class="money">1</td><td class="money">EUR 2 669.60</td><td>done (Fri Oct 21)</td></tr> <tr><td>Event box</td><td class="money">EUR 1500.00</td><td class="money">1</td><td class="money">1</td><td class="money">EUR 1 500.00</td><td>pending</td></tr> <tr><td>Event travel</td><td class="money">EUR 1 000.00</td><td class="money">1</td><td class="money">2</td><td class="money">EUR 2 000.00</td><td>pending</td></tr> <tr><td>HW for spare</td><td class="money">EUR 3 000.00</td><td class="money">1</td><td class="money">1</td><td class="money">EUR 3 000.00</td><td>pending</td></tr> <tr><td>Brand registration</td><td class="money">EUR 280.00</td><td class="money">1</td><td class="money">1</td><td class="money">EUR 280.00</td><td>pending</td></tr> <tr><td>Reserve fund</td><td class="money">EUR 4 000.00</td><td class="money">1</td><td class="money">1</td><td class="money">EUR 4 000.00</td><td>pending</td></tr> <tr><td colspan=6> </td></tr> - <tr><td colspan=4>Total</td><td class="money">EUR 22 306.96</td><td>pending</td></tr> + <tr><td colspan=4>Total</td><td class="money">EUR 19 146.68</td><td>pending</td></tr> </table> <h2>Miscellaneous</h2> <ul> |