Updated budget lines

svn path=/trunk/; revision=35073

cgi-bin/expense-request.pl

@@ -72,7 +72,7 @@ my %names = (
 # );
 
 my %responsible = (
-  "ADMIN-TRAVEL" => "oberg",
+  "ADMIN-COORD" => "oberg",
   "ADMIN-GA" => "oberg",
   "ADMIN-TECH" => "oberg",
   "ADMIN-FUNDRAISING" => "oberg",
@@ -96,11 +96,10 @@ my %responsible = (
   "PERSONELL-OBERG" => "kirschner",
   "PERSONELL-MALAJA" => "oberg",
   "OFFICE-BERLIN" => "oberg",
-  "OFFICE-DUSSELDORF" => "oberg",
 );
 
 my %account = (
-  "ADMIN-TRAVEL" => "2503",
+  "ADMIN-COORD" => "2504",
   "ADMIN-GA" => "2505",
   "ADMIN-TECH" => "2506",
   "ADMIN-FUNDRAISING" => "2509",

internal/er.en.xhtml

@@ -54,15 +54,15 @@
           <td><p>Budget:</p></td>
           <td>
             <select name="budget1" size="1">
-              <option value="ADMIN-TRAVEL">ADMIN Internal travel</option>
+              <option value="ADMIN-COORD">ADMIN 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="GR-TRAINING">GROWING training activists</option>
-              <option value="GR-LOCAL">GROWING local activities</option>
-              <option value="PA-OUTREACH">PA Outreach activities</option>
+              <option value="GR-LOCAL">GROWING local activities incl travel</option>
+              <option value="PA-OUTREACH">PA outreach (events)</option>
               <option value="PA-MATERIAL">PA information material</option>
-              <option value="PA-CAMPAIGN">PA campaigns</option>
+              <option value="PA-CAMPAIGN">PA specific 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>
@@ -78,7 +78,6 @@
               <option value="PERSONELL-MEHL">PERSONELL Max Mehl</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>
@@ -93,13 +92,13 @@
           <td>
             <select name="budget2" size="1">
               <option value="NONE">No second budget</option>
-              <option value="ADMIN-TRAVEL">ADMIN Internal travel</option>
+              <option value="ADMIN-COORD">ADMIN 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="GR-TRAINING">GROWING training activists</option>
+              <option value="GR-TRAINING">GROWING training activists incl travel</option>
               <option value="GR-LOCAL">GROWING local activities</option>
-              <option value="PA-OUTREACH">PA Outreach activities</option>
+              <option value="PA-OUTREACH">PA outreach (events)</option>
               <option value="PA-MATERIAL">PA information material</option>
               <option value="PA-CAMPAIGN">PA campaigns</option>
               <option value="NET-TRAVEL">NETWORK travel costs</option>
@@ -117,7 +116,6 @@
               <option value="PERSONELL-MALAJA">PERSONELL Polina Malaja</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>