Browse Source

Adapted Expense Request form to 2015 budget items.

svn path=/trunk/; revision=30681
tags/stw2018
Reinhard Müller 4 years ago
parent
commit
9fbdde9a96
2 changed files with 38 additions and 52 deletions
  1. 19
    27
      cgi-bin/expense-request.pl
  2. 19
    25
      internal/er.en.xhtml

+ 19
- 27
cgi-bin/expense-request.pl View File

@@ -44,61 +44,53 @@ my %names = (
# -----------------------------------------------------------------------------

my %responsible = (
"ADMIN-PERSONELL" => "gerloff",
"ADMIN-OFFICE" => "gerloff",
"ADMIN-TRAVEL" => "gerloff",
"ADMIN-COORDINATION" => "gerloff",
"ADMIN-GA" => "gerloff",
"ADMIN-TECH" => "gerloff",
"ADMIN-FUNDRAISING" => "gerloff",
"PA-PERSONELL" => "kirschner",
"PA-OFFICE" => "kirschner",
"PA-EVENTS" => "kirschner",
"PA-MATERIAL" => "kirschner",
"PA-CAMPAIGNS" => "kirschner",
"FELLOWSHIP-PERSONELL" => "albers",
"FELLOWSHIP-MATERIAL" => "albers",
"FELLOWSHIP-CONF" => "albers",
"FELLOWSHIP-LOCAL" => "albers",
"LEGAL-PERSONELL" => "suklje",
"LEGAL-OFFICE" => "suklje",
"LEGAL-TRAVEL" => "suklje",
"LEGAL-CONF" => "suklje",
"LEGAL-COMPLIANCE" => "suklje",
"POLICY-PERSONELL" => "gerloff",
"POLICY-OFFICE" => "gerloff",
"POLICY-TRAVEL" => "gerloff",
"MERCHANDISE-PURCHASE" => "gerloff",
"MERCHANDISE-SHIPPING" => "gerloff",
"PERSONELL-INTERN" => "oberg",
"PERSONELL-GERLOFF" => "oberg",
"PERSONELL-KERSTEN" => "oberg",
"PERSONELL-KIRSCHNER" => "oberg",
"PERSONELL-ALBERS" => "oberg",
"PERSONELL-SUKLJE" => "oberg",
"PERSONELL-OBERG" => "oberg",
"OFFICE-BERLIN" => "oberg",
"OFFICE-DUSSELDORF" => "oberg",
);

my %account = (
"ADMIN-PERSONELL" => "2501",
"ADMIN-OFFICE" => "2502",
"ADMIN-TRAVEL" => "2503",
"ADMIN-COORDINATION" => "2504",
"ADMIN-GA" => "2505",
"ADMIN-TECH" => "2506",
"ADMIN-FUNDRAISING" => "2507",
"PA-PERSONELL" => "2511",
"PA-OFFICE" => "2512",
"ADMIN-FUNDRAISING" => "2509",
"PA-EVENTS" => "2513",
"PA-MATERIAL" => "2514",
"PA-CAMPAIGNS" => "2515",
"FELLOWSHIP-PERSONELL" => "2521",
"FELLOWSHIP-MATERIAL" => "2524",
"FELLOWSHIP-CONF" => "2525",
"FELLOWSHIP-LOCAL" => "2526",
"LEGAL-PERSONELL" => "2531",
"LEGAL-OFFICE" => "2532",
"LEGAL-TRAVEL" => "2533",
"LEGAL-CONF" => "2535",
"LEGAL-COMPLIANCE" => "2536",
"POLICY-PERSONELL" => "2541",
"POLICY-OFFICE" => "2542",
"POLICY-TRAVEL" => "2543",
"MERCHANDISE-PURCHASE" => "8154",
"MERCHANDISE-SHIPPING" => "8159",
"PERSONELL-INTERN" => "81000",
"PERSONELL-GERLOFF" => "81002",
"PERSONELL-KERSTEN" => "81003",
"PERSONELL-KIRSCHNER" => "81012",
"PERSONELL-ALBERS" => "81021",
"PERSONELL-SUKLJE" => "81101",
"PERSONELL-OBERG" => "81201",
"OFFICE-BERLIN" => "82001",
"OFFICE-DUSSELDORF" => "82002",
);

# -----------------------------------------------------------------------------

+ 19
- 25
internal/er.en.xhtml View File

@@ -57,31 +57,28 @@
<td><p>Budget 1:</p></td>
<td>
<select name="budget1" size="1">
<option value="ADMIN-PERSONELL">ADMIN personell costs</option>
<option value="ADMIN-OFFICE">ADMIN office Düsseldorf/Aachen</option>
<option value="ADMIN-COORDINATION">ADMIN team coordination</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-PERSONELL">PA personell costs</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>
<option value="FELLOWSHIP-MATERIAL">FELLOWSHIP material</option>
<option value="FELLOWSHIP-CONF">FELLOWSHIP conferences</option>
<option value="FELLOWSHIP-LOCAL">FELLOWSHIP local activities</option>
<option value="LEGAL-PERSONELL">LEGAL personell costs</option>
<option value="LEGAL-OFFICE">LEGAL office Ljubljana</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="POLICY-PERSONELL">POLICY personell costs</option>
<option value="POLICY-OFFICE">POLICY office Aachen/Brussels</option>
<option value="POLICY-TRAVEL">POLICY travel costs</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-SUKLJE">PERSONELL Matija Šuklje (includes homeoffice)</option>
<option value="PERSONELL-OBERG">PERSONELL Jonas Öberg (includes homeoffice)</option>
<option value="OFFICE-BERLIN">OFFICE Berlin</option>
<option value="OFFICE-DUSSELDORF">OFFICE Dusseldorf</option>
</select>
</td>
</tr>
@@ -96,31 +93,28 @@
<td>
<select name="budget2" size="1">
<option value="NONE">No second budget</option>
<option value="ADMIN-PERSONELL">ADMIN personell costs</option>
<option value="ADMIN-OFFICE">ADMIN office Düsseldorf</option>
<option value="ADMIN-COORDINATION">ADMIN team coordination</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-PERSONELL">PA personell costs</option>
<option value="PA-OFFICE">PA office Berlin</option>
<option value="PA-EVENTS">PA events costs</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>
<option value="FELLOWSHIP-MATERIAL">FELLOWSHIP material</option>
<option value="FELLOWSHIP-CONF">FELLOWSHIP conferences</option>
<option value="FELLOWSHIP-LOCAL">FELLOWSHIP local activities</option>
<option value="LEGAL-PERSONELL">LEGAL personell costs</option>
<option value="LEGAL-OFFICE">LEGAL office Ljubljana</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="POLICY-PERSONELL">POLICY personell costs</option>
<option value="POLICY-OFFICE">POLICY office Aachen/Brussels</option>
<option value="POLICY-TRAVEL">POLICY travel costs</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-SUKLJE">PERSONELL Matija Šuklje (includes homeoffice)</option>
<option value="PERSONELL-OBERG">PERSONELL Jonas Öberg (includes homeoffice)</option>
<option value="OFFICE-BERLIN">OFFICE Berlin</option>
<option value="OFFICE-DUSSELDORF">OFFICE Dusseldorf</option>
</select>
</td>
</tr>

Loading…
Cancel
Save