From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 31 Oct 2007 15:28:16 +0000 (+0000)
Subject: Umstellung der Vorlagen aus templates/webpages/dbupgrade von HTML::Template auf Template.
X-Git-Tag: release-2.6.0beta1~451
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a1486b4ea62f731a7ce86b2b3f51983703dff2ad;p=kivitendo-erp.git

Umstellung der Vorlagen aus templates/webpages/dbupgrade von HTML::Template auf Template.
---

diff --git a/SL/User.pm b/SL/User.pm
index 8e60b8d0b..99c531938 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -193,13 +193,13 @@ sub login {
       $form->{"stylesheet"} = "lx-office-erp.css";
       $form->{"title"} = $main::locale->text("Dataset upgrade");
       $form->header();
-      print($form->parse_html_template("dbupgrade/header"));
+      print($form->parse_html_template2("dbupgrade/header"));
 
       $form->{dbupdate} = "db$myconfig{dbname}";
       $form->{ $form->{dbupdate} } = 1;
 
       if ($form->{"show_dbupdate_warning"}) {
-        print($form->parse_html_template("dbupgrade/warning"));
+        print($form->parse_html_template2("dbupgrade/warning"));
         exit(0);
       }
 
@@ -226,8 +226,8 @@ sub login {
         $self->{"menustyle"} eq "neu" ? "menunew.pl" :
         "menu.pl";
 
-      print($form->parse_html_template("dbupgrade/footer",
-                                       { "menufile" => $menufile }));
+      print($form->parse_html_template2("dbupgrade/footer",
+                                        { "menufile" => $menufile }));
 
       $rc = -2;
 
@@ -492,9 +492,9 @@ sub process_perl_script {
   }
 
   if (!defined($result)) {
-    print($form->parse_html_template("dbupgrade/error",
-                                     { "file" => $filename,
-                                       "error" => $@ }));
+    print($form->parse_html_template2("dbupgrade/error",
+                                      { "file" => $filename,
+                                        "error" => $@ }));
     exit(0);
   } elsif (1 != $result) {
     unlink("users/nologin") if (2 == $result);
@@ -927,8 +927,8 @@ sub dbupdate2 {
 
       # apply upgrade
       $main::lxdebug->message(DEBUG2, "Applying Update $control->{file}");
-      print($form->parse_html_template("dbupgrade/upgrade_message2",
-                                       $control));
+      print($form->parse_html_template2("dbupgrade/upgrade_message2",
+                                        $control));
 
       if ($file_type eq "sql") {
         $self->process_query($form, $dbh, "sql/" . $form->{"dbdriver"} .
diff --git a/locale/de/all b/locale/de/all
index 89c61e21d..fc19fe533 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -142,7 +142,7 @@ $self->{texts} = {
   'Ansprechpartner'             => 'Ansprechpartner',
   'Application Error. No Format given' => 'Fehler in der Anwendung. Das Ausgabeformat fehlt.',
   'Application Error. Wrong Format' => 'Fehler in der Anwendung. Falsches Format: ',
-  'Applying <TMPL_VAR file ESCAPE=HTML>:' => 'F&uuml;hre <TMPL_VAR file ESCAPE=HTML> aus:',
+  'Applying [% HTML.escape(file) %]:' => 'F&uuml;hre [% HTML.escape(file) %] aus:',
   'Apr'                         => 'Apr',
   'April'                       => 'April',
   'Are you sure you want to delete Invoice Number' => 'Soll die Rechnung mit folgender Nummer wirklich gelöscht werden:',
@@ -593,7 +593,6 @@ aktualisieren wollen?',
   'Inventory Account'           => 'Warenbestand',
   'Inventory quantity must be zero before you can set this assembly obsolete!' => 'Bevor dieses Erzeugnis als ungültig markiert werden kann, muß das Inventar auf Null sein!',
   'Inventory quantity must be zero before you can set this part obsolete!' => 'Bevor diese Ware als ungültig markiert werden kann, muß das Inventar Null sein!',
-  'Invetory'                    => 'Inventar',
   'Invno.'                      => 'Rg. Nr.',
   'Invnumber'                   => 'Rechnungsnummer',
   'Invoice'                     => 'Rechnung',
@@ -687,7 +686,7 @@ aktualisieren wollen?',
   'Long Dates'                  => 'Lange Monatsnamen',
   'Long Description'            => 'Langtext',
   'Lx-Office 2.4.0 introduces two new concepts: tax zones and Buchungsgruppen.' => 'Lx-Office 2.4.0 f&uuml;hrt zwei neue Konzepte ein: Steuerzonen und Buchungsgruppen.',
-  'Lx-Office is about to update the database <b><TMPL_VAR dbname ESCAPE=HTML></b>. You should create a backup of the database before proceeding because the backup might not be reversible.' => 'Lx-Office wird gleich die Datenbank <b><TMPL_VAR dbname ESCAPE=HTML></b> aktualisieren. Sie sollten eine Sicherungskopie der Datenbank erstellen, bevor Sie fortfahren, da die Aktualisierung unter Umst&auml;nden nicht umkehrbar ist.',
+  'Lx-Office is about to update the database <b>[% HTML.escape(dbname) %]</b>. You should create a backup of the database before proceeding because the backup might not be reversible.' => 'Lx-Office wird gleich die Datenbank <b>[% HTML.escape(dbname) %]</b> aktualisieren. Sie sollten eine Sicherungskopie der Datenbank erstellen, bevor Sie fortfahren, da die Aktualisierung unter Umst&auml;nden nicht umkehrbar ist.',
   'Lx-Office website'           => 'Lx-Office-Webseite',
   'MAILED'                      => 'Gesendet',
   'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' => 'Ihr Browser kann leider keine eingebetteten Frames anzeigen. Bitte w&auml;hlen Sie ein anderes Men&uuml; in der Benutzerkonfiguration im Administrationsmen&uuml; aus.',
@@ -734,7 +733,7 @@ aktualisieren wollen?',
   'National Expenses'           => 'Aufwand Inland',
   'National Revenues'           => 'Erl&ouml;se Inland',
   'Netto Terms'                 => 'Zahlungsziel netto',
-  'New Buchungsgruppe <TMPL_VAR __counter__>' => 'Neue Buchungsgruppe <TMPL_VAR __counter__>',
+  'New Buchungsgruppe [% loop.count %]' => 'Neue Buchungsgruppe [% loop.count %]',
   'New Templates'               => 'neue Vorlagen',
   'New assembly'                => 'Neues Erzeugnis',
   'New contact'                 => 'Neuer Ansprechpartner',
@@ -772,6 +771,7 @@ aktualisieren wollen?',
   'Not Discountable'            => 'Nicht rabattierfähig',
   'Not delivered'               => 'Nicht geliefert',
   'Not obsolete'                => 'Gültig',
+  'Note'                        => 'Hinweis',
   'Notes'                       => 'Bemerkungen',
   'Nothing selected!'           => 'Es wurde nichts ausgewählt!',
   'Nothing to delete!'          => 'Es konnte nichts gelöscht werden!',
@@ -1122,7 +1122,7 @@ aktualisieren wollen?',
   'The base unit relations must not contain loops (e.g. by saying that unit A\'s base unit is B, B\'s base unit is C and C\'s base unit is A) in row %d.' => 'Die Beziehungen der Einheiten d&uuml;rfen keine Schleifen beinhalten (z.B. wenn gesagt wird, dass Einheit As Basiseinheit B, Bs Basiseinheit C und Cs Basiseinheit A ist) in Zeile %d.',
   'The columns &quot;Dunning Duedate&quot;, &quot;Total Fees&quot; and &quot;Interest&quot; show data for the previous dunning created for this invoice.' => 'Die Spalten &quot;Zahlbar bis&quot;, &quot;Kumulierte Geb&uuml;hren&quot; und &quot;Zinsen&quot; zeigen Daten der letzten f&uuml;r diese Rechnung erzeugten Mahnung.',
   'The database [% HTML.escape(db) %] has been successfully deleted.' => 'Die Datenbank [% HTML.escape(db) %] wurde erfolgreich gel&ouml;scht.',
-  'The database update/creation did not succeed. The file <TMPL_VAR file ESCAPE=HTML> contained the following error:' => 'Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei <TMPL_VAR file ESCAPE=HTML> enthielt den folgenden Fehler:',
+  'The database update/creation did not succeed. The file [% HTML.escape(file) %] contained the following error:' => 'Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei [% HTML.escape(file) %] enthielt den folgenden Fehler:',
   'The database upgrade for the introduction of Buchungsgruppen is now complete.' => 'Das Datenbankupgrade f&uuml;r die Einf&uuml;hrung von Buchungsgruppen ist jetzt beendet.',
   'The database upgrade for the introduction of units is now complete.' => 'Das Datenbankupgrade zwecks Einf&uuml;hrung von Einheiten ist nun beendet.',
   'The dataset [% HTML.escape(db) %] has been successfully created.' => 'Die Datenbank [% HTML.escape(db) %] wurde erfolgreich angelegt.',
@@ -1169,6 +1169,7 @@ aktualisieren wollen?',
   'Therefore there\'s no need to create the same article more than once if it is sold or bought in/from another tax zone.' => 'Deswegen muss man den gleichen Artikel nicht mehr mehrmals anlegen, wenn er in verschiedenen Steuerzonen gehandelt werden soll.',
   'These units can be based on other units so that Lx-Office can convert prices when the user switches from one unit to another.' => 'Diese Einheiten k&ouml;nnen auf anderen Einheiten basieren, sodass Lx-Office Preise umrechnen kann, wenn der Benutzer von einer Einheit zu einer anderen Wechselt.',
   'This customer number is already in use.' => 'Diese Kundennummer wird bereits verwendet.',
+  'This installation uses an unknown chart of accounts (&quot;[% HTML.escape(coa) %]&quot;). This database upgrade cannot create standard buchungsgruppen automatically.' => 'Diese Installation benutzt einen unbekannten Kontenrahmen (&quot;[% HTML.escape(coa) %]&quot;). Dieses Datenbankupgrade kann die Standardbuchungsgruppen nicht automatisch anlegen.',
   'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' => 'In diesem Schritt werden bestehende Datenbanken gesucht. Es werden noch keine &Auml;nderungen vorgenommen!',
   'This upgrade script tries to map all existing parts in the database to the newly created Buchungsgruppen.' => 'Dieses Upgradescript versucht, bei allen bestehenden Artikeln neu erstellte Buchungsgruppen zuzuordnen.',
   'This upgrade script tries to map all existing units in the database to the newly created units.' => 'Dieses Update-Script versucht, alle bestehenden Einheiten automatisch in die neuen Einheiten umzuwandeln.',
@@ -1218,6 +1219,7 @@ aktualisieren wollen?',
   'Units'                       => 'Einheiten',
   'Unknown Category'            => 'Unbekannte Kategorie',
   'Unknown Link'                => 'Unbekannte Verknüpfung',
+  'Unknown chart of accounts'   => 'Unbekannter Kontenrahmen',
   'Unknown dependency \'%s\'.'  => 'Unbekannte Abh&auml;ngigkeit \'%s\'.',
   'Unlock System'               => 'System entsperren',
   'Until'                       => 'Bis',
diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl
index e51b3a8a5..da3de05c3 100644
--- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl
+++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl
@@ -13,8 +13,8 @@ sub mydberror {
 sub myshowerror {
   my ($msg) = @_;
 
-  print($main::form->parse_html_template("dbupgrade/units_error",
-                                         { "message" => $msg }));
+  print($main::form->parse_html_template2("dbupgrade/units_error",
+                                          { "message" => $msg }));
   return 2;
 }
 
@@ -219,15 +219,15 @@ sub update_units_steps_1_2 {
     map({ push(@unknown_parts, { "name" => $_, "NEW_UNITS" => $ddbox }); }
         sort({ lc($a) cmp lc($b) } keys(%unknown_dimension_units)));
 
-    print($form->parse_html_template("dbupgrade/units_parts",
-                                     { "NEW_BASE_UNIT_DDBOX" => $ddbox,
-                                       "UNKNOWN_PART_UNITS" => \@unknown_parts,
-                                     }));
+    print($form->parse_html_template2("dbupgrade/units_parts",
+                                      { "NEW_BASE_UNIT_DDBOX" => $ddbox,
+                                        "UNKNOWN_PART_UNITS" => \@unknown_parts,
+                                      }));
 
     return 2;
 
   } else {
-    print($form->parse_html_template("dbupgrade/units_parts_done"));
+    print($form->parse_html_template2("dbupgrade/units_parts_done"));
   }
 
   if (scalar(keys(%unknown_service_units)) != 0) {
@@ -238,15 +238,15 @@ sub update_units_steps_1_2 {
     map({ push(@unknown_services, { "name" => $_, "NEW_UNITS" => $ddbox }); }
         sort({ lc($a) cmp lc($b) } keys(%unknown_service_units)));
 
-    print($form->parse_html_template("dbupgrade/units_services",
-                                     { "NEW_BASE_UNIT_DDBOX" => $ddbox,
-                                       "UNKNOWN_PART_UNITS" => \@unknown_services,
-                                     }));
+    print($form->parse_html_template2("dbupgrade/units_services",
+                                      { "NEW_BASE_UNIT_DDBOX" => $ddbox,
+                                        "UNKNOWN_PART_UNITS" => \@unknown_services,
+                                      }));
 
     return 2;
 
   } else {
-    print($form->parse_html_template("dbupgrade/units_services_done"));
+    print($form->parse_html_template2("dbupgrade/units_services_done"));
   }
 
   return 0;
@@ -271,13 +271,13 @@ sub update_units_step_3 {
     my $service_units = retrieve_units(\%dbup_myconfig, $form, "service");
     my $service_ddbox = unit_select_data($service_units);
 
-    print($form->parse_html_template("dbupgrade/units_set_default",
-                                     { "DIMENSION_DDBOX" => $dimension_ddbox,
-                                       "SERVICE_DDBOX" => $service_ddbox }));
+    print($form->parse_html_template2("dbupgrade/units_set_default",
+                                      { "DIMENSION_DDBOX" => $dimension_ddbox,
+                                        "SERVICE_DDBOX" => $service_ddbox }));
     return 2;
 
   } else {
-    print($form->parse_html_template("dbupgrade/units_set_default_done"));
+    print($form->parse_html_template2("dbupgrade/units_set_default_done"));
     return 1;
   }
 }
@@ -330,7 +330,7 @@ sub update_units {
 
   my $res;
 
-  print($form->parse_html_template("dbupgrade/units_header"));
+  print($form->parse_html_template2("dbupgrade/units_header"));
 
   if ($form->{"action2"} eq "add_unit") {
     $res = update_units_add_unit();
diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl
index 91144c29b..9d0894779 100644
--- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl
+++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl
@@ -11,8 +11,8 @@ sub mydberror {
 sub myshowerror {
   my ($msg) = @_;
 
-  print($main::form->parse_html_template("dbupgrade/units_error",
-                                         { "message" => $msg }));
+  print($main::form->parse_html_template2("dbupgrade/units_error",
+                                          { "message" => $msg }));
   return 2;
 }
 
@@ -76,8 +76,8 @@ sub update_guess_chart_of_accounts {
 
   my @coas = map(+{ "name" => $_ }, @valid_coas);
 
-  print($form->parse_html_template("dbupgrade/coa_guess",
-                                   { "COAS" => \@coas }));
+  print($form->parse_html_template2("dbupgrade/coa_guess",
+                                    { "COAS" => \@coas }));
 
   return 2;
 }
diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl
index 0e044e203..203857f82 100644
--- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl
+++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl
@@ -11,8 +11,8 @@ sub mydberror {
 sub myshowerror {
   my ($msg) = @_;
 
-  print($main::form->parse_html_template("dbupgrade/units_error",
-                                         { "message" => $msg }));
+  print($main::form->parse_html_template2("dbupgrade/units_error",
+                                          { "message" => $msg }));
   return 2;
 }
 
@@ -209,9 +209,7 @@ sub create_standard_buchungsgruppen {
     return create_standard_buchungsgruppen_skr04();
   }
 
-  print($form->parse_html_template("dbupgrade/" .
-                                   "std_buchungsgruppen_unknown_coa",
-                                   { "coa" => $coa }));
+  print($form->parse_html_template2("dbupgrade/std_buchungsgruppen_unknown_coa", { "coa" => $coa }));
 
   return 1;
 }
diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl
index 54f19eed1..9a8542a36 100644
--- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl
+++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl
@@ -11,8 +11,8 @@ sub mydberror {
 sub myshowerror {
   my ($msg) = @_;
 
-  print($main::form->parse_html_template("dbupgrade/units_error",
-                                         { "message" => $msg }));
+  print($main::form->parse_html_template2("dbupgrade/units_error",
+                                          { "message" => $msg }));
   return 2;
 }
 
@@ -117,13 +117,11 @@ sub update_steuersaetze {
     return update_steuersaetze_skr04();
   }
 
-  print($form->parse_html_template("dbupgrade/" .
-                                   "std_buchungsgruppen_unknown_coa",
-                                   { "coa" => $coa }));
+  print($form->parse_html_template2("dbupgrade/std_buchungsgruppen_unknown_coa", { "coa" => $coa }));
 
   return 1;
 }
 
 
 
-return update_steuersaetze();
\ No newline at end of file
+return update_steuersaetze();
diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl
index cc4780e1f..2a3dbe186 100644
--- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl
+++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl
@@ -302,14 +302,14 @@ sub display_create_bgs_dialog {
     $entry->{"eur"} = $main::eur;
   }
 
-  # $form->parse_html_template("dbupgrade/buchungsgruppen_parts")
-  # $form->parse_html_template("dbupgrade/buchungsgruppen_services")
-  # $form->parse_html_template("dbupgrade/buchungsgruppen_assemblies")
-
-  print($form->parse_html_template("dbupgrade/buchungsgruppen_${type}",
-                                   { "LIST" => $list,
-                                     "BUCHUNGSGRUPPEN" => $buchungsgruppen,
-                                   }));
+  # $form->parse_html_template2("dbupgrade/buchungsgruppen_parts")
+  # $form->parse_html_template2("dbupgrade/buchungsgruppen_services")
+  # $form->parse_html_template2("dbupgrade/buchungsgruppen_assemblies")
+
+  print($form->parse_html_template2("dbupgrade/buchungsgruppen_${type}",
+                                    { "LIST" => $list,
+                                      "BUCHUNGSGRUPPEN" => $buchungsgruppen,
+                                    }));
 }
 
 sub create_buchungsgruppen {
@@ -459,7 +459,7 @@ sub do_update {
 
   my ($acc_inventory, $acc_income, $acc_expense) = retrieve_accounts();
 
-  print($form->parse_html_template("dbupgrade/buchungsgruppen_header"));
+  print($form->parse_html_template2("dbupgrade/buchungsgruppen_header"));
 
   if (scalar(@{$parts})) {
     display_create_bgs_dialog("parts", $parts,
@@ -467,7 +467,7 @@ sub do_update {
                               $buchungsgruppen);
     return 2;
   } else {
-    print($form->parse_html_template("dbupgrade/buchungsgruppen_parts_done"));
+    print($form->parse_html_template2("dbupgrade/buchungsgruppen_parts_done"));
   }
 
   if (scalar(@{$services})) {
@@ -476,7 +476,7 @@ sub do_update {
                               $buchungsgruppen);
     return 2;
   } else {
-    print($form->parse_html_template("dbupgrade/buchungsgruppen_services_done"));
+    print($form->parse_html_template2("dbupgrade/buchungsgruppen_services_done"));
   }
 
   if (scalar(@{$assemblies})) {
@@ -485,10 +485,10 @@ sub do_update {
                               $buchungsgruppen);
     return 2;
   } else {
-    print($form->parse_html_template("dbupgrade/buchungsgruppen_assemblies_done"));
+    print($form->parse_html_template2("dbupgrade/buchungsgruppen_assemblies_done"));
   }
 
-  print($form->parse_html_template("dbupgrade/buchungsgruppen_footer"));
+  print($form->parse_html_template2("dbupgrade/buchungsgruppen_footer"));
 
   return 1;
 }
diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.37-2.2.0.38.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.37-2.2.0.38.pl
index 09a0603f3..144875a9f 100644
--- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.37-2.2.0.38.pl
+++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.37-2.2.0.38.pl
@@ -48,8 +48,8 @@ sub update_templates {
 
   if (@warnings) {
     @warnings = map(+{ "message" => $_ }, @warnings);
-    print($form->parse_html_template("dbupgrade/update_templates_warnings",
-                                     { "WARNINGS" => \@warnings }));
+    print($form->parse_html_template2("dbupgrade/update_templates_warnings",
+                                      { "WARNINGS" => \@warnings }));
   }
 
   return 1;
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html
index da29ef7b5..331fedc86 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html
@@ -1,16 +1,16 @@
-<div class="listtop">Schritt 3 von 3: Erzeugnisse</div>
+[% USE HTML %]<div class="listtop">Schritt 3 von 3: Erzeugnisse</div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="type" value="parts">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="create_buchungsgruppen_assemblies">
 
- <TMPL_IF saved_message>
-  <p><TMPL_VAR saved_message></p>
- </TMPL_IF>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
 
  <div class="subsubheading">Existierende Buchungsgruppen</div>
 
@@ -18,62 +18,62 @@
   Die folgenden Buchungsgruppen wurden bereits angelegt:
   <br>
   <ul>
-   <TMPL_LOOP BUCHUNGSGRUPPEN>
+   [% FOREACH row = BUCHUNGSGRUPPEN %]
     <li>
-     <TMPL_VAR description ESCAPE=HTML>:
-     Inventar: <TMPL_VAR inventory_accno>;
+     [% HTML.escape(row.description) %]:
+     Inventar: [% row.inventory_accno %];
 
      Erl&ouml;skonto/Aufwandskonto
-     Inand: <TMPL_VAR income_accno_0>/<TMPL_VAR expense_accno_0>;
+     Inand: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
 
      Erl&ouml;skonto/Aufwandskonto
-     EU mit UstId-Nummer: <TMPL_VAR income_accno_1>/<TMPL_VAR expense_accno_1>;
+     EU mit UstId-Nummer: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
 
      Erl&ouml;skonto/Aufwandskonto
-     EU ohne UstId-Nummer: <TMPL_VAR income_accno_2>/<TMPL_VAR expense_accno_2>;
+     EU ohne UstId-Nummer: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
 
      Erl&ouml;skonto/Aufwandskonto
-     Ausland: <TMPL_VAR income_accno_3>/<TMPL_VAR expense_accno_3>
+     Ausland: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
     </li>
-   </TMPL_LOOP>
+   [% END %]
   </ul>
  </p>
 
- <TMPL_LOOP LIST>
-  <div class="subsubheading">Neue Buchungsgruppe <TMPL_VAR __counter__></div>
+ [% FOREACH row = LIST %]
+  <div class="subsubheading">Neue Buchungsgruppe [% loop.count %]</div>
 
   <table>
    <tr>
     <td>Beschreibung:</td>
-    <td><input name="description_<TMPL_VAR __counter__>"></td>
+    <td><input name="description_[% loop.count %]"></td>
    </tr>
 
-   <TMPL_IF eur>
-    <input type="hidden" name="inventory_accno_id_<TMPL_VAR __counter__>" value="<TMPL_VAR std_inventory_accno_id>">
-    <TMPL_ELSE>
+   [% IF row.eur %]
+    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
+    [% ELSE %]
     <tr>
      <td>Inventar:</td>
      <td>
-      <select name="inventory_accno_id_<TMPL_VAR __counter__>">
-       <TMPL_LOOP ACC_INVENTORY><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+      <select name="inventory_accno_id_[% loop.count %]">
+       [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
       </select>
      </td>
     </tr>
-   </TMPL_IF>
+   [% END %]
 
    <tr>
     <td>Erl&ouml;skonto Inand:</td>
     <td>
-     <input type="hidden" name="income_accno_id_0_<TMPL_VAR __counter__>" value="<TMPL_VAR income_accno_id ESCAPE=HTML>">
-     <TMPL_VAR income_accno ESCAPE=HTML>--<TMPL_VAR income_description ESCAPE=HTML>
+     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
+     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
     </td>
    </tr>
 
    <tr>
     <td>Aufwandskonto EU mit UstId-Nummer:</td>
     <td>
-     <select name="expense_accno_id_0_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_0_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -81,8 +81,8 @@
    <tr>
     <td>Erl&ouml;skonto EU mit UstId-Nummer:</td>
     <td>
-     <select name="income_accno_id_1_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -90,8 +90,8 @@
    <tr>
     <td>Aufwandskonto EU mit UstId-Nummer:</td>
     <td>
-     <select name="expense_accno_id_1_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -99,8 +99,8 @@
    <tr>
     <td>Erl&ouml;skonto EU ohne UstId-Nummer:</td>
     <td>
-     <select name="income_accno_id_2_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -108,8 +108,8 @@
    <tr>
     <td>Aufwandskonto EU ohne UstId-Nummer:</td>
     <td>
-     <select name="expense_accno_id_2_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -117,8 +117,8 @@
    <tr>
     <td>Erl&ouml;skonto Ausland:</td>
     <td>
-     <select name="income_accno_id_3_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -126,19 +126,19 @@
    <tr>
     <td>Aufwandskonto Ausland:</td>
     <td>
-     <select name="expense_accno_id_3_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
   </table>
 
-  <TMPL_IF __last__>
-   <input type="hidden" name="rowcount" value="<TMPL_VAR __counter__>">
-  </TMPL_IF>
+  [% IF loop.last %]
+   <input type="hidden" name="rowcount" value="[% loop.count %]">
+  [% END %]
 
   <hr>
- </TMPL_LOOP>
+ [% END %]
 
  <input type="submit" name="dummy" value="Buchungsgruppe erfassen">
 
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html
index 170c5a575..f3cc4d588 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html
@@ -1,16 +1,16 @@
-<div class="listtop"><translate>Step 3 of 3: Assemblies</translate></div>
+[% USE HTML %]<div class="listtop"><translate>Step 3 of 3: Assemblies</translate></div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="type" value="parts">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="create_buchungsgruppen_assemblies">
 
- <TMPL_IF saved_message>
-  <p><TMPL_VAR saved_message></p>
- </TMPL_IF>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
 
  <div class="subsubheading"><translate>Existing Buchungsgruppen</translate></div>
 
@@ -18,62 +18,62 @@
   <translate>The following Buchungsgruppen have already been created:</translate>
   <br>
   <ul>
-   <TMPL_LOOP BUCHUNGSGRUPPEN>
+   [% FOREACH row = BUCHUNGSGRUPPEN %]
     <li>
-     <TMPL_VAR description ESCAPE=HTML>:
-     <translate>Invetory</translate>: <TMPL_VAR inventory_accno>;
+     [% HTML.escape(row.description) %]:
+     <translate>Inventory</translate>: [% row.inventory_accno %];
 
      <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>National</translate>: <TMPL_VAR income_accno_0>/<TMPL_VAR expense_accno_0>;
+     <translate>National</translate>: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
 
      <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU with VAT ID</translate>: <TMPL_VAR income_accno_1>/<TMPL_VAR expense_accno_1>;
+     <translate>EU with VAT ID</translate>: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
 
      <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU without VAT ID</translate>: <TMPL_VAR income_accno_2>/<TMPL_VAR expense_accno_2>;
+     <translate>EU without VAT ID</translate>: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
 
      <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>International</translate>: <TMPL_VAR income_accno_3>/<TMPL_VAR expense_accno_3>
+     <translate>International</translate>: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
     </li>
-   </TMPL_LOOP>
+   [% END %]
   </ul>
  </p>
 
- <TMPL_LOOP LIST>
-  <div class="subsubheading"><translate>New Buchungsgruppe <TMPL_VAR __counter__></translate></div>
+ [% FOREACH row = LIST %]
+  <div class="subsubheading"><translate>New Buchungsgruppe [% loop.count %]</translate></div>
 
   <table>
    <tr>
     <td><translate>Description</translate>:</td>
-    <td><input name="description_<TMPL_VAR __counter__>"></td>
+    <td><input name="description_[% loop.count %]"></td>
    </tr>
 
-   <TMPL_IF eur>
-    <input type="hidden" name="inventory_accno_id_<TMPL_VAR __counter__>" value="<TMPL_VAR std_inventory_accno_id>">
-    <TMPL_ELSE>
+   [% IF row.eur %]
+    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
+    [% ELSE %]
     <tr>
      <td><translate>Inventory</translate>:</td>
      <td>
-      <select name="inventory_accno_id_<TMPL_VAR __counter__>">
-       <TMPL_LOOP ACC_INVENTORY><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+      <select name="inventory_accno_id_[% loop.count %]">
+       [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
       </select>
      </td>
     </tr>
-   </TMPL_IF>
+   [% END %]
 
    <tr>
     <td><translate>Income accno</translate> <translate>National</translate>:</td>
     <td>
-     <input type="hidden" name="income_accno_id_0_<TMPL_VAR __counter__>" value="<TMPL_VAR income_accno_id ESCAPE=HTML>">
-     <TMPL_VAR income_accno ESCAPE=HTML>--<TMPL_VAR income_description ESCAPE=HTML>
+     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
+     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
     </td>
    </tr>
 
    <tr>
     <td><translate>Expense accno</translate> <translate>EU with VAT ID</translate>:</td>
     <td>
-     <select name="expense_accno_id_0_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_0_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -81,8 +81,8 @@
    <tr>
     <td><translate>Income accno</translate> <translate>EU with VAT ID</translate>:</td>
     <td>
-     <select name="income_accno_id_1_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -90,8 +90,8 @@
    <tr>
     <td><translate>Expense accno</translate> <translate>EU with VAT ID</translate>:</td>
     <td>
-     <select name="expense_accno_id_1_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -99,8 +99,8 @@
    <tr>
     <td><translate>Income accno</translate> <translate>EU without VAT ID</translate>:</td>
     <td>
-     <select name="income_accno_id_2_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -108,8 +108,8 @@
    <tr>
     <td><translate>Expense accno</translate> <translate>EU without VAT ID</translate>:</td>
     <td>
-     <select name="expense_accno_id_2_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -117,8 +117,8 @@
    <tr>
     <td><translate>Income accno</translate> <translate>International</translate>:</td>
     <td>
-     <select name="income_accno_id_3_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -126,19 +126,19 @@
    <tr>
     <td><translate>Expense accno</translate> <translate>International</translate>:</td>
     <td>
-     <select name="expense_accno_id_3_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
   </table>
 
-  <TMPL_IF __last__>
-   <input type="hidden" name="rowcount" value="<TMPL_VAR __counter__>">
-  </TMPL_IF>
+  [% IF loop.last %]
+   <input type="hidden" name="rowcount" value="[% loop.count %]">
+  [% END %]
 
   <hr>
- </TMPL_LOOP>
+ [% END %]
 
  <input type="submit" name="dummy" value="<translate>Create Buchungsgruppen</translate>">
 
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html
index 593ffa627..225698e25 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html
@@ -1,16 +1,16 @@
-<div class="listtop">Schritt 1 von 3: Waren</div>
+[% USE HTML %]<div class="listtop">Schritt 1 von 3: Waren</div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="type" value="parts">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="">
 
- <TMPL_IF saved_message>
-  <p><TMPL_VAR saved_message></p>
- </TMPL_IF>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
 
  <div class="subsubheading">Existierende Buchungsgruppen</div>
 
@@ -18,69 +18,69 @@
   Die folgenden Buchungsgruppen wurden bereits angelegt:
   <br>
   <ul>
-   <TMPL_LOOP BUCHUNGSGRUPPEN>
+   [% FOREACH row = BUCHUNGSGRUPPEN %]
     <li>
-     <TMPL_VAR description ESCAPE=HTML>:
-     Inventar: <TMPL_VAR inventory_accno>;
+     [% HTML.escape(row.description) %]:
+     Inventar: [% row.inventory_accno %];
 
      Erl&ouml;skonto/Aufwandskonto
-     Inand: <TMPL_VAR income_accno_0>/<TMPL_VAR expense_accno_0>;
+     Inand: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
 
      Erl&ouml;skonto/Aufwandskonto
-     EU mit UstId-Nummer: <TMPL_VAR income_accno_1>/<TMPL_VAR expense_accno_1>;
+     EU mit UstId-Nummer: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
 
      Erl&ouml;skonto/Aufwandskonto
-     EU ohne UstId-Nummer: <TMPL_VAR income_accno_2>/<TMPL_VAR expense_accno_2>;
+     EU ohne UstId-Nummer: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
 
      Erl&ouml;skonto/Aufwandskonto
-     Ausland: <TMPL_VAR income_accno_3>/<TMPL_VAR expense_accno_3>
+     Ausland: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
     </li>
-   </TMPL_LOOP>
+   [% END %]
   </ul>
  </p>
 
- <TMPL_LOOP LIST>
-  <div class="subsubheading">Neue Buchungsgruppe <TMPL_VAR __counter__></div>
+ [% FOREACH row = LIST %]
+  <div class="subsubheading">Neue Buchungsgruppe [% loop.count %]</div>
 
   <table>
    <tr>
     <td>Beschreibung:</td>
-    <td><input name="description_<TMPL_VAR __counter__>"></td>
+    <td><input name="description_[% loop.count %]"></td>
    </tr>
 
-   <TMPL_IF eur>
-    <input type="hidden" name="inventory_accno_id_<TMPL_VAR __counter__>" value="<TMPL_VAR std_inventory_accno_id>">
-    <TMPL_ELSE>
+   [% IF row.eur %]
+    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
+    [% ELSE %]
     <tr>
      <td>Inventar:</td>
      <td>
-      <input type="hidden" name="inventory_accno_id_<TMPL_VAR __counter__>" value="<TMPL_VAR inventory_accno_id ESCAPE=HTML>">
-      <TMPL_VAR inventory_accno ESCAPE=HTML>--<TMPL_VAR inventory_description ESCAPE=HTML>
+      <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% HTML.escape(row.inventory_accno_id) %]">
+      [% HTML.escape(row.inventory_accno) %]--[% HTML.escape(row.inventory_description) %]
      </td>
     </tr>
-   </TMPL_IF>
+   [% END %]
 
    <tr>
     <td>Erl&ouml;skonto Inand:</td>
     <td>
-     <input type="hidden" name="income_accno_id_0_<TMPL_VAR __counter__>" value="<TMPL_VAR income_accno_id ESCAPE=HTML>">
-     <TMPL_VAR income_accno ESCAPE=HTML>--<TMPL_VAR income_description ESCAPE=HTML>
+     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
+     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
     </td>
    </tr>
 
    <tr>
     <td>Aufwandskonto Inand:</td>
     <td>
-     <input type="hidden" name="expense_accno_id_0_<TMPL_VAR __counter__>" value="<TMPL_VAR expense_accno_id ESCAPE=HTML>">
-     <TMPL_VAR expense_accno ESCAPE=HTML>--<TMPL_VAR expense_description ESCAPE=HTML>
+     <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
+     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
     </td>
    </tr>
 
    <tr>
     <td>Erl&ouml;skonto EU mit UstId-Nummer:</td>
     <td>
-     <select name="income_accno_id_1_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -88,8 +88,8 @@
    <tr>
     <td>Aufwandskonto EU mit UstId-Nummer:</td>
     <td>
-     <select name="expense_accno_id_1_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -97,8 +97,8 @@
    <tr>
     <td>Erl&ouml;skonto EU ohne UstId-Nummer:</td>
     <td>
-     <select name="income_accno_id_2_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -106,8 +106,8 @@
    <tr>
     <td>Aufwandskonto EU ohne UstId-Nummer:</td>
     <td>
-     <select name="expense_accno_id_2_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -115,8 +115,8 @@
    <tr>
     <td>Erl&ouml;skonto Ausland:</td>
     <td>
-     <select name="income_accno_id_3_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -124,19 +124,19 @@
    <tr>
     <td>Aufwandskonto Ausland:</td>
     <td>
-     <select name="expense_accno_id_3_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
   </table>
 
-  <TMPL_IF __last__>
-   <input type="hidden" name="rowcount" value="<TMPL_VAR __counter__>">
-  </TMPL_IF>
+  [% IF loop.last %]
+   <input type="hidden" name="rowcount" value="[% loop.count %]">
+  [% END %]
 
   <hr>
- </TMPL_LOOP>
+ [% END %]
 
  <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="Buchungsgruppe erfassen">
 
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html
index 3ae56c94e..1d0f2d45f 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html
@@ -1,16 +1,16 @@
-<div class="listtop"><translate>Step 1 of 3: Parts</translate></div>
+[% USE HTML %]<div class="listtop"><translate>Step 1 of 3: Parts</translate></div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="type" value="parts">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="">
 
- <TMPL_IF saved_message>
-  <p><TMPL_VAR saved_message></p>
- </TMPL_IF>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
 
  <div class="subsubheading"><translate>Existing Buchungsgruppen</translate></div>
 
@@ -18,69 +18,69 @@
   <translate>The following Buchungsgruppen have already been created:</translate>
   <br>
   <ul>
-   <TMPL_LOOP BUCHUNGSGRUPPEN>
+   [% FOREACH row = BUCHUNGSGRUPPEN %]
     <li>
-     <TMPL_VAR description ESCAPE=HTML>:
-     <translate>Invetory</translate>: <TMPL_VAR inventory_accno>;
+     [% HTML.escape(row.description) %]:
+     <translate>Inventory</translate>: [% row.inventory_accno %];
 
      <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>National</translate>: <TMPL_VAR income_accno_0>/<TMPL_VAR expense_accno_0>;
+     <translate>National</translate>: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
 
      <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU with VAT ID</translate>: <TMPL_VAR income_accno_1>/<TMPL_VAR expense_accno_1>;
+     <translate>EU with VAT ID</translate>: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
 
      <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU without VAT ID</translate>: <TMPL_VAR income_accno_2>/<TMPL_VAR expense_accno_2>;
+     <translate>EU without VAT ID</translate>: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
 
      <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>International</translate>: <TMPL_VAR income_accno_3>/<TMPL_VAR expense_accno_3>
+     <translate>International</translate>: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
     </li>
-   </TMPL_LOOP>
+   [% END %]
   </ul>
  </p>
 
- <TMPL_LOOP LIST>
-  <div class="subsubheading"><translate>New Buchungsgruppe <TMPL_VAR __counter__></translate></div>
+ [% FOREACH row = LIST %]
+  <div class="subsubheading"><translate>New Buchungsgruppe [% loop.count %]</translate></div>
 
   <table>
    <tr>
     <td><translate>Description</translate>:</td>
-    <td><input name="description_<TMPL_VAR __counter__>"></td>
+    <td><input name="description_[% loop.count %]"></td>
    </tr>
 
-   <TMPL_IF eur>
-    <input type="hidden" name="inventory_accno_id_<TMPL_VAR __counter__>" value="<TMPL_VAR std_inventory_accno_id>">
-    <TMPL_ELSE>
+   [% IF row.eur %]
+    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
+    [% ELSE %]
     <tr>
      <td><translate>Inventory</translate>:</td>
      <td>
-      <input type="hidden" name="inventory_accno_id_<TMPL_VAR __counter__>" value="<TMPL_VAR inventory_accno_id ESCAPE=HTML>">
-      <TMPL_VAR inventory_accno ESCAPE=HTML>--<TMPL_VAR inventory_description ESCAPE=HTML>
+      <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% HTML.escape(row.inventory_accno_id) %]">
+      [% HTML.escape(row.inventory_accno) %]--[% HTML.escape(row.inventory_description) %]
      </td>
     </tr>
-   </TMPL_IF>
+   [% END %]
 
    <tr>
     <td><translate>Income accno</translate> <translate>National</translate>:</td>
     <td>
-     <input type="hidden" name="income_accno_id_0_<TMPL_VAR __counter__>" value="<TMPL_VAR income_accno_id ESCAPE=HTML>">
-     <TMPL_VAR income_accno ESCAPE=HTML>--<TMPL_VAR income_description ESCAPE=HTML>
+     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
+     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
     </td>
    </tr>
 
    <tr>
     <td><translate>Expense accno</translate> <translate>National</translate>:</td>
     <td>
-     <input type="hidden" name="expense_accno_id_0_<TMPL_VAR __counter__>" value="<TMPL_VAR expense_accno_id ESCAPE=HTML>">
-     <TMPL_VAR expense_accno ESCAPE=HTML>--<TMPL_VAR expense_description ESCAPE=HTML>
+     <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
+     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
     </td>
    </tr>
 
    <tr>
     <td><translate>Income accno</translate> <translate>EU with VAT ID</translate>:</td>
     <td>
-     <select name="income_accno_id_1_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -88,8 +88,8 @@
    <tr>
     <td><translate>Expense accno</translate> <translate>EU with VAT ID</translate>:</td>
     <td>
-     <select name="expense_accno_id_1_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -97,8 +97,8 @@
    <tr>
     <td><translate>Income accno</translate> <translate>EU without VAT ID</translate>:</td>
     <td>
-     <select name="income_accno_id_2_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -106,8 +106,8 @@
    <tr>
     <td><translate>Expense accno</translate> <translate>EU without VAT ID</translate>:</td>
     <td>
-     <select name="expense_accno_id_2_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -115,8 +115,8 @@
    <tr>
     <td><translate>Income accno</translate> <translate>International</translate>:</td>
     <td>
-     <select name="income_accno_id_3_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -124,19 +124,19 @@
    <tr>
     <td><translate>Expense accno</translate> <translate>International</translate>:</td>
     <td>
-     <select name="expense_accno_id_3_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
      </select>
     </td>
    </tr>
   </table>
 
-  <TMPL_IF __last__>
-   <input type="hidden" name="rowcount" value="<TMPL_VAR __counter__>">
-  </TMPL_IF>
+  [% IF loop.last %]
+   <input type="hidden" name="rowcount" value="[% loop.count %]">
+  [% END %]
 
   <hr>
- </TMPL_LOOP>
+ [% END %]
 
  <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="<translate>Create Buchungsgruppen</translate>">
 
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_de.html b/templates/webpages/dbupgrade/buchungsgruppen_services_de.html
index 4489dbd66..b8353d5e9 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_services_de.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_services_de.html
@@ -1,16 +1,16 @@
-<div class="listtop">Schritt 2 von 3: Dienstleistungen</div>
+[% USE HTML %]<div class="listtop">Schritt 2 von 3: Dienstleistungen</div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="type" value="parts">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="">
 
- <TMPL_IF saved_message>
-  <p><TMPL_VAR saved_message></p>
- </TMPL_IF>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
 
  <div class="subsubheading">Existierende Buchungsgruppen</div>
 
@@ -18,70 +18,70 @@
   Die folgenden Buchungsgruppen wurden bereits angelegt:
   <br>
   <ul>
-   <TMPL_LOOP BUCHUNGSGRUPPEN>
+   [% FOREACH row = BUCHUNGSGRUPPEN %]
     <li>
-     <TMPL_VAR description ESCAPE=HTML>:
-     Inventar: <TMPL_VAR inventory_accno>;
+     [% HTML.escape(row.description) %]:
+     Inventar: [% row.inventory_accno %];
 
      Erl&ouml;skonto/Aufwandskonto
-     Inand: <TMPL_VAR income_accno_0>/<TMPL_VAR expense_accno_0>;
+     Inand: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
 
      Erl&ouml;skonto/Aufwandskonto
-     EU mit UstId-Nummer: <TMPL_VAR income_accno_1>/<TMPL_VAR expense_accno_1>;
+     EU mit UstId-Nummer: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
 
      Erl&ouml;skonto/Aufwandskonto
-     EU ohne UstId-Nummer: <TMPL_VAR income_accno_2>/<TMPL_VAR expense_accno_2>;
+     EU ohne UstId-Nummer: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
 
      Erl&ouml;skonto/Aufwandskonto
-     Ausland: <TMPL_VAR income_accno_3>/<TMPL_VAR expense_accno_3>
+     Ausland: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
     </li>
-   </TMPL_LOOP>
+   [% END %]
   </ul>
  </p>
 
- <TMPL_LOOP LIST>
-  <div class="subsubheading">Neue Buchungsgruppe <TMPL_VAR __counter__></div>
+ [% FOREACH row = LIST %]
+  <div class="subsubheading">Neue Buchungsgruppe [% loop.count %]</div>
 
   <table>
    <tr>
     <td>Beschreibung:</td>
-    <td><input name="description_<TMPL_VAR __counter__>"></td>
+    <td><input name="description_[% loop.count %]"></td>
    </tr>
 
-   <TMPL_IF eur>
-    <input type="hidden" name="inventory_accno_id_<TMPL_VAR __counter__>" value="<TMPL_VAR std_inventory_accno_id>">
-    <TMPL_ELSE>
+   [% IF row.eur %]
+    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
+    [% ELSE %]
     <tr>
      <td>Inventar:</td>
      <td>
-      <select name="inventory_accno_id_<TMPL_VAR __counter__>">
-       <TMPL_LOOP ACC_INVENTORY><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+      <select name="inventory_accno_id_[% loop.count %]">
+       [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
       </select>
      </td>
     </tr>
-   </TMPL_IF>
+   [% END %]
 
    <tr>
     <td>Erl&ouml;skonto Inand:</td>
     <td>
-     <input type="hidden" name="income_accno_id_0_<TMPL_VAR __counter__>" value="<TMPL_VAR income_accno_id ESCAPE=HTML>">
-     <TMPL_VAR income_accno ESCAPE=HTML>--<TMPL_VAR income_description ESCAPE=HTML>
+     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
+     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
     </td>
    </tr>
 
    <tr>
     <td>Aufwandskonto Inand:</td>
     <td>
-     <input type="hidden" name="expense_accno_id_0_<TMPL_VAR __counter__>" value="<TMPL_VAR expense_accno_id ESCAPE=HTML>">
-     <TMPL_VAR expense_accno ESCAPE=HTML>--<TMPL_VAR expense_description ESCAPE=HTML>
+     <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
+     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
     </td>
    </tr>
 
    <tr>
     <td>Erl&ouml;skonto EU mit UstId-Nummer:</td>
     <td>
-     <select name="income_accno_id_1_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -89,8 +89,8 @@
    <tr>
     <td>Aufwandskonto EU mit UstId-Nummer:</td>
     <td>
-     <select name="expense_accno_id_1_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -98,8 +98,8 @@
    <tr>
     <td>Erl&ouml;skonto EU ohne UstId-Nummer:</td>
     <td>
-     <select name="income_accno_id_2_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -107,8 +107,8 @@
    <tr>
     <td>Aufwandskonto EU ohne UstId-Nummer:</td>
     <td>
-     <select name="expense_accno_id_2_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -116,8 +116,8 @@
    <tr>
     <td>Erl&ouml;skonto Ausland:</td>
     <td>
-     <select name="income_accno_id_3_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -125,19 +125,19 @@
    <tr>
     <td>Aufwandskonto Ausland:</td>
     <td>
-     <select name="expense_accno_id_3_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
      </select>
     </td>
    </tr>
   </table>
 
-  <TMPL_IF __last__>
-   <input type="hidden" name="rowcount" value="<TMPL_VAR __counter__>">
-  </TMPL_IF>
+  [% IF loop.last %]
+   <input type="hidden" name="rowcount" value="[% loop.count %]">
+  [% END %]
 
   <hr>
- </TMPL_LOOP>
+ [% END %]
 
  <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="Buchungsgruppe erfassen">
 
diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_master.html b/templates/webpages/dbupgrade/buchungsgruppen_services_master.html
index 731fa8da7..235987845 100644
--- a/templates/webpages/dbupgrade/buchungsgruppen_services_master.html
+++ b/templates/webpages/dbupgrade/buchungsgruppen_services_master.html
@@ -1,16 +1,16 @@
-<div class="listtop"><translate>Step 2 of 3: Services</translate></div>
+[% USE HTML %]<div class="listtop"><translate>Step 2 of 3: Services</translate></div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="type" value="parts">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="">
 
- <TMPL_IF saved_message>
-  <p><TMPL_VAR saved_message></p>
- </TMPL_IF>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
 
  <div class="subsubheading"><translate>Existing Buchungsgruppen</translate></div>
 
@@ -18,70 +18,70 @@
   <translate>The following Buchungsgruppen have already been created:</translate>
   <br>
   <ul>
-   <TMPL_LOOP BUCHUNGSGRUPPEN>
+   [% FOREACH row = BUCHUNGSGRUPPEN %]
     <li>
-     <TMPL_VAR description ESCAPE=HTML>:
-     <translate>Invetory</translate>: <TMPL_VAR inventory_accno>;
+     [% HTML.escape(row.description) %]:
+     <translate>Inventory</translate>: [% row.inventory_accno %];
 
      <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>National</translate>: <TMPL_VAR income_accno_0>/<TMPL_VAR expense_accno_0>;
+     <translate>National</translate>: [% row.income_accno_0 %]/[% row.expense_accno_0 %];
 
      <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU with VAT ID</translate>: <TMPL_VAR income_accno_1>/<TMPL_VAR expense_accno_1>;
+     <translate>EU with VAT ID</translate>: [% row.income_accno_1 %]/[% row.expense_accno_1 %];
 
      <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>EU without VAT ID</translate>: <TMPL_VAR income_accno_2>/<TMPL_VAR expense_accno_2>;
+     <translate>EU without VAT ID</translate>: [% row.income_accno_2 %]/[% row.expense_accno_2 %];
 
      <translate>Income accno</translate>/<translate>Expense accno</translate>
-     <translate>International</translate>: <TMPL_VAR income_accno_3>/<TMPL_VAR expense_accno_3>
+     <translate>International</translate>: [% row.income_accno_3 %]/[% row.expense_accno_3 %]
     </li>
-   </TMPL_LOOP>
+   [% END %]
   </ul>
  </p>
 
- <TMPL_LOOP LIST>
-  <div class="subsubheading"><translate>New Buchungsgruppe <TMPL_VAR __counter__></translate></div>
+ [% FOREACH row = LIST %]
+  <div class="subsubheading"><translate>New Buchungsgruppe [% loop.count %]</translate></div>
 
   <table>
    <tr>
     <td><translate>Description</translate>:</td>
-    <td><input name="description_<TMPL_VAR __counter__>"></td>
+    <td><input name="description_[% loop.count %]"></td>
    </tr>
 
-   <TMPL_IF eur>
-    <input type="hidden" name="inventory_accno_id_<TMPL_VAR __counter__>" value="<TMPL_VAR std_inventory_accno_id>">
-    <TMPL_ELSE>
+   [% IF row.eur %]
+    <input type="hidden" name="inventory_accno_id_[% loop.count %]" value="[% std_inventory_accno_id %]">
+    [% ELSE %]
     <tr>
      <td><translate>Inventory</translate>:</td>
      <td>
-      <select name="inventory_accno_id_<TMPL_VAR __counter__>">
-       <TMPL_LOOP ACC_INVENTORY><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+      <select name="inventory_accno_id_[% loop.count %]">
+       [% FOREACH acc_row = ACC_INVENTORY %]<option value="[% acc_row.id %]" [% acc_row.selected %]>[% HTML.escape(acc_row.accno) %]--[% HTML.escape(acc_row.description) %]</option>[% END %]
       </select>
      </td>
     </tr>
-   </TMPL_IF>
+   [% END %]
 
    <tr>
     <td><translate>Income accno</translate> <translate>National</translate>:</td>
     <td>
-     <input type="hidden" name="income_accno_id_0_<TMPL_VAR __counter__>" value="<TMPL_VAR income_accno_id ESCAPE=HTML>">
-     <TMPL_VAR income_accno ESCAPE=HTML>--<TMPL_VAR income_description ESCAPE=HTML>
+     <input type="hidden" name="income_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.income_accno_id) %]">
+     [% HTML.escape(row.income_accno) %]--[% HTML.escape(row.income_description) %]
     </td>
    </tr>
 
    <tr>
     <td><translate>Expense accno</translate> <translate>National</translate>:</td>
     <td>
-     <input type="hidden" name="expense_accno_id_0_<TMPL_VAR __counter__>" value="<TMPL_VAR expense_accno_id ESCAPE=HTML>">
-     <TMPL_VAR expense_accno ESCAPE=HTML>--<TMPL_VAR expense_description ESCAPE=HTML>
+     <input type="hidden" name="expense_accno_id_0_[% loop.count %]" value="[% HTML.escape(row.expense_accno_id) %]">
+     [% HTML.escape(row.expense_accno) %]--[% HTML.escape(row.expense_description) %]
     </td>
    </tr>
 
    <tr>
     <td><translate>Income accno</translate> <translate>EU with VAT ID</translate>:</td>
     <td>
-     <select name="income_accno_id_1_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -89,8 +89,8 @@
    <tr>
     <td><translate>Expense accno</translate> <translate>EU with VAT ID</translate>:</td>
     <td>
-     <select name="expense_accno_id_1_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_1_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -98,8 +98,8 @@
    <tr>
     <td><translate>Income accno</translate> <translate>EU without VAT ID</translate>:</td>
     <td>
-     <select name="income_accno_id_2_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -107,8 +107,8 @@
    <tr>
     <td><translate>Expense accno</translate> <translate>EU without VAT ID</translate>:</td>
     <td>
-     <select name="expense_accno_id_2_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_2_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -116,8 +116,8 @@
    <tr>
     <td><translate>Income accno</translate> <translate>International</translate>:</td>
     <td>
-     <select name="income_accno_id_3_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_INCOME><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="income_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_INCOME %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -125,19 +125,19 @@
    <tr>
     <td><translate>Expense accno</translate> <translate>International</translate>:</td>
     <td>
-     <select name="expense_accno_id_3_<TMPL_VAR __counter__>">
-      <TMPL_LOOP ACC_EXPENSE><option value="<TMPL_VAR id>" <TMPL_VAR selected>><TMPL_VAR accno ESCAPE=HTML>--<TMPL_VAR description ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="expense_accno_id_3_[% loop.count %]">
+      [% FOREACH acc_row = ACC_EXPENSE %]<option value="[% id %]" [% selected %]>[% HTML.escape(accno) %]--[% HTML.escape(description) %]</option>[% END %]
      </select>
     </td>
    </tr>
   </table>
 
-  <TMPL_IF __last__>
-   <input type="hidden" name="rowcount" value="<TMPL_VAR __counter__>">
-  </TMPL_IF>
+  [% IF loop.last %]
+   <input type="hidden" name="rowcount" value="[% loop.count %]">
+  [% END %]
 
   <hr>
- </TMPL_LOOP>
+ [% END %]
 
  <input type="submit" onclick="document.Form.action2.value = 'create_buchungsgruppen'; document.Form.submit();" name="dummy" value="<translate>Create Buchungsgruppen</translate>">
 
diff --git a/templates/webpages/dbupgrade/coa_guess_de.html b/templates/webpages/dbupgrade/coa_guess_de.html
index 6379936b4..b93d1d721 100644
--- a/templates/webpages/dbupgrade/coa_guess_de.html
+++ b/templates/webpages/dbupgrade/coa_guess_de.html
@@ -1,15 +1,15 @@
-<div class="listtop">Benutzten Kontenrahmen ausw&auml;hlen</div>
+[% USE HTML %]<div class="listtop">Benutzten Kontenrahmen ausw&auml;hlen</div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="">
 
- <TMPL_IF saved_message>
-  <p><TMPL_VAR saved_message></p>
- </TMPL_IF>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
 
  <p>
   Bitte w&auml;hlen Sie den Kontenrahmen aus, der bei dieser Installation verwendet wird.
@@ -17,7 +17,7 @@
 
  <p>
   Kontenrahmen:
-  <select name="coa"><TMPL_LOOP COAS><option><TMPL_VAR name></option></TMPL_LOOP></select>
+  <select name="coa">[% FOREACH row = COAS %]<option>[% row.name %]</option>[% END %]</select>
  </p>
 
  <input type="submit" onclick="document.Form.action2.value = 'set_coa'; document.Form.submit();" name="dummy" value="Weiter">
diff --git a/templates/webpages/dbupgrade/coa_guess_master.html b/templates/webpages/dbupgrade/coa_guess_master.html
index 2bc5acaec..656012bdd 100644
--- a/templates/webpages/dbupgrade/coa_guess_master.html
+++ b/templates/webpages/dbupgrade/coa_guess_master.html
@@ -1,15 +1,15 @@
-<div class="listtop"><translate>Select the chart of accounts in use</translate></div>
+[% USE HTML %]<div class="listtop"><translate>Select the chart of accounts in use</translate></div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="">
 
- <TMPL_IF saved_message>
-  <p><TMPL_VAR saved_message></p>
- </TMPL_IF>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
 
  <p>
   <translate>Please select the chart of accounts this installation
@@ -18,7 +18,7 @@
 
  <p>
   <translate>Chart of accounts</translate>:
-  <select name="coa"><TMPL_LOOP COAS><option><TMPL_VAR name></option></TMPL_LOOP></select>
+  <select name="coa">[% FOREACH row = COAS %]<option>[% row.name %]</option>[% END %]</select>
  </p>
 
  <input type="submit" onclick="document.Form.action2.value = 'set_coa'; document.Form.submit();" name="dummy" value="<translate>Continue</translate>">
diff --git a/templates/webpages/dbupgrade/error_de.html b/templates/webpages/dbupgrade/error_de.html
index 77e8dcef0..ee37ea538 100644
--- a/templates/webpages/dbupgrade/error_de.html
+++ b/templates/webpages/dbupgrade/error_de.html
@@ -1,6 +1,6 @@
-<p>Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei <TMPL_VAR file ESCAPE=HTML> enthielt den folgenden Fehler:
+[% USE HTML %]<p>Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei [% HTML.escape(file) %] enthielt den folgenden Fehler:
  <br>
- <TMPL_VAR error>
+ [% error %]
  <br>
  Alle &Auml;nderungen in dieser Datei wurden r&uuml;ckg&auml;ngig gemacht.
 </p>
diff --git a/templates/webpages/dbupgrade/error_master.html b/templates/webpages/dbupgrade/error_master.html
index f9a5e7696..ca99d400a 100644
--- a/templates/webpages/dbupgrade/error_master.html
+++ b/templates/webpages/dbupgrade/error_master.html
@@ -1,6 +1,6 @@
-<p><translate>The database update/creation did not succeed. The file <TMPL_VAR file ESCAPE=HTML> contained the following error:</translate>
+[% USE HTML %]<p><translate>The database update/creation did not succeed. The file [% HTML.escape(file) %] contained the following error:</translate>
  <br>
- <TMPL_VAR error>
+ [% error %]
  <br>
  <translate>All changes in that file have been reverted.</translate>
 </p>
diff --git a/templates/webpages/dbupgrade/footer_de.html b/templates/webpages/dbupgrade/footer_de.html
index 4230911a0..7db7cf981 100644
--- a/templates/webpages/dbupgrade/footer_de.html
+++ b/templates/webpages/dbupgrade/footer_de.html
@@ -1,9 +1,9 @@
-<p>...fertig</p>
+[% USE HTML %]<p>...fertig</p>
 
-<form action="<TMPL_VAR menufile>">
+<form action="[% menufile %]">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="action" value="display">
 
  <p><input type="submit" value="Weiter"></p>
diff --git a/templates/webpages/dbupgrade/footer_master.html b/templates/webpages/dbupgrade/footer_master.html
index c26603f18..b89531f3e 100644
--- a/templates/webpages/dbupgrade/footer_master.html
+++ b/templates/webpages/dbupgrade/footer_master.html
@@ -1,9 +1,9 @@
-<p><translate>...done</translate></p>
+[% USE HTML %]<p><translate>...done</translate></p>
 
-<form action="<TMPL_VAR menufile>">
+<form action="[% menufile %]">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="action" value="display">
 
  <p><input type="submit" value="<translate>Continue</translate>"></p>
diff --git a/templates/webpages/dbupgrade/header_de.html b/templates/webpages/dbupgrade/header_de.html
index 90ca9360d..112eea4cd 100644
--- a/templates/webpages/dbupgrade/header_de.html
+++ b/templates/webpages/dbupgrade/header_de.html
@@ -1,7 +1,7 @@
-<body>
+[% USE HTML %]<body>
 
  <table width="100%">
   <tr>
-   <td class="listtop">Datenbankaktualisierung (<TMPL_VAR dbname ESCAPE=HTML>)</td>
+   <td class="listtop">Datenbankaktualisierung ([% HTML.escape(dbname) %])</td>
   </tr>
  </table>
diff --git a/templates/webpages/dbupgrade/header_master.html b/templates/webpages/dbupgrade/header_master.html
index ced681327..77dc972b9 100644
--- a/templates/webpages/dbupgrade/header_master.html
+++ b/templates/webpages/dbupgrade/header_master.html
@@ -1,7 +1,7 @@
-<body>
+[% USE HTML %]<body>
 
  <table width="100%">
   <tr>
-   <td class="listtop"><translate>Dataset upgrade</translate> (<TMPL_VAR dbname ESCAPE=HTML>)</td>
+   <td class="listtop"><translate>Dataset upgrade</translate> ([% HTML.escape(dbname) %])</td>
   </tr>
  </table>
diff --git a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_de.html b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_de.html
index 9924d54d1..564d0d4d4 100644
--- a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_de.html
+++ b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_de.html
@@ -1,20 +1,19 @@
-<div class="listtop">Unbekannter Kontenrahmen</div>
+[% USE HTML %]<div class="listtop">Unknown chart of accounts</div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>">
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="">
 
- <TMPL_IF saved_message>
-  <p><TMPL_VAR saved_message></p>
- </TMPL_IF>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
 
  <p>
-  Hinweis:
-  Diese Installation benutzt einen unbekannten Kontenrahmen (&quot;<TMPL_VAR coa ESCAPE=HTML>&quot;). Dieses Datenbankupgrade kann die Standardbuchungsgruppen nicht automatisch anlegen.
+  Note:
+  This installation uses an unknown chart of accounts (&quot;[% HTML.escape(coa) %]&quot;). This database upgrade cannot create standard buchungsgruppen automatically.
  </p>
 
  <hr>
diff --git a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html
index b79945373..ea4424062 100644
--- a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html
+++ b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html
@@ -1,20 +1,20 @@
-<div class="listtop"><translate>Unknown chart of accounts</translate></div>
+[% USE HTML %]<div class="listtop"><translate>Unknown chart of accounts</translate></div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="">
 
- <TMPL_IF saved_message>
-  <p><TMPL_VAR saved_message></p>
- </TMPL_IF>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
 
  <p>
   <translate>Note</translate>:
   <translate>This installation uses an unknown chart of accounts
-   (&quot;<TMPL_VAR coa ESCAPE=HTML>&quot;). This database upgrade
+   (&quot;[% HTML.escape(coa) %]&quot;). This database upgrade
    cannot create standard buchungsgruppen automatically.</translate>
  </p>
 
diff --git a/templates/webpages/dbupgrade/units_error_de.html b/templates/webpages/dbupgrade/units_error_de.html
index 67a0932d3..aa3f94618 100644
--- a/templates/webpages/dbupgrade/units_error_de.html
+++ b/templates/webpages/dbupgrade/units_error_de.html
@@ -1,4 +1,4 @@
-<p><b>Fehler:</b> <TMPL_VAR message></p>
+[% USE HTML %]<p><b>Fehler:</b> [% message %]</p>
 
 <form>
 <input type="button" onclick="history.back()" value="Zurück">
diff --git a/templates/webpages/dbupgrade/units_error_master.html b/templates/webpages/dbupgrade/units_error_master.html
index d62657e88..53578e2f6 100644
--- a/templates/webpages/dbupgrade/units_error_master.html
+++ b/templates/webpages/dbupgrade/units_error_master.html
@@ -1,4 +1,4 @@
-<p><b><translate>Error</translate>:</b> <TMPL_VAR message></p>
+[% USE HTML %]<p><b><translate>Error</translate>:</b> [% message %]</p>
 
 <form>
 <input type="button" onclick="history.back()" value="<translate>Back</translate>">
diff --git a/templates/webpages/dbupgrade/units_parts_de.html b/templates/webpages/dbupgrade/units_parts_de.html
index 663088f11..f1af5f330 100644
--- a/templates/webpages/dbupgrade/units_parts_de.html
+++ b/templates/webpages/dbupgrade/units_parts_de.html
@@ -1,16 +1,16 @@
-<div class="listtop">Schritt 1 von 3: Waren</div>
+[% USE HTML %]<div class="listtop">Schritt 1 von 3: Waren</div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="unit_type" value="dimension">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="">
 
- <TMPL_IF saved_message>
-  <p><TMPL_VAR saved_message></p>
- </TMPL_IF>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
 
  <div class="subsubheading">Einheit hinzuf&uuml;gen</div>
 
@@ -20,7 +20,7 @@
 
  <p>
   Die folgenden Einheiten existieren bereits:
-  <TMPL_LOOP NEW_BASE_UNIT_DDBOX><TMPL_IF name><TMPL_VAR name ESCAPE=HTML><TMPL_UNLESS __last__>; </TMPL_UNLESS></TMPL_IF></TMPL_LOOP>
+  [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
  </p>
 
  <hr>
@@ -34,7 +34,7 @@
    <th align="right">Basiseinheit</th>
    <td>
     <select name="new_base_unit">
-     <TMPL_LOOP NEW_BASE_UNIT_DDBOX><option <TMPL_VAR selected>><TMPL_VAR name></option></TMPL_LOOP>
+     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
     </select>
    </td>
   </tr>
@@ -61,19 +61,19 @@
    <th class="listheading">Neue Einheit</th>
   </tr>
 
-  <TMPL_LOOP UNKNOWN_PART_UNITS>
-   <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
+  [% FOREACH row = UNKNOWN_PART_UNITS %]
+   <tr class="listrow[% loop.count % 2 %]">
     <td>
-     <TMPL_VAR name ESCAPE=HTML>
-     <input type="hidden" name="old_unit_<TMPL_VAR __counter__>" value="<TMPL_VAR name ESCAPE=HTML>">
+     [% HTML.escape(row.name) %]
+     <input type="hidden" name="old_unit_[% loop.count %]" value="[% HTML.escape(row.name) %]">
     </td>
     <td>
-     <select name="new_unit_<TMPL_VAR __counter__>">
-      <TMPL_LOOP NEW_UNITS><option><TMPL_VAR name ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="new_unit_[% loop.count %]">
+      [% FOREACH row_new = row.NEW_UNITS %]<option>[% HTML.escape(row_new.name) %]</option>[% END %]
      </select>
     </td>
-    <TMPL_IF __last__><input type="hidden" name="rowcount" value="<TMPL_VAR __counter__>"></TMPL_IF>
-  </TMPL_LOOP>
+    [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
+  [% END %]
  </table>
 
  <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="Einheiten zuweisen">
diff --git a/templates/webpages/dbupgrade/units_parts_master.html b/templates/webpages/dbupgrade/units_parts_master.html
index 1d8f41269..a7737b962 100644
--- a/templates/webpages/dbupgrade/units_parts_master.html
+++ b/templates/webpages/dbupgrade/units_parts_master.html
@@ -1,16 +1,16 @@
-<div class="listtop"><translate>Step 1 of 3: Parts</translate></div>
+[% USE HTML %]<div class="listtop"><translate>Step 1 of 3: Parts</translate></div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="unit_type" value="dimension">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="">
 
- <TMPL_IF saved_message>
-  <p><TMPL_VAR saved_message></p>
- </TMPL_IF>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
 
  <div class="subsubheading"><translate>Add unit</translate></div>
 
@@ -26,7 +26,7 @@
 
  <p>
   <translate>The following units exist already:</translate>
-  <TMPL_LOOP NEW_BASE_UNIT_DDBOX><TMPL_IF name><TMPL_VAR name ESCAPE=HTML><TMPL_UNLESS __last__>; </TMPL_UNLESS></TMPL_IF></TMPL_LOOP>
+  [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
  </p>
 
  <hr>
@@ -40,7 +40,7 @@
    <th align="right"><translate>Base unit</translate></th>
    <td>
     <select name="new_base_unit">
-     <TMPL_LOOP NEW_BASE_UNIT_DDBOX><option <TMPL_VAR selected>><TMPL_VAR name></option></TMPL_LOOP>
+     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
     </select>
    </td>
   </tr>
@@ -67,19 +67,19 @@
    <th class="listheading"><translate>New unit</translate></th>
   </tr>
 
-  <TMPL_LOOP UNKNOWN_PART_UNITS>
-   <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
+  [% FOREACH row = UNKNOWN_PART_UNITS %]
+   <tr class="listrow[% loop.count % 2 %]">
     <td>
-     <TMPL_VAR name ESCAPE=HTML>
-     <input type="hidden" name="old_unit_<TMPL_VAR __counter__>" value="<TMPL_VAR name ESCAPE=HTML>">
+     [% HTML.escape(row.name) %]
+     <input type="hidden" name="old_unit_[% loop.count %]" value="[% HTML.escape(row.name) %]">
     </td>
     <td>
-     <select name="new_unit_<TMPL_VAR __counter__>">
-      <TMPL_LOOP NEW_UNITS><option><TMPL_VAR name ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="new_unit_[% loop.count %]">
+      [% FOREACH row_new = row.NEW_UNITS %]<option>[% HTML.escape(row_new.name) %]</option>[% END %]
      </select>
     </td>
-    <TMPL_IF __last__><input type="hidden" name="rowcount" value="<TMPL_VAR __counter__>"></TMPL_IF>
-  </TMPL_LOOP>
+    [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
+  [% END %]
  </table>
 
  <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="<translate>Assign units</translate>">
diff --git a/templates/webpages/dbupgrade/units_services_de.html b/templates/webpages/dbupgrade/units_services_de.html
index 99a0858aa..d11561760 100644
--- a/templates/webpages/dbupgrade/units_services_de.html
+++ b/templates/webpages/dbupgrade/units_services_de.html
@@ -1,16 +1,16 @@
-<div class="listtop">Schritt 2 von 3: Dienstleistungen</div>
+[% USE HTML %]<div class="listtop">Schritt 2 von 3: Dienstleistungen</div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="unit_type" value="service">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="">
 
- <TMPL_IF saved_message>
-  <p><TMPL_VAR saved_message></p>
- </TMPL_IF>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
 
  <div class="subsubheading">Einheit hinzuf&uuml;gen</div>
 
@@ -20,7 +20,7 @@
 
  <p>
   Die folgenden Einheiten existieren bereits:
-  <TMPL_LOOP NEW_BASE_UNIT_DDBOX><TMPL_IF name><TMPL_VAR name ESCAPE=HTML><TMPL_UNLESS __last__>; </TMPL_UNLESS></TMPL_IF></TMPL_LOOP>
+  [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
  </p>
 
  <hr>
@@ -34,7 +34,7 @@
    <th align="right">Basiseinheit</th>
    <td>
     <select name="new_base_unit">
-     <TMPL_LOOP NEW_BASE_UNIT_DDBOX><option <TMPL_VAR selected>><TMPL_VAR name></option></TMPL_LOOP>
+     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
     </select>
    </td>
   </tr>
@@ -61,19 +61,19 @@
    <th class="listheading">Neue Einheit</th>
   </tr>
 
-  <TMPL_LOOP UNKNOWN_PART_UNITS>
-   <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
+  [% FOREACH row = UNKNOWN_PART_UNITS %]
+   <tr class="listrow[% loop.count % 2 %]">
     <td>
-     <TMPL_VAR name ESCAPE=HTML>
-     <input type="hidden" name="old_unit_<TMPL_VAR __counter__>" value="<TMPL_VAR name ESCAPE=HTML>">
+     [% HTML.escape(row.name) %]
+     <input type="hidden" name="old_unit_[% loop.count %]" value="[% HTML.escape(row.name) %]">
     </td>
     <td>
-     <select name="new_unit_<TMPL_VAR __counter__>">
-      <TMPL_LOOP NEW_UNITS><option><TMPL_VAR name ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="new_unit_[% loop.count %]">
+      [% FOREACH row_new = row.NEW_UNITS %]<option>[% HTML.escape(row_new.name) %]</option>[% END %]
      </select>
     </td>
-    <TMPL_IF __last__><input type="hidden" name="rowcount" value="<TMPL_VAR __counter__>"></TMPL_IF>
-  </TMPL_LOOP>
+    [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
+  [% END %]
  </table>
 
  <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="Einheiten zuweisen">
diff --git a/templates/webpages/dbupgrade/units_services_master.html b/templates/webpages/dbupgrade/units_services_master.html
index 9622469b1..623714673 100644
--- a/templates/webpages/dbupgrade/units_services_master.html
+++ b/templates/webpages/dbupgrade/units_services_master.html
@@ -1,16 +1,16 @@
-<div class="listtop"><translate>Step 2 of 3: Services</translate></div>
+[% USE HTML %]<div class="listtop"><translate>Step 2 of 3: Services</translate></div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="unit_type" value="service">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="">
 
- <TMPL_IF saved_message>
-  <p><TMPL_VAR saved_message></p>
- </TMPL_IF>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
 
  <div class="subsubheading"><translate>Add unit</translate></div>
 
@@ -26,7 +26,7 @@
 
  <p>
   <translate>The following units exist already:</translate>
-  <TMPL_LOOP NEW_BASE_UNIT_DDBOX><TMPL_IF name><TMPL_VAR name ESCAPE=HTML><TMPL_UNLESS __last__>; </TMPL_UNLESS></TMPL_IF></TMPL_LOOP>
+  [% FOREACH row = NEW_BASE_UNIT_DDBOX %][% IF row.name %][% HTML.escape(row.name) %][% UNLESS loop.last %]; [% END %][% END %][% END %]
  </p>
 
  <hr>
@@ -40,7 +40,7 @@
    <th align="right"><translate>Base unit</translate></th>
    <td>
     <select name="new_base_unit">
-     <TMPL_LOOP NEW_BASE_UNIT_DDBOX><option <TMPL_VAR selected>><TMPL_VAR name></option></TMPL_LOOP>
+     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
     </select>
    </td>
   </tr>
@@ -67,19 +67,19 @@
    <th class="listheading"><translate>New unit</translate></th>
   </tr>
 
-  <TMPL_LOOP UNKNOWN_PART_UNITS>
-   <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
+  [% FOREACH row = UNKNOWN_PART_UNITS %]
+   <tr class="listrow[% loop.count % 2 %]">
     <td>
-     <TMPL_VAR name ESCAPE=HTML>
-     <input type="hidden" name="old_unit_<TMPL_VAR __counter__>" value="<TMPL_VAR name ESCAPE=HTML>">
+     [% HTML.escape(row.name) %]
+     <input type="hidden" name="old_unit_[% loop.count %]" value="[% HTML.escape(row.name) %]">
     </td>
     <td>
-     <select name="new_unit_<TMPL_VAR __counter__>">
-      <TMPL_LOOP NEW_UNITS><option><TMPL_VAR name ESCAPE=HTML></option></TMPL_LOOP>
+     <select name="new_unit_[% loop.count %]">
+      [% FOREACH row_new = row.NEW_UNITS %]<option>[% HTML.escape(row_new.name) %]</option>[% END %]
      </select>
     </td>
-    <TMPL_IF __last__><input type="hidden" name="rowcount" value="<TMPL_VAR __counter__>"></TMPL_IF>
-  </TMPL_LOOP>
+    [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
+  [% END %]
  </table>
 
  <input type="submit" onclick="document.Form.action2.value = 'assign_units'; document.Form.submit();" name="dummy" value="<translate>Assign units</translate>">
diff --git a/templates/webpages/dbupgrade/units_set_default_de.html b/templates/webpages/dbupgrade/units_set_default_de.html
index 6b0b1e273..7b59444d5 100644
--- a/templates/webpages/dbupgrade/units_set_default_de.html
+++ b/templates/webpages/dbupgrade/units_set_default_de.html
@@ -1,9 +1,9 @@
-<div class="listtop">Schritt 3 von 3: Standardeinheiten</div>
+[% USE HTML %]<div class="listtop">Schritt 3 von 3: Standardeinheiten</div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="unit_type" value="dimension">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="">
@@ -18,7 +18,7 @@
    <td>Ma&szlig;einheit:</td>
    <td>
     <select name="default_dimension_unit">
-     <TMPL_LOOP DIMENSION_DDBOX><option><TMPL_VAR name ESCAPE=HTML></option></TMPL_LOOP>
+     [% FOREACH row = DIMENSION_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
     </select>
    </td>
   </tr>
@@ -27,7 +27,7 @@
    <td>Dienstleistungseinheit:</td>
    <td>
     <select name="default_service_unit">
-     <TMPL_LOOP SERVICE_DDBOX><option><TMPL_VAR name ESCAPE=HTML></option></TMPL_LOOP>
+     [% FOREACH row = SERVICE_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
     </select>
    </td>
   </tr>
diff --git a/templates/webpages/dbupgrade/units_set_default_master.html b/templates/webpages/dbupgrade/units_set_default_master.html
index bed20b824..655d45b53 100644
--- a/templates/webpages/dbupgrade/units_set_default_master.html
+++ b/templates/webpages/dbupgrade/units_set_default_master.html
@@ -1,9 +1,9 @@
-<div class="listtop"><translate>Step 3 of 3: Default units</translate></div>
+[% USE HTML %]<div class="listtop"><translate>Step 3 of 3: Default units</translate></div>
 
 <form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="unit_type" value="dimension">
  <input type="hidden" name="action" value="login">
  <input type="hidden" name="action2" value="">
@@ -20,7 +20,7 @@
    <td><translate>Dimension unit</translate>:</td>
    <td>
     <select name="default_dimension_unit">
-     <TMPL_LOOP DIMENSION_DDBOX><option><TMPL_VAR name ESCAPE=HTML></option></TMPL_LOOP>
+     [% FOREACH row = DIMENSION_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
     </select>
    </td>
   </tr>
@@ -29,7 +29,7 @@
    <td><translate>Service unit</translate>:</td>
    <td>
     <select name="default_service_unit">
-     <TMPL_LOOP SERVICE_DDBOX><option><TMPL_VAR name ESCAPE=HTML></option></TMPL_LOOP>
+     [% FOREACH row = SERVICE_DDBOX %]<option>[% HTML.escape(row.name) %]</option>[% END %]
     </select>
    </td>
   </tr>
diff --git a/templates/webpages/dbupgrade/update_templates_warnings_de.html b/templates/webpages/dbupgrade/update_templates_warnings_de.html
index 3580e61dd..4b8f00ba5 100644
--- a/templates/webpages/dbupgrade/update_templates_warnings_de.html
+++ b/templates/webpages/dbupgrade/update_templates_warnings_de.html
@@ -1,11 +1,11 @@
-<div class="listtop">Warnungen bei Aktualisierung der Dokumentenvorlagen</div>
+[% USE HTML %]<div class="listtop">Warnungen bei Aktualisierung der Dokumentenvorlagen</div>
 
 <p>Die folgenden Warnungen traten w&auml;hrend einer Aktualisierung der Dokumentenvorlagen auf:</p>
 
 <p>
  <ul>
-  <TMPL_LOOP WARNINGS>
-   <li><TMPL_VAR message></li>
-  </TMPL_LOOP>
+  [% FOREACH row = WARNINGS %]
+   <li>[% row.message %]</li>
+  [% END %]
  </ul>
 </p>
diff --git a/templates/webpages/dbupgrade/update_templates_warnings_master.html b/templates/webpages/dbupgrade/update_templates_warnings_master.html
index addda81a4..69e20ef60 100644
--- a/templates/webpages/dbupgrade/update_templates_warnings_master.html
+++ b/templates/webpages/dbupgrade/update_templates_warnings_master.html
@@ -1,12 +1,12 @@
-<div class="listtop"><translate>Warnings during template upgrade</translate></div>
+[% USE HTML %]<div class="listtop"><translate>Warnings during template upgrade</translate></div>
 
 <p><translate>The following warnings occured during an upgrade to the
   document templates:</translate></p>
 
 <p>
  <ul>
-  <TMPL_LOOP WARNINGS>
-   <li><TMPL_VAR message></li>
-  </TMPL_LOOP>
+  [% FOREACH row = WARNINGS %]
+   <li>[% row.message %]</li>
+  [% END %]
  </ul>
 </p>
diff --git a/templates/webpages/dbupgrade/upgrade_message2_de.html b/templates/webpages/dbupgrade/upgrade_message2_de.html
index 3bf47b734..2c2f57f6c 100644
--- a/templates/webpages/dbupgrade/upgrade_message2_de.html
+++ b/templates/webpages/dbupgrade/upgrade_message2_de.html
@@ -1,4 +1,4 @@
-<ul>
- <li>F&uuml;hre <TMPL_VAR file ESCAPE=HTML> aus: <TMPL_VAR description></li>
+[% USE HTML %]<ul>
+ <li>F&uuml;hre [% HTML.escape(file) %] aus: [% description %]</li>
 </ul>
 
diff --git a/templates/webpages/dbupgrade/upgrade_message2_master.html b/templates/webpages/dbupgrade/upgrade_message2_master.html
index c5718e13f..f7aedd185 100644
--- a/templates/webpages/dbupgrade/upgrade_message2_master.html
+++ b/templates/webpages/dbupgrade/upgrade_message2_master.html
@@ -1,4 +1,4 @@
-<ul>
- <li><translate>Applying <TMPL_VAR file ESCAPE=HTML>:</translate> <TMPL_VAR description></li>
+[% USE HTML %]<ul>
+ <li><translate>Applying [% HTML.escape(file) %]:</translate> [% description %]</li>
 </ul>
 
diff --git a/templates/webpages/dbupgrade/ustva_setup_2007_error_master.html b/templates/webpages/dbupgrade/ustva_setup_2007_error_master.html
index d62657e88..53578e2f6 100644
--- a/templates/webpages/dbupgrade/ustva_setup_2007_error_master.html
+++ b/templates/webpages/dbupgrade/ustva_setup_2007_error_master.html
@@ -1,4 +1,4 @@
-<p><b><translate>Error</translate>:</b> <TMPL_VAR message></p>
+[% USE HTML %]<p><b><translate>Error</translate>:</b> [% message %]</p>
 
 <form>
 <input type="button" onclick="history.back()" value="<translate>Back</translate>">
diff --git a/templates/webpages/dbupgrade/warning_de.html b/templates/webpages/dbupgrade/warning_de.html
index b2600bc1a..7f926dbc9 100644
--- a/templates/webpages/dbupgrade/warning_de.html
+++ b/templates/webpages/dbupgrade/warning_de.html
@@ -1,11 +1,11 @@
-<form name="Form" method="post" action="login.pl">
+[% USE HTML %]<form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="action" value="login">
 
  <p>
-  Lx-Office wird gleich die Datenbank <b><TMPL_VAR dbname ESCAPE=HTML></b> aktualisieren. Sie sollten eine Sicherungskopie der Datenbank erstellen, bevor Sie fortfahren, da die Aktualisierung unter Umst&auml;nden nicht umkehrbar ist.
+  Lx-Office wird gleich die Datenbank <b>[% HTML.escape(dbname) %]</b> aktualisieren. Sie sollten eine Sicherungskopie der Datenbank erstellen, bevor Sie fortfahren, da die Aktualisierung unter Umst&auml;nden nicht umkehrbar ist.
  </p>
 
  <input type="submit" name="dummy" value="Weiter">
diff --git a/templates/webpages/dbupgrade/warning_master.html b/templates/webpages/dbupgrade/warning_master.html
index ac00dd4ad..160c236b5 100644
--- a/templates/webpages/dbupgrade/warning_master.html
+++ b/templates/webpages/dbupgrade/warning_master.html
@@ -1,12 +1,12 @@
-<form name="Form" method="post" action="login.pl">
+[% USE HTML %]<form name="Form" method="post" action="login.pl">
 
- <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
- <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>">
+ <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+ <input type="hidden" name="hashed_password" value="[% HTML.escape(password) %]">
  <input type="hidden" name="action" value="login">
 
  <p>
   <translate>Lx-Office is about to update the
-   database <b><TMPL_VAR dbname ESCAPE=HTML></b>. You should create a
+   database <b>[% HTML.escape(dbname) %]</b>. You should create a
    backup of the database before proceeding because the backup might not
    be reversible.</translate>
  </p>