FSFE
/
fsfe-website
29
30
Fork 85
Code Issues 62 Pull Requests 14 Wiki Activity

Updated expense request form 

svn path=/trunk/; revision=32553
This commit is contained in:
jonas 2016-01-07 08:34:22 +00:00
parent 8f974f1e05
commit 6cb386b4b4
2 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,10 +34,11 @@ my %names = (
"kirschner" => "Matthias Kirschner",
"mehl" => "Max Mehl",
"mueller" => "Reinhard Müller",
"roy" => "Hugo Roy",
"rubini" => "Alessandro Rubini",
"sliwinski" => "Ulrike Sliwinski",
"suklje" => "Matija Šuklje",
"malaja" => "Polina Malaja",
"feltrin" => "Nicola Feltrin",
);
# -----------------------------------------------------------------------------
@ -45,17 +46,20 @@ my %names = (
# -----------------------------------------------------------------------------
my %responsible = (
"ADMIN-COORDINATION" => "oberg",
"ADMIN-TRAVEL" => "oberg",
"ADMIN-GA" => "oberg",
"ADMIN-TECH" => "oberg",
"ADMIN-FUNDRAISING" => "oberg",
"PA-EVENTS" => "kirschner",
"GR-TRAINING" => "kirschner",
"GR-LOCAL" => "kirschner",
"PA-OUTREACH" => "kirschner",
"PA-MATERIAL" => "kirschner",
"PA-CAMPAIGNS" => "kirschner",
"LEGAL-TRAVEL" => "suklje",
"LEGAL-CONF" => "suklje",
"LEGAL-COMPLIANCE" => "suklje",
"PA-CAMPAIGN" => "kirschner",
"NET-ORG" => "oberg",
"NET-TRAVEL" => "oberg",
"POLICY-TRAVEL" => "kirschner",
"POLICY-DEV" => "kirschner",
"POLICY-CAMPAIGN" => "kirschner",
"MERCHANDISE-PURCHASE" => "oberg",
"MERCHANDISE-SHIPPING" => "oberg",
"PERSONELL-INTERN" => "oberg",
@ -66,22 +70,26 @@ my %responsible = (
"PERSONELL-MEHL" => "oberg",
"PERSONELL-SUKLJE" => "oberg",
"PERSONELL-OBERG" => "oberg",
"PERSONELL-FELTRIN" => "oberg",
"OFFICE-BERLIN" => "oberg",
"OFFICE-DUSSELDORF" => "oberg",
);
my %account = (
"ADMIN-COORDINATION" => "2504",
"ADMIN-TRAVEL" => "2503",
"ADMIN-GA" => "2505",
"ADMIN-TECH" => "2506",
"ADMIN-FUNDRAISING" => "2509",
"PA-EVENTS" => "2513",
"GR-TRAINING" => "2527",
"GR-LOCAL" => "2526",
"PA-OUTREACH" => "2513",
"PA-MATERIAL" => "2514",
"PA-CAMPAIGNS" => "2515",
"LEGAL-TRAVEL" => "2533",
"LEGAL-CONF" => "2535",
"LEGAL-COMPLIANCE" => "2536",
"PA-CAMPAIGN" => "2515",
"NET-TRAVEL" => "2533",
"NET-ORG" => "2535",
"POLICY-TRAVEL" => "2543",
"POLICY-DEV" => "2546",
"POLICY-CAMPAIGN" => "2545",
"MERCHANDISE-PURCHASE" => "8154",
"MERCHANDISE-SHIPPING" => "8159",
"PERSONELL-INTERN" => "81000",
@ -92,6 +100,7 @@ my %account = (
"PERSONELL-MEHL" => "81042",
"PERSONELL-SUKLJE" => "81101",
"PERSONELL-OBERG" => "81201",
"PERSONELL-FELTRIN" => "81043",
"OFFICE-BERLIN" => "82001",
"OFFICE-DUSSELDORF" => "82002",
);

38
internal/er.en.xhtml
View File

@ -23,10 +23,11 @@
<option value="kirschner">Matthias Kirschner</option>
<option value="mehl">Max Mehl</option>
<option value="mueller">Reinhard Müller</option>
<option value="roy">Hugo Roy</option>
<option value="rubini">Alessandro Rubini</option>
<option value="sliwinski">Ulrike Sliwinski</option>
<option value="suklje">Matija Šuklje</option>
<option value="malaja">Polina Malaja</option>
<option value="feltrin">Nicola Feltrin</option>
</select>
</td>
</tr>
@ -58,17 +59,20 @@
<td><p>Budget:</p></td>
<td>
<select name="budget1" size="1">
<option value="ADMIN-COORDINATION">ADMIN team coordination</option>
<option value="ADMIN-TRAVEL">ADMIN Internal travel</option>
<option value="ADMIN-GA">ADMIN General Assembly</option>
<option value="ADMIN-TECH">ADMIN technical infrastructure</option>
<option value="ADMIN-FUNDRAISING">ADMIN fundraising</option>
<option value="PA-EVENTS">PA event costs</option>
<option value="GR-TRAINING">GROWING training activists</option>
<option value="GR-LOCAL">GROWING local activities</option>
<option value="PA-OUTREACH">PA Outreach activities</option>
<option value="PA-MATERIAL">PA information material</option>
<option value="PA-CAMPAIGNS">PA campaigns</option>
<option value="LEGAL-TRAVEL">LEGAL travel costs</option>
<option value="LEGAL-CONF">LEGAL conference</option>
<option value="LEGAL-COMPLIANCE">LEGAL compliance</option>
<option value="PA-CAMPAIGN">PA campaigns</option>
<option value="NET-TRAVEL">NETWORK travel costs</option>
<option value="NET-ORG">NETWORK workshops/conferences</option>
<option value="POLICY-TRAVEL">POLICY travel costs</option>
<option value="POLICY-CAMPAIGN">POLICY campaigns</option>
<option value="POLICY-DEV">POLICY development</option>
<option value="MERCHANDISE-PURCHASE">MERCHANDISE purchase of goods</option>
<option value="MERCHANDISE-SHIPPING">MERCHANDISE shipping costs</option>
<option value="PERSONELL-INTERN">PERSONELL Interns</option>
@ -79,6 +83,7 @@
<option value="PERSONELL-MEHL">PERSONELL Max Mehl</option>
<option value="PERSONELL-SUKLJE">PERSONELL Matija Šuklje (includes homeoffice)</option>
<option value="PERSONELL-OBERG">PERSONELL Jonas Öberg (includes homeoffice)</option>
<option value="PERSONELL-FELTRIN">PERSONELL Nicola Feltrin</option>
<option value="OFFICE-BERLIN">OFFICE Berlin</option>
<option value="OFFICE-DUSSELDORF">OFFICE Dusseldorf</option>
</select>
@ -95,26 +100,31 @@
<td>
<select name="budget2" size="1">
<option value="NONE">No second budget</option>
<option value="ADMIN-COORDINATION">ADMIN team coordination</option>
<option value="ADMIN-TRAVEL">ADMIN Internal travel</option>
<option value="ADMIN-GA">ADMIN General Assembly</option>
<option value="ADMIN-TECH">ADMIN technical infrastructure</option>
<option value="ADMIN-FUNDRAISING">ADMIN fundraising</option>
<option value="PA-EVENTS">PA event costs</option>
<option value="GR-TRAINING">GROWING training activists</option>
<option value="GR-LOCAL">GROWING local activities</option>
<option value="PA-OUTREACH">PA Outreach activities</option>
<option value="PA-MATERIAL">PA information material</option>
<option value="PA-CAMPAIGNS">PA campaigns</option>
<option value="LEGAL-TRAVEL">LEGAL travel costs</option>
<option value="LEGAL-CONF">LEGAL conference</option>
<option value="LEGAL-COMPLIANCE">LEGAL compliance</option>
<option value="PA-CAMPAIGN">PA campaigns</option>
<option value="NET-TRAVEL">NETWORK travel costs</option>
<option value="NET-ORG">NETWORK workshops/conferences</option>
<option value="POLICY-TRAVEL">POLICY travel costs</option>
<option value="POLICY-CAMPAIGN">POLICY campaigns</option>
<option value="POLICY-DEV">POLICY development</option>
<option value="MERCHANDISE-PURCHASE">MERCHANDISE purchase of goods</option>
<option value="MERCHANDISE-SHIPPING">MERCHANDISE shipping costs</option>
<option value="PERSONELL-INTERN">PERSONELL Interns</option>
<option value="PERSONELL-GERLOFF">PERSONELL Karsten Gerloff (includes homeoffice)</option>
<option value="PERSONELL-KERSTEN">PERSONELL Rainer Kersten</option>
<option value="PERSONELL-KIRSCHNER">PERSONELL Matthias Kirschner</option>
<option value="PERSONELL-ALBERS">PERSONELL Erik Albers</option>
<option value="PERSONELL-SLIWINSKI">PERSONELL Ulrike Sliwinski</option>
<option value="PERSONELL-MEHL">PERSONELL Max Mehl</option>
<option value="PERSONELL-SUKLJE">PERSONELL Matija Šuklje (includes homeoffice)</option>
<option value="PERSONELL-OBERG">PERSONELL Jonas Öberg (includes homeoffice)</option>
<option value="PERSONELL-FELTRIN">PERSONELL Nicola Feltrin</option>
<option value="OFFICE-BERLIN">OFFICE Berlin</option>
<option value="OFFICE-DUSSELDORF">OFFICE Dusseldorf</option>
</select>