FSFE/fsfe-website
26
32
Fork 92
Code Issues 65 Pull Requests 10 Wiki Activity

Renamed PA-Travel budget, removed some people from the list, and added local group as from

Browse Source 
svn path=/trunk/; revision=28645
This commit is contained in:
Matthias Kirschner
2014-06-21 16:11:21 +00:00
parent 80c43024f3
commit ae70505c5c
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cgi-bin/expense-request.pl
View File

@@ -25,19 +25,16 @@ use POSIX qw(strftime);
# -----------------------------------------------------------------------------
my %names = (
"fellowship" => "Local Fellowship Group",
"albers" => "Erik Albers",
"gerloff" => "Karsten Gerloff",
"gollowitzer" => "Martin Gollowitzer",
"harmuth" => "Stefan Harmuth",
"kersten" => "Rainer Kersten",
"kirschner" => "Matthias Kirschner",
"kekalainen" => "Otto Kekäläinen",
"morris" => "Anna Morris",
"mueller" => "Reinhard Müller",
"roy" => "Hugo Roy",
"sandklef" => "Henrik Sandklef",
"suklje" => "Matija Šuklje",
"tuke" => "Sam Tuke",
);
# -----------------------------------------------------------------------------
@@ -54,7 +51,7 @@ my %responsible = (
"ADMIN-FUNDRAISING" => "gerloff",
"PA-PERSONELL" => "kirschner",
"PA-OFFICE" => "kirschner",
"PA-TRAVEL" => "kirschner",
"PA-EVENTS" => "kirschner",
"PA-MATERIAL" => "kirschner",
"PA-CAMPAIGNS" => "kirschner",
"FELLOWSHIP-PERSONELL" => "albers",
@@ -83,7 +80,7 @@ my %account = (
"ADMIN-FUNDRAISING" => "2507",
"PA-PERSONELL" => "2511",
"PA-OFFICE" => "2512",
"PA-TRAVEL" => "2513",
"PA-EVENTS" => "2513",
"PA-MATERIAL" => "2514",
"PA-CAMPAIGNS" => "2515",
"FELLOWSHIP-PERSONELL" => "2521",
@@ -154,7 +151,6 @@ my $replyto = "finance\@fsfeurope.org, $who\@fsfeurope.org, $to1\@fsfeurope.org"
if ($budget2 ne "NONE") {
$replyto .= ", $to2\@fsfeurope.org";
}
$replyto .= ", council\@fsfeurope.org";
open(MAIL, "|/usr/lib/sendmail -t -f $who\@fsfeurope.org");
print MAIL "From: $who\@fsfeurope.org\n";

12
internal/er.en.xhtml
View File

@@ -14,14 +14,12 @@
<td><p>Who:</p></td>
<td>
<select name="who" size="1">
<option value="fellowship">Local Fellowship Group</option>
<option value="albers">Erik Albers</option>
<option value="gerloff">Karsten Gerloff</option>
<option value="gollowitzer">Martin Gollowitzer</option>
<option value="harmuth">Stefan Harmuth</option>
<option value="kersten">Rainer Kersten</option>
<option value="kirschner">Matthias Kirschner</option>
<option value="kekalainen">Otto Kekäläinen</option>
<option value="morris">Anna Morris</option>
<option value="mueller">Reinhard Müller</option>
<option value="roy">Hugo Roy</option>
<option value="sandklef">Henrik Sandklef</option>
@@ -64,8 +62,8 @@
<option value="ADMIN-TECH">ADMIN technical infrastructure</option>
<option value="ADMIN-FUNDRAISING">ADMIN fundraising</option>
<option value="PA-PERSONELL">PA personell costs</option>
<option value="PA-OFFICE">PA office Berlin/Manchester</option>
<option value="PA-TRAVEL">PA travel costs to events</option>
<option value="PA-OFFICE">PA office Berlin</option>
<option value="PA-EVENTS">PA event costs</option>
<option value="PA-MATERIAL">PA information material</option>
<option value="PA-CAMPAIGNS">PA campaigns</option>
<option value="FELLOWSHIP-PERSONELL">FELLOWSHIP personell costs</option>
@@ -103,8 +101,8 @@
<option value="ADMIN-TECH">ADMIN technical infrastructure</option>
<option value="ADMIN-FUNDRAISING">ADMIN fundraising</option>
<option value="PA-PERSONELL">PA personell costs</option>
<option value="PA-OFFICE">PA office Berlin/Manchester</option>
<option value="PA-TRAVEL">PA travel costs to events</option>
<option value="PA-OFFICE">PA office Berlin</option>
<option value="PA-EVENTS">PA events costs</option>
<option value="PA-MATERIAL">PA information material</option>
<option value="PA-CAMPAIGNS">PA campaigns</option>
<option value="FELLOWSHIP-PERSONELL">FELLOWSHIP personell costs</option>