X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=27b18e400fc77f1111e30112c5679d57d4fc7e6c;hb=e2b9e1737230c4e4209904784808dcaec723f730;hp=60814f2dcfa1dd9c8f8b76b3104ffd47ae131744;hpb=e0d47e23c8ef3863f7c2387e49e2207f9140f0db;p=kivitendo-erp.git

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 60814f2dc..27b18e400 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -31,45 +31,61 @@
 #
 #======================================================================
 
+use SL::Auth;
 use SL::AM;
 use SL::CA;
 use SL::Form;
 use SL::User;
+use SL::USTVA;
+use SL::Iconv;
+use SL::TODO;
+use CGI::Ajax;
+use CGI;
 
 use Data::Dumper;
 
-1;
-
+require "bin/mozilla/common.pl";
 
+use strict;
 
-require "$form->{path}/common.pl";
+1;
 
 # end of main
 
-sub add    { &{"add_$form->{type}"} }
-sub edit   { &{"edit_$form->{type}"} }
-sub save   { &{"save_$form->{type}"} }
-sub delete { &{"delete_$form->{type}"} }
+sub add      { call_sub("add_$main::form->{type}"); }
+sub delete   { call_sub("delete_$main::form->{type}"); }
+sub save     { call_sub("save_$main::form->{type}"); }
+sub edit     { call_sub("edit_$main::form->{type}"); }
+sub continue { call_sub($main::form->{"nextsub"}); }
+sub save_as_new { call_sub("save_as_new_$main::form->{type}"); }
 
 sub add_account {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::auth->assert('config');
 
   $form->{title}     = "Add";
   $form->{charttype} = "A";
   AM->get_account(\%myconfig, \%$form);
 
-  $form->{callback} =
-    "$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
+  $form->{callback} = "am.pl?action=list_account" unless $form->{callback};
 
   &account_header;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub edit_account {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::auth->assert('config');
 
   $form->{title} = "Edit";
   AM->get_account(\%myconfig, \%$form);
@@ -81,134 +97,122 @@ sub edit_account {
   &account_header;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub account_header {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
+
+  if ( $form->{action} eq 'edit_account') {
+    $form->{account_exists} = '1';
+  }
 
   $form->{title} = $locale->text("$form->{title} Account");
 
-  $checked{ $form->{charttype} } = "checked";
-  $checked{"$form->{category}_"} = "checked";
-  $checked{CT_tax} = ($form->{CT_tax}) ? "" : "checked";
+  $form->{"$form->{charttype}_checked"} = "checked";
+  $form->{"$form->{category}_checked"}  = "checked";
 
-  $form->{description} =~ s/\"/"/g;
+  $form->{select_tax} = "";
+
+  my @tax_report_pos = USTVA->report_variables({
+      myconfig   => \%myconfig,
+      form       => $form,
+      type       => '',
+      attribute  => 'position',
+      calc       => '',
+  });
 
   if (@{ $form->{TAXKEY} }) {
-    foreach $item (@{ $form->{TAXKEY} }) {
-      if ($item->{tax} == $form->{tax}) {
-        $form->{selecttaxkey} .=
-          "<option value=$item->{tax} selected>$item->{taxdescription}\n";
-      } else {
-        $form->{selecttaxkey} .=
-          "<option value=$item->{tax}>$item->{taxdescription}\n";
+    foreach my $item (@{ $form->{TAXKEY} }) {
+      $item->{rate} = $item->{rate} * 100 . '%';
+    }
+
+    # Fill in empty row for new Taxkey
+    my $newtaxkey_ref = {
+      id             => '',
+      chart_id       => '',
+      accno          => '',
+      tax_id         => '',
+      taxdescription => '',
+      rate           => '',
+      taxkey_id      => '',
+      pos_ustva      => '',
+      startdate      => '',
+    };
+
+    push @{ $form->{ACCOUNT_TAXKEYS} }, $newtaxkey_ref;
+
+    my $i = 0;
+    foreach my $taxkey_used (@{ $form->{ACCOUNT_TAXKEYS} } ) {
+
+      # Fill in a runningnumber
+      $form->{ACCOUNT_TAXKEYS}[$i]{runningnumber} = $i;
+
+      # Fill in the Taxkeys as select options
+      foreach my $item (@{ $form->{TAXKEY} }) {
+        if ($item->{id} == $taxkey_used->{tax_id}) {
+          $form->{ACCOUNT_TAXKEYS}[$i]{selecttaxkey} .=
+            qq|<option value="$item->{id}" selected="selected">|
+            . sprintf("%.2d", $item->{taxkey})
+            . qq|. $item->{taxdescription} ($item->{rate}) |
+            . $locale->text('Tax-o-matic Account')
+            . qq|: $item->{chart_accno}\n|;
+        }
+        else {
+          $form->{ACCOUNT_TAXKEYS}[$i]{selecttaxkey} .=
+            qq|<option value="$item->{id}">|
+            . sprintf("%.2d", $item->{taxkey})
+            . qq|. $item->{taxdescription} ($item->{rate}) |
+            . $locale->text('Tax-o-matic Account')
+            . qq|: $item->{chart_accno}\n|;
+        }
+
       }
 
+      # Fill in the USTVA Numbers as select options
+      foreach my $item ( '', sort({ $a cmp $b } @tax_report_pos) ) {
+        if ($item eq ''){
+          $form->{ACCOUNT_TAXKEYS}[$i]{select_tax} .= qq|<option value="" selected="selected">-\n|;
+        }
+        elsif ( $item eq $taxkey_used->{pos_ustva} ) {
+          $form->{ACCOUNT_TAXKEYS}[$i]{select_tax} .= qq|<option value="$item" selected="selected">$item\n|;
+        }
+        else {
+          $form->{ACCOUNT_TAXKEYS}[$i]{select_tax} .= qq|<option value="$item">$item\n|;
+        }
+
+      }
+
+      $i++;
     }
   }
 
-  $taxkey = qq|
-	      <tr>
-		<th align=right>| . $locale->text('Steuersatz') . qq|</th>
-		<td><select name=tax>$form->{selecttaxkey}</select></td>
-		<th align=right>| . $locale->text('Gültig ab') . qq|</th>
-                <td><input name=startdate value="$form->{startdate}"></td>
-	      </tr>|;
-
-  if (@{ $form->{NEWACCOUNT} }) {
+  # Newaccount Folgekonto
+  if (@{ $form->{NEWACCOUNT} || [] }) {
     if (!$form->{new_chart_valid}) {
-      $form->{selectnewaccount} = "<option value=></option>";
+      $form->{selectnewaccount} = qq|<option value=""> |. $locale->text('None') .q|</option>|;
     }
-    foreach $item (@{ $form->{NEWACCOUNT} }) {
+    foreach my $item (@{ $form->{NEWACCOUNT} }) {
       if ($item->{id} == $form->{new_chart_id}) {
         $form->{selectnewaccount} .=
-          "<option value=$item->{id} selected>$item->{accno}--$item->{description}</option>";
+          qq|<option value="$item->{id}" selected>$item->{accno}--$item->{description}</option>|;
       } elsif (!$form->{new_chart_valid}) {
         $form->{selectnewaccount} .=
-          "<option value=$item->{id}>$item->{accno}--$item->{description}</option>";
+          qq|<option value="$item->{id}">$item->{accno}--$item->{description}</option>|;
       }
 
     }
   }
 
-  $newaccount = qq|
-	      <tr>
-                <td colspan=2>
-                  <table>
-                    <tr>
-		      <th align=right>| . $locale->text('Folgekonto') . qq|</th>
-		      <td><select name=new_chart_id>$form->{selectnewaccount}</select></td>
-                      <th align=right>| . $locale->text('Gültig ab') . qq|</th>
-		      <td><input name=valid_from value="$form->{valid_from}"></td>
-                    </tr>
-                  </table>
-                </td>
-	      </tr>|;
-
-  $form->{selectustva} = "<option>\n";
-
-  %ustva = (35  => $locale->text('UStVA-Nr. 35'),
-            36  => $locale->text('UStVA-Nr. 36'),
-            39  => $locale->text('UStVA-Nr. 39'),
-            41  => $locale->text('UStVA-Nr. 41'),
-            42  => $locale->text('UStVA-Nr. 42'),
-            43  => $locale->text('UStVA-Nr. 43'),
-            44  => $locale->text('UStVA-Nr. 44'),
-            45  => $locale->text('UStVA-Nr. 45'),
-            48  => $locale->text('UStVA-Nr. 48'),
-            49  => $locale->text('UStVA-Nr. 49'),
-            51  => $locale->text('UStVA-Nr. 51 left'),
-            511 => $locale->text('UStVA-Nr. 51 right'),
-            52  => $locale->text('UStVA-Nr. 52'),
-            53  => $locale->text('UStVA-Nr. 53'),
-            59  => $locale->text('UStVA-Nr. 59'),
-            60  => $locale->text('UStVA-Nr. 60'),
-            61  => $locale->text('UStVA-Nr. 61'),
-            62  => $locale->text('UStVA-Nr. 62'),
-            63  => $locale->text('UStVA-Nr. 63'),
-            64  => $locale->text('UStVA-Nr. 64'),
-            65  => $locale->text('UStVA-Nr. 65'),
-            66  => $locale->text('UStVA-Nr. 66'),
-            67  => $locale->text('UStVA-Nr. 67'),
-            69  => $locale->text('UStVA-Nr. 69'),
-            73  => $locale->text('UStVA-Nr. 73'),
-            74  => $locale->text('UStVA-Nr. 74'),
-            76  => $locale->text('UStVA-Nr. 76'),
-            77  => $locale->text('UStVA-Nr. 77'),
-            80  => $locale->text('UStVA-Nr. 80'),
-            84  => $locale->text('UStVA-Nr. 84'),
-            85  => $locale->text('UStVA-Nr. 85'),
-            86  => $locale->text('UStVA-Nr. 86 left'),
-            861 => $locale->text('UStVA-Nr. 86 right'),
-            91  => $locale->text('UStVA-Nr. 91'),
-            93  => $locale->text('UStVA-Nr. 93 left'),
-            931 => $locale->text('UStVA-Nr. 93 right'),
-            94  => $locale->text('UStVA-Nr. 94'),
-            95  => $locale->text('UStVA-Nr. 95'),
-            96  => $locale->text('UStVA-Nr. 96'),
-            97  => $locale->text('UStVA-Nr. 97 links'),
-            971 => $locale->text('UStVA-Nr. 97 rechts'),
-            98  => $locale->text('UStVA-Nr. 98'));
-
-  foreach $item (sort({ $a cmp $b } keys %ustva)) {
-    if ($item == $form->{pos_ustva}) {
-      $form->{selectustva} .= "<option value=$item selected>$ustva{$item}\n";
-    } else {
-      $form->{selectustva} .= "<option value=$item>$ustva{$item}\n";
-    }
-
-  }
-
-  $ustva = qq|
-	      <tr>
-		<th align=right>| . $locale->text('Umsatzsteuervoranmeldung') . qq|</th>
-		<td><select name=pos_ustva>$form->{selectustva}</select></td>
-		<input type=hidden name=selectustva value="$form->{selectustva}">
-	      </tr>|;
-
-  $form->{selecteur} = "<option>\n";
-  %eur = (1  => "Umsatzerlöse",
+  my $select_eur = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
+  my %eur = (
+          1  => "Umsatzerlöse",
           2  => "sonstige Erlöse",
           3  => "Privatanteile",
           4  => "Zinserträge",
@@ -224,7 +228,7 @@ sub account_header {
           14 => "Steuern, Versich., Beiträge",
           15 => "Kfz-Steuern",
           16 => "Kfz-Versicherungen",
-          17 => "Sonst. Fahrtkosten",
+          17 => "Sonst. Fahrzeugkosten",
           18 => "Werbe- und Reisekosten",
           19 => "Instandhaltung u. Werkzeuge",
           20 => "Fachzeitschriften, Bücher",
@@ -239,25 +243,20 @@ sub account_header {
           29 => "Zinsaufwand",
           30 => "Ausserordentlicher Aufwand",
           31 => "Betriebliche Steuern");
-  foreach $item (sort({ $a <=> $b } keys(%eur))) {
+  foreach my $item (sort({ $a <=> $b } keys(%eur))) {
+    my $text = H(SL::Iconv::convert("ISO-8859-15", $main::dbcharset, $eur{$item}));
     if ($item == $form->{pos_eur}) {
-      $form->{selecteur} .= "<option value=$item selected>$eur{$item}\n";
+      $select_eur .= qq|<option value=$item selected>|. sprintf("%.2d", $item) .qq|. $text</option>\n|;
     } else {
-      $form->{selecteur} .= "<option value=$item>$eur{$item}\n";
+      $select_eur .= qq|<option value=$item>|. sprintf("%.2d", $item) .qq|. $text</option>\n|;
     }
 
   }
 
-  $eur = qq|
-	      <tr>
-		<th align=right>| . $locale->text('EUER') . qq|</th>
-		<td><select name=pos_eur>$form->{selecteur}</select></td>
-		<input type=hidden name=selecteur value="$form->{selecteur}">
-	      </tr>|;
-
-  $form->{selectbwa} = "<option>\n";
+  my $select_bwa = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
 
-  %bwapos = (1  => 'Umsatzerlöse',
+  my %bwapos = (
+             1  => 'Umsatzerlöse',
              2  => 'Best.Verdg.FE/UE',
              3  => 'Aktiv.Eigenleistung',
              4  => 'Mat./Wareneinkauf',
@@ -279,209 +278,103 @@ sub account_header {
              33 => 'Sonst.neutr.Ertrag',
              34 => 'Verr.kalk.Kosten',
              35 => 'Steuern Eink.u.Ertr.');
-  foreach $item (sort({ $a <=> $b } keys %bwapos)) {
+  foreach my $item (sort({ $a <=> $b } keys %bwapos)) {
+    my $text = H(SL::Iconv::convert("ISO-8859-15", $main::dbcharset, $bwapos{$item}));
     if ($item == $form->{pos_bwa}) {
-      $form->{selectbwa} .= "<option value=$item selected>$bwapos{$item}\n";
+      $select_bwa .= qq|<option value="$item" selected>|. sprintf("%.2d", $item) .qq|. $text\n|;
     } else {
-      $form->{selectbwa} .= "<option value=$item>$bwapos{$item}\n";
+      $select_bwa .= qq|<option value="$item">|. sprintf("%.2d", $item) .qq|. $text\n|;
     }
 
   }
 
-  $bwa = qq|
-	      <tr>
-		<th align=right>| . $locale->text('BWA') . qq|</th>
-		<td><select name=pos_bwa>$form->{selectbwa}</select></td>
-		<input type=hidden name=selectbwa value="$form->{selectbwa}">
-	      </tr>|;
+# Wieder hinzugefügt zu evaluationszwecken (us) 09.03.2007
+  my $select_bilanz = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
+  foreach my $item ((1, 2, 3, 4)) {
+    if ($item == $form->{pos_bilanz}) {
+      $select_bilanz .= qq|<option value=$item selected>|. sprintf("%.2d", $item) .qq|.\n|;
+    } else {
+      $select_bilanz .= qq|<option value=$item>|. sprintf("%.2d", $item) .qq|.\n|;
+    }
 
-# Entfernt bis es ordentlich umgesetzt wird (hli) 30.03.2006
-#  $form->{selectbilanz} = "<option>\n";
-#  foreach $item ((1, 2, 3, 4)) {
-#    if ($item == $form->{pos_bilanz}) {
-#      $form->{selectbilanz} .= "<option value=$item selected>$item\n";
-#    } else {
-#      $form->{selectbilanz} .= "<option value=$item>$item\n";
-#    }
-#
-#  }
-#
-#  $bilanz = qq|
-#	      <tr>
-#		<th align=right>| . $locale->text('Bilanz') . qq|</th>
-#		<td><select name=pos_bilanz>$form->{selectbilanz}</select></td>
-#		<input type=hidden name=selectbilanz value="$form->{selectbilanz}">
-#	      </tr>|;
-
-  # this is for our parser only!
+  }
+
+  # this is for our parser only! Do not remove.
   # type=submit $locale->text('Add Account')
   # type=submit $locale->text('Edit Account')
+
   $form->{type} = "account";
 
-  $form->header;
+  # preselections category
+
+  my $select_category = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
+
+  my %category = (
+      'A'  => $locale->text('Asset'),
+      'L'  => $locale->text('Liability'),
+      'Q'  => $locale->text('Equity'),
+      'I'  => $locale->text('Revenue'),
+      'E'  => $locale->text('Expense'),
+      'C'  => $locale->text('Costs'),
+  );
+  foreach my $item ( sort({ $a <=> $b } keys %category) ) {
+    if ($item eq $form->{category}) {
+      $select_category .= qq|<option value="$item" selected="selected">$category{$item} (|. sprintf("%s", $item) .qq|)\n|;
+    } else {
+      $select_category .= qq|<option value="$item">$category{$item} (|. sprintf("%s", $item) .qq|)\n|;
+    }
 
-  print qq|
-<body>
+  }
 
-<form method=post action=$form->{script}>
+  # preselection chart type
+  my $select_charttype = q{};
 
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=type value=account>
-<input type=hidden name=orphaned value=$form->{orphaned}>
-<input type=hidden name=new_chart_valid value=$form->{new_chart_valid}>
+  my %charttype = (
+      'A'  => $locale->text('Account'),
+      'H'  => $locale->text('Header'),
+  );
 
-<input type=hidden name=inventory_accno_id value=$form->{inventory_accno_id}>
-<input type=hidden name=income_accno_id value=$form->{income_accno_id}>
-<input type=hidden name=expense_accno_id value=$form->{expense_accno_id}>
-<input type=hidden name=fxgain_accno_id value=$form->{fxgain_accno_id}>
-<input type=hidden name=fxloss_accno_id value=$form->{fxloss_accno_id}>
+  foreach my $item ( sort({ $a <=> $b } keys %charttype) ) {
+    if ($item eq $form->{charttype}) {
+      $select_charttype .= qq|<option value="$item" selected="selected">$charttype{$item}\n|;
 
-<table border=0 width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr valign=top>
-    <td>
-      <table>
-	<tr>
-	  <th align=right>| . $locale->text('Account Number') . qq|</th>
-	  <td><input name=accno size=20 value=$form->{accno}></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Description') . qq|</th>
-	  <td><input name=description size=40 value="$form->{description}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Account Type') . qq|</th>
-	  <td>
-	    <table>
-	      <tr valign=top>
-		<td><input name=category type=radio class=radio value=A $checked{A_}>&nbsp;|
-    . $locale->text('Asset') . qq|\n<br>
-		<input name=category type=radio class=radio value=L $checked{L_}>&nbsp;|
-    . $locale->text('Liability') . qq|\n<br>
-		<input name=category type=radio class=radio value=Q $checked{Q_}>&nbsp;|
-    . $locale->text('Equity') . qq|\n<br>
-		<input name=category type=radio class=radio value=I $checked{I_}>&nbsp;|
-    . $locale->text('Revenue') . qq|\n<br>
-		<input name=category type=radio class=radio value=E $checked{E_}>&nbsp;|
-    . $locale->text('Expense') . qq|<br>
-		<input name=category type=radio class=radio value=C $checked{C_}>&nbsp;|
-    . $locale->text('Costs') . qq|</td>
-		<td width=50>&nbsp;</td>
-		<td>
-		<input name=charttype type=radio class=radio value="H" $checked{H}>&nbsp;|
-    . $locale->text('Heading') . qq|<br>
-		<input name=charttype type=radio class=radio value="A" $checked{A}>&nbsp;|
-    . $locale->text('Account') . qq|</td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
-|;
+    } else {
+      $select_charttype .= qq|<option value="$item">$charttype{$item}\n|;
+    }
 
-  if ($form->{charttype} eq "A") {
-    print qq|
-	<tr>
-	  <td colspan=2>
-	    <table>
-	      <tr>
-		<th align=left>|
-      . $locale->text('Is this a summary account to record') . qq|</th>
-		<td>
-		<input name=AR type=checkbox class=checkbox value=AR $form->{AR}>&nbsp;|
-      . $locale->text('AR')
-      . qq|&nbsp;<input name=AP type=checkbox class=checkbox value=AP $form->{AP}>&nbsp;|
-      . $locale->text('AP')
-      . qq|&nbsp;<input name=IC type=checkbox class=checkbox value=IC $form->{IC}>&nbsp;|
-      . $locale->text('Inventory')
-      . qq|</td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
-	<tr>
-	  <th colspan=2>| . $locale->text('Include in drop-down menus') . qq|</th>
-	</tr>
-	<tr valign=top>
-	  <td colspan=2>
-	    <table width=100%>
-	      <tr>
-		<th align=left>| . $locale->text('Receivables') . qq|</th>
-		<th align=left>| . $locale->text('Payables') . qq|</th>
-		<th align=left>| . $locale->text('Parts Inventory') . qq|</th>
-		<th align=left>| . $locale->text('Service Items') . qq|</th>
-	      </tr>
-	      <tr>
-		<td>
-		<input name=AR_amount type=checkbox class=checkbox value=AR_amount $form->{AR_amount}>&nbsp;|
-      . $locale->text('Revenue') . qq|\n<br>
-		<input name=AR_paid type=checkbox class=checkbox value=AR_paid $form->{AR_paid}>&nbsp;|
-      . $locale->text('Receipt') . qq|\n<br>
-		<input name=AR_tax type=checkbox class=checkbox value=AR_tax $form->{AR_tax}>&nbsp;|
-      . $locale->text('Tax') . qq|
-		</td>
-		<td>
-		<input name=AP_amount type=checkbox class=checkbox value=AP_amount $form->{AP_amount}>&nbsp;|
-      . $locale->text('Expense/Asset') . qq|\n<br>
-		<input name=AP_paid type=checkbox class=checkbox value=AP_paid $form->{AP_paid}>&nbsp;|
-      . $locale->text('Payment') . qq|\n<br>
-		<input name=AP_tax type=checkbox class=checkbox value=AP_tax $form->{AP_tax}>&nbsp;|
-      . $locale->text('Tax') . qq|
-		</td>
-		<td>
-		<input name=IC_sale type=checkbox class=checkbox value=IC_sale $form->{IC_sale}>&nbsp;|
-      . $locale->text('Revenue') . qq|\n<br>
-		<input name=IC_cogs type=checkbox class=checkbox value=IC_cogs $form->{IC_cogs}>&nbsp;|
-      . $locale->text('Expense') . qq|\n<br>
-		<input name=IC_taxpart type=checkbox class=checkbox value=IC_taxpart $form->{IC_taxpart}>&nbsp;|
-      . $locale->text('Tax') . qq|
-		</td>
-		<td>
-		<input name=IC_income type=checkbox class=checkbox value=IC_income $form->{IC_income}>&nbsp;|
-      . $locale->text('Revenue') . qq|\n<br>
-		<input name=IC_expense type=checkbox class=checkbox value=IC_expense $form->{IC_expense}>&nbsp;|
-      . $locale->text('Expense') . qq|\n<br>
-		<input name=IC_taxservice type=checkbox class=checkbox value=IC_taxservice $form->{IC_taxservice}>&nbsp;|
-      . $locale->text('Tax') . qq|
-		</td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
-|;
   }
 
-  print qq|
-        $taxkey
-        $ustva
-        $eur
-	$bwa
-        $bilanz
-      </table>
-    </td>
-  </tr>
-  $newaccount
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
+  my $ChartTypeIsAccount = ($form->{charttype} eq "A") ? "1":"";
+
+  $form->header();
+
+  my $parameters_ref = {
+    ChartTypeIsAccount         => $ChartTypeIsAccount,
+    select_category            => $select_category,
+    select_charttype           => $select_charttype,
+    select_bwa                 => $select_bwa,
+    select_bilanz              => $select_bilanz,
+    select_eur                 => $select_eur,
+  };
+
+  # Ausgabe des Templates
+  print($form->parse_html_template('am/edit_accounts', $parameters_ref));
 
-  $lxdebug->leave_sub();
+
+  $main::lxdebug->leave_sub();
 }
 
 sub form_footer {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  print qq|
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
-<input name=callback type=hidden value="$form->{callback}">
+  $main::auth->assert('config');
+
+  print qq|
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+<input name=callback type=hidden value="| . H($form->{callback}) . qq|">
 
 <br>|;
   if ((!$form->{id}) || ($form->{id} && $form->{orphaned}) || (($form->{type} eq "account") && (!$form->{new_chart_valid}))) {
@@ -496,6 +389,12 @@ sub form_footer {
       . $locale->text('Delete') . qq|">|;
   }
 
+  if ($form->{id} && $form->{type} eq "account") {
+    print qq|
+    <input class=submit type=submit name=action value="|
+      . $locale->text('Save as new') . qq|">|;
+  }
+
   print qq|
 </form>
 
@@ -503,39 +402,137 @@ sub form_footer {
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_account {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
+
+  $form->isblank("accno",       $locale->text('Account Number missing!'));
+  $form->isblank("description", $locale->text('Account Description missing!'));
+
+  if ($form->{charttype} eq 'A'){
+    $form->isblank("category",  $locale->text('Account Type missing!'));
+  }
+
+  $form->redirect($locale->text('Account saved!'))
+    if (AM->save_account(\%myconfig, \%$form));
+  $form->error($locale->text('Cannot save account!'));
+
+  $main::lxdebug->leave_sub();
+}
+
+sub save_as_new_account {
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
+
+  $form->isblank("accno",       $locale->text('Account Number missing!'));
+  $form->isblank("description", $locale->text('Account Description missing!'));
+
+  if ($form->{charttype} eq 'A'){
+    $form->isblank("category",  $locale->text('Account Type missing!'));
+  }
 
-  $form->isblank("accno",    $locale->text('Account Number missing!'));
-  $form->isblank("category", $locale->text('Account Type missing!'));
+  for my $taxkey (0 .. 9) {
+    if ($form->{"taxkey_id_$taxkey"}) {
+      $form->{"taxkey_id_$taxkey"} = "NEW";
+    }
+  }
 
+  $form->{id} = 0;
+  if ($form->{"original_accno"} &&
+      ($form->{"accno"} eq $form->{"original_accno"})) {
+    $form->error($locale->text('Account Number already used!'));
+  }
   $form->redirect($locale->text('Account saved!'))
     if (AM->save_account(\%myconfig, \%$form));
   $form->error($locale->text('Cannot save account!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub list_account {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
+
+  $form->{callback}     = build_std_url('action=list_account');
+  my $link_edit_account = build_std_url('action=edit_account', 'callback');
 
   CA->all_accounts(\%myconfig, \%$form);
 
-  $form->{title} = $locale->text('Chart of Accounts');
+  foreach my $ca (@{ $form->{CA} }) {
 
-  # construct callback
-  $callback =
-    "$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+    $ca->{debit}  = "";
+    $ca->{credit} = "";
+
+    if ($ca->{amount} > 0) {
+      $ca->{credit} = $form->format_amount(\%myconfig, $ca->{amount}, 2);
+    }
+    if ($ca->{amount} < 0) {
+      $ca->{debit} = $form->format_amount(\%myconfig, -1 * $ca->{amount}, 2);
+    }
+    $ca->{heading}   = ( $ca->{charttype} eq 'H' ) ? 1:'';
+    $ca->{link_edit_account} = $link_edit_account . '&id=' . E($ca->{id});
+  }
+
+  # Ajax
+  my $pjx = new CGI::Ajax('list_account_details' => build_std_url('action=list_account_details'));
+
+  # Eneable AJAX debuging
+  #$pjx->DEBUG(1);
+  #$pjx->JSDEBUG(1);
+
+  push(@ { $form->{AJAX} }, $pjx);
+
+  $form->{stylesheets} = "list_accounts.css";
+  $form->{title}       = $locale->text('Chart of Accounts');
 
   $form->header;
 
-  # escape callback
-  $callback = $form->escape($callback);
 
-  foreach $ca (@{ $form->{CA} }) {
+  my $parameters_ref = {
+  #   hidden_variables                => $_hidden_variables_ref,
+  };
+
+  # Ausgabe des Templates
+  print($form->parse_html_template('am/list_accounts', $parameters_ref));
+
+  $main::lxdebug->leave_sub();
+
+}
+
+
+sub list_account_details {
+# Ajax Funktion aus list_account_details
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
+
+  my $chart_id = $form->{args};
+
+  CA->all_accounts(\%myconfig, \%$form, $chart_id);
+
+  foreach my $ca (@{ $form->{CA} }) {
 
     $ca->{debit}  = "&nbsp;";
     $ca->{credit} = "&nbsp;";
@@ -546,15 +543,15 @@ sub list_account {
     }
     if ($ca->{amount} < 0) {
       $ca->{debit} =
-        $form->format_amount(\%myconfig, -$ca->{amount}, 2, "&nbsp;");
+        $form->format_amount(\%myconfig, -1 * $ca->{amount}, 2, "&nbsp;");
     }
 
     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')
@@ -569,18 +566,10 @@ sub list_account {
                : ( $link eq 'IC_income' )     ? $locale->text('Account Link IC_income')
                : ( $link eq 'IC_expense' )    ? $locale->text('Account Link IC_expense')
                : ( $link eq 'IC_taxservice' ) ? $locale->text('Account Link IC_taxservice')
-               : ( $link eq 'CT_tax' )        ? $locale->text('Account Link CT_tax')
+#               : ( $link eq 'CT_tax' )        ? $locale->text('Account Link CT_tax')
                : $locale->text('Unknown Link') . ': ' . $link;
-      
-      $ca->{link} .= qq|[| . $link . qq|]&nbsp;|;
+      $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'):q{};
 
     $ca->{category} = ($ca->{category} eq 'A') ? $locale->text('Account Category A')
                     : ($ca->{category} eq 'E') ? $locale->text('Account Category E')
@@ -590,33 +579,29 @@ sub list_account {
                     : ($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|&path=$form->{path}&login=$form->{login}|
-       .qq|&password=$form->{password}&callback=$callback>$ca->{accno}|;
   }
-  
-  my $parameters_ref = {
-  
-  
-  #   hidden_variables                => $_hidden_variables_ref,
-  };
-  
-  # Ausgabe des Templates
-  print($form->parse_html_template('am/list_accounts', $parameters_ref));
-  
-  $lxdebug->leave_sub();
-  
+
+  $form->{title} = $locale->text('Chart of Accounts');
+  $form->header();
+
+  print $form->parse_html_template('am/list_account_details');
+
+  $main::lxdebug->leave_sub();
 
 }
 
 sub delete_account {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   $form->{title} = $locale->text('Delete Account');
 
-  foreach $id (
+  foreach my $id (
     qw(inventory_accno_id income_accno_id expense_accno_id fxgain_accno_id fxloss_accno_id)
     ) {
     if ($form->{id} == $form->{$id}) {
@@ -628,378 +613,168 @@ sub delete_account {
     if (AM->delete_account(\%myconfig, \%$form));
   $form->error($locale->text('Cannot delete account!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
+}
+
+sub add_department {
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+
+  $main::auth->assert('config');
+
+  $form->{title} = "Add";
+  $form->{role}  = "P";
+
+  $form->{callback} = "am.pl?action=add_department" unless $form->{callback};
+
+  &department_header;
+  &form_footer;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub edit_department {
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::auth->assert('config');
+
+  $form->{title} = "Edit";
+
+  AM->get_department(\%myconfig, \%$form);
+
+  &department_header;
+  &form_footer;
+
+  $main::lxdebug->leave_sub();
 }
 
-sub list_gifi {
-  $lxdebug->enter_sub();
+sub list_department {
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  @{ $form->{fields} } = (accno, description);
-  $form->{table}     = "gifi";
-  $form->{sortorder} = "accno";
+  $main::auth->assert('config');
 
-  AM->gifi_accounts(\%myconfig, \%$form);
+  AM->departments(\%myconfig, \%$form);
 
-  $form->{title} = $locale->text('GIFI');
+  $form->{callback} = "am.pl?action=list_department";
 
-  # construct callback
-  $callback =
-    "$form->{script}?action=list_gifi&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+  my $callback = $form->escape($form->{callback});
 
-  @column_index = qw(accno description);
+  $form->{title} = $locale->text('Departments');
 
-  $column_header{accno} = qq|<th>| . $locale->text('GIFI') . qq|</a></th>|;
+  my @column_index = qw(description cost profit);
+  my %column_header;
   $column_header{description} =
-    qq|<th>| . $locale->text('Description') . qq|</a></th>|;
+      qq|<th class=listheading width=90%>|
+    . $locale->text('Description')
+    . qq|</th>|;
+  $column_header{cost} =
+      qq|<th class=listheading nowrap>|
+    . $locale->text('Cost Center')
+    . qq|</th>|;
+  $column_header{profit} =
+      qq|<th class=listheading nowrap>|
+    . $locale->text('Profit Center')
+    . qq|</th>|;
 
   $form->header;
-  $colspan = $#column_index + 1;
 
   print qq|
 <body>
 
 <table width=100%>
   <tr>
-    <th class=listtop colspan=$colspan>$form->{title}</th>
+    <th class=listtop>$form->{title}</th>
   </tr>
   <tr height="5"></tr>
-  <tr class=listheading>
+  <tr>
+    <td>
+      <table width=100%>
+        <tr class=listheading>
 |;
 
   map { print "$column_header{$_}\n" } @column_index;
 
   print qq|
-</tr>
+        </tr>
 |;
 
-  # escape callback
-  $callback = $form->escape($callback);
-
-  foreach $ca (@{ $form->{ALL} }) {
+  my ($i, %column_data);
+  foreach my $ref (@{ $form->{ALL} }) {
 
     $i++;
     $i %= 2;
 
     print qq|
-<tr valign=top class=listrow$i>|;
+        <tr valign=top class=listrow$i>
+|;
 
-    $column_data{accno} =
-      qq|<td><a href=$form->{script}?action=edit_gifi&coa=1&accno=$ca->{accno}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{accno}</td>|;
-    $column_data{description} = qq|<td>$ca->{description}&nbsp;</td>|;
+    my $costcenter   = ($ref->{role} eq "C") ? "X" : "";
+    my $profitcenter = ($ref->{role} eq "P") ? "X" : "";
+
+    $column_data{description} =
+      qq|<td><a href="am.pl?action=edit_department&id=$ref->{id}&callback=$callback">$ref->{description}</td>|;
+    $column_data{cost}   = qq|<td align=center>$costcenter</td>|;
+    $column_data{profit} = qq|<td align=center>$profitcenter</td>|;
 
     map { print "$column_data{$_}\n" } @column_index;
 
-    print "</tr>\n";
+    print qq|
+	</tr>
+|;
   }
 
   print qq|
+      </table>
+    </td>
+  </tr>
   <tr>
-    <td colspan=$colspan><hr size=3 noshade></td>
+  <td><hr size=3 noshade></td>
   </tr>
 </table>
 
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
-}
+<br>
+<form method=post action=am.pl>
 
-sub add_gifi {
-  $lxdebug->enter_sub();
+<input name=callback type=hidden value="$form->{callback}">
 
-  $form->{title} = "Add";
+<input type=hidden name=type value=department>
 
-  # construct callback
-  $form->{callback} =
-    "$form->{script}?action=list_gifi&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+<input class=submit type=submit name=action value="|
+    . $locale->text('Add') . qq|">
 
-  $form->{coa} = 1;
+  </form>
 
-  &gifi_header;
-  &gifi_footer;
+  </body>
+  </html>
+|;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub edit_gifi {
-  $lxdebug->enter_sub();
-
-  $form->{title} = "Edit";
-
-  AM->get_gifi(\%myconfig, \%$form);
-
-  &gifi_header;
-  &gifi_footer;
+sub department_header {
+  $main::lxdebug->enter_sub();
 
-  $lxdebug->leave_sub();
-}
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
-sub gifi_header {
-  $lxdebug->enter_sub();
+  $main::auth->assert('config');
 
-  $form->{title} = $locale->text("$form->{title} GIFI");
+  $form->{title} = $locale->text("$form->{title} Department");
 
-  # $locale->text('Add GIFI')
-  # $locale->text('Edit GIFI')
-
-  $form->{description} =~ s/\"/&quot;/g;
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<input type=hidden name=id value=$form->{accno}>
-<input type=hidden name=type value=gifi>
-
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-	<tr>
-	  <th align=right>| . $locale->text('GIFI') . qq|</th>
-	  <td><input name=accno size=20 value=$form->{accno}></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Description') . qq|</th>
-	  <td><input name=description size=60 value="$form->{description}"></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td colspan=2><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub gifi_footer {
-  $lxdebug->enter_sub();
-
-  print qq|
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<br><input type=submit class=submit name=action value="|
-    . $locale->text('Save') . qq|">|;
-
-  if ($form->{coa}) {
-    print qq|
-<input type=submit class=submit name=action value="|
-      . $locale->text('Copy to COA') . qq|">
-|;
-
-    if ($form->{accno} && $form->{orphaned}) {
-      print qq|<input type=submit class=submit name=action value="|
-        . $locale->text('Delete') . qq|">|;
-    }
-  }
-
-  print qq|
-  </form>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub save_gifi {
-  $lxdebug->enter_sub();
-
-  $form->isblank("accno", $locale->text('GIFI missing!'));
-  AM->save_gifi(\%myconfig, \%$form);
-  $form->redirect($locale->text('GIFI saved!'));
-
-  $lxdebug->leave_sub();
-}
-
-sub copy_to_coa {
-  $lxdebug->enter_sub();
-
-  $form->isblank("accno", $locale->text('GIFI missing!'));
-
-  AM->save_gifi(\%myconfig, \%$form);
-
-  delete $form->{id};
-  $form->{gifi_accno} = $form->{accno};
-  $form->{title}      = "Add";
-  $form->{charttype}  = "A";
-
-  &account_header;
-  &form_footer;
-
-  $lxdebug->leave_sub();
-}
-
-sub delete_gifi {
-  $lxdebug->enter_sub();
-
-  AM->delete_gifi(\%myconfig, \%$form);
-  $form->redirect($locale->text('GIFI deleted!'));
-
-  $lxdebug->leave_sub();
-}
-
-sub add_department {
-  $lxdebug->enter_sub();
-
-  $form->{title} = "Add";
-  $form->{role}  = "P";
-
-  $form->{callback} =
-    "$form->{script}?action=add_department&path=$form->{path}&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
-
-  &department_header;
-  &form_footer;
-
-  $lxdebug->leave_sub();
-}
-
-sub edit_department {
-  $lxdebug->enter_sub();
-
-  $form->{title} = "Edit";
-
-  AM->get_department(\%myconfig, \%$form);
-
-  &department_header;
-  &form_footer;
-
-  $lxdebug->leave_sub();
-}
-
-sub list_department {
-  $lxdebug->enter_sub();
-
-  AM->departments(\%myconfig, \%$form);
-
-  $form->{callback} =
-    "$form->{script}?action=list_department&path=$form->{path}&login=$form->{login}&password=$form->{password}";
-
-  $callback = $form->escape($form->{callback});
-
-  $form->{title} = $locale->text('Departments');
-
-  @column_index = qw(description cost profit);
-
-  $column_header{description} =
-      qq|<th class=listheading width=90%>|
-    . $locale->text('Description')
-    . qq|</th>|;
-  $column_header{cost} =
-      qq|<th class=listheading nowrap>|
-    . $locale->text('Cost Center')
-    . qq|</th>|;
-  $column_header{profit} =
-      qq|<th class=listheading nowrap>|
-    . $locale->text('Profit Center')
-    . qq|</th>|;
-
-  $form->header;
-
-  print qq|
-<body>
-
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table width=100%>
-        <tr class=listheading>
-|;
-
-  map { print "$column_header{$_}\n" } @column_index;
-
-  print qq|
-        </tr>
-|;
-
-  foreach $ref (@{ $form->{ALL} }) {
-
-    $i++;
-    $i %= 2;
-
-    print qq|
-        <tr valign=top class=listrow$i>
-|;
-
-    $costcenter   = ($ref->{role} eq "C") ? "X" : "";
-    $profitcenter = ($ref->{role} eq "P") ? "X" : "";
-
-    $column_data{description} =
-      qq|<td><a href=$form->{script}?action=edit_department&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
-    $column_data{cost}   = qq|<td align=center>$costcenter</td>|;
-    $column_data{profit} = qq|<td align=center>$profitcenter</td>|;
-
-    map { print "$column_data{$_}\n" } @column_index;
-
-    print qq|
-	</tr>
-|;
-  }
-
-  print qq|
-      </table>
-    </td>
-  </tr>
-  <tr>
-  <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<br>
-<form method=post action=$form->{script}>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=type value=department>
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
-
-  </form>
-
-  </body>
-  </html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub department_header {
-  $lxdebug->enter_sub();
-
-  $form->{title} = $locale->text("$form->{title} Department");
-
-  # $locale->text('Add Department')
-  # $locale->text('Edit Department')
+  # $locale->text('Add Department')
+  # $locale->text('Edit Department')
 
   $form->{description} =~ s/\"/&quot;/g;
 
+  my ($rows, $description);
   if (($rows = $form->numtextrows($form->{description}, 60)) > 1) {
     $description =
       qq|<textarea name="description" rows=$rows cols=60 wrap=soft>$form->{description}</textarea>|;
@@ -1008,15 +783,15 @@ sub department_header {
       qq|<input name=description size=60 value="$form->{description}">|;
   }
 
-  $costcenter   = "checked" if $form->{role} eq "C";
-  $profitcenter = "checked" if $form->{role} eq "P";
+  my $costcenter   = "checked" if $form->{role} eq "C";
+  my $profitcenter = "checked" if $form->{role} eq "P";
 
   $form->header;
 
   print qq|
 <body>
 
-<form method=post action=$form->{script}>
+<form method=post action=am.pl>
 
 <input type=hidden name=id value=$form->{id}>
 <input type=hidden name=type value=department>
@@ -1043,45 +818,64 @@ sub department_header {
 </table>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_department {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   $form->isblank("description", $locale->text('Description missing!'));
   AM->save_department(\%myconfig, \%$form);
   $form->redirect($locale->text('Department saved!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub delete_department {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   AM->delete_department(\%myconfig, \%$form);
   $form->redirect($locale->text('Department deleted!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub add_lead {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+
+  $main::auth->assert('config');
 
   $form->{title} = "Add";
 
-  $form->{callback} =
-    "$form->{script}?action=add_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
+  $form->{callback} = "am.pl?action=add_lead" unless $form->{callback};
 
   &lead_header;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub edit_lead {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::auth->assert('config');
 
   $form->{title} = "Edit";
 
@@ -1092,23 +886,28 @@ sub edit_lead {
   $form->{orphaned} = 1;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub list_lead {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   AM->lead(\%myconfig, \%$form);
 
-  $form->{callback} =
-    "$form->{script}?action=list_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+  $form->{callback} = "am.pl?action=list_lead";
 
-  $callback = $form->escape($form->{callback});
+  my $callback = $form->escape($form->{callback});
 
   $form->{title} = $locale->text('Lead');
 
-  @column_index = qw(description cost profit);
-
+  my @column_index = qw(description cost profit);
+  my %column_header;
   $column_header{description} =
       qq|<th class=listheading width=100%>|
     . $locale->text('Description')
@@ -1133,7 +932,8 @@ sub list_lead {
         </tr>
 |;
 
-  foreach $ref (@{ $form->{ALL} }) {
+  my ($i, %column_data);
+  foreach my $ref (@{ $form->{ALL} }) {
 
     $i++;
     $i %= 2;
@@ -1142,10 +942,9 @@ sub list_lead {
         <tr valign=top class=listrow$i>
 |;
 
-	$lead = $ref->{lead};
-	
-    $column_data{description} =
-      qq|<td><a href=$form->{script}?action=edit_lead&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{lead}</td>|;
+#	$lead = $ref->{lead};
+
+    $column_data{description} = qq|<td><a href="am.pl?action=edit_lead&id=$ref->{id}&callback=$callback">$ref->{lead}</td>|;
 
     map { print "$column_data{$_}\n" } @column_index;
 
@@ -1161,16 +960,12 @@ sub list_lead {
 </table>
 
 <br>
-<form method=post action=$form->{script}>
+<form method=post action=am.pl>
 
 <input name=callback type=hidden value="$form->{callback}">
 
 <input type=hidden name=type value=lead>
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <input class=submit type=submit name=action value="|
     . $locale->text('Add') . qq|">
 
@@ -1180,11 +975,16 @@ sub list_lead {
   </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub lead_header {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   $form->{title} = $locale->text("$form->{title} Lead");
 
@@ -1193,7 +993,7 @@ sub lead_header {
 
   $form->{description} =~ s/\"/&quot;/g;
 
-  $description =
+  my $description =
       qq|<input name=description size=50 value="$form->{lead}">|;
 
   $form->header;
@@ -1201,7 +1001,7 @@ sub lead_header {
   print qq|
 <body>
 
-<form method=post action=$form->{script}>
+<form method=post action=am.pl>
 
 <input type=hidden name=id value=$form->{id}>
 <input type=hidden name=type value=lead>
@@ -1220,45 +1020,62 @@ sub lead_header {
 </table>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_lead {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   $form->isblank("description", $locale->text('Description missing!'));
   AM->save_lead(\%myconfig, \%$form);
   $form->redirect($locale->text('lead saved!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub delete_lead {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   AM->delete_lead(\%myconfig, \%$form);
   $form->redirect($locale->text('lead deleted!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub add_business {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+
+  $main::auth->assert('config');
 
   $form->{title} = "Add";
 
-  $form->{callback} =
-    "$form->{script}?action=add_business&path=$form->{path}&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
+  $form->{callback} = "am.pl?action=add_business" unless $form->{callback};
 
   &business_header;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub edit_business {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
   $form->{title} = "Edit";
 
@@ -1269,23 +1086,28 @@ sub edit_business {
   $form->{orphaned} = 1;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub list_business {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   AM->business(\%myconfig, \%$form);
 
-  $form->{callback} =
-    "$form->{script}?action=list_business&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+  $form->{callback} = "am.pl?action=list_business";
 
-  $callback = $form->escape($form->{callback});
+  my $callback = $form->escape($form->{callback});
 
   $form->{title} = $locale->text('Type of Business');
 
-  @column_index = qw(description discount customernumberinit);
-
+  my @column_index = qw(description discount customernumberinit);
+  my %column_header;
   $column_header{description} =
       qq|<th class=listheading width=60%>|
     . $locale->text('Description')
@@ -1321,7 +1143,8 @@ sub list_business {
         </tr>
 |;
 
-  foreach $ref (@{ $form->{ALL} }) {
+  my ($i, %column_data);
+  foreach my $ref (@{ $form->{ALL} }) {
 
     $i++;
     $i %= 2;
@@ -1330,14 +1153,9 @@ sub list_business {
         <tr valign=top class=listrow$i>
 |;
 
-    $discount =
-      $form->format_amount(\%myconfig, $ref->{discount} * 100, 1, "&nbsp");
-    $description =
-      ($ref->{salesman})
-      ? "<b>$ref->{description}</b>"
-      : "$ref->{description}";
-    $column_data{description} =
-      qq|<td><a href=$form->{script}?action=edit_business&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$description</td>|;
+    my $discount    = $form->format_amount(\%myconfig, $ref->{discount} * 100);
+    my $description = $ref->{description};
+    $column_data{description} = qq|<td><a href="am.pl?action=edit_business&id=$ref->{id}&callback=$callback">$description</td>|;
     $column_data{discount}           = qq|<td align=right>$discount</td>|;
     $column_data{customernumberinit} =
       qq|<td align=right>$ref->{customernumberinit}</td>|;
@@ -1359,16 +1177,12 @@ sub list_business {
 </table>
 
 <br>
-<form method=post action=$form->{script}>
+<form method=post action=am.pl>
 
 <input name=callback type=hidden value="$form->{callback}">
 
 <input type=hidden name=type value=business>
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <input class=submit type=submit name=action value="|
     . $locale->text('Add') . qq|">
 
@@ -1378,14 +1192,19 @@ sub list_business {
   </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub business_header {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   $form->{title}    = $locale->text("$form->{title} Business");
-  $form->{salesman} = "checked" if $form->{salesman};
 
   # $locale->text('Add Business')
   # $locale->text('Edit Business')
@@ -1399,7 +1218,7 @@ sub business_header {
   print qq|
 <body>
 
-<form method=post action=$form->{script}>
+<form method=post action=am.pl>
 
 <input type=hidden name=id value=$form->{id}>
 <input type=hidden name=type value=business>
@@ -1421,54 +1240,70 @@ sub business_header {
     <th align=right>| . $locale->text('Customernumberinit') . qq|</th>
     <td><input name=customernumberinit size=10 value=$form->{customernumberinit}></td>
   </tr>
-  <tr>
-    <td align=right>| . $locale->text('Salesman') . qq|</td>
-    <td><input name=salesman class=checkbox type=checkbox value=1 $form->{salesman}></td>
-  </tr>
   <td colspan=2><hr size=3 noshade></td>
   </tr>
 </table>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_business {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   $form->isblank("description", $locale->text('Description missing!'));
+  $form->{discount} = $form->parse_amount(\%myconfig, $form->{discount}) / 100;
   AM->save_business(\%myconfig, \%$form);
   $form->redirect($locale->text('Business saved!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub delete_business {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   AM->delete_business(\%myconfig, \%$form);
   $form->redirect($locale->text('Business deleted!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub add_language {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+
+  $main::auth->assert('config');
 
   $form->{title} = "Add";
 
-  $form->{callback} =
-    "$form->{script}?action=add_language&path=$form->{path}&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
+  $form->{callback} = "am.pl?action=add_language" unless $form->{callback};
 
   &language_header;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub edit_language {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::auth->assert('config');
 
   $form->{title} = "Edit";
 
@@ -1479,23 +1314,28 @@ sub edit_language {
   $form->{orphaned} = 1;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub list_language {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   AM->language(\%myconfig, \%$form);
 
-  $form->{callback} =
-    "$form->{script}?action=list_language&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+  $form->{callback} = "am.pl?action=list_language";
 
-  $callback = $form->escape($form->{callback});
+  my $callback = $form->escape($form->{callback});
 
   $form->{title} = $locale->text('Languages');
 
-  @column_index = qw(description template_code article_code output_numberformat output_dateformat output_longdates);
-
+  my @column_index = qw(description template_code article_code output_numberformat output_dateformat output_longdates);
+  my %column_header;
   $column_header{description} =
       qq|<th class=listheading width=60%>|
     . $locale->text('Description')
@@ -1543,7 +1383,8 @@ sub list_language {
         </tr>
 |;
 
-  foreach $ref (@{ $form->{ALL} }) {
+  my ($i, %column_data);
+  foreach my $ref (@{ $form->{ALL} }) {
 
     $i++;
     $i %= 2;
@@ -1554,7 +1395,7 @@ sub list_language {
 
 
     $column_data{description} =
-      qq|<td><a href=$form->{script}?action=edit_language&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
+      qq|<td><a href="am.pl?action=edit_language&id=$ref->{id}&callback=$callback">$ref->{description}</td>|;
     $column_data{template_code}           = qq|<td align=right>$ref->{template_code}</td>|;
     $column_data{article_code} =
       qq|<td align=right>$ref->{article_code}</td>|;
@@ -1590,16 +1431,12 @@ sub list_language {
 </table>
 
 <br>
-<form method=post action=$form->{script}>
+<form method=post action=am.pl>
 
 <input name=callback type=hidden value="$form->{callback}">
 
 <input type=hidden name=type value=language>
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <input class=submit type=submit name=action value="|
     . $locale->text('Add') . qq|">
 
@@ -1609,11 +1446,16 @@ sub list_language {
   </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub language_header {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   $form->{title}    = $locale->text("$form->{title} Language");
 
@@ -1630,7 +1472,7 @@ sub language_header {
   my $numberformat =
     qq|<option value="">| . $locale->text("use program settings") .
     qq|</option>|;
-  foreach $item (qw(1,000.00 1000.00 1.000,00 1000,00)) {
+  foreach my $item (('1,000.00', '1000.00', '1.000,00', '1000,00')) {
     $numberformat .=
       ($item eq $form->{output_numberformat})
       ? "<option selected>$item"
@@ -1641,7 +1483,7 @@ sub language_header {
   my $dateformat =
     qq|<option value="">| . $locale->text("use program settings") .
     qq|</option>|;
-  foreach $item (qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd)) {
+  foreach my $item (qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd)) {
     $dateformat .=
       ($item eq $form->{output_dateformat})
       ? "<option selected>$item"
@@ -1652,7 +1494,7 @@ sub language_header {
   print qq|
 <body>
 
-<form method=post action=$form->{script}>
+<form method=post action=am.pl>
 
 <input type=hidden name=id value=$form->{id}>
 <input type=hidden name=type value=language>
@@ -1697,11 +1539,17 @@ sub language_header {
 </table>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_language {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   $form->isblank("description", $locale->text('Language missing!'));
   $form->isblank("template_code", $locale->text('Template Code missing!'));
@@ -1709,29 +1557,40 @@ sub save_language {
   AM->save_language(\%myconfig, \%$form);
   $form->redirect($locale->text('Language saved!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub delete_language {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   AM->delete_language(\%myconfig, \%$form);
   $form->redirect($locale->text('Language deleted!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 
 sub add_buchungsgruppe {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   # $locale->text("Add Buchungsgruppe")
   # $locale->text("Edit Buchungsgruppe")
   $form->{title} = "Add";
 
-  $form->{callback} =
-    "$form->{script}?action=add_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
+  $form->{callback} = "am.pl?action=add_buchungsgruppe" unless $form->{callback};
+
   AM->get_buchungsgruppe(\%myconfig, \%$form);
   $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"};
   for (my $i = 0; 4 > $i; $i++) {
@@ -1742,11 +1601,16 @@ sub add_buchungsgruppe {
   &buchungsgruppe_header;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub edit_buchungsgruppe {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::auth->assert('config');
 
   $form->{title} = "Edit";
 
@@ -1756,33 +1620,38 @@ sub edit_buchungsgruppe {
 
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub list_buchungsgruppe {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   AM->buchungsgruppe(\%myconfig, \%$form);
 
-  $form->{callback} =
-    "$form->{script}?action=list_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+  $form->{callback} = "am.pl?action=list_buchungsgruppe";
 
-  $callback = $form->escape($form->{callback});
+  my $callback = $form->escape($form->{callback});
 
   $form->{title} = $locale->text('Buchungsgruppen');
 
-  @column_index = qw(up down description inventory_accno
+  my @column_index = qw(up down description inventory_accno
                      income_accno_0 expense_accno_0
                      income_accno_1 expense_accno_1
                      income_accno_2 expense_accno_2
                      income_accno_3 expense_accno_3 );
-
+  my %column_header;
   $column_header{up} =
-      qq|<th class="listheading">|
+      qq|<th class="listheading" width="16">|
     . qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">|
     . qq|</th>|;
   $column_header{down} =
-      qq|<th class="listheading">|
+      qq|<th class="listheading" width="16">|
     . qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">|
     . qq|</th>|;
   $column_header{description} =
@@ -1795,35 +1664,35 @@ sub list_buchungsgruppe {
     . qq|</th>|;
   $column_header{income_accno_0} =
       qq|<th class=listheading>|
-    . $locale->text('Erlöse Inland')
+    . $locale->text('National Revenues')
     . qq|</th>|;
   $column_header{expense_accno_0} =
       qq|<th class=listheading>|
-    . $locale->text('Aufwand Inland')
+    . $locale->text('National Expenses')
     . qq|</th>|;
   $column_header{income_accno_1} =
       qq|<th class=listheading>|
-    . $locale->text('Erlöse EU m. UStId')
+    . $locale->text('Revenues EU with UStId')
     . qq|</th>|;
   $column_header{expense_accno_1} =
       qq|<th class=listheading>|
-    . $locale->text('Aufwand EU m. UStId')
+    . $locale->text('Expenses EU with UStId')
     . qq|</th>|;
   $column_header{income_accno_2} =
       qq|<th class=listheading>|
-    . $locale->text('Erlöse EU o. UStId')
+    . $locale->text('Revenues EU without UStId')
     . qq|</th>|;
   $column_header{expense_accno_2} =
       qq|<th class=listheading>|
-    . $locale->text('Aufwand EU o. UStId')
+    . $locale->text('Expenses EU without UStId')
     . qq|</th>|;
   $column_header{income_accno_3} =
       qq|<th class=listheading>|
-    . $locale->text('Erlöse Ausland')
+    . $locale->text('Foreign Revenues')
     . qq|</th>|;
   $column_header{expense_accno_3} =
       qq|<th class=listheading>|
-    . $locale->text('Aufwand Ausland')
+    . $locale->text('Foreign Expenses')
     . qq|</th>|;
   $form->header;
 
@@ -1847,12 +1716,11 @@ sub list_buchungsgruppe {
         </tr>
 |;
 
-  my $swap_link = qq|$form->{script}?action=swap_buchungsgruppen&|;
-  map({ $swap_link .= $_ . "=" . $form->escape($form->{$_}) . "&" }
-      qw(login password path));
+  my $swap_link = qq|am.pl?action=swap_buchungsgruppen&|;
 
   my $row = 0;
-  foreach $ref (@{ $form->{ALL} }) {
+  my ($i, %column_data);
+  foreach my $ref (@{ $form->{ALL} }) {
 
     $i++;
     $i %= 2;
@@ -1864,27 +1732,26 @@ sub list_buchungsgruppe {
     if ($row) {
       my $pref = $form->{ALL}->[$row - 1];
       $column_data{up} =
-        qq|<td align="center" valign="center">| .
+        qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}id1=$ref->{id}&id2=$pref->{id}">| .
-        qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">| .
+        qq|<img border="0" src="image/up.png" alt="| . $locale->text("up") . qq|">| .
         qq|</a></td>|;
     } else {
-      $column_data{up} = qq|<td>&nbsp;</td>|;
+      $column_data{up} = qq|<td width="16">&nbsp;</td>|;
     }
 
     if ($row == (scalar(@{ $form->{ALL} }) - 1)) {
-      $column_data{down} = qq|<td>&nbsp;</td>|;
+      $column_data{down} = qq|<td width="16">&nbsp;</td>|;
     } else {
       my $nref = $form->{ALL}->[$row + 1];
       $column_data{down} =
-        qq|<td align="center" valign="center">| .
+        qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}id1=$ref->{id}&id2=$nref->{id}">| .
-        qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">| .
+        qq|<img border="0" src="image/down.png" alt="| . $locale->text("down") . qq|">| .
         qq|</a></td>|;
     }
 
-    $column_data{description} =
-      qq|<td><a href=$form->{script}?action=edit_buchungsgruppe&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
+    $column_data{description} = qq|<td><a href="am.pl?action=edit_buchungsgruppe&id=$ref->{id}&callback=$callback">$ref->{description}</td>|;
     $column_data{inventory_accno}           = qq|<td align=right>$ref->{inventory_accno}</td>|;
     $column_data{income_accno_0} =
       qq|<td align=right>$ref->{income_accno_0}</td>|;
@@ -1918,16 +1785,12 @@ sub list_buchungsgruppe {
 </table>
 
 <br>
-<form method=post action=$form->{script}>
+<form method=post action=am.pl>
 
 <input name=callback type=hidden value="$form->{callback}">
 
 <input type=hidden name=type value=buchungsgruppe>
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <input class=submit type=submit name=action value="|
     . $locale->text('Add') . qq|">
 
@@ -1937,16 +1800,21 @@ sub list_buchungsgruppe {
   </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub buchungsgruppe_header {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   $form->{title}    = $locale->text("$form->{title} Buchungsgruppe");
 
-  # $locale->text('Buchungsgruppe hinzufügen')
-  # $locale->text('Buchungsgruppe bearbeiten')
+  # $locale->text('Add Accounting Group')
+  # $locale->text('Edit Accounting Group')
 
   my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {});
   my %acc_type_map = (
@@ -1957,8 +1825,8 @@ sub buchungsgruppe_header {
     "IC_cogs" => $acc_expense,
     );
 
-  foreach $key (keys(%acc_type_map)) {
-    foreach $ref (@{ $form->{IC_links}{$key} }) {
+  foreach my $key (keys(%acc_type_map)) {
+    foreach my $ref (@{ $form->{IC_links}{$key} }) {
       $acc_type_map{$key}->{$ref->{"id"}} = $ref;
     }
   }
@@ -1974,14 +1842,15 @@ sub buchungsgruppe_header {
 
   if ($form->{id}) {
     $form->{selectIC} =~ s/selected//g;
-    $form->{selectIC} =~ s/ value=$form->{inventory_accno_id}/  value=$form->{inventory_accno_id} selected/;
+    $form->{selectIC} =~ s/ value=\Q$form->{inventory_accno_id}\E/  value=$form->{inventory_accno_id} selected/;
     $form->{selectIC_income} =~ s/selected//g;
-    $form->{selectIC_income} =~ s/ value=$form->{income_accno_id_0}/  value=$form->{income_accno_id_0} selected/;
+    $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_0}\E/  value=$form->{income_accno_id_0} selected/;
     $form->{selectIC_expense} =~ s/selected//g;
-    $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_0}/  value=$form->{expense_accno_id_0} selected/;
+    $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_0}\E/  value=$form->{expense_accno_id_0} selected/;
   }
 
-  if (!$eur) {
+  my $linkaccounts;
+  if (!$main::eur) {
     $linkaccounts = qq|
                <tr>
 		<th align=right>| . $locale->text('Inventory') . qq|</th>
@@ -1996,57 +1865,57 @@ sub buchungsgruppe_header {
 
   $linkaccounts .= qq|
 	      <tr>
-		<th align=right>| . $locale->text('Erlöse Inland') . qq|</th>
+		<th align=right>| . $locale->text('National Revenues') . qq|</th>
 		<td><select name=income_accno_id_0>$form->{selectIC_income}</select></td>
 	      </tr>
 	      <tr>
-		<th align=right>| . $locale->text('Aufwand Inland') . qq|</th>
+		<th align=right>| . $locale->text('National Expenses') . qq|</th>
 		<td><select name=expense_accno_id_0>$form->{selectIC_expense}</select></td>
 	      </tr>|;
   if ($form->{id}) {
     $form->{selectIC_income} =~ s/selected//g;
-    $form->{selectIC_income} =~ s/ value=$form->{income_accno_id_1}/  value=$form->{income_accno_id_1} selected/;
+    $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_1}\E/  value=$form->{income_accno_id_1} selected/;
     $form->{selectIC_expense} =~ s/selected//g;
-    $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_1}/  value=$form->{expense_accno_id_1} selected/;
+    $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_1}\E/  value=$form->{expense_accno_id_1} selected/;
   }
   $linkaccounts .= qq|	      <tr>
-		<th align=right>| . $locale->text('Erlöse EU m. UStId') . qq|</th>
+		<th align=right>| . $locale->text('Revenues EU with UStId') . qq|</th>
 		<td><select name=income_accno_id_1>$form->{selectIC_income}</select></td>
 	      </tr>
 	      <tr>
-		<th align=right>| . $locale->text('Aufwand EU m UStId') . qq|</th>
+		<th align=right>| . $locale->text('Expenses EU with UStId') . qq|</th>
 		<td><select name=expense_accno_id_1>$form->{selectIC_expense}</select></td>
 	      </tr>|;
 
   if ($form->{id}) {
     $form->{selectIC_income} =~ s/selected//g;
-    $form->{selectIC_income} =~ s/ value=$form->{income_accno_id_2}/  value=$form->{income_accno_id_2} selected/;
+    $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_2}\E/  value=$form->{income_accno_id_2} selected/;
     $form->{selectIC_expense} =~ s/selected//g;
-    $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_2}/  value=$form->{expense_accno_id_2} selected/;
+    $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_2}\E/  value=$form->{expense_accno_id_2} selected/;
   }
 
   $linkaccounts .= qq|	      <tr>
-		<th align=right>| . $locale->text('Erlöse EU o. UStId') . qq|</th>
+		<th align=right>| . $locale->text('Revenues EU without UStId') . qq|</th>
 		<td><select name=income_accno_id_2>$form->{selectIC_income}</select></td>
 	      </tr>
 	      <tr>
-		<th align=right>| . $locale->text('Aufwand EU o. UStId') . qq|</th>
+		<th align=right>| . $locale->text('Expenses EU without UStId') . qq|</th>
 		<td><select name=expense_accno_id_2>$form->{selectIC_expense}</select></td>
 	      </tr>|;
 
   if ($form->{id}) {
     $form->{selectIC_income} =~ s/selected//g;
-    $form->{selectIC_income} =~ s/ value=$form->{income_accno_id_3}/  value=$form->{income_accno_id_3} selected/;
+    $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_3}\E/  value=$form->{income_accno_id_3} selected/;
     $form->{selectIC_expense} =~ s/selected//g;
-    $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_3}/  value=$form->{expense_accno_id_3} selected/;
+    $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_3}\E/  value=$form->{expense_accno_id_3} selected/;
   }
 
   $linkaccounts .= qq|	      <tr>
-		<th align=right>| . $locale->text('Erlöse Ausland') . qq|</th>
+		<th align=right>| . $locale->text('Foreign Revenues') . qq|</th>
 		<td><select name=income_accno_id_3>$form->{selectIC_income}</select></td>
 	      </tr>
 	      <tr>
-		<th align=right>| . $locale->text('Aufwand Ausland') . qq|</th>
+		<th align=right>| . $locale->text('Foreign Expenses') . qq|</th>
 		<td><select name=expense_accno_id_3>$form->{selectIC_expense}</select></td>
 	      </tr>
 |;
@@ -2057,7 +1926,7 @@ sub buchungsgruppe_header {
   print qq|
 <body>
 
-<form method=post action=$form->{script}>
+<form method=post action=am.pl>
 
 <input type=hidden name=id value=$form->{id}>
 <input type=hidden name=type value=buchungsgruppe>
@@ -2077,56 +1946,80 @@ sub buchungsgruppe_header {
 </table>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_buchungsgruppe {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   $form->isblank("description", $locale->text('Description missing!'));
 
   AM->save_buchungsgruppe(\%myconfig, \%$form);
-  $form->redirect($locale->text('Buchungsgruppe gespeichert!'));
+  $form->redirect($locale->text('Accounting Group saved!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub delete_buchungsgruppe {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   AM->delete_buchungsgruppe(\%myconfig, \%$form);
-  $form->redirect($locale->text('Buchungsgruppe gelöscht!'));
+  $form->redirect($locale->text('Accounting Group deleted!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub swap_buchungsgruppen {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::auth->assert('config');
 
   AM->swap_sortkeys(\%myconfig, $form, "buchungsgruppen");
   list_buchungsgruppe();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 
 sub add_printer {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+
+  $main::auth->assert('config');
 
   $form->{title} = "Add";
 
-  $form->{callback} =
-    "$form->{script}?action=add_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
+  $form->{callback} = "am.pl?action=add_printer" unless $form->{callback};
 
   &printer_header;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub edit_printer {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::auth->assert('config');
 
   $form->{title} = "Edit";
 
@@ -2137,23 +2030,28 @@ sub edit_printer {
   $form->{orphaned} = 1;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub list_printer {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   AM->printer(\%myconfig, \%$form);
 
-  $form->{callback} =
-    "$form->{script}?action=list_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+  $form->{callback} = "am.pl?action=list_printer";
 
-  $callback = $form->escape($form->{callback});
+  my $callback = $form->escape($form->{callback});
 
   $form->{title} = $locale->text('Printer');
 
-  @column_index = qw(printer_description printer_command template_code);
-
+  my @column_index = qw(printer_description printer_command template_code);
+  my %column_header;
   $column_header{printer_description} =
       qq|<th class=listheading width=60%>|
     . $locale->text('Printer Description')
@@ -2189,7 +2087,8 @@ sub list_printer {
         </tr>
 |;
 
-  foreach $ref (@{ $form->{ALL} }) {
+  my ($i, %column_data);
+  foreach my $ref (@{ $form->{ALL} }) {
 
     $i++;
     $i %= 2;
@@ -2199,8 +2098,7 @@ sub list_printer {
 |;
 
 
-    $column_data{printer_description} =
-      qq|<td><a href=$form->{script}?action=edit_printer&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{printer_description}</td>|;
+    $column_data{printer_description} = qq|<td><a href="am.pl?action=edit_printer&id=$ref->{id}&callback=$callback">$ref->{printer_description}</td>|;
     $column_data{printer_command}           = qq|<td align=right>$ref->{printer_command}</td>|;
     $column_data{template_code} =
       qq|<td align=right>$ref->{template_code}</td>|;
@@ -2222,16 +2120,12 @@ sub list_printer {
 </table>
 
 <br>
-<form method=post action=$form->{script}>
+<form method=post action=am.pl>
 
 <input name=callback type=hidden value="$form->{callback}">
 
 <input type=hidden name=type value=printer>
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <input class=submit type=submit name=action value="|
     . $locale->text('Add') . qq|">
 
@@ -2241,11 +2135,16 @@ sub list_printer {
   </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub printer_header {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   $form->{title}    = $locale->text("$form->{title} Printer");
 
@@ -2262,7 +2161,7 @@ sub printer_header {
   print qq|
 <body>
 
-<form method=post action=$form->{script}>
+<form method=post action=am.pl>
 
 <input type=hidden name=id value=$form->{id}>
 <input type=hidden name=type value=printer>
@@ -2289,38 +2188,52 @@ sub printer_header {
 </table>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_printer {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   $form->isblank("printer_description", $locale->text('Description missing!'));
   $form->isblank("printer_command", $locale->text('Printer Command missing!'));
   AM->save_printer(\%myconfig, \%$form);
   $form->redirect($locale->text('Printer saved!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub delete_printer {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   AM->delete_printer(\%myconfig, \%$form);
   $form->redirect($locale->text('Printer deleted!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-
 sub add_payment {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::auth->assert('config');
 
   $form->{title} = "Add";
 
-  $form->{callback} =
-    "$form->{script}?action=add_payment&path=$form->{path}&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
+  $form->{callback} = "am.pl?action=add_payment" unless $form->{callback};
 
   $form->{terms_netto} = 0;
   $form->{terms_skonto} = 0;
@@ -2332,11 +2245,16 @@ sub add_payment {
   &payment_header;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub edit_payment {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::auth->assert('config');
 
   $form->{title} = "Edit";
 
@@ -2349,29 +2267,35 @@ sub edit_payment {
   $form->{orphaned} = 1;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub list_payment {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   AM->payment(\%myconfig, \%$form);
 
   $form->{callback} = build_std_url("action=list_payment");
 
-  $callback = $form->escape($form->{callback});
+  my $callback = $form->escape($form->{callback});
 
   $form->{title} = $locale->text('Payment Terms');
 
-  @column_index = qw(up down description description_long terms_netto
+  my @column_index = qw(up down description description_long terms_netto
                      terms_skonto percent_skonto);
-
+  my %column_header;
   $column_header{up} =
-      qq|<th class="listheading" align="center" valign="center">|
+      qq|<th class="listheading" align="center" valign="center" width="16">|
     . qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">|
     . qq|</th>|;
   $column_header{down} =
-      qq|<th class="listheading" align="center" valign="center">|
+      qq|<th class="listheading" align="center" valign="center" width="16">|
     . qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">|
     . qq|</th>|;
   $column_header{description} =
@@ -2420,7 +2344,8 @@ sub list_payment {
   my $swap_link = build_std_url("action=swap_payment_terms");
 
   my $row = 0;
-  foreach $ref (@{ $form->{ALL} }) {
+  my ($i, %column_data);
+  foreach my $ref (@{ $form->{ALL} }) {
 
     $i++;
     $i %= 2;
@@ -2432,22 +2357,22 @@ sub list_payment {
     if ($row) {
       my $pref = $form->{ALL}->[$row - 1];
       $column_data{up} =
-        qq|<td align="center" valign="center">| .
+        qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}&id1=$ref->{id}&id2=$pref->{id}">| .
-        qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">| .
+        qq|<img border="0" src="image/up.png" alt="| . $locale->text("up") . qq|">| .
         qq|</a></td>|;
     } else {
-      $column_data{up} = qq|<td>&nbsp;</td>|;
+      $column_data{up} = qq|<td width="16">&nbsp;</td>|;
     }
 
     if ($row == (scalar(@{ $form->{ALL} }) - 1)) {
-      $column_data{down} = qq|<td>&nbsp;</td>|;
+      $column_data{down} = qq|<td width="16">&nbsp;</td>|;
     } else {
       my $nref = $form->{ALL}->[$row + 1];
       $column_data{down} =
-        qq|<td align="center" valign="center">| .
+        qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}&id1=$ref->{id}&id2=$nref->{id}">| .
-        qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">| .
+        qq|<img border="0" src="image/down.png" alt="| . $locale->text("down") . qq|">| .
         qq|</a></td>|;
     }
 
@@ -2483,16 +2408,12 @@ sub list_payment {
 </table>
 
 <br>
-<form method=post action=$form->{script}>
+<form method=post action=am.pl>
 
 <input name=callback type=hidden value="$form->{callback}">
 
 <input type=hidden name=type value=payment>
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <input class=submit type=submit name=action value="|
     . $locale->text('Add') . qq|">
 
@@ -2502,11 +2423,16 @@ sub list_payment {
   </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub payment_header {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   $form->{title}    = $locale->text("$form->{title} Payment Terms");
 
@@ -2522,7 +2448,7 @@ sub payment_header {
   print qq|
 <body>
 
-<form method=post action=$form->{script}>
+<form method=post action=am.pl>
 
 <input type=hidden name=id value=$form->{id}>
 <input type=hidden name=type value=payment>
@@ -2563,11 +2489,11 @@ sub payment_header {
   <tr>
     <th align=right>| . $locale->text('Skonto Terms') . qq|</th>
     <td><input name=terms_skonto size=10 value="$form->{terms_skonto}"></td>
-  </tr>  
+  </tr>
   <tr>
     <th align=right>| . $locale->text('Skonto') . qq| %</th>
     <td><input name=percent_skonto size=10 value="$form->{percent_skonto}"></td>
-  </tr> 
+  </tr>
   <td colspan=2><hr size=3 noshade></td>
   </tr>
 </table>
@@ -2588,8 +2514,12 @@ sub payment_header {
   <li>| . $locale->text("&lt;%skonto_amount%&gt; -- The deductible amount")
 . qq|</li>
   <li>| . $locale->text("&lt;%total%&gt; -- Amount payable")
+. qq|</li>
+  <li>| . $locale->text("&lt;%total_wo_skonto%&gt; -- Amount payable less discount")
 . qq|</li>
   <li>| . $locale->text("&lt;%invtotal%&gt; -- Invoice total")
+. qq|</li>
+  <li>| . $locale->text("&lt;%invtotal_wo_skonto%&gt; -- Invoice total less discount")
 . qq|</li>
   <li>| . $locale->text("&lt;%currency%&gt; -- The selected currency")
 . qq|</li>
@@ -2604,11 +2534,17 @@ sub payment_header {
 . qq|</li>
 </ul>|;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_payment {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   $form->isblank("description", $locale->text('Description missing!'));
   $form->{"percent_skonto"} =
@@ -2616,1231 +2552,1006 @@ sub save_payment {
   AM->save_payment(\%myconfig, \%$form);
   $form->redirect($locale->text('Payment Terms saved!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub delete_payment {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
 
   AM->delete_payment(\%myconfig, \%$form);
   $form->redirect($locale->text('Payment terms deleted!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub swap_payment_terms {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::auth->assert('config');
 
   AM->swap_sortkeys(\%myconfig, $form, "payment_terms");
   list_payment();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub add_sic {
-  $lxdebug->enter_sub();
-
-  $form->{title} = "Add";
-
-  $form->{callback} =
-    "$form->{script}?action=add_sic&path=$form->{path}&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
+sub edit_defaults {
+  $main::lxdebug->enter_sub();
 
-  &sic_header;
-  &form_footer;
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $lxdebug->leave_sub();
-}
+  # get defaults for account numbers and last numbers
+  AM->defaultaccounts(\%myconfig, \%$form);
+  $form->{ALL_UNITS} = AM->convertible_units(AM->retrieve_all_units(), 'g');
 
-sub edit_sic {
-  $lxdebug->enter_sub();
+  map { $form->{"defaults_${_}"} = $form->{defaults}->{$_} } keys %{ $form->{defaults} };
 
-  $form->{title} = "Edit";
+  foreach my $key (keys %{ $form->{IC} }) {
+    foreach my $accno (sort keys %{ $form->{IC}->{$key} }) {
+      my $array = "ACCNOS_" . uc($key);
+      $form->{$array} ||= [];
 
-  AM->get_sic(\%myconfig, \%$form);
+      my $value = "${accno}--" . $form->{IC}->{$key}->{$accno}->{description};
+      push @{ $form->{$array} }, {
+        'name'     => $value,
+        'value'    => $value,
+        'selected' => $form->{IC}->{$key}->{$accno}->{id} == $form->{defaults}->{$key},
+      };
+    }
+  }
 
-  &sic_header;
+  $form->{title} = $locale->text('Ranges of numbers and default accounts');
 
-  $form->{orphaned} = 1;
-  &form_footer;
+  $form->header();
+  print $form->parse_html_template('am/edit_defaults');
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub list_sic {
-  $lxdebug->enter_sub();
+sub save_defaults {
+  $main::lxdebug->enter_sub();
 
-  AM->sic(\%myconfig, \%$form);
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
-  $form->{callback} =
-    "$form->{script}?action=list_sic&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+  AM->save_defaults();
 
-  $callback = $form->escape($form->{callback});
+  $form->redirect($locale->text('Defaults saved.'));
 
-  $form->{title} = $locale->text('Standard Industrial Codes');
+  $main::lxdebug->leave_sub();
+}
 
-  @column_index = qw(code description);
+sub _build_cfg_options {
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  $column_header{code} =
-    qq|<th class=listheading>| . $locale->text('Code') . qq|</th>|;
-  $column_header{description} =
-    qq|<th class=listheading>| . $locale->text('Description') . qq|</th>|;
+  my $idx   = shift;
+  my $array = uc($idx) . 'S';
 
-  $form->header;
+  $form->{$array} = [];
+  foreach my $item (@_) {
+    push @{ $form->{$array} }, {
+      'name'     => $item,
+      'value'    => $item,
+      'selected' => $item eq $myconfig{$idx},
+    };
+  }
+}
 
-  print qq|
-<body>
+sub config {
+  $main::lxdebug->enter_sub();
 
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table width=100%>
-        <tr class=listheading>
-|;
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  map { print "$column_header{$_}\n" } @column_index;
+  _build_cfg_options('dateformat', qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd));
+  _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00'));
 
-  print qq|
-        </tr>
-|;
+  my @formats = ();
+  if ($main::opendocument_templates && $main::openofficeorg_writer_bin &&
+      $main::xvfb_bin && (-x $main::openofficeorg_writer_bin) && (-x $main::xvfb_bin)) {
+    push(@formats, { "name" => $locale->text("PDF (OpenDocument/OASIS)"),
+                     "value" => "opendocument_pdf" });
+  }
+  if ($main::latex_templates) {
+    push(@formats, { "name" => $locale->text("PDF"), "value" => "pdf" });
+  }
+  push(@formats, { "name" => "HTML", "value" => "html" });
+  if ($main::latex_templates) {
+    push(@formats, { "name" => $locale->text("Postscript"),
+                     "value" => "postscript" });
+  }
+  if ($main::opendocument_templates) {
+    push(@formats, { "name" => $locale->text("OpenDocument/OASIS"),
+                     "value" => "opendocument" });
+  }
 
-  foreach $ref (@{ $form->{ALL} }) {
+  if (!$myconfig{"template_format"}) {
+    $myconfig{"template_format"} = "pdf";
+  }
+  $form->{TEMPLATE_FORMATS} = [];
+  foreach my $item (@formats) {
+    push @{ $form->{TEMPLATE_FORMATS} }, {
+      'name'     => $item->{name},
+      'value'    => $item->{value},
+      'selected' => $item->{value} eq $myconfig{template_format},
+    };
+  }
 
-    $i++;
-    $i %= 2;
+  if (!$myconfig{"default_media"}) {
+    $myconfig{"default_media"} = "screen";
+  }
 
-    if ($ref->{sictype} eq 'H') {
-      print qq|
-        <tr valign=top class=listheading>
-|;
-      $column_data{code} =
-        qq|<th><a href=$form->{script}?action=edit_sic&code=$ref->{code}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{code}</th>|;
-      $column_data{description} = qq|<th>$ref->{description}</th>|;
+  my %selected = ($myconfig{"default_media"} => "selected");
+  $form->{MEDIA} = [
+    { 'name' => $locale->text('Screen'),  'value' => 'screen',  'selected' => $selected{screen}, },
+    { 'name' => $locale->text('Printer'), 'value' => 'printer', 'selected' => $selected{printer}, },
+    { 'name' => $locale->text('Queue'),   'value' => 'queue',   'selected' => $selected{queue}, },
+    ];
 
-    } else {
-      print qq|
-        <tr valign=top class=listrow$i>
-|;
+  AM->printer(\%myconfig, $form);
 
-      $column_data{code} =
-        qq|<td><a href=$form->{script}?action=edit_sic&code=$ref->{code}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{code}</td>|;
-      $column_data{description} = qq|<td>$ref->{description}</td>|;
+  $form->{PRINTERS} = [];
+  foreach my $printer (@{$form->{"ALL"}}) {
+    push @{ $form->{PRINTERS} }, {
+      'name'     => $printer->{printer_description},
+      'value'    => $printer->{id},
+      'selected' => $printer->{id} == $myconfig{default_printer_id},
+    };
+  }
 
-    }
+  my %countrycodes = User->country_codes;
 
-    map { print "$column_data{$_}\n" } @column_index;
+  $form->{COUNTRYCODES} = [];
+  foreach my $countrycode (sort { $countrycodes{$a} cmp $countrycodes{$b} } keys %countrycodes) {
+    push @{ $form->{COUNTRYCODES} }, {
+      'name'     => $countrycodes{$countrycode},
+      'value'    => $countrycode,
+      'selected' => $countrycode eq $myconfig{countrycode},
+    };
+  }
 
-    print qq|
-	</tr>
-|;
+  $form->{STYLESHEETS} = [];
+  foreach my $item (qw(lx-office-erp.css Win2000.css)) {
+    push @{ $form->{STYLESHEETS} }, {
+      'name'     => $item,
+      'value'    => $item,
+      'selected' => $item eq $myconfig{stylesheet},
+    };
   }
 
-  print qq|
-      </table>
-    </td>
-  </tr>
-  <tr>
-  <td><hr size=3 noshade></td>
-  </tr>
-</table>
+  $myconfig{show_form_details} = 1 unless (defined($myconfig{show_form_details}));
+  $form->{CAN_CHANGE_PASSWORD} = $main::auth->can_change_password();
+  $form->{todo_cfg}            = { TODO->get_user_config('login' => $form->{login}) };
 
-<br>
-<form method=post action=$form->{script}>
+  $form->{title}               = $locale->text('Edit Preferences for #1', $form->{login});
 
-<input name=callback type=hidden value="$form->{callback}">
+  $form->header();
+  print $form->parse_html_template('am/config');
 
-<input type=hidden name=type value=sic>
+  $main::lxdebug->leave_sub();
+}
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+sub save_preferences {
+  $main::lxdebug->enter_sub();
 
-<input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  </form>
+  $form->{stylesheet} = $form->{usestylesheet};
 
-  </body>
-  </html>
-|;
+  TODO->save_user_config('login' => $form->{login}, %{ $form->{todo_cfg} || { } });
+
+  $form->redirect($locale->text('Preferences saved!')) if (AM->save_preferences(\%myconfig, \%$form, 0));
+  $form->error($locale->text('Cannot save preferences!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub sic_header {
-  $lxdebug->enter_sub();
+sub audit_control {
+  $main::lxdebug->enter_sub();
 
-  $form->{title} = $locale->text("$form->{title} SIC");
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  # $locale->text('Add SIC')
-  # $locale->text('Edit SIC')
+  $main::auth->assert('config');
 
-  $form->{code}        =~ s/\"/&quot;/g;
-  $form->{description} =~ s/\"/&quot;/g;
+  $form->{title} = $locale->text('Audit Control');
 
-  $checked = ($form->{sictype} eq 'H') ? "checked" : "";
+  AM->closedto(\%myconfig, \%$form);
 
   $form->header;
 
   print qq|
 <body>
 
-<form method=post action=$form->{script}>
-
-<input type=hidden name=type value=sic>
-<input type=hidden name=id value=$form->{code}>
+<form method=post action=am.pl>
 
 <table width=100%>
-  <tr>
-    <th class=listtop colspan=2>$form->{title}</th>
-  </tr>
+  <tr><th class=listtop>$form->{title}</th></tr>
   <tr height="5"></tr>
   <tr>
-    <th align=right>| . $locale->text('Code') . qq|</th>
-    <td><input name=code size=10 value=$form->{code}></td>
-  <tr>
-  <tr>
-    <td></td>
-    <th align=left><input name=sictype type=checkbox style=checkbox value="H" $checked> |
-    . $locale->text('Heading') . qq|</th>
-  <tr>
-  <tr>
-    <th align=right>| . $locale->text('Description') . qq|</th>
-    <td><input name=description size=60 value="$form->{description}"></td>
-  </tr>
-    <td colspan=2><hr size=3 noshade></td>
+    <td>
+      <table>
+	<tr>
+	  <th>| . $locale->text('Close Books up to') . qq|</th>
+	  <td><input name=closedto size=11 title="$myconfig{dateformat}" value=$form->{closedto}></td>
+	</tr>
+      </table>
+    </td>
   </tr>
 </table>
-|;
-
-  $lxdebug->leave_sub();
-}
 
-sub save_sic {
-  $lxdebug->enter_sub();
+<hr size=3 noshade>
 
-  $form->isblank("code",        $locale->text('Code missing!'));
-  $form->isblank("description", $locale->text('Description missing!'));
-  AM->save_sic(\%myconfig, \%$form);
-  $form->redirect($locale->text('SIC saved!'));
+<br>
+<input type=hidden name=nextsub value=doclose>
 
-  $lxdebug->leave_sub();
-}
+<input type=submit class=submit name=action value="|
+    . $locale->text('Continue') . qq|">
 
-sub delete_sic {
-  $lxdebug->enter_sub();
+</form>
 
-  AM->delete_sic(\%myconfig, \%$form);
-  $form->redirect($locale->text('SIC deleted!'));
+</body>
+</html>
+|;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub display_stylesheet {
-  $lxdebug->enter_sub();
+sub doclose {
+  $main::lxdebug->enter_sub();
 
-  $form->{file} = "css/$myconfig{stylesheet}";
-  &display_form;
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $lxdebug->leave_sub();
-}
+  $main::auth->assert('config');
 
-sub display_form {
-  $lxdebug->enter_sub();
+  AM->closebooks(\%myconfig, \%$form);
 
-  $form->{file} =~ s/^(.:)*?\/|\.\.\///g;
-  $form->{file} =~ s/^\/*//g;
-  $form->{file} =~ s/$userspath//;
+  if ($form->{closedto}) {
+    $form->redirect(
+                    $locale->text('Books closed up to') . " "
+                      . $locale->date(\%myconfig, $form->{closedto}, 1));
+  } else {
+    $form->redirect($locale->text('Books are open'));
+  }
 
-  $form->error("$!: $form->{file}") unless -f $form->{file};
+  $main::lxdebug->leave_sub();
+}
 
-  AM->load_template(\%$form);
+sub edit_units {
+  $main::lxdebug->enter_sub();
 
-  $form->{title} = $form->{file};
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  # if it is anything but html
-  if ($form->{file} !~ /\.html$/) {
-    $form->{body} = "<pre>\n$form->{body}\n</pre>";
-  }
+  $main::auth->assert('config');
 
-  $form->header;
+  my $units = AM->retrieve_units(\%myconfig, $form, "resolved_");
+  AM->units_in_use(\%myconfig, $form, $units);
+  map({ $units->{$_}->{"BASE_UNIT_DDBOX"} = AM->unit_select_data($units, $units->{$_}->{"base_unit"}, 1); } keys(%{$units}));
 
-  print qq|
-<body>
+  my @languages = AM->language(\%myconfig, $form, 1);
 
-$form->{body}
+  my @unit_list = sort({ $a->{"sortkey"} <=> $b->{"sortkey"} } values(%{$units}));
 
-<form method=post action=$form->{script}>
+  my $i = 1;
+  foreach (@unit_list) {
+    $_->{"factor"} = $form->format_amount(\%myconfig, $_->{"factor"} * 1) if ($_->{"factor"});
+    $_->{"UNITLANGUAGES"} = [];
+    foreach my $lang (@languages) {
+      push(@{ $_->{"UNITLANGUAGES"} },
+           { "idx" => $i,
+             "unit" => $_->{"name"},
+             "language_id" => $lang->{"id"},
+             "localized" => $_->{"LANGUAGES"}->{$lang->{"template_code"}}->{"localized"},
+             "localized_plural" => $_->{"LANGUAGES"}->{$lang->{"template_code"}}->{"localized_plural"},
+           });
+    }
+    $i++;
+  }
 
-<input name=file type=hidden value=$form->{file}>
-<input name=type type=hidden value=template>
+  $units = AM->retrieve_units(\%myconfig, $form);
+  my $ddbox = AM->unit_select_data($units, undef, 1);
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+  my $updownlink = build_std_url("action=swap_units");
 
-<input name=action type=submit class=submit value="|
-    . $locale->text('Edit') . qq|">
+  $form->{"title"} = $locale->text("Add and edit units");
+  $form->header();
+  print($form->parse_html_template("am/edit_units",
+                                   { "UNITS"               => \@unit_list,
+                                     "NEW_BASE_UNIT_DDBOX" => $ddbox,
+                                     "LANGUAGES"           => \@languages,
+                                     "updownlink"          => $updownlink }));
 
-  </form>
+  $main::lxdebug->leave_sub();
+}
 
-</body>
-</html>
-|;
+sub add_unit {
+  $main::lxdebug->enter_sub();
 
-  $lxdebug->leave_sub();
-}
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-sub edit_template {
-  $lxdebug->enter_sub();
+  $main::auth->assert('config');
 
-  AM->load_template(\%$form);
+  $form->isblank("new_name", $locale->text("The name is missing."));
+  my $units = AM->retrieve_units(\%myconfig, $form);
+  my $all_units = AM->retrieve_units(\%myconfig, $form);
+  $form->show_generic_error($locale->text("A unit with this name does already exist.")) if ($all_units->{$form->{"new_name"}});
 
-  $form->{title} = $locale->text('Edit Template');
+  my ($base_unit, $factor);
+  if ($form->{"new_base_unit"}) {
+    $form->show_generic_error($locale->text("The base unit does not exist.")) unless (defined($units->{$form->{"new_base_unit"}}));
 
-  # convert &nbsp to &amp;nbsp;
-  $form->{body} =~ s/&nbsp;/&amp;nbsp;/gi;
+    $form->isblank("new_factor", $locale->text("The factor is missing."));
+    $factor = $form->parse_amount(\%myconfig, $form->{"new_factor"});
+    $form->show_generic_error($locale->text("The factor is missing.")) unless ($factor);
+    $base_unit = $form->{"new_base_unit"};
+  }
 
-  $form->header;
+  my @languages;
+  foreach my $lang (AM->language(\%myconfig, $form, 1)) {
+    next unless ($form->{"new_localized_$lang->{id}"} || $form->{"new_localized_plural_$lang->{id}"});
+    push(@languages, { "id" => $lang->{"id"},
+                       "localized" => $form->{"new_localized_$lang->{id}"},
+                       "localized_plural" => $form->{"new_localized_plural_$lang->{id}"},
+         });
+  }
 
-  print qq|
-<body>
+  AM->add_unit(\%myconfig, $form, $form->{"new_name"}, $base_unit, $factor, \@languages);
 
-<form method=post action=$form->{script}>
+  $form->{"saved_message"} = $locale->text("The unit has been saved.");
 
-<input name=file type=hidden value=$form->{file}>
-<input name=type type=hidden value=template>
+  edit_units();
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+  $main::lxdebug->leave_sub();
+}
 
-<input name=callback type=hidden value="$form->{script}?action=display_form&file=$form->{file}&path=$form->{path}&login=$form->{login}&password=$form->{password}">
+sub set_unit_languages {
+  $main::lxdebug->enter_sub();
 
-<textarea name=body rows=25 cols=70>
-$form->{body}
-</textarea>
+  my $form     = $main::form;
 
-<br>
-<input type=submit class=submit name=action value="|
-    . $locale->text('Save') . qq|">
+  $main::auth->assert('config');
 
-  </form>
+  my ($unit, $languages, $idx) = @_;
 
+  $unit->{"LANGUAGES"} = [];
 
-</body>
-</html>
-|;
+  foreach my $lang (@{$languages}) {
+    push(@{ $unit->{"LANGUAGES"} },
+         { "id" => $lang->{"id"},
+           "localized" => $form->{"localized_${idx}_$lang->{id}"},
+           "localized_plural" => $form->{"localized_plural_${idx}_$lang->{id}"},
+         });
+  }
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub save_template {
-  $lxdebug->enter_sub();
+sub save_unit {
+  $main::lxdebug->enter_sub();
 
-  AM->save_template(\%$form);
-  $form->redirect($locale->text('Template saved!'));
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $lxdebug->leave_sub();
-}
+  $main::auth->assert('config');
 
-sub config {
-  $lxdebug->enter_sub();
+  my $old_units = AM->retrieve_units(\%myconfig, $form, "resolved_");
+  AM->units_in_use(\%myconfig, $form, $old_units);
 
-  # get defaults for account numbers and last numbers
-  AM->defaultaccounts(\%myconfig, \%$form);
+  my @languages = AM->language(\%myconfig, $form, 1);
 
-  foreach $item (qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd)) {
-    $dateformat .=
-      ($item eq $myconfig{dateformat})
-      ? "<option selected>$item\n"
-      : "<option>$item\n";
-  }
+  my $new_units = {};
+  my @delete_units = ();
+  foreach my $i (1..($form->{"rowcount"} * 1)) {
+    my $old_unit = $old_units->{$form->{"old_name_$i"}};
+    if (!$old_unit) {
+      $form->show_generic_error(sprintf($locale->text("The unit in row %d has been deleted in the meantime."), $i));
+    }
 
-  foreach $item (qw(1,000.00 1000.00 1.000,00 1000,00)) {
-    $numberformat .=
-      ($item eq $myconfig{numberformat})
-      ? "<option selected>$item\n"
-      : "<option>$item\n";
-  }
+    if ($form->{"unchangeable_$i"}) {
+      $new_units->{$form->{"old_name_$i"}} = $old_units->{$form->{"old_name_$i"}};
+      $new_units->{$form->{"old_name_$i"}}->{"unchanged_unit"} = 1;
+      set_unit_languages($new_units->{$form->{"old_name_$i"}}, \@languages, $i);
+      next;
+    }
 
-  foreach $item (qw(name company address signature)) {
-    $myconfig{$item} =~ s/\"/&quot;/g;
-  }
+    if ($old_unit->{"in_use"}) {
+      $form->show_generic_error(sprintf($locale->text("The unit in row %d has been used in the meantime and cannot be changed anymore."), $i));
+    }
 
-  foreach $item (qw(address signature)) {
-    $myconfig{$item} =~ s/\\n/\r\n/g;
-  }
+    if ($form->{"delete_$i"}) {
+      push(@delete_units, $old_unit->{"name"});
+      next;
+    }
 
-  @formats = ();
-  if ($opendocument_templates && $openofficeorg_writer_bin &&
-      $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)) {
-    push(@formats, { "name" => $locale->text("PDF (OpenDocument/OASIS)"),
-                     "value" => "opendocument_pdf" });
-  }
-  if ($latex_templates) {
-    push(@formats, { "name" => $locale->text("PDF"), "value" => "pdf" });
-  }
-  push(@formats, { "name" => "HTML", "value" => "html" });
-  if ($latex_templates) {
-    push(@formats, { "name" => $locale->text("Postscript"),
-                     "value" => "postscript" });
-  }
-  if ($opendocument_templates) {
-    push(@formats, { "name" => $locale->text("OpenDocument/OASIS"),
-                     "value" => "opendocument" });
-  }
+    $form->isblank("name_$i", sprintf($locale->text("The name is missing in row %d."), $i));
 
-  if (!$myconfig{"template_format"}) {
-    $myconfig{"template_format"} = "pdf";
-  }
-  my $template_format = "";
-  foreach $item (@formats) {
-    $template_format .=
-      "<option value=\"$item->{value}\"" .
-      ($item->{"value"} eq $myconfig{"template_format"} ?
-       " selected" : "") .
-       ">" . H($item->{"name"}) . "</option>";
+    $form->show_generic_error(sprintf($locale->text("The name in row %d has already been used before."), $i)) if ($new_units->{$form->{"name_$i"}});
+    my %h = map({ $_ => $form->{"${_}_$i"} } qw(name base_unit factor old_name));
+    $new_units->{$form->{"name_$i"}} = \%h;
+    $new_units->{$form->{"name_$i"}}->{"row"} = $i;
+    set_unit_languages($new_units->{$form->{"old_name_$i"}}, \@languages, $i);
   }
 
-  if (!$myconfig{"default_media"}) {
-    $myconfig{"default_media"} = "screen";
+  foreach my $unit (values(%{$new_units})) {
+    next unless ($unit->{"old_name"});
+    if ($unit->{"base_unit"}) {
+      $form->show_generic_error(sprintf($locale->text("The base unit does not exist or it is about to be deleted in row %d."), $unit->{"row"}))
+        unless (defined($new_units->{$unit->{"base_unit"}}));
+      $unit->{"factor"} = $form->parse_amount(\%myconfig, $unit->{"factor"});
+      $form->show_generic_error(sprintf($locale->text("The factor is missing in row %d."), $unit->{"row"})) unless ($unit->{"factor"} >= 1.0);
+    } else {
+      $unit->{"base_unit"} = undef;
+      $unit->{"factor"} = undef;
+    }
   }
-  my %selected = ($myconfig{"default_media"} => "selected");
-  my $default_media = qq|
-  <option value="screen" $selected{'screen'}>| . $locale->text("Screen") . qq|</option>
-  <option value="printer" $selected{'printer'}>| . $locale->text("Printer") . qq|</option>
-  <option value="queue" $selected{'queue'}>| . $locale->text("Queue") . qq|</option>
-|;
 
-  %selected = ();
-  $selected{$myconfig{"default_printer_id"}} = "selected"
-    if ($myconfig{"default_printer_id"});
-  my $default_printer = qq|<option></option>|;
-  AM->printer(\%myconfig, $form);
-  foreach my $printer (@{$form->{"ALL"}}) {
-    $default_printer .= qq|<option value="| . Q($printer->{"id"}) .
-      qq|" $selected{$printer->{'id'}}>| .
-      H($printer->{"printer_description"}) . qq|</option>|;
-  }
+  foreach my $unit (values(%{$new_units})) {
+    next if ($unit->{"unchanged_unit"});
 
-  %countrycodes = User->country_codes;
-  $countrycodes = '';
-  foreach $key (sort { $countrycodes{$a} cmp $countrycodes{$b} }
-                keys %countrycodes
-    ) {
-    $countrycodes .=
-      ($myconfig{countrycode} eq $key)
-      ? "<option selected value=$key>$countrycodes{$key}\n"
-      : "<option value=$key>$countrycodes{$key}\n";
-  }
-  $countrycodes = "<option>American English\n$countrycodes";
-
-  # use an other input number format than output numberformat
-  # look at Form.pm, sub parse_amount
-  my $in_numberformat = '';
-  $text1 = qq|value="0">| . $locale->text('equal Outputformat');
-  $text2 = qq|value="1">| . $locale->text('1000,00 or 1000.00');
-  @in_nf = ($text1, $text2);
-  foreach $item (@in_nf) {
-    $in_numberformat .=
-      (substr($item, 7, 1) eq $myconfig{in_numberformat})
-      ? "<option selected $item\n"
-      : "<option $item\n";
-  }
-
-  foreach $key (keys %{ $form->{IC} }) {
-    foreach $accno (sort keys %{ $form->{IC}{$key} }) {
-      $myconfig{$key} .=
-        ($form->{IC}{$key}{$accno}{id} == $form->{defaults}{$key})
-        ? "<option selected>$accno--$form->{IC}{$key}{$accno}{description}\n"
-        : "<option>$accno--$form->{IC}{$key}{$accno}{description}\n";
+    map({ $_->{"seen"} = 0; } values(%{$new_units}));
+    my $new_unit = $unit;
+    while ($new_unit->{"base_unit"}) {
+      $new_unit->{"seen"} = 1;
+      $new_unit = $new_units->{$new_unit->{"base_unit"}};
+      if ($new_unit->{"seen"}) {
+        $form->show_generic_error(sprintf($locale->text("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."), $unit->{"row"}));
+      }
     }
   }
 
-  opendir CSS, "css/.";
-  @all = grep /.*\.css$/, readdir CSS;
-  closedir CSS;
+  AM->save_units(\%myconfig, $form, $new_units, \@delete_units);
 
-  foreach $item (@all) {
-    if ($item eq $myconfig{stylesheet}) {
-      $selectstylesheet .= qq|<option selected>$item\n|;
-    } else {
-      $selectstylesheet .= qq|<option>$item\n|;
-    }
-  }
-  $selectstylesheet .= "<option>\n";
+  $form->{"saved_message"} = $locale->text("The units have been saved.");
 
-  $form->{title} = $locale->text('Edit Preferences for') . qq| $form->{login}|;
+  edit_units();
 
-  $form->header;
+  $main::lxdebug->leave_sub();
+}
 
-  if ($myconfig{menustyle} eq "old") {
-    $menustyle_old = "checked";
-  } elsif ($myconfig{menustyle} eq "neu") {
-    $menustyle_neu = "checked";
-  } elsif ($myconfig{menustyle} eq "v3") {
-    $menustyle_v3 = "checked";
-  }
+sub show_history_search {
+  $main::lxdebug->enter_sub();
 
-  my ($show_form_details, $hide_form_details);
-  $myconfig{"show_form_details"} = 1
-    unless (defined($myconfig{"show_form_details"}));
-  $show_form_details = "checked" if ($myconfig{"show_form_details"});
-  $hide_form_details = "checked" unless ($myconfig{"show_form_details"});
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
-  print qq|
-<body>
+  $main::auth->assert('config');
 
-<form method=post action=$form->{script}>
+  $form->{title} = $locale->text("History Search");
+  $form->header();
 
-<input type=hidden name=old_password value=$myconfig{password}>
-<input type=hidden name=type value=preferences>
-<input type=hidden name=role value=$myconfig{role}>
+  print $form->parse_html_template("common/search_history");
 
-<table width=100%>
-  <tr><th class=listtop>$form->{title}</th></tr>
-  <tr>
-    <td>
-      <table>
-        <tr>
-	  <th align=right>| . $locale->text('Name') . qq|</th>
-	  <td><input name=name size=15 value="$myconfig{name}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Password') . qq|</th>
-	  <td><input type=password name=new_password size=10 value=$myconfig{password}></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('E-mail') . qq|</th>
-	  <td><input name=email size=30 value="$myconfig{email}"></td>
-	</tr>
-	<tr valign=top>
-	  <th align=right>| . $locale->text('Signature') . qq|</th>
-	  <td><textarea name=signature rows=3 cols=50>$myconfig{signature}</textarea></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Phone') . qq|</th>
-	  <td><input name=tel size=14 value="$myconfig{tel}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Fax') . qq|</th>
-	  <td><input name=fax size=14 value="$myconfig{fax}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Company') . qq|</th>
-	  <td><input name=company size=30 value="$myconfig{company}"></td>
-	</tr>
-	<tr valign=top>
-	  <th align=right>| . $locale->text('Address') . qq|</th>
-	  <td><textarea name=address rows=4 cols=50>$myconfig{address}</textarea></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Date Format') . qq|</th>
-	  <td><select name=dateformat>$dateformat</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Output Number Format') . qq|</th>
-	  <td><select name=numberformat>$numberformat</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Input Number Format') . qq|</th>
-	  <td><select name=in_numberformat>$in_numberformat</select></td>
-	</tr>
+  $main::lxdebug->leave_sub();
+}
 
-	<tr>
-	  <th align=right>| . $locale->text('Dropdown Limit') . qq|</th>
-	  <td><input name=vclimit size=10 value="$myconfig{vclimit}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Language') . qq|</th>
-	  <td><select name=countrycode>$countrycodes</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Stylesheet') . qq|</th>
-	  <td><select name=usestylesheet>$selectstylesheet</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Setup Menu') . qq|</th>
-	  <td><input name=menustyle type=radio class=radio value=v3 $menustyle_v3>&nbsp;| .
-    $locale->text("Top (CSS)") . qq|
-	  <input name=menustyle type=radio class=radio value=neu $menustyle_neu>&nbsp;| .
-    $locale->text("Top (Javascript)") . qq|
-    <input name=menustyle type=radio class=radio value=old $menustyle_old>&nbsp;| .
-    $locale->text("Old (on the side)") . qq|</td>
-  </tr>
-  <tr>
-    <th align=right>| . $locale->text('Form details (second row)') . qq|</th>
-    <td><input type="radio" id="rad_show_form_details" name="show_form_details" value="1" $show_form_details>&nbsp;
-    <label for="rad_show_form_details">| . $locale->text('Show by default') . qq|</label>
-    <input type="radio" id="rad_hide_form_details" name="show_form_details" value="0" $hide_form_details>&nbsp;
-    <label for="rad_hide_form_details">| . $locale->text('Hide by default') . qq|</label></td>
-	</tr>
-	<input name=printer type=hidden value="$myconfig{printer}">
-	<tr class=listheading>
-	  <th colspan=2>| . $locale->text("Print options") . qq|</th>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Default template format') . qq|</th>
-	  <td><select name="template_format">$template_format</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Default output medium') . qq|</th>
-	  <td><select name="default_media">$default_media</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Default printer') . qq|</th>
-	  <td><select name="default_printer_id">$default_printer</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Number of copies') . qq|</th>
-	  <td><input name="copies" size="10" value="| .
-    $form->quote($myconfig{"copies"}) . qq|"></td>
-	</tr>
+sub show_am_history {
+  $main::lxdebug->enter_sub();
 
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-	<tr class=listheading>
-	  <th colspan=2>&nbsp;</th>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Business Number') . qq|</th>
-	  <td><input name=businessnumber size=25 value="$myconfig{businessnumber}"></td>
-	</tr>
-	<tr>
-		<th align=right>| . $locale->text('Year End') . qq| (mm/dd)</th>
-		<td><input name=yearend size=5 value=$form->{defaults}{yearend}></td>
-	</tr>
-	<tr class=listheading>
-	  <th colspan=2>|
-    . $locale->text('Last Numbers & Default Accounts') . qq|</th>
-	</tr>
-	<tr>
-	  <td colspan=2>
-	    <table width=100%>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Inventory Account') . qq|</th>
-		<td><select name=inventory_accno>$myconfig{IC}</select></td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Revenue Account') . qq|</th>
-		<td><select name=income_accno>$myconfig{IC_income}</select></td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Expense Account') . qq|</th>
-		<td><select name=expense_accno>$myconfig{IC_expense}</select></td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Foreign Exchange Gain') . qq|</th>
-		<td><select name=fxgain_accno>$myconfig{FX_gain}</select></td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Foreign Exchange Loss') . qq|</th>
-		<td><select name=fxloss_accno>$myconfig{FX_loss}</select></td>
-	      </tr>
-	      <tr>
-		<td colspan=2>|
-    . $locale->text(
-    'Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies'
-    )
-    . qq|<br><input name=curr size=40 value="$form->{defaults}{curr}"></td>
-	      </tr>
-            </table>
-          </td>
-         </tr>
-         <tr>
-           <td colspan=2>
-             <table width=100%>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Last Invoice Number') . qq|</th>
-		<td><input name=invnumber size=10 value=$form->{defaults}{invnumber}></td>
-                <th align=right nowrap>|
-    . $locale->text('Last Customer Number') . qq|</th>
-		<td><input name=customernumber size=10 value=$form->{defaults}{customernumber}></td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>|
-    . $locale->text('Last Credit Note Number') . qq|</th>
-		<td><input name=cnnumber size=10 value=$form->{defaults}{cnnumber}></td>
-                <th align=right nowrap>|
-    . $locale->text('Last Vendor Number') . qq|</th>
-		<td><input name=vendornumber size=10 value=$form->{defaults}{vendornumber}></td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>|
-    . $locale->text('Last Sales Order Number') . qq|</th>
-		<td><input name=sonumber size=10 value=$form->{defaults}{sonumber}></td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>|
-    . $locale->text('Last Purchase Order Number') . qq|</th>
-		<td><input name=ponumber size=10 value=$form->{defaults}{ponumber}></td>
-                <th align=right nowrap>|
-    . $locale->text('Last Article Number') . qq|</th>
-		<td><input name=articlenumber size=10 value=$form->{defaults}{articlenumber}></td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>|
-    . $locale->text('Last Sales Quotation Number') . qq|</th>
-		<td><input name=sqnumber size=10 value=$form->{defaults}{sqnumber}></td>
-                <th align=right nowrap>|
-    . $locale->text('Last Service Number') . qq|</th>
-		<td><input name=servicenumber size=10 value=$form->{defaults}{servicenumber}></td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Last RFQ Number') . qq|</th>
-		<td><input name=rfqnumber size=10 value=$form->{defaults}{rfqnumber}></td>
-                <th align=right nowrap></th>
-		<td></td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>|;
-# 	<tr class=listheading>
-# 	  <th colspan=2>| . $locale->text('Tax Accounts') . qq|</th>
-# 	</tr>
-# 	<tr>
-# 	  <td colspan=2>
-# 	    <table>
-# 	      <tr>
-# 		<th>&nbsp;</th>
-# 		<th>| . $locale->text('Rate') . qq| (%)</th>
-# 		<th>| . $locale->text('Number') . qq|</th>
-# 	      </tr>
-# |;
-# 
-#   foreach $accno (sort keys %{ $form->{taxrates} }) {
-#     print qq|
-#               <tr>
-# 		<th align=right>$form->{taxrates}{$accno}{description}</th>
-# 		<td><input name=$form->{taxrates}{$accno}{id} size=6 value=$form->{taxrates}{$accno}{rate}></td>
-# 		<td><input name="taxnumber_$form->{taxrates}{$accno}{id}" value="$form->{taxrates}{$accno}{taxnumber}"></td>
-# 	      </tr>
-# |;
-#     $form->{taxaccounts} .= "$form->{taxrates}{$accno}{id} ";
-#   }
-# 
-#   chop $form->{taxaccounts};
-# 
-#   print qq|
-# <input name=taxaccounts type=hidden value="$form->{taxaccounts}">
-# 
-#             </table>
-# 	  </td>
-# 	</tr>
-print qq|      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
+  $main::auth->assert('config');
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+  my $callback     = build_std_url(qw(action einschraenkungen fromdate todate mitarbeiter searchid what2search));
+  $form->{order} ||= 'h.itime--1';
 
-<br>
-<input type=submit class=submit name=action value="|
-    . $locale->text('Save') . qq|">
+  my %search = ( "Artikelnummer"          => "parts",
+                 "Kundennummer"           => "customer",
+                 "Lieferantennummer"      => "vendor",
+                 "Projektnummer"          => "project",
+                 "Buchungsnummer"         => "oe",
+                 "Eingangsrechnungnummer" => "ap",
+                 "Ausgangsrechnungnummer" => "ar",
+                 "Mahnungsnummer"         => "dunning"
+    );
+  my %searchNo = ( "Artikelnummer"          => "partnumber",
+                   "Kundennummer"           => "customernumber",
+                   "Lieferantennummer"      => "vendornumber",
+                   "Projektnummer"          => "projectnummer",
+                   "Buchungsnummer"         => "ordnumber",
+                   "Eingangsrechnungnummer" => "invnumber",
+                   "Ausgangsrechnungnummer" => "invnumber",
+                   "Mahnungsnummer"         => "dunning_id"
+    );
 
-  </form>
+  my $dbh = $form->dbconnect(\%myconfig);
 
-</body>
-</html>
-|;
+  my $restriction  = qq| AND (| . join(' OR ', map { " addition = " . $dbh->quote($_) } split(m/\,/, $form->{einschraenkungen})) . qq|)| if $form->{einschraenkungen};
+  $restriction    .= qq| AND h.itime::date >= | . conv_dateq($form->{fromdate})                                                          if $form->{fromdate};
+  $restriction    .= qq| AND h.itime::date <= | . conv_dateq($form->{todate})                                                            if $form->{todate};
+  if ($form->{mitarbeiter} =~ m/^\d+$/) {
+    $restriction  .= qq| AND employee_id = |    . $form->{mitarbeiter};
+  } elsif ($form->{mitarbeiter}) {
+    $restriction  .= qq| AND employee_id = (SELECT id FROM employee WHERE name ILIKE | . $dbh->quote('%' . $form->{mitarbeiter} . '%') . qq|)|;
+  }
+
+  my $query = qq|SELECT trans_id AS id FROM history_erp | .
+    (  $form->{'searchid'} ? qq| WHERE snumbers = '|  . $searchNo{$form->{'what2search'}} . qq|_| . $form->{'searchid'} . qq|'|
+     :                       qq| WHERE snumbers ~ '^| . $searchNo{$form->{'what2search'}} . qq|'|);
+
+  my @ids    = grep { $_ * 1 } selectall_array_query($form, $dbh, $query);
+  my $daten .= shift @ids;
+  $daten    .= join '', map { " OR trans_id = $_" } @ids;
+
+  my ($sort, $sortby) = split(/\-\-/, $form->{order});
+  $sort =~ s/.*\.(.*)$/$1/;
+
+  $form->{title} = $locale->text("History Search");
+  $form->header();
 
-  $lxdebug->leave_sub();
+  print $form->parse_html_template("common/show_history",
+                                   { "DATEN"          => $form->get_history($dbh, $daten, $restriction, $form->{order}),
+                                     "SUCCESS"        => ($form->get_history($dbh, $daten, $restriction, $form->{order}) ne "0"),
+                                     "NONEWWINDOW"    => 1,
+                                     uc($sort)        => 1,
+                                     uc($sort) . "BY" => $sortby,
+                                     'callback'       => $callback,
+                                   });
+  $dbh->disconnect();
+
+  $main::lxdebug->leave_sub();
 }
 
-sub save_preferences {
-  $lxdebug->enter_sub();
+sub swap_units {
+  $main::lxdebug->enter_sub();
 
-  $form->{stylesheet} = $form->{usestylesheet};
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  $form->redirect($locale->text('Preferences saved!'))
-    if (
-     AM->save_preferences(\%myconfig, \%$form, $memberfile, $userspath, $webdav
-     ));
-  $form->error($locale->text('Cannot save preferences!'));
+  $main::auth->assert('config');
 
-  $lxdebug->leave_sub();
+  my $dir = $form->{"dir"} eq "down" ? "down" : "up";
+  AM->swap_units(\%myconfig, $form, $dir, $form->{"name"});
+
+  edit_units();
+
+  $main::lxdebug->leave_sub();
 }
 
-sub backup {
-  $lxdebug->enter_sub();
+sub add_tax {
+  $main::lxdebug->enter_sub();
 
-  if ($form->{media} eq 'email') {
-    $form->error($locale->text('No email address for') . " $myconfig{name}")
-      unless ($myconfig{email});
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
-    $form->{OUT} = "$sendmail";
+  $main::auth->assert('config');
 
-  }
+  $form->{title} =  $locale->text('Add');
 
-  AM->backup(\%myconfig, \%$form, $userspath);
+  $form->{callback} ||= "am.pl?action=add_tax";
 
-  if ($form->{media} eq 'email') {
-    $form->redirect($locale->text('Backup sent to') . qq| $myconfig{email}|);
-  }
+  _get_taxaccount_selection();
+
+  $form->header();
+
+  my $parameters_ref = {
+#    ChartTypeIsAccount         => $ChartTypeIsAccount,
+  };
+
+  # Ausgabe des Templates
+  print($form->parse_html_template('am/edit_tax', $parameters_ref));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub audit_control {
-  $lxdebug->enter_sub();
+sub edit_tax {
+  $main::lxdebug->enter_sub();
 
-  $form->{title} = $locale->text('Audit Control');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  AM->closedto(\%myconfig, \%$form);
+  $main::auth->assert('config');
 
-  if ($form->{revtrans}) {
-    $checked{Y} = "checked";
-  } else {
-    $checked{N} = "checked";
-  }
+  $form->{title} =  $locale->text('Edit');
 
-  $form->header;
+  AM->get_tax(\%myconfig, \%$form);
+  _get_taxaccount_selection();
 
-  print qq|
-<body>
+  $form->{rate} = $form->format_amount(\%myconfig, $form->{rate}, 2);
 
-<form method=post action=$form->{script}>
+  $form->header();
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+  my $parameters_ref = {
+  };
 
-<table width=100%>
-  <tr><th class=listtop>$form->{title}</th></tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-	<tr>
-	  <td>|
-    . $locale->text('Enforce transaction reversal for all dates') . qq|</th>
-	  <td><input name=revtrans class=radio type=radio value="1" $checked{Y}> |
-    . $locale->text('Yes')
-    . qq| <input name=revtrans class=radio type=radio value="0" $checked{N}> |
-    . $locale->text('No')
-    . qq|</td>
-	</tr>
-	<tr>
-	  <th>| . $locale->text('Close Books up to') . qq|</th>
-	  <td><input name=closedto size=11 title="$myconfig{dateformat}" value=$form->{closedto}></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-</table>
+  # Ausgabe des Templates
+  print($form->parse_html_template('am/edit_tax', $parameters_ref));
 
-<hr size=3 noshade>
+  $main::lxdebug->leave_sub();
+}
 
-<br>
-<input type=hidden name=nextsub value=doclose>
+sub list_tax {
+  $main::lxdebug->enter_sub();
 
-<input type=submit class=submit name=action value="|
-    . $locale->text('Continue') . qq|">
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-</form>
+  $main::auth->assert('config');
 
-</body>
-</html>
-|;
+  AM->taxes(\%myconfig, \%$form);
+
+  map { $_->{rate} = $form->format_amount(\%myconfig, $_->{rate}, 2) } @{ $form->{TAX} };
+
+  $form->{callback} = build_std_url('action=list_tax');
+
+  $form->{title} = $locale->text('Tax-O-Matic');
+
+  $form->header();
 
-  $lxdebug->leave_sub();
+  my $parameters_ref = {
+  };
+
+  # Ausgabe des Templates
+  print($form->parse_html_template('am/list_tax', $parameters_ref));
+
+  $main::lxdebug->leave_sub();
 }
 
-sub doclose {
-  $lxdebug->enter_sub();
+sub _get_taxaccount_selection{
+  $main::lxdebug->enter_sub();
 
-  AM->closebooks(\%myconfig, \%$form);
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  if ($form->{revtrans}) {
-    $form->redirect(
-                 $locale->text('Transaction reversal enforced for all dates'));
-  } else {
-    if ($form->{closedto}) {
-      $form->redirect(
-                     $locale->text('Transaction reversal enforced up to') . " "
-                       . $locale->date(\%myconfig, $form->{closedto}, 1));
-    } else {
-      $form->redirect($locale->text('Books are open'));
-    }
-  }
+  $main::auth->assert('config');
 
-  $lxdebug->leave_sub();
+  AM->get_tax_accounts(\%myconfig, \%$form);
+
+  map { $_->{selected} = $form->{chart_id} == $_->{id} } @{ $form->{ACCOUNTS} };
+
+  $main::lxdebug->leave_sub();
 }
 
-sub add_warehouse {
-  $lxdebug->enter_sub();
+sub save_tax {
+  $main::lxdebug->enter_sub();
 
-  $form->{title} = "Add";
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $form->{callback} =
-    "$form->{script}?action=add_warehouse&path=$form->{path}&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
+  $main::auth->assert('config');
 
-  &warehouse_header;
-  &form_footer;
+  $form->isblank("rate", $locale->text('Taxrate missing!'));
+  $form->isblank("taxdescription", $locale->text('Taxdescription  missing!'));
+  $form->isblank("taxkey", $locale->text('Taxkey  missing!'));
+
+  $form->{rate} = $form->parse_amount(\%myconfig, $form->{rate});
+
+  if ( $form->{rate} < 0 || $form->{rate} >= 100 ) {
+    $form->error($locale->text('Tax Percent is a number between 0 and 100'));
+  }
+
+  if ( $form->{rate} <= 0.99 && $form->{rate} > 0 ) {
+    $form->error($locale->text('Tax Percent is a number between 0 and 100'));
+  }
+
+  AM->save_tax(\%myconfig, \%$form);
+  $form->redirect($locale->text('Tax saved!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub edit_warehouse {
-  $lxdebug->enter_sub();
+sub delete_tax {
+  $main::lxdebug->enter_sub();
 
-  $form->{title} = "Edit";
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  AM->get_warehouse(\%myconfig, \%$form);
+  $main::auth->assert('config');
 
-  &warehouse_header;
-  &form_footer;
+  AM->delete_tax(\%myconfig, \%$form);
+  $form->redirect($locale->text('Tax deleted!'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub list_warehouse {
-  $lxdebug->enter_sub();
+sub add_price_factor {
+  $main::lxdebug->enter_sub();
 
-  AM->warehouses(\%myconfig, \%$form);
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
-  $form->{callback} =
-    "$form->{script}?action=list_warehouse&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+  $main::auth->assert('config');
 
-  $callback = $form->escape($form->{callback});
+  $form->{title}      = $locale->text('Add Price Factor');
+  $form->{callback} ||= build_std_url('action=add_price_factor');
+  $form->{fokus}      = 'description';
 
-  $form->{title} = $locale->text('Warehouses');
+  $form->header();
+  print $form->parse_html_template('am/edit_price_factor');
 
-  @column_index = qw(description);
+  $main::lxdebug->leave_sub();
+}
 
-  $column_header{description} =
-      qq|<th class=listheading width=100%>|
-    . $locale->text('Description')
-    . qq|</th>|;
+sub edit_price_factor {
+  $main::lxdebug->enter_sub();
 
-  $form->header;
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  print qq|
-<body>
+  $main::auth->assert('config');
 
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table width=100%>
-        <tr class=listheading>
-|;
+  $form->{title}      = $locale->text('Edit Price Factor');
+  $form->{callback} ||= build_std_url('action=add_price_factor');
+  $form->{fokus}      = 'description';
 
-  map { print "$column_header{$_}\n" } @column_index;
+  AM->get_price_factor(\%myconfig, $form);
 
-  print qq|
-        </tr>
-|;
+  $form->{factor} = $form->format_amount(\%myconfig, $form->{factor} * 1);
 
-  foreach $ref (@{ $form->{ALL} }) {
+  $form->header();
+  print $form->parse_html_template('am/edit_price_factor');
 
-    $i++;
-    $i %= 2;
+  $main::lxdebug->leave_sub();
+}
 
-    print qq|
-        <tr valign=top class=listrow$i>
-|;
+sub list_price_factors {
+  $main::lxdebug->enter_sub();
 
-    $column_data{description} =
-      qq|<td><a href=$form->{script}?action=edit_warehouse&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-    map { print "$column_data{$_}\n" } @column_index;
+  $main::auth->assert('config');
 
-    print qq|
-	</tr>
-|;
+  AM->get_all_price_factors(\%myconfig, \%$form);
+
+  my $previous;
+  foreach my $current (@{ $form->{PRICE_FACTORS} }) {
+    if ($previous) {
+      $previous->{next_id}    = $current->{id};
+      $current->{previous_id} = $previous->{id};
+    }
+
+    $current->{factor} = $form->format_amount(\%myconfig, $current->{factor} * 1);
+
+    $previous = $current;
   }
 
-  print qq|
-      </table>
-    </td>
-  </tr>
-  <tr>
-  <td><hr size=3 noshade></td>
-  </tr>
-</table>
+  $form->{callback} = build_std_url('action=list_price_factors');
+  $form->{title}    = $locale->text('Price Factors');
+  $form->{url_base} = build_std_url('callback');
 
-<br>
-<form method=post action=$form->{script}>
+  $form->header();
+  print $form->parse_html_template('am/list_price_factors');
 
-<input name=callback type=hidden value="$form->{callback}">
+  $main::lxdebug->leave_sub();
+}
 
-<input type=hidden name=type value=warehouse>
+sub save_price_factor {
+  $main::lxdebug->enter_sub();
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-<input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
+  $main::auth->assert('config');
 
-  </form>
+  $form->isblank("description", $locale->text('Description missing!'));
+  $form->isblank("factor", $locale->text('Factor missing!'));
 
-  </body>
-  </html>
-|;
+  $form->{factor} = $form->parse_amount(\%myconfig, $form->{factor});
+
+  AM->save_price_factor(\%myconfig, $form);
+
+  $form->{callback} .= '&MESSAGE=' . $form->escape($locale->text('Price factor saved!')) if ($form->{callback});
 
-  $lxdebug->leave_sub();
+  $form->redirect($locale->text('Price factor saved!'));
+
+  $main::lxdebug->leave_sub();
 }
 
-sub warehouse_header {
-  $lxdebug->enter_sub();
+sub delete_price_factor {
+  $main::lxdebug->enter_sub();
 
-  $form->{title} = $locale->text("$form->{title} Warehouse");
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  # $locale->text('Add Warehouse')
-  # $locale->text('Edit Warehouse')
+  $main::auth->assert('config');
 
-  $form->{description} =~ s/\"/&quot;/g;
+  AM->delete_price_factor(\%myconfig, \%$form);
 
-  if (($rows = $form->numtextrows($form->{description}, 60)) > 1) {
-    $description =
-      qq|<textarea name="description" rows=$rows cols=60 wrap=soft>$form->{description}</textarea>|;
-  } else {
-    $description =
-      qq|<input name=description size=60 value="$form->{description}">|;
-  }
+  $form->{callback} .= '&MESSAGE=' . $form->escape($locale->text('Price factor deleted!')) if ($form->{callback});
 
-  $form->header;
+  $form->redirect($locale->text('Price factor deleted!'));
 
-  print qq|
-<body>
+  $main::lxdebug->leave_sub();
+}
 
-<form method=post action=$form->{script}>
+sub swap_price_factors {
+  $main::lxdebug->enter_sub();
 
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=type value=warehouse>
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=2>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <th align=right>| . $locale->text('Description') . qq|</th>
-    <td>$description</td>
-  </tr>
-  <tr>
-    <td colspan=2><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
+  $main::auth->assert('config');
+
+  AM->swap_sortkeys(\%myconfig, $form, 'price_factors');
+  list_price_factors();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub save_warehouse {
-  $lxdebug->enter_sub();
+sub add_warehouse {
+  $main::lxdebug->enter_sub();
 
-  $form->isblank("description", $locale->text('Description missing!'));
-  AM->save_warehouse(\%myconfig, \%$form);
-  $form->redirect($locale->text('Warehouse saved!'));
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
-  $lxdebug->leave_sub();
-}
+  $main::auth->assert('config');
 
-sub delete_warehouse {
-  $lxdebug->enter_sub();
+  $form->{title}      = $locale->text('Add Warehouse');
+  $form->{callback} ||= build_std_url('action=add_warehouse');
+  $form->{fokus}      = 'description';
 
-  AM->delete_warehouse(\%myconfig, \%$form);
-  $form->redirect($locale->text('Warehouse deleted!'));
+  $form->header();
+  print $form->parse_html_template('am/edit_warehouse');
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub continue {
-  $lxdebug->enter_sub();
+sub edit_warehouse {
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');
+
+  AM->get_warehouse(\%myconfig, $form);
+
+  $form->get_lists('employees' => 'EMPLOYEES');
 
-  &{ $form->{nextsub} };
+  $form->{title}      = $locale->text('Edit Warehouse');
+  $form->{callback} ||= build_std_url('action=list_warehouses');
+  $form->{fokus}      = 'description';
 
-  $lxdebug->leave_sub();
+  $form->header();
+  print $form->parse_html_template('am/edit_warehouse');
+
+  $main::lxdebug->leave_sub();
 }
 
-sub edit_units {
-  $lxdebug->enter_sub();
+sub list_warehouses {
+  $main::lxdebug->enter_sub();
 
-  $units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"}, "resolved_");
-  AM->units_in_use(\%myconfig, $form, $units);
-  map({ $units->{$_}->{"BASE_UNIT_DDBOX"} = AM->unit_select_data($units, $units->{$_}->{"base_unit"}, 1); } keys(%{$units}));
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  @languages = AM->language(\%myconfig, $form, 1);
+  $main::auth->assert('config');
 
-  @unit_list = ();
-  foreach $name (sort({ lc($a) cmp lc($b) } grep({ !$units->{$_}->{"base_unit"} } keys(%{$units})))) {
-    map({ push(@unit_list, $units->{$_}); }
-        sort({ ($units->{$a}->{"resolved_factor"} * 1) <=> ($units->{$b}->{"resolved_factor"} * 1) }
-             grep({ $units->{$_}->{"resolved_base_unit"} eq $name } keys(%{$units}))));
-  }
-  my $i = 1;
-  foreach (@unit_list) {
-    $_->{"factor"} = $form->format_amount(\%myconfig, $_->{"factor"}, 5) if ($_->{"factor"});
-    $_->{"UNITLANGUAGES"} = [];
-    foreach my $lang (@languages) {
-      push(@{ $_->{"UNITLANGUAGES"} },
-           { "idx" => $i,
-             "unit" => $_->{"name"},
-             "language_id" => $lang->{"id"},
-             "localized" => $_->{"LANGUAGES"}->{$lang->{"template_code"}}->{"localized"},
-             "localized_plural" => $_->{"LANGUAGES"}->{$lang->{"template_code"}}->{"localized_plural"},
-           });
+  AM->get_all_warehouses(\%myconfig, $form);
+
+  my $previous;
+  foreach my $current (@{ $form->{WAREHOUSES} }) {
+    if ($previous) {
+      $previous->{next_id}    = $current->{id};
+      $current->{previous_id} = $previous->{id};
     }
-    $i++;
+
+    $previous = $current;
   }
 
-  $units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"});
-  $ddbox = AM->unit_select_data($units, undef, 1);
+  $form->{callback} = build_std_url('action=list_warehouses');
+  $form->{title}    = $locale->text('Warehouses');
+  $form->{url_base} = build_std_url('callback');
 
-  $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 }));
+  print $form->parse_html_template('am/list_warehouses');
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub add_unit {
-  $lxdebug->enter_sub();
+sub save_warehouse {
+  $main::lxdebug->enter_sub();
 
-  $form->isblank("new_name", $locale->text("The name is missing."));
-  $units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"});
-  $all_units = AM->retrieve_units(\%myconfig, $form);
-  $form->show_generic_error($locale->text("A unit with this name does already exist.")) if ($all_units->{$form->{"new_name"}});
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  my ($base_unit, $factor);
-  if ($form->{"new_base_unit"}) {
-    $form->show_generic_error($locale->text("The base unit does not exist.")) unless (defined($units->{$form->{"new_base_unit"}}));
+  $main::auth->assert('config');
 
-    $form->isblank("new_factor", $locale->text("The factor is missing."));
-    $factor = $form->parse_amount(\%myconfig, $form->{"new_factor"});
-    $form->show_generic_error($locale->text("The factor is missing.")) unless ($factor);
-    $base_unit = $form->{"new_base_unit"};
-  }
+  $form->isblank("description", $locale->text('Description missing!'));
 
-  my @languages;
-  foreach my $lang (AM->language(\%myconfig, $form, 1)) {
-    next unless ($form->{"new_localized_$lang->{id}"} || $form->{"new_localized_plural_$lang->{id}"});
-    push(@languages, { "id" => $lang->{"id"},
-                       "localized" => $form->{"new_localized_$lang->{id}"},
-                       "localized_plural" => $form->{"new_localized_plural_$lang->{id}"},
-         });
-  }
+  $form->{number_of_new_bins} = $form->parse_amount(\%myconfig, $form->{number_of_new_bins});
 
-  AM->add_unit(\%myconfig, $form, $form->{"new_name"}, $base_unit, $factor, $form->{"unit_type"}, \@languages);
+  AM->save_warehouse(\%myconfig, $form);
 
-  $form->{"saved_message"} = $locale->text("The unit has been saved.");
+  $form->{callback} .= '&saved_message=' . E($locale->text('Warehouse saved.')) if ($form->{callback});
 
-  edit_units();
+  $form->redirect($locale->text('Warehouse saved.'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub set_unit_languages {
-  $lxdebug->enter_sub();
+sub swap_warehouses {
+  $main::lxdebug->enter_sub();
 
-  my ($unit, $languages, $idx) = @_;
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  $unit->{"LANGUAGES"} = [];
+  $main::auth->assert('config');
 
-  foreach my $lang (@{$languages}) {
-    push(@{ $unit->{"LANGUAGES"} },
-         { "id" => $lang->{"id"},
-           "localized" => $form->{"localized_${idx}_$lang->{id}"},
-           "localized_plural" => $form->{"localized_plural_${idx}_$lang->{id}"},
-         });
-  }
+  AM->swap_sortkeys(\%myconfig, $form, 'warehouse');
+  list_warehouses();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub save_unit {
-  $lxdebug->enter_sub();
-
-  $old_units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"}, "resolved_");
-  AM->units_in_use(\%myconfig, $form, $old_units);
-
-  @languages = AM->language(\%myconfig, $form, 1);
+sub delete_warehouse {
+  $main::lxdebug->enter_sub();
 
-  $new_units = {};
-  @delete_units = ();
-  foreach $i (1..($form->{"rowcount"} * 1)) {
-    $old_unit = $old_units->{$form->{"old_name_$i"}};
-    if (!$old_unit) {
-      $form->show_generic_error(sprintf($locale->text("The unit in row %d has been deleted in the meantime."), $i));
-    }
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-    if ($form->{"unchangeable_$i"}) {
-      $new_units->{$form->{"old_name_$i"}} = $old_units->{$form->{"old_name_$i"}};
-      $new_units->{$form->{"old_name_$i"}}->{"unchanged_unit"} = 1;
-      set_unit_languages($new_units->{$form->{"old_name_$i"}}, \@languages, $i);
-      next;
-    }
+  $main::auth->assert('config');
 
-    if ($old_unit->{"in_use"}) {
-      $form->show_generic_error(sprintf($locale->text("The unit in row %d has been used in the meantime and cannot be changed anymore."), $i));
-    }
+  if (!$form->{confirmed}) {
+    $form->{title} = $locale->text('Confirmation');
 
-    if ($form->{"delete_$i"}) {
-      push(@delete_units, $old_unit->{"name"});
-      next;
-    }
+    $form->header();
+    print $form->parse_html_template('am/confirm_delete_warehouse');
+    exit 0;
+  }
 
-    $form->isblank("name_$i", sprintf($locale->text("The name is missing in row %d."), $i));
+  if (AM->delete_warehouse(\%myconfig, $form)) {
+    $form->{callback} .= '&saved_message=' . E($locale->text('Warehouse deleted.')) if ($form->{callback});
+    $form->redirect($locale->text('Warehouse deleted.'));
 
-    $form->show_generic_error(sprintf($locale->text("The name in row %d has already been used before."), $i)) if ($new_units->{$form->{"name_$i"}});
-    my %h = map({ $_ => $form->{"${_}_$i"} } qw(name base_unit factor old_name));
-    $new_units->{$form->{"name_$i"}} = \%h;
-    $new_units->{$form->{"name_$i"}}->{"row"} = $i;
-    set_unit_languages($new_units->{$form->{"old_name_$i"}}, \@languages, $i);
+  } else {
+    $form->error($locale->text('The warehouse could not be deleted because it has already been used.'));
   }
 
-  foreach $unit (values(%{$new_units})) {
-    next unless ($unit->{"old_name"});
-    if ($unit->{"base_unit"}) {
-      $form->show_generic_error(sprintf($locale->text("The base unit does not exist or it is about to be deleted in row %d."), $unit->{"row"}))
-        unless (defined($new_units->{$unit->{"base_unit"}}));
-      $unit->{"factor"} = $form->parse_amount(\%myconfig, $unit->{"factor"});
-      $form->show_generic_error(sprintf($locale->text("The factor is missing in row %d."), $unit->{"row"})) unless ($unit->{"factor"} >= 1.0);
-    } else {
-      $unit->{"base_unit"} = undef;
-      $unit->{"factor"} = undef;
-    }
-  }
+  $main::lxdebug->leave_sub();
+}
 
-  foreach $unit (values(%{$new_units})) {
-    next if ($unit->{"unchanged_unit"});
+sub save_bin {
+  $main::lxdebug->enter_sub();
 
-    map({ $_->{"seen"} = 0; } values(%{$new_units}));
-    $new_unit = $unit;
-    while ($new_unit->{"base_unit"}) {
-      $new_unit->{"seen"} = 1;
-      $new_unit = $new_units->{$new_unit->{"base_unit"}};
-      if ($new_unit->{"seen"}) {
-        $form->show_generic_error(sprintf($locale->text("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."), $unit->{"row"}));
-      }
-    }
-  }
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  AM->save_units(\%myconfig, $form, $form->{"unit_type"}, $new_units, \@delete_units);
+  $main::auth->assert('config');
 
-  $form->{"saved_message"} = $locale->text("The units have been saved.");
+  AM->save_bins(\%myconfig, $form);
 
-  edit_units();
+  $form->{callback} .= '&saved_message=' . E($locale->text('Bins saved.')) if ($form->{callback});
+
+  $form->redirect($locale->text('Bins saved.'));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }