From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 31 Oct 2007 14:30:43 +0000 (+0000)
Subject: Umstellung der Vorlagen in templates/webpages/am von HTML::Template auf Template.
X-Git-Tag: release-2.6.0beta1~453
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b9882bee823f393f2071c790c1d73407c7d8ea51;p=kivitendo-erp.git

Umstellung der Vorlagen in templates/webpages/am von HTML::Template auf Template.
---

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index d11f16113..ac973cff9 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -339,7 +339,7 @@ sub account_header {
   };
   
   # Ausgabe des Templates
-  print($form->parse_html_template('am/edit_accounts', $parameters_ref));
+  print($form->parse_html_template2('am/edit_accounts', $parameters_ref));
 
 
   $lxdebug->leave_sub();
@@ -398,18 +398,10 @@ sub save_account {
 sub list_account {
   $lxdebug->enter_sub();
 
-  CA->all_accounts(\%myconfig, \%$form);
-
-  $form->{title} = $locale->text('Chart of Accounts');
-
-  # construct callback
-  $callback =
-    "$form->{script}?action=list_account&login=$form->{login}&password=$form->{password}";
-
+  $form->{callback}     = build_std_url('action=list_account');
+  my $link_edit_account = build_std_url('action=edit_account', 'callback');
 
-
-  # escape callback
-  $callback = $form->escape($callback);
+  CA->all_accounts(\%myconfig, \%$form);
 
   foreach $ca (@{ $form->{CA} }) {
 
@@ -423,19 +415,11 @@ sub list_account {
       $ca->{debit} = $form->format_amount(\%myconfig, -1 * $ca->{amount}, 2);
     }
     $ca->{heading}   = ( $ca->{charttype} eq 'H' ) ? 1:''; 
-    $ca->{link_edit_account} = 
-        qq|$form->{script}?action=edit_account&id=$ca->{id}|
-       .qq|&login=$form->{login}|
-       .qq|&password=$form->{password}&callback=$callback|;
+    $ca->{link_edit_account} = $link_edit_account . '&id=' . E($ca->{id});
   }
   
   # Ajax 
-  my $list_account_details_url = 
-              "$form->{script}?login=$form->{login}"
-             ."&password=$form->{password}&action=list_account_details&";
-  
-  
-  my $pjx = new CGI::Ajax('list_account_details' => $list_account_details_url);
+  my $pjx = new CGI::Ajax('list_account_details' => build_std_url('action=list_account_details'));
 
   # Eneable AJAX debuging
   #$pjx->DEBUG(1);
@@ -444,6 +428,7 @@ sub list_account {
   push(@ { $form->{AJAX} }, $pjx);
 
   $form->{stylesheets} = "list_accounts.css";
+  $form->{title}       = $locale->text('Chart of Accounts');
 
   $form->header;
   
@@ -461,23 +446,12 @@ sub list_account {
 
 
 sub list_account_details {
-# Ajax Funktion aus list_account_details  
+# Ajax Funktion aus list_account_details
   $lxdebug->enter_sub();
 
   my $chart_id = $form->{args};
-  
-  CA->all_accounts(\%myconfig, \%$form, $chart_id);
-
-  $form->{title} = $locale->text('Chart of Accounts');
-
-  # construct callback
-  $callback =
-    "$form->{script}?action=list_account&login=$form->{login}&password=$form->{password}";
 
-  $form->header;
-
-  # escape callback
-  $callback = $form->escape($callback);
+  CA->all_accounts(\%myconfig, \%$form, $chart_id);
 
   foreach $ca (@{ $form->{CA} }) {
 
@@ -494,11 +468,11 @@ sub list_account_details {
     }
 
     my @links = split( q{:}, $ca->{link});
-    
+
     $ca->{link} = q{};
-    
+
     foreach my $link (@links){
-      $link = ( $link eq 'AR')             ? $locale->text('Account Link AR')
+      $link =    ( $link eq 'AR')             ? $locale->text('Account Link AR')
                : ( $link eq 'AP')             ? $locale->text('Account Link AP')
                : ( $link eq 'IC')             ? $locale->text('Account Link IC')
                : ( $link eq 'AR_amount' )     ? $locale->text('Account Link AR_amount')
@@ -515,16 +489,8 @@ sub list_account_details {
                : ( $link eq 'IC_taxservice' ) ? $locale->text('Account Link IC_taxservice')
 #               : ( $link eq 'CT_tax' )        ? $locale->text('Account Link CT_tax')
                : $locale->text('Unknown Link') . ': ' . $link;
-      
       $ca->{link} .= ($link ne '') ?  "[$link] ":'';
     }
-    
-    $ca->{startdate}      =~ s/,/<br>/og;
-    $ca->{tk_ustva}       =~ s/,/<br>/og;
-    $ca->{taxkey}         =~ s/,/<br>/og;
-    $ca->{taxaccount}     =~ s/,/<br>/og;
-    $ca->{taxdescription} =~ s/,/<br>/og;
-    $ca->{datevautomatik} = ($ca->{datevautomatik}) ? $locale->text('On'):$locale->text('Off');
 
     $ca->{category} = ($ca->{category} eq 'A') ? $locale->text('Account Category A')
                     : ($ca->{category} eq 'E') ? $locale->text('Account Category E')
@@ -534,29 +500,13 @@ sub list_account_details {
                     : ($ca->{category} eq 'C') ? $locale->text('Account Category C')
                     : ($ca->{category} eq 'G') ? $locale->text('Account Category G')
                     : $locale->text('Unknown Category') . ': ' . $ca->{category};
-
-    $ca->{link_edit_account} = 
-        qq|$form->{script}?action=edit_account&id=$ca->{id}|
-       .qq|&login=$form->{login}|
-       .qq|&password=$form->{password}&callback=$callback|;
   }
 
+  $form->{title} = $locale->text('Chart of Accounts');
+  $form->header();
 
+  print $form->parse_html_template2('am/list_account_details');
 
-
-  my $parameters_ref = {
-  
-  
-  #   hidden_variables                => $_hidden_variables_ref,
-  };
-  
-  # Ausgabe des Templates
-  #my $q = CGI->new();
-  my $result = $form->parse_html_template('am/list_account_details', $parameters_ref);
-  
-  print $result;
-#  print "chart_id:$chart_id, form->chartid:$form->{chart_id}, rest=$rest";
-      
   $lxdebug->leave_sub();
 
 }
@@ -2609,11 +2559,11 @@ sub edit_units {
 
   $form->{"title"} = sprintf($locale->text("Add and edit %s"), $form->{"unit_type"} eq "dimension" ? $locale->text("dimension units") : $locale->text("service units"));
   $form->header();
-  print($form->parse_html_template("am/edit_units",
-                                   { "UNITS" => \@unit_list,
-                                     "NEW_BASE_UNIT_DDBOX" => $ddbox,
-                                     "LANGUAGES" => \@languages,
-                                     "updownlink" => $updownlink }));
+  print($form->parse_html_template2("am/edit_units",
+                                    { "UNITS"               => \@unit_list,
+                                      "NEW_BASE_UNIT_DDBOX" => $ddbox,
+                                      "LANGUAGES"           => \@languages,
+                                      "updownlink"          => $updownlink }));
 
   $lxdebug->leave_sub();
 }
diff --git a/bin/mozilla/amtemplates.pl b/bin/mozilla/amtemplates.pl
index 73e7e9b82..61877259a 100644
--- a/bin/mozilla/amtemplates.pl
+++ b/bin/mozilla/amtemplates.pl
@@ -145,8 +145,7 @@ sub display_template_form {
 
       push(@values,
            { "value"   => $file,
-             "label"   => ref($setup) ? $setup->{"translation"} : $setup,
-             "default" => $file eq $form->{"formname"} });
+             "label"   => ref($setup) ? $setup->{"translation"} : $setup });
     }
 
     # "zahlungserinnerung" => $locale->text('Payment Reminder'),
@@ -155,54 +154,45 @@ sub display_template_form {
       next if !$ref->{"template"};
 
       push(@values,
-           { "value"   => $ref->{"template"},
-             "label"   => $locale->text('Payment Reminder') . ": " . $ref->{"dunning_description"},
-             "default" => $ref->{"template"} eq $form->{"formname"} });
+           { "value" => $ref->{"template"},
+             "label" => $locale->text('Payment Reminder') . ": " . $ref->{"dunning_description"} });
     }
 
     @values = sort({ $a->{"label"} cmp $b->{"label"} } @values);
 
-    $options{"FORMNAME"} = [ @values ];
+    $options{FORMNAME} = [ @values ];
 
     #
     # Setup "language" selection
     #
 
-    @values = ( { "value" => "", "label" => "", "default" => 0 } );
+    @values = ();
 
     foreach my $item (@{ $form->{"ALL_LANGUAGES"} }) {
       next unless ($item->{"template_code"});
 
-      my $key = "$item->{id}--$item->{template_code}";
-
       push(@values,
-           { "value"   => $key,
-             "label"   => $item->{"description"},
-             "default" => $key eq $form->{"language"} });
+           { "value" => "$item->{id}--$item->{template_code}",
+             "label" => $item->{"description"} });
     }
 
-    $options{"LANGUAGE"} = [ @values ];
-    $options{"SHOW_LANGUAGE"} = scalar(@values) > 1;
-
-    @values = ( { "value" => "", "label" => "", "default" => 0 } );
+    $options{LANGUAGE} = [ @values ];
 
     #
     # Setup "printer" selection
     #
 
+    @values = ();
+
     foreach my $item (@{ $form->{"ALL_PRINTERS"} }) {
       next unless ($item->{"template_code"});
 
-      my $key = "$item->{id}--$item->{template_code}";
-
       push(@values,
-           { "value"   => $key,
-             "label"   => $item->{"printer_description"},
-             "default" => $key eq $form->{"printer"} });
+           { "value" => "$item->{id}--$item->{template_code}",
+             "label" => $item->{"printer_description"} });
     }
 
-    $options{"PRINTER"} = [ @values ];
-    $options{"SHOW_PRINTER"} = scalar(@values) > 1;
+    $options{PRINTER} = [ @values ];
 
   } else {
     push(@hidden, qw(formname language printer));
@@ -231,7 +221,7 @@ sub display_template_form {
   $options{"HIDDEN"} = [ map(+{ "name" => $_, "value" => $form->{$_} }, @hidden) ];
 
   $form->header;
-  print($form->parse_html_template("am/edit_templates", \%options));
+  print($form->parse_html_template2("am/edit_templates", \%options));
 
   $lxdebug->leave_sub();
 }
diff --git a/locale/de/am b/locale/de/am
index 876d6966d..0d3936765 100644
--- a/locale/de/am
+++ b/locale/de/am
@@ -161,8 +161,6 @@ $self->{texts} = {
   'No vendor has been selected yet.' => 'Es wurde noch kein Lieferant ausgewählt.',
   'None'                        => 'Kein',
   'Number Format'               => 'Zahlenformat',
-  'Off'                         => 'Aus',
-  'On'                          => 'An',
   'OpenDocument/OASIS'          => 'OpenDocument/OASIS',
   'PAYMENT POSTED'              => 'Rechung gebucht',
   'PDF'                         => 'PDF',
diff --git a/templates/webpages/am/edit_accounts_de.html b/templates/webpages/am/edit_accounts_de.html
index 12a61d09d..08829fcca 100644
--- a/templates/webpages/am/edit_accounts_de.html
+++ b/templates/webpages/am/edit_accounts_de.html
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="js/FormManager.js" >
+[% USE HTML %]<script type="text/javascript" src="js/FormManager.js" >
 /****************************************************
 * Form Dependency Manager- By Twey- http://www.twey.co.uk
 * Visit Dynamic Drive for this script and more: http://www.dynamicdrive.com
@@ -12,21 +12,21 @@ window.onload = function() {
 </script>
 
 <body>
-<form method="post" name="EditAccount" action="<TMPL_VAR script>">
+<form method="post" name="EditAccount" action="am.pl">
 
-<input type="hidden" name="id"                 value="<TMPL_VAR id>">
+<input type="hidden" name="id"                 value="[% HTML.escape(id) %]">
 <input type="hidden" name="type"               value="account">
-<input type="hidden" name="orphaned"           value="<TMPL_VAR orphaned>">
-<input type="hidden" name="new_chart_valid"    value="<TMPL_VAR new_chart_valid>">
-<input type="hidden" name="inventory_accno_id" value="<TMPL_VAR inventory_accno_id>">
-<input type="hidden" name="income_accno_id"    value="<TMPL_VAR income_accno_id>">
-<input type="hidden" name="expense_accno_id"   value="<TMPL_VAR expense_accno_id>">
-<input type="hidden" name="fxgain_accno_id"    value="<TMPL_VAR fxgain_accno_id>">
-<input type="hidden" name="fxloss_accno_id"    value="<TMPL_VAR fxloss_accno_id>">
+<input type="hidden" name="orphaned"           value="[% HTML.escape(orphaned) %]">
+<input type="hidden" name="new_chart_valid"    value="[% HTML.escape(new_chart_valid) %]">
+<input type="hidden" name="inventory_accno_id" value="[% HTML.escape(inventory_accno_id) %]">
+<input type="hidden" name="income_accno_id"    value="[% HTML.escape(income_accno_id) %]">
+<input type="hidden" name="expense_accno_id"   value="[% HTML.escape(expense_accno_id) %]">
+<input type="hidden" name="fxgain_accno_id"    value="[% HTML.escape(fxgain_accno_id) %]">
+<input type="hidden" name="fxloss_accno_id"    value="[% HTML.escape(fxloss_accno_id) %]">
 
 <table border="0" width="100%">
   <tr>
-    <th class="listtop"><TMPL_VAR title></th>
+    <th class="listtop">[% title %]</th>
   </tr>
 </table>
 
@@ -40,16 +40,15 @@ window.onload = function() {
         <label>
           Kontonummer
         </label></td>
-        <td><input name="accno" size="20" value="<TMPL_VAR accno>"></td>
+        <td><input name="accno" size="20" value="[% HTML.escape(accno) %]"></td>
     </tr>
     <tr>
       <td>
         <label>
           Beschreibung
-        </label>  
+        </label>
       </td>
-      <td><input name="description" size="40" value="<TMPL_VAR 
-              description ESCAPE=HTML>"></td>
+      <td><input name="description" size="40" value="[% HTML.escape(description) %]"></td>
     </tr>
     <tr>
       <td>
@@ -58,25 +57,24 @@ window.onload = function() {
 
         </label>
       </td>
-      <td><select name="charttype"><TMPL_VAR 
-              select_charttype></select></td>
+      <td><select name="charttype">[% select_charttype %]</select></td>
     </tr>
-  </table>    
-</fieldset>  
+  </table>
+</fieldset>
 <fieldset class="DEPENDS ON charttype BEING A">
   <legend>Kontoart</legend>
   <select name="category" id="AccountType" class="DEPENDS ON charttype BEING A">
-          <TMPL_VAR select_category></select>
+          [% select_category %]</select>
 </fieldset>
 
-<TMPL_IF ChartTypeIsAccount>
+[% IF ChartTypeIsAccount %]
 <fieldset class="DEPENDS ON charttype BEING A">
   <legend>Buchungskonto in</legend>
-    <input name="AR" type="checkbox" class="checkbox" value="AR" <TMPL_VAR AR ESCAPE=HTML>>
+    <input name="AR" type="checkbox" class="checkbox" value="AR" [% HTML.escape(AR) %]>
     &nbsp;Verkauf
-    <input name="AP" type="checkbox" class="checkbox" value="AP" <TMPL_VAR AP ESCAPE=HTML>>
+    <input name="AP" type="checkbox" class="checkbox" value="AP" [% HTML.escape(AP) %]>
     &nbsp;Einkauf
-    <input name="IC" type="checkbox" class="checkbox" value="IC" <TMPL_VAR IC ESCAPE=HTML>>
+    <input name="IC" type="checkbox" class="checkbox" value="IC" [% HTML.escape(IC) %]>
     &nbsp;Inventar
 </fieldset>
 
@@ -92,46 +90,46 @@ window.onload = function() {
     <tr>
       <td>
         <input name="AR_amount" type="checkbox" class="checkbox" value="AR_amount"
-          <TMPL_VAR AR_amount ESCAPE=HTML>>&nbsp; 
+          [% HTML.escape(AR_amount) %]>&nbsp;
         Erlöskonto <br>
-        <input name="AR_paid" type="checkbox" class="checkbox" value="AR_paid" 
-          <TMPL_VAR AR_paid ESCAPE=HTML>>&nbsp; 
+        <input name="AR_paid" type="checkbox" class="checkbox" value="AR_paid"
+          [% HTML.escape(AR_paid) %]>&nbsp;
         Zahlungseingang <br>
-        <input name="AR_tax" type="checkbox" class="checkbox" value="AR_tax" 
-          <TMPL_VAR AR_tax ESCAPE=HTML>>&nbsp; 
+        <input name="AR_tax" type="checkbox" class="checkbox" value="AR_tax"
+          [% HTML.escape(AR_tax) %]>&nbsp;
         Steuer
       </td>
       <td>
-        <input name="AP_amount" type="checkbox" class="checkbox" value="AP_amount" 
-          <TMPL_VAR AP_amount ESCAPE=HTML>>&nbsp; 
+        <input name="AP_amount" type="checkbox" class="checkbox" value="AP_amount"
+          [% HTML.escape(AP_amount) %]>&nbsp;
         Aufwand/Anlagen <br>
-        <input name="AP_paid" type="checkbox" class="checkbox" value="AP_paid" 
-          <TMPL_VAR AP_paid ESCAPE=HTML>>&nbsp; 
+        <input name="AP_paid" type="checkbox" class="checkbox" value="AP_paid"
+          [% HTML.escape(AP_paid) %]>&nbsp;
         Zahlungsausgang <br>
-        <input name="AP_tax" type="checkbox" class="checkbox" value="AP_tax" 
-            <TMPL_VAR AP_tax ESCAPE=HTML>>&nbsp; 
+        <input name="AP_tax" type="checkbox" class="checkbox" value="AP_tax"
+            [% HTML.escape(AP_tax) %]>&nbsp;
         Steuer
       </td>
       <td>
-        <input name="IC_sale" type="checkbox" class="checkbox" value="IC_sale" 
-          <TMPL_VAR IC_sale ESCAPE=HTML>>&nbsp; 
+        <input name="IC_sale" type="checkbox" class="checkbox" value="IC_sale"
+          [% HTML.escape(IC_sale) %]>&nbsp;
         Erlöskonto <br>
-        <input name="IC_cogs" type="checkbox" class="checkbox" value="IC_cogs" 
-          <TMPL_VAR IC_cogs ESCAPE=HTML>>&nbsp; 
+        <input name="IC_cogs" type="checkbox" class="checkbox" value="IC_cogs"
+          [% HTML.escape(IC_cogs) %]>&nbsp;
         Aufwandskonto <br>
-        <input name="IC_taxpart" type="checkbox" class="checkbox" value="IC_taxpart" 
-          <TMPL_VAR IC_taxpart ESCAPE=HTML>>&nbsp; 
+        <input name="IC_taxpart" type="checkbox" class="checkbox" value="IC_taxpart"
+          [% HTML.escape(IC_taxpart) %]>&nbsp;
         Steuer
       </td>
       <td>
         <input name=IC_income type=checkbox class=checkbox value="IC_income"
-          <TMPL_VAR IC_income ESCAPE=HTML>>&nbsp; 
+          [% HTML.escape(IC_income) %]>&nbsp;
         Erlöskonto <br>
-        <input name=IC_expense type=checkbox class=checkbox value="IC_expense" 
-          <TMPL_VAR IC_expense ESCAPE=HTML>>&nbsp; 
+        <input name=IC_expense type=checkbox class=checkbox value="IC_expense"
+          [% HTML.escape(IC_expense) %]>&nbsp;
         Aufwandskonto <br>
         <input name=IC_taxservice type=checkbox class=checkbox value="IC_taxservice"
-          <TMPL_VAR IC_taxservice ESCAPE=HTML>>&nbsp; 
+          [% HTML.escape(IC_taxservice) %]>&nbsp;
         Steuer
       </td>
     </tr>
@@ -144,39 +142,39 @@ window.onload = function() {
   </legend>
 
             <table>
-<TMPL_IF account_exists >
+[% IF account_exists %]
               <tr>
                 <th align="left">Steuerschlüssel</th>
                 <th align="left">Gültig ab</th>
                 <th align="left">UStVA</th>
                 <th align="left">Löschen ? </th>
               </tr>
-<TMPL_LOOP ACCOUNT_TAXKEYS >
+[% FOREACH tk = ACCOUNT_TAXKEYS %]
               <tr>
-    <TMPL_IF id>
-                <input type="hidden" name="taxkey_id_<TMPL_VAR runningnumber>" value="<TMPL_VAR id>">
-                <td><select name="taxkey_tax_<TMPL_VAR runningnumber>"><TMPL_VAR selecttaxkey></select></td>
-                <td><input name="taxkey_startdate_<TMPL_VAR runningnumber>" value="<TMPL_VAR startdate>"></td>
-                <td><select name="taxkey_pos_ustva_<TMPL_VAR runningnumber>"><TMPL_VAR select_tax></select></td>
-                <td><input name="taxkey_del_<TMPL_VAR runningnumber>" type="checkbox"
+    [% IF tk.id %]
+                <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="[% tk.id %]">
+                <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
+                <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
+                <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
+                <td><input name="taxkey_del_[% tk.runningnumber %]" type="checkbox"
                 class="checkbox" value="delete"></td>
-    <TMPL_ELSE>
-                <input type="hidden" name="taxkey_id_<TMPL_VAR runningnumber>" value="NEW">
-                <td><select name="taxkey_tax_<TMPL_VAR runningnumber>"><TMPL_VAR selecttaxkey></select></td>
-                <td><input name="taxkey_startdate_<TMPL_VAR runningnumber>" value="<TMPL_VAR startdate>"></td>
-                <td><select name="taxkey_pos_ustva_<TMPL_VAR runningnumber>"><TMPL_VAR select_tax></select></td>
+    [% ELSE %]
+                <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="NEW">
+                <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
+                <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
+                <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
                 <td>&nbsp;</td>
-    </TMPL_IF>            
+    [% END %]
               </tr>
 
-</TMPL_LOOP>
-<TMPL_ELSE>
+[% END %]
+[% ELSE %]
 <tr>
   <td align="center" colspan="4"><p>Einstellungen sind nach
   dem Speichern des Kontos verfügbar...</p>
   </td>
 </tr>
-</TMPL_IF>
+[% END %]
             </table>
 </fieldset>
 
@@ -185,30 +183,27 @@ window.onload = function() {
   <table>
         <tr>
           <th align="left">Einnahmen-/Überschussrechnung</th>
-          <td colspan="3"><select name="pos_eur"><TMPL_VAR select_eur></select></td>
+          <td colspan="3"><select name="pos_eur">[% select_eur %]</select></td>
         </tr>
         <tr>
           <th align="left">BWA</th>
-          <td colspan="3"><select name="pos_bwa"><TMPL_VAR select_bwa></select></td>
+          <td colspan="3"><select name="pos_bwa">[% select_bwa %]</select></td>
         </tr>
         <tr>
           <th align="left">Bilanz</th>
-          <td colspan="3"><select name="pos_bilanz"><TMPL_VAR select_bilanz></select></td>
+          <td colspan="3"><select name="pos_bilanz">[% select_bilanz %]</select></td>
         </tr>
         <tr>
           <th align="left">Datevexport</th>
-          <td colspan="3"><input name="datevautomatik" type="checkbox"
-          class="checkbox" value="T" <TMPL_IF
-          datevautomatik>checked="checked" </TMPL_IF>></td>
+          <td colspan="3"><input name="datevautomatik" type="checkbox" class="checkbox" value="T" [% IF datevautomatik %]checked [% END %]></td>
         </tr>
         <tr>
           <th align="left">Folgekonto</th>
-          <td><select name="new_chart_id"><TMPL_VAR selectnewaccount></select></td>
+          <td><select name="new_chart_id">[% selectnewaccount %]</select></td>
           <th align="left">Gültig ab</th>
-          <td><input name="valid_from" value="<TMPL_VAR valid_from>"></td>
-        </tr>        
+          <td><input name="valid_from" value="[% valid_from %]"></td>
+        </tr>
   </table>
-</TMPL_IF>
+[% END %]
 </fieldset>
 <hr size="3" noshade>
-
diff --git a/templates/webpages/am/edit_accounts_master.html b/templates/webpages/am/edit_accounts_master.html
index 2ddf5536d..d2eab9da0 100644
--- a/templates/webpages/am/edit_accounts_master.html
+++ b/templates/webpages/am/edit_accounts_master.html
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="js/FormManager.js" >
+[% USE HTML %]<script type="text/javascript" src="js/FormManager.js" >
 /****************************************************
 * Form Dependency Manager- By Twey- http://www.twey.co.uk
 * Visit Dynamic Drive for this script and more: http://www.dynamicdrive.com
@@ -12,21 +12,21 @@ window.onload = function() {
 </script>
 
 <body>
-<form method="post" name="EditAccount" action="<TMPL_VAR script>">
+<form method="post" name="EditAccount" action="am.pl">
 
-<input type="hidden" name="id"                 value="<TMPL_VAR id>">
+<input type="hidden" name="id"                 value="[% HTML.escape(id) %]">
 <input type="hidden" name="type"               value="account">
-<input type="hidden" name="orphaned"           value="<TMPL_VAR orphaned>">
-<input type="hidden" name="new_chart_valid"    value="<TMPL_VAR new_chart_valid>">
-<input type="hidden" name="inventory_accno_id" value="<TMPL_VAR inventory_accno_id>">
-<input type="hidden" name="income_accno_id"    value="<TMPL_VAR income_accno_id>">
-<input type="hidden" name="expense_accno_id"   value="<TMPL_VAR expense_accno_id>">
-<input type="hidden" name="fxgain_accno_id"    value="<TMPL_VAR fxgain_accno_id>">
-<input type="hidden" name="fxloss_accno_id"    value="<TMPL_VAR fxloss_accno_id>">
+<input type="hidden" name="orphaned"           value="[% HTML.escape(orphaned) %]">
+<input type="hidden" name="new_chart_valid"    value="[% HTML.escape(new_chart_valid) %]">
+<input type="hidden" name="inventory_accno_id" value="[% HTML.escape(inventory_accno_id) %]">
+<input type="hidden" name="income_accno_id"    value="[% HTML.escape(income_accno_id) %]">
+<input type="hidden" name="expense_accno_id"   value="[% HTML.escape(expense_accno_id) %]">
+<input type="hidden" name="fxgain_accno_id"    value="[% HTML.escape(fxgain_accno_id) %]">
+<input type="hidden" name="fxloss_accno_id"    value="[% HTML.escape(fxloss_accno_id) %]">
 
 <table border="0" width="100%">
   <tr>
-    <th class="listtop"><TMPL_VAR title></th>
+    <th class="listtop">[% title %]</th>
   </tr>
 </table>
 
@@ -40,16 +40,15 @@ window.onload = function() {
         <label>
           <translate>Account Number</translate>
         </label></td>
-        <td><input name="accno" size="20" value="<TMPL_VAR accno>"></td>
+        <td><input name="accno" size="20" value="[% HTML.escape(accno) %]"></td>
     </tr>
     <tr>
       <td>
         <label>
           <translate>Description</translate>
-        </label>  
+        </label>
       </td>
-      <td><input name="description" size="40" value="<TMPL_VAR 
-              description ESCAPE=HTML>"></td>
+      <td><input name="description" size="40" value="[% HTML.escape(description) %]"></td>
     </tr>
     <tr>
       <td>
@@ -58,25 +57,24 @@ window.onload = function() {
 
         </label>
       </td>
-      <td><select name="charttype"><TMPL_VAR 
-              select_charttype></select></td>
+      <td><select name="charttype">[% select_charttype %]</select></td>
     </tr>
-  </table>    
-</fieldset>  
+  </table>
+</fieldset>
 <fieldset class="DEPENDS ON charttype BEING A">
   <legend><translate>Account Type</translate></legend>
   <select name="category" id="AccountType" class="DEPENDS ON charttype BEING A">
-          <TMPL_VAR select_category></select>
+          [% select_category %]</select>
 </fieldset>
 
-<TMPL_IF ChartTypeIsAccount>
+[% IF ChartTypeIsAccount %]
 <fieldset class="DEPENDS ON charttype BEING A">
   <legend><translate>Is this a summary account to record</translate></legend>
-    <input name="AR" type="checkbox" class="checkbox" value="AR" <TMPL_VAR AR ESCAPE=HTML>>
+    <input name="AR" type="checkbox" class="checkbox" value="AR" [% HTML.escape(AR) %]>
     &nbsp;<translate>AR</translate>
-    <input name="AP" type="checkbox" class="checkbox" value="AP" <TMPL_VAR AP ESCAPE=HTML>>
+    <input name="AP" type="checkbox" class="checkbox" value="AP" [% HTML.escape(AP) %]>
     &nbsp;<translate>AP</translate>
-    <input name="IC" type="checkbox" class="checkbox" value="IC" <TMPL_VAR IC ESCAPE=HTML>>
+    <input name="IC" type="checkbox" class="checkbox" value="IC" [% HTML.escape(IC) %]>
     &nbsp;<translate>Inventory</translate>
 </fieldset>
 
@@ -92,46 +90,46 @@ window.onload = function() {
     <tr>
       <td>
         <input name="AR_amount" type="checkbox" class="checkbox" value="AR_amount"
-          <TMPL_VAR AR_amount ESCAPE=HTML>>&nbsp; 
+          [% HTML.escape(AR_amount) %]>&nbsp;
         <translate>Revenue</translate> <br>
-        <input name="AR_paid" type="checkbox" class="checkbox" value="AR_paid" 
-          <TMPL_VAR AR_paid ESCAPE=HTML>>&nbsp; 
+        <input name="AR_paid" type="checkbox" class="checkbox" value="AR_paid"
+          [% HTML.escape(AR_paid) %]>&nbsp;
         <translate>Receipt</translate> <br>
-        <input name="AR_tax" type="checkbox" class="checkbox" value="AR_tax" 
-          <TMPL_VAR AR_tax ESCAPE=HTML>>&nbsp; 
+        <input name="AR_tax" type="checkbox" class="checkbox" value="AR_tax"
+          [% HTML.escape(AR_tax) %]>&nbsp;
         <translate>Tax</translate>
       </td>
       <td>
-        <input name="AP_amount" type="checkbox" class="checkbox" value="AP_amount" 
-          <TMPL_VAR AP_amount ESCAPE=HTML>>&nbsp; 
+        <input name="AP_amount" type="checkbox" class="checkbox" value="AP_amount"
+          [% HTML.escape(AP_amount) %]>&nbsp;
         <translate>Expense/Asset</translate> <br>
-        <input name="AP_paid" type="checkbox" class="checkbox" value="AP_paid" 
-          <TMPL_VAR AP_paid ESCAPE=HTML>>&nbsp; 
+        <input name="AP_paid" type="checkbox" class="checkbox" value="AP_paid"
+          [% HTML.escape(AP_paid) %]>&nbsp;
         <translate>Payment</translate> <br>
-        <input name="AP_tax" type="checkbox" class="checkbox" value="AP_tax" 
-            <TMPL_VAR AP_tax ESCAPE=HTML>>&nbsp; 
+        <input name="AP_tax" type="checkbox" class="checkbox" value="AP_tax"
+            [% HTML.escape(AP_tax) %]>&nbsp;
         <translate>Tax</translate>
       </td>
       <td>
-        <input name="IC_sale" type="checkbox" class="checkbox" value="IC_sale" 
-          <TMPL_VAR IC_sale ESCAPE=HTML>>&nbsp; 
+        <input name="IC_sale" type="checkbox" class="checkbox" value="IC_sale"
+          [% HTML.escape(IC_sale) %]>&nbsp;
         <translate>Revenue</translate> <br>
-        <input name="IC_cogs" type="checkbox" class="checkbox" value="IC_cogs" 
-          <TMPL_VAR IC_cogs ESCAPE=HTML>>&nbsp; 
+        <input name="IC_cogs" type="checkbox" class="checkbox" value="IC_cogs"
+          [% HTML.escape(IC_cogs) %]>&nbsp;
         <translate>Expense</translate> <br>
-        <input name="IC_taxpart" type="checkbox" class="checkbox" value="IC_taxpart" 
-          <TMPL_VAR IC_taxpart ESCAPE=HTML>>&nbsp; 
+        <input name="IC_taxpart" type="checkbox" class="checkbox" value="IC_taxpart"
+          [% HTML.escape(IC_taxpart) %]>&nbsp;
         <translate>Tax</translate>
       </td>
       <td>
         <input name=IC_income type=checkbox class=checkbox value="IC_income"
-          <TMPL_VAR IC_income ESCAPE=HTML>>&nbsp; 
+          [% HTML.escape(IC_income) %]>&nbsp;
         <translate>Revenue</translate> <br>
-        <input name=IC_expense type=checkbox class=checkbox value="IC_expense" 
-          <TMPL_VAR IC_expense ESCAPE=HTML>>&nbsp; 
+        <input name=IC_expense type=checkbox class=checkbox value="IC_expense"
+          [% HTML.escape(IC_expense) %]>&nbsp;
         <translate>Expense</translate> <br>
         <input name=IC_taxservice type=checkbox class=checkbox value="IC_taxservice"
-          <TMPL_VAR IC_taxservice ESCAPE=HTML>>&nbsp; 
+          [% HTML.escape(IC_taxservice) %]>&nbsp;
         <translate>Tax</translate>
       </td>
     </tr>
@@ -144,38 +142,38 @@ window.onload = function() {
   </legend>
 
             <table>
-<TMPL_IF account_exists >
+[% IF account_exists %]
               <tr>
                 <th align="left"><translate>Taxkey</translate></th>
                 <th align="left"><translate>valid from</translate></th>
                 <th align="left"><translate>pos_ustva</translate></th>
                 <th align="left"><translate>delete</translate> ? </th>
               </tr>
-<TMPL_LOOP ACCOUNT_TAXKEYS >
+[% FOREACH tk = ACCOUNT_TAXKEYS %]
               <tr>
-    <TMPL_IF id>
-                <input type="hidden" name="taxkey_id_<TMPL_VAR runningnumber>" value="<TMPL_VAR id>">
-                <td><select name="taxkey_tax_<TMPL_VAR runningnumber>"><TMPL_VAR selecttaxkey></select></td>
-                <td><input name="taxkey_startdate_<TMPL_VAR runningnumber>" value="<TMPL_VAR startdate>"></td>
-                <td><select name="taxkey_pos_ustva_<TMPL_VAR runningnumber>"><TMPL_VAR select_tax></select></td>
-                <td><input name="taxkey_del_<TMPL_VAR runningnumber>" type="checkbox"
+    [% IF tk.id %]
+                <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="[% tk.id %]">
+                <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
+                <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
+                <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
+                <td><input name="taxkey_del_[% tk.runningnumber %]" type="checkbox"
                 class="checkbox" value="delete"></td>
-    <TMPL_ELSE>
-                <input type="hidden" name="taxkey_id_<TMPL_VAR runningnumber>" value="NEW">
-                <td><select name="taxkey_tax_<TMPL_VAR runningnumber>"><TMPL_VAR selecttaxkey></select></td>
-                <td><input name="taxkey_startdate_<TMPL_VAR runningnumber>" value="<TMPL_VAR startdate>"></td>
-                <td><select name="taxkey_pos_ustva_<TMPL_VAR runningnumber>"><TMPL_VAR select_tax></select></td>
+    [% ELSE %]
+                <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="NEW">
+                <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
+                <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
+                <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
                 <td>&nbsp;</td>
-    </TMPL_IF>            
+    [% END %]
               </tr>
 
-</TMPL_LOOP>
-<TMPL_ELSE>
+[% END %]
+[% ELSE %]
 <tr>
   <td align="center" colspan="4"><p><translate>Save account first to insert taxkeys</translate></p>
   </td>
 </tr>
-</TMPL_IF>
+[% END %]
             </table>
 </fieldset>
 
@@ -184,30 +182,27 @@ window.onload = function() {
   <table>
         <tr>
           <th align="left"><translate>EUER</translate></th>
-          <td colspan="3"><select name="pos_eur"><TMPL_VAR select_eur></select></td>
+          <td colspan="3"><select name="pos_eur">[% select_eur %]</select></td>
         </tr>
         <tr>
           <th align="left"><translate>BWA</translate></th>
-          <td colspan="3"><select name="pos_bwa"><TMPL_VAR select_bwa></select></td>
+          <td colspan="3"><select name="pos_bwa">[% select_bwa %]</select></td>
         </tr>
         <tr>
           <th align="left"><translate>Bilanz</translate></th>
-          <td colspan="3"><select name="pos_bilanz"><TMPL_VAR select_bilanz></select></td>
+          <td colspan="3"><select name="pos_bilanz">[% select_bilanz %]</select></td>
         </tr>
         <tr>
           <th align="left"><translate>Datevautomatik</translate></th>
-          <td colspan="3"><input name="datevautomatik" type="checkbox"
-          class="checkbox" value="T" <TMPL_IF
-          datevautomatik>checked="checked" </TMPL_IF>></td>
+          <td colspan="3"><input name="datevautomatik" type="checkbox" class="checkbox" value="T" [% IF datevautomatik %]checked [% END %]></td>
         </tr>
         <tr>
           <th align="left"><translate>Folgekonto</translate></th>
-          <td><select name="new_chart_id"><TMPL_VAR selectnewaccount></select></td>
+          <td><select name="new_chart_id">[% selectnewaccount %]</select></td>
           <th align="left"><translate>Valid from</translate></th>
-          <td><input name="valid_from" value="<TMPL_VAR valid_from>"></td>
-        </tr>        
+          <td><input name="valid_from" value="[% valid_from %]"></td>
+        </tr>
   </table>
-</TMPL_IF>
+[% END %]
 </fieldset>
 <hr size="3" noshade>
-
diff --git a/templates/webpages/am/edit_templates_de.html b/templates/webpages/am/edit_templates_de.html
index ca0e62f40..2ffcbe836 100644
--- a/templates/webpages/am/edit_templates_de.html
+++ b/templates/webpages/am/edit_templates_de.html
@@ -1,31 +1,33 @@
-<body>
+[% USE HTML %]<body>
 
- <div class="listheading"><TMPL_VAR title></div>
+ <div class="listheading">[% title %]</div>
 
  <form method="post" name="Form" action="amtemplates.pl">
 
-  <TMPL_LOOP HIDDEN><input type="hidden" name="<TMPL_VAR name ESCAPE=HTML>" value="<TMPL_VAR value ESCAPE=HTML>"></TMPL_LOOP>
+  [% FOREACH var = HIDDEN %]<input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">[% END %]
 
-  <TMPL_IF SHOW_EDIT_OPTIONS>
+  [% IF SHOW_EDIT_OPTIONS %]
    <p>
     Druckvorlage
     <select name="formname">
-     <TMPL_LOOP FORMNAME><option value="<TMPL_VAR value ESCAPE=HTML>" <TMPL_IF default>selected</TMPL_IF>><TMPL_VAR label ESCAPE=HTML></option></TMPL_LOOP>
+     [% FOREACH row = FORMNAME %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == formname %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
     </select>
 
-    <TMPL_IF SHOW_LANGUAGE>
+    [% IF LANGUAGE.size %]
      Sprache
      <select name="language">
-      <TMPL_LOOP LANGUAGE><option value="<TMPL_VAR value ESCAPE=HTML>" <TMPL_IF default>selected</TMPL_IF>><TMPL_VAR label ESCAPE=HTML></option></TMPL_LOOP>
+      <option></option>
+      [% FOREACH row = LANGUAGE %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == language %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
      </select>
-    </TMPL_IF>
+    [% END %]
 
-    <TMPL_IF SHOW_PRINTER>
+    [% IF PRINTER.size %]
      Drucker
      <select name="printer">
-      <TMPL_LOOP PRINTER><option value="<TMPL_VAR value ESCAPE=HTML>" <TMPL_IF default>selected</TMPL_IF>><TMPL_VAR label ESCAPE=HTML></option></TMPL_LOOP>
+      <option></option>
+      [% FOREACH row = PRINTER %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == printer %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
      </select>
-    </TMPL_IF>
+    [% END %]
 
     <input type="hidden" name="display_nextsub" value="display_template">
 
@@ -34,40 +36,41 @@
    </p>
 
    <hr>
-  </TMPL_IF>
+  [% END %]
 
 
 
-  <TMPL_IF SHOW_CONTENT>
+  [% IF SHOW_CONTENT %]
    <p>
     <div class="listtop">
-     <TMPL_IF CAN_EDIT>Datei bearbeiten<TMPL_ELSE>Datei anzeigen</TMPL_IF> <TMPL_VAR display_filename ESCAPE=HTML>
+     [% IF CAN_EDIT %]Datei bearbeiten[% ELSE %]Datei anzeigen[% END %] [% HTML.escape(display_filename) %]
     </div>
    </p>
 
-   <TMPL_IF CAN_EDIT>
-    <p><textarea name="content" id="content" cols="100" rows="25"><TMPL_VAR content ESCAPE=HTML></textarea></p>
+   [% IF CAN_EDIT %]
+    <p><textarea name="content" id="content" cols="100" rows="25">[% HTML.escape(content) %]</textarea></p>
 
     <p>
      <input type="hidden" name="save_nextsub" value="save_template">
      <input type="submit" name="action" value="Speichern">
+     <input type="button" onclick="history.back()" value="Zurück">
     </p>
 
-    <TMPL_ELSE>
+    [% ELSE %]
 
     <input type="hidden" name="edit_nextsub" value="edit_template">
 
     <p><input name="action" type="submit" class="submit" value="Bearbeiten"></p>
 
-    <p><pre class="filecontent"><TMPL_VAR content ESCAPE=HTML></pre></p>
+    <p><pre class="filecontent">[% HTML.escape(content) %]</pre></p>
 
-    <TMPL_IF SHOW_SECOND_EDIT_BUTTON>
+    [% IF SHOW_SECOND_EDIT_BUTTON %]
      <p><input name="action" type="submit" class="submit" value="Bearbeiten"></p>
-    </TMPL_IF>
+    [% END %]
 
-   </TMPL_IF> <!-- CAN_EDIT -->
+   [% END %] <!-- CAN_EDIT -->
 
-  </TMPL_IF> <!-- SHOW_CONTENT -->
+  [% END %] <!-- SHOW_CONTENT -->
 
  </form>
 
diff --git a/templates/webpages/am/edit_templates_master.html b/templates/webpages/am/edit_templates_master.html
index 3a166ec3a..fcf223c9e 100644
--- a/templates/webpages/am/edit_templates_master.html
+++ b/templates/webpages/am/edit_templates_master.html
@@ -1,31 +1,33 @@
-<body>
+[% USE HTML %]<body>
 
- <div class="listheading"><TMPL_VAR title></div>
+ <div class="listheading">[% title %]</div>
 
  <form method="post" name="Form" action="amtemplates.pl">
 
-  <TMPL_LOOP HIDDEN><input type="hidden" name="<TMPL_VAR name ESCAPE=HTML>" value="<TMPL_VAR value ESCAPE=HTML>"></TMPL_LOOP>
+  [% FOREACH var = HIDDEN %]<input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">[% END %]
 
-  <TMPL_IF SHOW_EDIT_OPTIONS>
+  [% IF SHOW_EDIT_OPTIONS %]
    <p>
     <translate>Template</translate>
     <select name="formname">
-     <TMPL_LOOP FORMNAME><option value="<TMPL_VAR value ESCAPE=HTML>" <TMPL_IF default>selected</TMPL_IF>><TMPL_VAR label ESCAPE=HTML></option></TMPL_LOOP>
+     [% FOREACH row = FORMNAME %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == formname %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
     </select>
 
-    <TMPL_IF SHOW_LANGUAGE>
+    [% IF LANGUAGE.size %]
      <translate>Language</translate>
      <select name="language">
-      <TMPL_LOOP LANGUAGE><option value="<TMPL_VAR value ESCAPE=HTML>" <TMPL_IF default>selected</TMPL_IF>><TMPL_VAR label ESCAPE=HTML></option></TMPL_LOOP>
+      <option></option>
+      [% FOREACH row = LANGUAGE %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == language %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
      </select>
-    </TMPL_IF>
+    [% END %]
 
-    <TMPL_IF SHOW_PRINTER>
+    [% IF PRINTER.size %]
      <translate>Printer</translate>
      <select name="printer">
-      <TMPL_LOOP PRINTER><option value="<TMPL_VAR value ESCAPE=HTML>" <TMPL_IF default>selected</TMPL_IF>><TMPL_VAR label ESCAPE=HTML></option></TMPL_LOOP>
+      <option></option>
+      [% FOREACH row = PRINTER %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == printer %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
      </select>
-    </TMPL_IF>
+    [% END %]
 
     <input type="hidden" name="display_nextsub" value="display_template">
 
@@ -34,40 +36,41 @@
    </p>
 
    <hr>
-  </TMPL_IF>
+  [% END %]
 
 
 
-  <TMPL_IF SHOW_CONTENT>
+  [% IF SHOW_CONTENT %]
    <p>
     <div class="listtop">
-     <TMPL_IF CAN_EDIT><translate>Edit file</translate><TMPL_ELSE><translate>Display file</translate></TMPL_IF> <TMPL_VAR display_filename ESCAPE=HTML>
+     [% IF CAN_EDIT %]<translate>Edit file</translate>[% ELSE %]<translate>Display file</translate>[% END %] [% HTML.escape(display_filename) %]
     </div>
    </p>
 
-   <TMPL_IF CAN_EDIT>
-    <p><textarea name="content" id="content" cols="100" rows="25"><TMPL_VAR content ESCAPE=HTML></textarea></p>
+   [% IF CAN_EDIT %]
+    <p><textarea name="content" id="content" cols="100" rows="25">[% HTML.escape(content) %]</textarea></p>
 
     <p>
      <input type="hidden" name="save_nextsub" value="save_template">
      <input type="submit" name="action" value="<translate>Save</translate>">
+     <input type="button" onclick="history.back()" value="<translate>Back</translate>">
     </p>
 
-    <TMPL_ELSE>
+    [% ELSE %]
 
     <input type="hidden" name="edit_nextsub" value="edit_template">
 
     <p><input name="action" type="submit" class="submit" value="<translate>Edit</translate>"></p>
 
-    <p><pre class="filecontent"><TMPL_VAR content ESCAPE=HTML></pre></p>
+    <p><pre class="filecontent">[% HTML.escape(content) %]</pre></p>
 
-    <TMPL_IF SHOW_SECOND_EDIT_BUTTON>
+    [% IF SHOW_SECOND_EDIT_BUTTON %]
      <p><input name="action" type="submit" class="submit" value="<translate>Edit</translate>"></p>
-    </TMPL_IF>
+    [% END %]
 
-   </TMPL_IF> <!-- CAN_EDIT -->
+   [% END %] <!-- CAN_EDIT -->
 
-  </TMPL_IF> <!-- SHOW_CONTENT -->
+  [% END %] <!-- SHOW_CONTENT -->
 
  </form>
 
diff --git a/templates/webpages/am/edit_units_de.html b/templates/webpages/am/edit_units_de.html
index ca8d4e721..096bfa2d2 100644
--- a/templates/webpages/am/edit_units_de.html
+++ b/templates/webpages/am/edit_units_de.html
@@ -1,22 +1,22 @@
-<body>
+[% USE HTML %]<body>
 
- <TMPL_IF NAME=saved_message>
-  <p><TMPL_VAR NAME=saved_message></p>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
 
   <hr>
- </TMPL_IF>
+ [% END %]
 
- <form method="post" action="<TMPL_VAR NAME=script ESCAPE=HTML>">
+ <form method="post" action="[% HTML.escape(script) %]">
 
- <input type="hidden" name="login" value="<TMPL_VAR NAME=login ESCAPE=HTML>">
- <input type="hidden" name="password" value="<TMPL_VAR NAME=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="type" value="unit">
- <input type="hidden" name="unit_type" value="<TMPL_VAR NAME=unit_type ESCAPE=HTML>">
+ <input type="hidden" name="unit_type" value="[% HTML.escape(unit_type) %]">
 
  <table width="100%">
   <tr>
-   <th class="listtop" colspan="2"><TMPL_VAR NAME=title></th>
+   <th class="listtop" colspan="2">[% title %]</th>
   </tr>
   <tr height="5"></tr>
  </table>
@@ -47,7 +47,7 @@
    <th align="right">Basiseinheit</th>
    <td>
     <select name="new_base_unit">
-     <TMPL_LOOP NAME=NEW_BASE_UNIT_DDBOX><option <TMPL_VAR NAME=selected>><TMPL_VAR NAME=name></option></TMPL_LOOP>
+     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
     </select>
    </td>
   </tr>
@@ -56,14 +56,14 @@
    <td><input name="new_factor"></td>
   </tr>
 
-  <TMPL_LOOP LANGUAGES>
+  [% FOREACH language = LANGUAGES %]
    <tr>
-    <th align="right"><TMPL_VAR description></th>
-    <td><input name="new_localized_<TMPL_VAR id>" size="20" maxlength="20"></td>
+    <th align="right">[% language.description %]</th>
+    <td><input name="new_localized_[% language.id %]" size="20" maxlength="20"></td>
     <th align="right">Plural</th>
-    <td><input name="new_localized_plural_<TMPL_VAR id>" size="20" maxlength="20"></td>
+    <td><input name="new_localized_plural_[% language.id %]" size="20" maxlength="20"></td>
    </tr>
-  </TMPL_LOOP>
+  [% END %]
  </table>
 
  <input type="submit" class="submit" name="action" value="Erfassen">
@@ -98,51 +98,51 @@
    <th class="listheading">Einheit</th>
    <th class="listheading">Basiseinheit</th>
    <th class="listheading">Faktor</th>
-   <TMPL_LOOP LANGUAGES>
-    <th class="listheading"><TMPL_VAR description></th>
-   </TMPL_LOOP>
+   [% FOREACH language = LANGUAGES %]
+    <th class="listheading">[% language.description %]</th>
+   [% END %]
   </tr>
 
-  <TMPL_LOOP NAME=UNITS>
+  [% FOREACH row = UNITS %]
    <tr>
-    <td width="32" align="center" valign="center"><TMPL_IF __first__><img src="image/transparent16x16.gif"><TMPL_ELSE><a href="<TMPL_VAR updownlink>&dir=up&name=<TMPL_VAR name ESCAPE=URL>"><img alt="hoch" src="image/up.png"></a></TMPL_IF><TMPL_IF __last__><img src="image/transparent16x16.gif"><TMPL_ELSE><a href="<TMPL_VAR updownlink>&dir=down&name=<TMPL_VAR name ESCAPE=URL>"><img alt="runter" src="image/down.png"></a></TMPL_IF></td>
-    <TMPL_IF NAME=in_use>
+    <td width="32" align="center" valign="center">[% IF loop.first %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=up&name=[% HTML.url(row.name) %]"><img alt="hoch" src="image/up.png"></a>[% END %][% IF loop.last %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=down&name=[% HTML.url(row.name) %]"><img alt="runter" src="image/down.png"></a>[% END %]</td>
+    [% IF row.in_use %]
      <td>
-      <input type="hidden" name="unchangeable_<TMPL_VAR NAME=__counter__>" value="1">
-      <input type="hidden" name="old_name_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=name>">
+      <input type="hidden" name="unchangeable_[% loop.count %]" value="1">
+      <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
      </td>
 
-     <td><TMPL_VAR NAME=name ESCAPE=HTML></td>
-     <td><TMPL_IF NAME=base_unit><TMPL_VAR NAME=base_unit ESCAPE=HTML><TMPL_ELSE>---</TMPL_IF></td>
-     <td><TMPL_IF NAME=base_unit><TMPL_VAR NAME=factor ESCAPE=HTML><TMPL_ELSE>---</TMPL_IF></td>
+     <td>[% HTML.escape(row.name) %]</td>
+     <td>[% IF row.base_unit %][% HTML.escape(row.base_unit) %][% ELSE %]---[% END %]</td>
+     <td>[% IF row.base_unit %][% HTML.escape(row.factor) %][% ELSE %]---[% END %]</td>
 
-     <TMPL_ELSE>
+     [% ELSE %]
 
-     <td align="center"><input type="checkbox" name="delete_<TMPL_VAR NAME=__counter__>"></td>
+     <td align="center"><input type="checkbox" name="delete_[% loop.count %]"></td>
      <td>
-      <input type="hidden" name="old_name_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=name>">
-      <input name="name_<TMPL_VAR NAME=__counter__>" size="10" maxlength="20" value="<TMPL_VAR NAME=name>">
+      <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+      <input name="name_[% loop.count %]" size="10" maxlength="20" value="[% HTML.escape(row.name) %]">
      </td>
      <td>
-      <select name="base_unit_<TMPL_VAR NAME=__counter__>">
-       <TMPL_LOOP NAME=BASE_UNIT_DDBOX><option <TMPL_VAR NAME=selected>><TMPL_VAR NAME=name></option></TMPL_LOOP>
+      <select name="base_unit_[% loop.count %]">
+       [% FOREACH option = row.BASE_UNIT_DDBOX %]<option [% option.selected %]>[% HTML.escape(option.name) %]</option>[% END %]
       </select>
      </td>
-     <td><input name="factor_<TMPL_VAR NAME=__counter__>" size="8" value="<TMPL_VAR NAME=factor>"></td>
-    </TMPL_IF>
+     <td><input name="factor_[% loop.count %]" size="8" value="[% row.factor %]"></td>
+    [% END %]
 
-    <TMPL_LOOP UNITLANGUAGES>
+    [% FOREACH language = row.UNITLANGUAGES %]
      <td>
       S:
-      <input name="localized_<TMPL_VAR idx>_<TMPL_VAR language_id>" value="<TMPL_VAR localized>" size="6" maxlength="20">
+      <input name="localized_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized) %]" size="6" maxlength="20">
       P:
-      <input name="localized_plural_<TMPL_VAR idx>_<TMPL_VAR language_id>" value="<TMPL_VAR localized_plural>" size="6" maxlength="20">
+      <input name="localized_plural_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized_plural) %]" size="6" maxlength="20">
      </td>
-    </TMPL_LOOP>
+    [% END %]
    </tr>
 
-   <TMPL_IF NAME=__last__><input type="hidden" name="rowcount" value="<TMPL_VAR NAME=__counter__>"></TMPL_IF>
-  </TMPL_LOOP>
+   [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
+  [% END %]
  </table>
 
  <input type="submit" class="submit" name="action" value="Speichern">
diff --git a/templates/webpages/am/edit_units_master.html b/templates/webpages/am/edit_units_master.html
index a65b6904a..971eb28d7 100644
--- a/templates/webpages/am/edit_units_master.html
+++ b/templates/webpages/am/edit_units_master.html
@@ -1,22 +1,22 @@
-<body>
+[% USE HTML %]<body>
 
- <TMPL_IF NAME=saved_message>
-  <p><TMPL_VAR NAME=saved_message></p>
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
 
   <hr>
- </TMPL_IF>
+ [% END %]
 
- <form method="post" action="<TMPL_VAR NAME=script ESCAPE=HTML>">
+ <form method="post" action="[% HTML.escape(script) %]">
 
- <input type="hidden" name="login" value="<TMPL_VAR NAME=login ESCAPE=HTML>">
- <input type="hidden" name="password" value="<TMPL_VAR NAME=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="type" value="unit">
- <input type="hidden" name="unit_type" value="<TMPL_VAR NAME=unit_type ESCAPE=HTML>">
+ <input type="hidden" name="unit_type" value="[% HTML.escape(unit_type) %]">
 
  <table width="100%">
   <tr>
-   <th class="listtop" colspan="2"><TMPL_VAR NAME=title></th>
+   <th class="listtop" colspan="2">[% title %]</th>
   </tr>
   <tr height="5"></tr>
  </table>
@@ -47,7 +47,7 @@
    <th align="right"><translate>Base unit</translate></th>
    <td>
     <select name="new_base_unit">
-     <TMPL_LOOP NAME=NEW_BASE_UNIT_DDBOX><option <TMPL_VAR NAME=selected>><TMPL_VAR NAME=name></option></TMPL_LOOP>
+     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
     </select>
    </td>
   </tr>
@@ -56,14 +56,14 @@
    <td><input name="new_factor"></td>
   </tr>
 
-  <TMPL_LOOP LANGUAGES>
+  [% FOREACH language = LANGUAGES %]
    <tr>
-    <th align="right"><TMPL_VAR description></th>
-    <td><input name="new_localized_<TMPL_VAR id>" size="20" maxlength="20"></td>
+    <th align="right">[% language.description %]</th>
+    <td><input name="new_localized_[% language.id %]" size="20" maxlength="20"></td>
     <th align="right"><translate>Plural</translate></th>
-    <td><input name="new_localized_plural_<TMPL_VAR id>" size="20" maxlength="20"></td>
+    <td><input name="new_localized_plural_[% language.id %]" size="20" maxlength="20"></td>
    </tr>
-  </TMPL_LOOP>
+  [% END %]
  </table>
 
  <input type="submit" class="submit" name="action" value="<translate>Add</translate>">
@@ -98,51 +98,51 @@
    <th class="listheading"><translate>Unit</translate></th>
    <th class="listheading"><translate>Base unit</translate></th>
    <th class="listheading"><translate>Factor</translate></th>
-   <TMPL_LOOP LANGUAGES>
-    <th class="listheading"><TMPL_VAR description></th>
-   </TMPL_LOOP>
+   [% FOREACH language = LANGUAGES %]
+    <th class="listheading">[% language.description %]</th>
+   [% END %]
   </tr>
 
-  <TMPL_LOOP NAME=UNITS>
+  [% FOREACH row = UNITS %]
    <tr>
-    <td width="32" align="center" valign="center"><TMPL_IF __first__><img src="image/transparent16x16.gif"><TMPL_ELSE><a href="<TMPL_VAR updownlink>&dir=up&name=<TMPL_VAR name ESCAPE=URL>"><img alt="<translate>up</translate>" src="image/up.png"></a></TMPL_IF><TMPL_IF __last__><img src="image/transparent16x16.gif"><TMPL_ELSE><a href="<TMPL_VAR updownlink>&dir=down&name=<TMPL_VAR name ESCAPE=URL>"><img alt="<translate>down</translate>" src="image/down.png"></a></TMPL_IF></td>
-    <TMPL_IF NAME=in_use>
+    <td width="32" align="center" valign="center">[% IF loop.first %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=up&name=[% HTML.url(row.name) %]"><img alt="<translate>up</translate>" src="image/up.png"></a>[% END %][% IF loop.last %]<img src="image/transparent16x16.gif">[% ELSE %]<a href="[% updownlink %]&dir=down&name=[% HTML.url(row.name) %]"><img alt="<translate>down</translate>" src="image/down.png"></a>[% END %]</td>
+    [% IF row.in_use %]
      <td>
-      <input type="hidden" name="unchangeable_<TMPL_VAR NAME=__counter__>" value="1">
-      <input type="hidden" name="old_name_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=name>">
+      <input type="hidden" name="unchangeable_[% loop.count %]" value="1">
+      <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
      </td>
 
-     <td><TMPL_VAR NAME=name ESCAPE=HTML></td>
-     <td><TMPL_IF NAME=base_unit><TMPL_VAR NAME=base_unit ESCAPE=HTML><TMPL_ELSE>---</TMPL_IF></td>
-     <td><TMPL_IF NAME=base_unit><TMPL_VAR NAME=factor ESCAPE=HTML><TMPL_ELSE>---</TMPL_IF></td>
+     <td>[% HTML.escape(row.name) %]</td>
+     <td>[% IF row.base_unit %][% HTML.escape(row.base_unit) %][% ELSE %]---[% END %]</td>
+     <td>[% IF row.base_unit %][% HTML.escape(row.factor) %][% ELSE %]---[% END %]</td>
 
-     <TMPL_ELSE>
+     [% ELSE %]
 
-     <td align="center"><input type="checkbox" name="delete_<TMPL_VAR NAME=__counter__>"></td>
+     <td align="center"><input type="checkbox" name="delete_[% loop.count %]"></td>
      <td>
-      <input type="hidden" name="old_name_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=name>">
-      <input name="name_<TMPL_VAR NAME=__counter__>" size="10" maxlength="20" value="<TMPL_VAR NAME=name>">
+      <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+      <input name="name_[% loop.count %]" size="10" maxlength="20" value="[% HTML.escape(row.name) %]">
      </td>
      <td>
-      <select name="base_unit_<TMPL_VAR NAME=__counter__>">
-       <TMPL_LOOP NAME=BASE_UNIT_DDBOX><option <TMPL_VAR NAME=selected>><TMPL_VAR NAME=name></option></TMPL_LOOP>
+      <select name="base_unit_[% loop.count %]">
+       [% FOREACH option = row.BASE_UNIT_DDBOX %]<option [% option.selected %]>[% HTML.escape(option.name) %]</option>[% END %]
       </select>
      </td>
-     <td><input name="factor_<TMPL_VAR NAME=__counter__>" size="8" value="<TMPL_VAR NAME=factor>"></td>
-    </TMPL_IF>
+     <td><input name="factor_[% loop.count %]" size="8" value="[% row.factor %]"></td>
+    [% END %]
 
-    <TMPL_LOOP UNITLANGUAGES>
+    [% FOREACH language = row.UNITLANGUAGES %]
      <td>
       <translate>singular first char</translate>:
-      <input name="localized_<TMPL_VAR idx>_<TMPL_VAR language_id>" value="<TMPL_VAR localized>" size="6" maxlength="20">
+      <input name="localized_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized) %]" size="6" maxlength="20">
       <translate>plural first char</translate>:
-      <input name="localized_plural_<TMPL_VAR idx>_<TMPL_VAR language_id>" value="<TMPL_VAR localized_plural>" size="6" maxlength="20">
+      <input name="localized_plural_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized_plural) %]" size="6" maxlength="20">
      </td>
-    </TMPL_LOOP>
+    [% END %]
    </tr>
 
-   <TMPL_IF NAME=__last__><input type="hidden" name="rowcount" value="<TMPL_VAR NAME=__counter__>"></TMPL_IF>
-  </TMPL_LOOP>
+   [% IF loop.last %]<input type="hidden" name="rowcount" value="[% loop.count %]">[% END %]
+  [% END %]
  </table>
 
  <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
diff --git a/templates/webpages/am/list_account_details_de.html b/templates/webpages/am/list_account_details_de.html
index e9e2109c8..9caeece34 100644
--- a/templates/webpages/am/list_account_details_de.html
+++ b/templates/webpages/am/list_account_details_de.html
@@ -1,133 +1,63 @@
- <TMPL_LOOP CA> 
-        <table width="100%">
-
-          <colgroup>
-            <col width="10%">
-            <col width="10%">
-            <col width="10%">
-            <col width="50%">
-            <col width="10%">
-            <col width="10%">
-          </colgroup>
-
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-
-              <td rowspan="8" class="coa_detail_emph"><TMPL_VAR id ESCAPE=HTML DEFAULT="-"></td>
-              <td colspan="5" class="coa_detail_emph"><TMPL_VAR category ESCAPE=HTML>&nbsp;</td>
-
-            </tr>                                
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-              <td colspan="5" class="coa_detail_emph">
-                <TMPL_IF link>
-                <TMPL_VAR name="link" ESCAPE="HTML" DEFAULT="-">
-                <TMPL_ELSE>
-                -
-                </TMPL_IF>
-                </td>
-
-
-           </tr>                                
-
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-              <td colspan="5" class="coa_details_header">Steuerautomatik</td>
-           </tr>
-
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-              <td class="coa_details_header2">Steuerschlüssel</td>
-              <td class="coa_details_header2">Automatikkonto</td>
-              <td class="coa_details_header2">Steuer</td>
-              <td class="coa_details_header2">USTVA Kennz.</td>
-              <td class="coa_details_header2">Gültig ab</td>
-            </tr>
-
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-              
-              <td class="coa_detail_emph">
-                <TMPL_IF taxkey>
-                <TMPL_VAR taxkey         DEFAULT="-" >
-                <TMPL_ELSE>
-                -
-                </TMPL_IF>
-              </td>
-              <td class="coa_detail_emph">
-                <TMPL_IF taxaccount> 
-                <TMPL_VAR taxaccount     DEFAULT="-" >
-                <TMPL_ELSE>
-                -
-                </TMPL_IF>
-              </td>
-              <td class="coa_detail_emph">
-                <TMPL_IF taxdescription> 
-                <TMPL_VAR taxdescription DEFAULT="-" >
-                <TMPL_ELSE>
-                -
-                </TMPL_IF>
-              </td>
-              <td class="coa_detail_emph">
-                <TMPL_IF tk_ustva> 
-                <TMPL_VAR tk_ustva       DEFAULT="-" >
-                <TMPL_ELSE>
-                -
-                </TMPL_IF>
-              </td>
-              <td class="coa_detail_emph">
-                <TMPL_IF startdate> 
-                <TMPL_VAR startdate      DEFAULT="-" >
-                <TMPL_ELSE>
-                -
-                </TMPL_IF>
-              </td>
-           </tr>
-
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-              <td colspan="5" class="coa_details_header">Berichte</td>
-           </tr>
-
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-              <td class="coa_details_header2">BWA</td>
-              <td class="coa_details_header2">Bilanz</td>
-              <td class="coa_details_header2">E/ÜR</td>
-              <td colspan="2" class="coa_details_header2">Datevexport</td>
-           </tr>
-            
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-              <td class="coa_detail_emph"><TMPL_VAR pos_bwa    ESCAPE=HTML DEFAULT="-"></td>
-              <td class="coa_detail_emph"><TMPL_VAR pos_bilanz ESCAPE=HTML DEFAULT="-"></td>
-              <td class="coa_detail_emph"><TMPL_VAR pos_eur    ESCAPE=HTML DEFAULT="-"></td>
-              <td colspan="2" class="coa_detail_emph"><TMPL_VAR datevautomatik  ESCAPE=HTML DEFAULT="-"></td>
-           </tr>
-        </table>
-
-</TMPL_LOOP CA>
+[% USE HTML %] [% FOREACH row = CA %]
+<table width="100%">
+
+ <colgroup>
+  <col width="10%">
+  <col width="10%">
+  <col width="10%">
+  <col width="50%">
+  <col width="10%">
+  <col width="10%">
+ </colgroup>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td rowspan="8" class="coa_detail_emph">[% IF row.id %][% HTML.escape(row.id) %][% ELSE %]-[% END %]</td>
+  <td colspan="5" class="coa_detail_emph">[% HTML.escape(row.category) %]&nbsp;</td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td colspan="5" class="coa_detail_emph">
+   [% IF row.link %][% HTML.escape(row.link) %][% ELSE %]-[% END %]
+  </td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td colspan="5" class="coa_details_header">Steuerautomatik</td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td class="coa_details_header2">Steuerschlüssel</td>
+  <td class="coa_details_header2">Automatikkonto</td>
+  <td class="coa_details_header2">Steuer</td>
+  <td class="coa_details_header2">USTVA Kennz.</td>
+  <td class="coa_details_header2">Gültig ab</td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td class="coa_detail_emph">[% IF row.taxkey         %][% HTML.escape(row.taxkey).replace(',', '<br>')         %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.taxaccount     %][% HTML.escape(row.taxaccount).replace(',', '<br>')     %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.taxdescription %][% HTML.escape(row.taxdescription).replace(',', '<br>') %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.tk_ustva       %][% HTML.escape(row.tk_ustva).replace(',', '<br>')       %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.startdate      %][% HTML.escape(row.startdate).replace(',', '<br>')      %][% ELSE %]-[% END %]</td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td colspan="5" class="coa_details_header">Berichte</td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td class="coa_details_header2">BWA</td>
+  <td class="coa_details_header2">Bilanz</td>
+  <td class="coa_details_header2">E/ÜR</td>
+  <td colspan="2" class="coa_details_header2">Datevexport</td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td class="coa_detail_emph">[% IF row.pos_bwa    %][% HTML.escape(row.pos_bwa)    %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.pos_bilanz %][% HTML.escape(row.pos_bilanz) %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.pos_eur    %][% HTML.escape(row.pos_eur)    %][% ELSE %]-[% END %]</td>
+  <td colspan="2" class="coa_detail_emph">[% IF row.datevautomatik %]An[% ELSE %]Aus[% END %]</td>
+ </tr>
+</table>
+
+[% END %]
diff --git a/templates/webpages/am/list_account_details_master.html b/templates/webpages/am/list_account_details_master.html
index c19d4d137..a83a82eab 100644
--- a/templates/webpages/am/list_account_details_master.html
+++ b/templates/webpages/am/list_account_details_master.html
@@ -1,133 +1,63 @@
- <TMPL_LOOP CA> 
-        <table width="100%">
-
-          <colgroup>
-            <col width="10%">
-            <col width="10%">
-            <col width="10%">
-            <col width="50%">
-            <col width="10%">
-            <col width="10%">
-          </colgroup>
-
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-
-              <td rowspan="8" class="coa_detail_emph"><TMPL_VAR id ESCAPE=HTML DEFAULT="-"></td>
-              <td colspan="5" class="coa_detail_emph"><TMPL_VAR category ESCAPE=HTML>&nbsp;</td>
-
-            </tr>                                
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-              <td colspan="5" class="coa_detail_emph">
-                <TMPL_IF link>
-                <TMPL_VAR name="link" ESCAPE="HTML" DEFAULT="-">
-                <TMPL_ELSE>
-                -
-                </TMPL_IF>
-                </td>
-
-
-           </tr>                                
-
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-              <td colspan="5" class="coa_details_header"><translate>Taxlink_coa</translate></td>
-           </tr>
-
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-              <td class="coa_details_header2"><translate>Taxkey_coa</translate></td>
-              <td class="coa_details_header2"><translate>Taxaccount_coa</translate></td>
-              <td class="coa_details_header2"><translate>Taxdescription_coa</translate></td>
-              <td class="coa_details_header2"><translate>Posustva_coa</translate></td>
-              <td class="coa_details_header2"><translate>Startdate_coa</translate></td>
-            </tr>
-
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-              
-              <td class="coa_detail_emph">
-                <TMPL_IF taxkey>
-                <TMPL_VAR taxkey         DEFAULT="-" >
-                <TMPL_ELSE>
-                -
-                </TMPL_IF>
-              </td>
-              <td class="coa_detail_emph">
-                <TMPL_IF taxaccount> 
-                <TMPL_VAR taxaccount     DEFAULT="-" >
-                <TMPL_ELSE>
-                -
-                </TMPL_IF>
-              </td>
-              <td class="coa_detail_emph">
-                <TMPL_IF taxdescription> 
-                <TMPL_VAR taxdescription DEFAULT="-" >
-                <TMPL_ELSE>
-                -
-                </TMPL_IF>
-              </td>
-              <td class="coa_detail_emph">
-                <TMPL_IF tk_ustva> 
-                <TMPL_VAR tk_ustva       DEFAULT="-" >
-                <TMPL_ELSE>
-                -
-                </TMPL_IF>
-              </td>
-              <td class="coa_detail_emph">
-                <TMPL_IF startdate> 
-                <TMPL_VAR startdate      DEFAULT="-" >
-                <TMPL_ELSE>
-                -
-                </TMPL_IF>
-              </td>
-           </tr>
-
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-              <td colspan="5" class="coa_details_header"><translate>Report Positions</translate></td>
-           </tr>
-
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-              <td class="coa_details_header2"><translate>pos_bwa</translate></td>
-              <td class="coa_details_header2"><translate>pos_bilanz</translate></td>
-              <td class="coa_details_header2"><translate>pos_eur</translate></td>
-              <td colspan="2" class="coa_details_header2"><translate>Datevautomatik</translate></td>
-           </tr>
-            
-           <TMPL_IF __odd__>
-           <tr class="coa_listrow1">
-           <TMPL_ELSE>
-           <tr class="coa_listrow0">
-           </TMPL_IF>
-              <td class="coa_detail_emph"><TMPL_VAR pos_bwa    ESCAPE=HTML DEFAULT="-"></td>
-              <td class="coa_detail_emph"><TMPL_VAR pos_bilanz ESCAPE=HTML DEFAULT="-"></td>
-              <td class="coa_detail_emph"><TMPL_VAR pos_eur    ESCAPE=HTML DEFAULT="-"></td>
-              <td colspan="2" class="coa_detail_emph"><TMPL_VAR datevautomatik  ESCAPE=HTML DEFAULT="-"></td>
-           </tr>
-        </table>
-
-</TMPL_LOOP CA>
\ No newline at end of file
+[% USE HTML %] [% FOREACH row = CA %]
+<table width="100%">
+
+ <colgroup>
+  <col width="10%">
+  <col width="10%">
+  <col width="10%">
+  <col width="50%">
+  <col width="10%">
+  <col width="10%">
+ </colgroup>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td rowspan="8" class="coa_detail_emph">[% IF row.id %][% HTML.escape(row.id) %][% ELSE %]-[% END %]</td>
+  <td colspan="5" class="coa_detail_emph">[% HTML.escape(row.category) %]&nbsp;</td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td colspan="5" class="coa_detail_emph">
+   [% IF row.link %][% HTML.escape(row.link) %][% ELSE %]-[% END %]
+  </td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td colspan="5" class="coa_details_header"><translate>Taxlink_coa</translate></td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td class="coa_details_header2"><translate>Taxkey_coa</translate></td>
+  <td class="coa_details_header2"><translate>Taxaccount_coa</translate></td>
+  <td class="coa_details_header2"><translate>Taxdescription_coa</translate></td>
+  <td class="coa_details_header2"><translate>Posustva_coa</translate></td>
+  <td class="coa_details_header2"><translate>Startdate_coa</translate></td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td class="coa_detail_emph">[% IF row.taxkey         %][% HTML.escape(row.taxkey).replace(',', '<br>')         %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.taxaccount     %][% HTML.escape(row.taxaccount).replace(',', '<br>')     %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.taxdescription %][% HTML.escape(row.taxdescription).replace(',', '<br>') %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.tk_ustva       %][% HTML.escape(row.tk_ustva).replace(',', '<br>')       %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.startdate      %][% HTML.escape(row.startdate).replace(',', '<br>')      %][% ELSE %]-[% END %]</td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td colspan="5" class="coa_details_header"><translate>Report Positions</translate></td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td class="coa_details_header2"><translate>pos_bwa</translate></td>
+  <td class="coa_details_header2"><translate>pos_bilanz</translate></td>
+  <td class="coa_details_header2"><translate>pos_eur</translate></td>
+  <td colspan="2" class="coa_details_header2"><translate>Datevautomatik</translate></td>
+ </tr>
+
+ <tr class="coa_listrow[% loop.count % 2 %]">
+  <td class="coa_detail_emph">[% IF row.pos_bwa    %][% HTML.escape(row.pos_bwa)    %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.pos_bilanz %][% HTML.escape(row.pos_bilanz) %][% ELSE %]-[% END %]</td>
+  <td class="coa_detail_emph">[% IF row.pos_eur    %][% HTML.escape(row.pos_eur)    %][% ELSE %]-[% END %]</td>
+  <td colspan="2" class="coa_detail_emph">[% IF row.datevautomatik %]<translate>On</translate>[% ELSE %]<translate>Off</translate>[% END %]</td>
+ </tr>
+</table>
+
+[% END %]