X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/ee072e4f077213bf6f8792ca8f0a1afebbb6282f..54e4131e091831e00a861fe2c4f53e344b87ddca:/bin/mozilla/am.pl

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 20f1ad8d3..2a522808c 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -36,6 +36,8 @@ use SL::CA;
 use SL::Form;
 use SL::User;
 
+use Data::Dumper;
+
 1;
 
 # end of main
@@ -110,16 +112,83 @@ sub account_header {
 		<input type=hidden name=selecttaxkey value="$form->{selecttaxkey}">
 	      </tr>|;
 
+  #print(STDERR Dumper($form->{NEWACCOUNT}));
+  if (@{ $form->{NEWACCOUNT} }) {
+    if (!$form->{new_chart_valid}) {
+      $form->{selectnewaccount} = "<option value=></option>";
+    }
+    foreach $item (@{ $form->{NEWACCOUNT} }) {
+      if ($item->{id} == $form->{new_chart_id}) {
+        $form->{selectnewaccount} .=
+          "<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>";
+      }
+
+    }
+  }
+
+  $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 = (48 => "Steuerfrei, Zeile 48",
-            51 => "Steuerpflichtig 16%, Zeile 51",
-            86 => "Steuerpflichtig 7%, Zeile 86",
-            91 => "Steuerfrei, Zeile 91",
-            97 => "Steuerpflichtig 16%, Zeile 97",
-            93 => "Steuerpflichtig 7%, Zeile 93",
-            94 => "Steuerpflichtig 16%, Zeile 94",
-            66 => "Vorsteuer, Zeile 66");
-  foreach $item (sort({ $a <=> $b } keys %ustva)) {
+
+  %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 {
@@ -178,7 +247,7 @@ sub account_header {
 
   $eur = qq|
 	      <tr>
-		<th align=right>| . $locale->text('EÜR') . qq|</th>
+		<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>|;
@@ -243,6 +312,7 @@ sub account_header {
   # this is for our parser only!
   # type=submit $locale->text('Add Account')
   # type=submit $locale->text('Edit Account')
+  $form->{type} = "account";
 
   $form->header;
 
@@ -253,6 +323,8 @@ sub account_header {
 
 <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}>
 
 <input type=hidden name=inventory_accno_id value=$form->{inventory_accno_id}>
 <input type=hidden name=income_accno_id value=$form->{income_accno_id}>
@@ -282,27 +354,19 @@ sub account_header {
 	    <table>
 	      <tr valign=top>
 		<td><input name=category type=radio class=radio value=A $checked{A_}>&nbsp;|
-    . $locale->text('Asset')
-    . qq|\n<br>
+    . $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>
+    . $locale->text('Liability') . qq|\n<br>
 		<input name=category type=radio class=radio value=I $checked{I_}>&nbsp;|
-    . $locale->text('Revenue')
-    . qq|\n<br>
+    . $locale->text('Revenue') . qq|\n<br>
 		<input name=category type=radio class=radio value=E $checked{E_}>&nbsp;|
-    . $locale->text('Expense')
-    . qq|</td>
+    . $locale->text('Expense') . 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>
+    . $locale->text('Account') . qq|</td>
 	      </tr>
 	    </table>
 	  </td>
@@ -316,8 +380,7 @@ sub account_header {
 	    <table>
 	      <tr>
 		<th align=left>|
-      . $locale->text('Is this a summary account to record')
-      . qq|</th>
+      . $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')
@@ -345,41 +408,33 @@ sub account_header {
 	      <tr>
 		<td>
 		<input name=AR_amount type=checkbox class=checkbox value=AR_amount $form->{AR_amount}>&nbsp;|
-      . $locale->text('Revenue')
-      . qq|\n<br>
+      . $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>
+      . $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>
+      . $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>
+      . $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>
+      . $locale->text('Revenue') . qq|\n<br>
 		<input name=IC_cogs type=checkbox class=checkbox value=IC_cogs $form->{IC_cogs}>&nbsp;|
-      . $locale->text('COGS')
-      . qq|\n<br>
+      . $locale->text('COGS') . 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>
+      . $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>
+      . $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>
@@ -399,6 +454,7 @@ sub account_header {
       </table>
     </td>
   </tr>
+  $newaccount
   <tr>
     <td><hr size=3 noshade></td>
   </tr>
@@ -419,10 +475,14 @@ sub form_footer {
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 
-<br>
+<br>|;
+#print(STDERR "$form->{type} TYPE $form->{new_chart_valid} CHART_VALID\n");
+  if ((!$form->{id}) || ($form->{id} && $form->{orphaned}) || (($form->{type} eq "account") && (!$form->{new_chart_valid}))) {
+    print qq|
 <input type=submit class=submit name=action value="|
     . $locale->text('Save') . qq|">
 |;
+}
 
   if ($form->{id} && $form->{orphaned}) {
     print qq|<input type=submit class=submit name=action value="|
@@ -1244,29 +1304,29 @@ sub delete_business {
   $lxdebug->leave_sub();
 }
 
-sub add_sic {
+sub add_language {
   $lxdebug->enter_sub();
 
   $form->{title} = "Add";
 
   $form->{callback} =
-    "$form->{script}?action=add_sic&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    "$form->{script}?action=add_language&path=$form->{path}&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
 
-  &sic_header;
+  &language_header;
   &form_footer;
 
   $lxdebug->leave_sub();
 }
 
-sub edit_sic {
+sub edit_language {
   $lxdebug->enter_sub();
 
   $form->{title} = "Edit";
 
-  AM->get_sic(\%myconfig, \%$form);
+  AM->get_language(\%myconfig, \%$form);
 
-  &sic_header;
+  &language_header;
 
   $form->{orphaned} = 1;
   &form_footer;
@@ -1274,24 +1334,32 @@ sub edit_sic {
   $lxdebug->leave_sub();
 }
 
-sub list_sic {
+sub list_language {
   $lxdebug->enter_sub();
 
-  AM->sic(\%myconfig, \%$form);
+  AM->language(\%myconfig, \%$form);
 
   $form->{callback} =
-    "$form->{script}?action=list_sic&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+    "$form->{script}?action=list_language&path=$form->{path}&login=$form->{login}&password=$form->{password}";
 
   $callback = $form->escape($form->{callback});
 
-  $form->{title} = $locale->text('Standard Industrial Codes');
+  $form->{title} = $locale->text('Languages');
 
-  @column_index = qw(code description);
+  @column_index = qw(description template_code article_code);
 
-  $column_header{code} =
-    qq|<th class=listheading>| . $locale->text('Code') . qq|</th>|;
   $column_header{description} =
-    qq|<th class=listheading>| . $locale->text('Description') . qq|</th>|;
+      qq|<th class=listheading width=60%>|
+    . $locale->text('Description')
+    . qq|</th>|;
+  $column_header{template_code} =
+      qq|<th class=listheading width=10%>|
+    . $locale->text('Template Code')
+    . qq|</th>|;
+  $column_header{article_code} =
+      qq|<th class=listheading>|
+    . $locale->text('Article Code')
+    . qq|</th>|;
 
   $form->header;
 
@@ -1320,24 +1388,16 @@ sub list_sic {
     $i++;
     $i %= 2;
 
-    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>|;
-
-    } else {
-      print qq|
+    print qq|
         <tr valign=top class=listrow$i>
 |;
 
-      $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>|;
 
-    }
+    $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>|;
+    $column_data{template_code}           = qq|<td align=right>$ref->{template_code}</td>|;
+    $column_data{article_code} =
+      qq|<td align=right>$ref->{article_code}</td>|;
 
     map { print "$column_data{$_}\n" } @column_index;
 
@@ -1360,7 +1420,7 @@ sub list_sic {
 
 <input name=callback type=hidden value="$form->{callback}">
 
-<input type=hidden name=type value=sic>
+<input type=hidden name=type value=language>
 
 <input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
@@ -1375,6 +1435,7 @@ sub list_sic {
   }
 
   print qq|
+
   </form>
 
   </body>
@@ -1384,18 +1445,18 @@ sub list_sic {
   $lxdebug->leave_sub();
 }
 
-sub sic_header {
+sub language_header {
   $lxdebug->enter_sub();
 
-  $form->{title} = $locale->text("$form->{title} SIC");
+  $form->{title}    = $locale->text("$form->{title} Language");
 
-  # $locale->text('Add SIC')
-  # $locale->text('Edit SIC')
+  # $locale->text('Add Language')
+  # $locale->text('Edit Language')
 
-  $form->{code}        =~ s/\"/&quot;/g;
   $form->{description} =~ s/\"/&quot;/g;
+  $form->{template_code} =~ s/\"/&quot;/g;
+  $form->{article_code} =~ s/\"/&quot;/g;
 
-  $checked = ($form->{sictype} eq 'H') ? "checked" : "";
 
   $form->header;
 
@@ -1404,8 +1465,8 @@ sub sic_header {
 
 <form method=post action=$form->{script}>
 
-<input type=hidden name=type value=sic>
-<input type=hidden name=id value=$form->{code}>
+<input type=hidden name=id value=$form->{id}>
+<input type=hidden name=type value=language>
 
 <table width=100%>
   <tr>
@@ -1413,20 +1474,18 @@ sub sic_header {
   </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>
+    <th align=right>| . $locale->text('Language') . qq|</th>
+    <td><input name=description size=30 value="$form->{description}"></td>
   <tr>
-    <td></td>
-    <th align=left><input name=sictype type=checkbox style=checkbox value="H" $checked> |
-    . $locale->text('Heading')
-    . qq|</th>
   <tr>
+    <th align=right>| . $locale->text('Template Code') . qq|</th>
+    <td><input name=template_code size=5 value=$form->{template_code}></td>
+  </tr>
   <tr>
-    <th align=right>| . $locale->text('Description') . qq|</th>
-    <td><input name=description size=60 value="$form->{description}"></td>
+    <th align=right>| . $locale->text('Article Code') . qq|</th>
+    <td><input name=article_code size=10 value=$form->{article_code}></td>
   </tr>
-    <td colspan=2><hr size=3 noshade></td>
+  <td colspan=2><hr size=3 noshade></td>
   </tr>
 </table>
 |;
@@ -1434,178 +1493,1389 @@ sub sic_header {
   $lxdebug->leave_sub();
 }
 
-sub save_sic {
+sub save_language {
   $lxdebug->enter_sub();
 
-  $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!'));
+  $form->isblank("description", $locale->text('Language missing!'));
+  $form->isblank("template_code", $locale->text('Template Code missing!'));
+  $form->isblank("article_code", $locale->text('Article Code missing!'));
+  AM->save_language(\%myconfig, \%$form);
+  $form->redirect($locale->text('Language saved!'));
 
   $lxdebug->leave_sub();
 }
 
-sub delete_sic {
+sub delete_language {
   $lxdebug->enter_sub();
 
-  AM->delete_sic(\%myconfig, \%$form);
-  $form->redirect($locale->text('SIC deleted!'));
+  AM->delete_language(\%myconfig, \%$form);
+  $form->redirect($locale->text('Language deleted!'));
 
   $lxdebug->leave_sub();
 }
 
-sub display_stylesheet {
+
+sub add_buchungsgruppe {
   $lxdebug->enter_sub();
 
-  $form->{file} = "css/$myconfig{stylesheet}";
-  &display_form;
+  # $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};
+  AM->get_buchungsgruppe(\%myconfig, \%$form);
+
+  &buchungsgruppe_header;
+  &form_footer;
 
   $lxdebug->leave_sub();
 }
 
-sub display_form {
+sub edit_buchungsgruppe {
   $lxdebug->enter_sub();
 
-  $form->{file} =~ s/^(.:)*?\/|\.\.\///g;
-  $form->{file} =~ s/^\/*//g;
-  $form->{file} =~ s/$userspath//;
-
-  $form->error("$!: $form->{file}") unless -f $form->{file};
+  $form->{title} = "Edit";
 
-  AM->load_template(\%$form);
+  AM->get_buchungsgruppe(\%myconfig, \%$form);
 
-  $form->{title} = $form->{file};
+  &buchungsgruppe_header;
 
-  # if it is anything but html
-  if ($form->{file} !~ /\.html$/) {
-    $form->{body} = "<pre>\n$form->{body}\n</pre>";
-  }
+  &form_footer;
 
-  $form->header;
+  $lxdebug->leave_sub();
+}
 
-  print qq|
-<body>
+sub list_buchungsgruppe {
+  $lxdebug->enter_sub();
 
-$form->{body}
+  AM->buchungsgruppe(\%myconfig, \%$form);
 
-<form method=post action=$form->{script}>
+  $form->{callback} =
+    "$form->{script}?action=list_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}";
 
-<input name=file type=hidden value=$form->{file}>
-<input name=type type=hidden value=template>
+  $callback = $form->escape($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}>
+  $form->{title} = $locale->text('Buchungsgruppen');
 
-<input name=action type=submit class=submit value="|
-    . $locale->text('Edit') . qq|">|;
+  @column_index = qw(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 );
 
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
+  $column_header{description} =
+      qq|<th class=listheading width=60%>|
+    . $locale->text('Description')
+    . qq|</th>|;
+  $column_header{inventory_accno} =
+      qq|<th class=listheading width=10%>|
+    . $locale->text('Bestandskonto')
+    . qq|</th>|;
+  $column_header{income_accno_0} =
+      qq|<th class=listheading>|
+    . $locale->text('Erlöse Inland')
+    . qq|</th>|;
+  $column_header{expense_accno_0} =
+      qq|<th class=listheading>|
+    . $locale->text('Aufwand Inland')
+    . qq|</th>|;
+  $column_header{income_accno_1} =
+      qq|<th class=listheading>|
+    . $locale->text('Erlöse EU o. UStId')
+    . qq|</th>|;
+  $column_header{expense_accno_1} =
+      qq|<th class=listheading>|
+    . $locale->text('Aufwand EU o. UStId')
+    . qq|</th>|;
+  $column_header{income_accno_2} =
+      qq|<th class=listheading>|
+    . $locale->text('Erlöse EU m. UStId')
+    . qq|</th>|;
+  $column_header{expense_accno_2} =
+      qq|<th class=listheading>|
+    . $locale->text('Aufwand EU m. UStId')
+    . qq|</th>|;
+  $column_header{income_accno_3} =
+      qq|<th class=listheading>|
+    . $locale->text('Erlöse Ausland')
+    . qq|</th>|;
+  $column_header{expense_accno_3} =
+      qq|<th class=listheading>|
+    . $locale->text('Aufwand Ausland')
+    . qq|</th>|;
+  $form->header;
 
   print qq|
-  </form>
+<body>
 
-</body>
-</html>
+<table width=100%>
+  <tr>
+    <th class=listtop>$form->{title}</th>
+  </tr>
+  <tr height="5"></tr>
+  <tr>
+    <td>
+      <table width=100%>
+        <tr class=listheading>
 |;
 
-  $lxdebug->leave_sub();
-}
+  map { print "$column_header{$_}\n" } @column_index;
 
-sub edit_template {
-  $lxdebug->enter_sub();
+  print qq|
+        </tr>
+|;
 
-  AM->load_template(\%$form);
+  foreach $ref (@{ $form->{ALL} }) {
 
-  $form->{title} = $locale->text('Edit Template');
+    $i++;
+    $i %= 2;
 
-  # convert &nbsp to &amp;nbsp;
-  $form->{body} =~ s/&nbsp;/&amp;nbsp;/gi;
+    print qq|
+        <tr valign=top class=listrow$i>
+|;
 
-  $form->header;
+
+    $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{inventory_accno}           = qq|<td align=right>$ref->{inventory_accno}</td>|;
+    $column_data{income_accno_0} =
+      qq|<td align=right>$ref->{income_accno_0}</td>|;
+    $column_data{expense_accno_0}           = qq|<td align=right>$ref->{expense_accno_0}</td>|;
+    $column_data{income_accno_1} =
+      qq|<td align=right>$ref->{income_accno_1}</td>|;
+    $column_data{expense_accno_1}           = qq|<td align=right>$ref->{expense_accno_1}</td>|;
+    $column_data{income_accno_2} =
+      qq|<td align=right>$ref->{income_accno_2}</td>|;
+    $column_data{expense_accno_2}           = qq|<td align=right>$ref->{expense_accno_2}</td>|;
+    $column_data{income_accno_3} =
+      qq|<td align=right>$ref->{income_accno_3}</td>|;
+    $column_data{expense_accno_3}           = qq|<td align=right>$ref->{expense_accno_3}</td>|;
+
+    map { print "$column_data{$_}\n" } @column_index;
+
+    print qq|
+	</tr>
+|;
+  }
 
   print qq|
-<body>
+      </table>
+    </td>
+  </tr>
+  <tr>
+  <td><hr size=3 noshade></td>
+  </tr>
+</table>
 
+<br>
 <form method=post action=$form->{script}>
 
-<input name=file type=hidden value=$form->{file}>
-<input name=type type=hidden value=template>
+<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 name=callback type=hidden value="$form->{script}?action=display_form&file=$form->{file}&path=$form->{path}&login=$form->{login}&password=$form->{password}">
-
-<textarea name=body rows=25 cols=70>
-$form->{body}
-</textarea>
-
-<br>
-<input type=submit class=submit name=action value="|
-    . $locale->text('Save') . qq|">|;
+<input class=submit type=submit name=action value="|
+    . $locale->text('Add') . qq|">|;
 
   if ($form->{menubar}) {
     require "$form->{path}/menu.pl";
     &menubar;
   }
 
-  print q|
-  </form>
+  print qq|
 
+  </form>
 
-</body>
-</html>
+  </body>
+  </html>
 |;
 
   $lxdebug->leave_sub();
 }
 
-sub save_template {
+sub buchungsgruppe_header {
   $lxdebug->enter_sub();
 
-  AM->save_template(\%$form);
-  $form->redirect($locale->text('Template saved!'));
+  $form->{title}    = $locale->text("$form->{title} Buchungsgruppe");
 
-  $lxdebug->leave_sub();
-}
+  # $locale->text('Buchungsgruppe hinzufügen')
+  # $locale->text('Buchungsgruppe bearbeiten')
 
-sub config {
-  $lxdebug->enter_sub();
+  $form->{description} =~ s/\"/&quot;/g;
 
-  # get defaults for account numbers and last numbers
-  AM->defaultaccounts(\%myconfig, \%$form);
+  # build the popup menus
+  $form->{taxaccounts} = "";
+  foreach $key (keys %{ $form->{IC_links} }) {
+    foreach $ref (@{ $form->{IC_links}{$key} }) {
+
+      # if this is a tax field
+      if ($key =~ /IC_tax/) {
+        if ($key =~ /$item/) {
+          $form->{taxaccounts} .= "$ref->{accno} ";
+          $form->{"IC_tax_$ref->{accno}_description"} =
+            "$ref->{accno}--$ref->{description}";
+
+          if ($form->{id}) {
+            if ($form->{amount}{ $ref->{accno} }) {
+              $form->{"IC_tax_$ref->{accno}"} = "checked";
+            }
+          } else {
+            $form->{"IC_tax_$ref->{accno}"} = "checked";
+          }
+        }
+      } else {
 
-  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";
-  }
+        $form->{"select$key"} .=
+          "<option value=$ref->{id} $ref->{selected}>$ref->{accno}--$ref->{description}\n";
+        if (($key eq "IC") && ($ref->{selected} eq "selected")) {
+          $form->{IC_default} = $ref->{id};
+        }
+        if ($form->{amount}{$key} eq $ref->{accno}) {
+          $form->{$key} = "$ref->{accno}--$ref->{description}";
+        }
 
-  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";
+      }
+    }
   }
-
-  foreach $item (qw(name company address signature)) {
-    $myconfig{$item} =~ s/\"/&quot;/g;
+  $form->{selectIC_income}  = $form->{selectIC_sale};
+  $form->{selectIC_expense} = $form->{selectIC_cogs};
+  $form->{IC_income}        = $form->{IC_sale};
+  $form->{IC_expense}       = $form->{IC_cogs};
+
+  if ($form->{id}) {
+    $form->{selectIC} =~ s/selected//g;
+    $form->{selectIC} =~ s/ value=\$form->{inventory_accno_id}/  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_expense} =~ s/selected//g;
+    $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_0}/  value=$form->{expense_accno_id_0} selected/;
   }
 
-  foreach $item (qw(address signature)) {
-    $myconfig{$item} =~ s/\\n/\r\n/g;
-  }
+  if (!$eur) {
+    $linkaccounts = qq|
+               <tr>
+		<th align=right>| . $locale->text('Inventory') . qq|</th>
+		<td><select name=inventory_accno_id>$form->{selectIC}</select></td>
+		<input name=selectIC type=hidden value="$form->{selectIC}">
+	      </tr>|;
+  } else {
+    $linkaccounts = qq|
+                <input type=hidden name=inventory_accno_id value=1>|;
+  }   
+
+
+    $linkaccounts .= qq|
+	      <tr>
+		<th align=right>| . $locale->text('Erlöse Inland') . 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>
+		<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_expense} =~ s/selected//g;
+    $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_1}/  value=$form->{expense_accno_id_1} selected/;
+  }
+  $linkaccounts .= qq|	      <tr>
+		<th align=right>| . $locale->text('Erlöse EU m. 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>
+		<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_expense} =~ s/selected//g;
+    $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_2}/  value=$form->{expense_accno_id_2} selected/;
+  }
+
+  $linkaccounts .= qq|	      <tr>
+		<th align=right>| . $locale->text('Erlöse EU o. 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>
+		<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_expense} =~ s/selected//g;
+    $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_3}/  value=$form->{expense_accno_id_3} selected/;
+  }
+
+  $linkaccounts .= qq|	      <tr>
+		<th align=right>| . $locale->text('Erlöse Ausland') . 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>
+		<td><select name=expense_accno_id_3>$form->{selectIC_expense}</select></td>
+	      </tr>
+|;
+
+
+  $form->header;
+
+  print qq|
+<body>
+
+<form method=post action=$form->{script}>
+
+<input type=hidden name=id value=$form->{id}>
+<input type=hidden name=type value=buchungsgruppe>
+
+<table width=100%>
+  <tr>
+    <th class=listtop colspan=2>$form->{title}</th>
+  </tr>
+  <tr height="5"></tr>
+  <tr>
+    <th align=right>| . $locale->text('Buchungsgruppe') . qq|</th>
+    <td><input name=description size=30 value="$form->{description}"></td>
+  <tr>
+  $linkaccounts
+  <td colspan=2><hr size=3 noshade></td>
+  </tr>
+</table>
+|;
+
+  $lxdebug->leave_sub();
+}
+
+sub save_buchungsgruppe {
+  $lxdebug->enter_sub();
+
+  $form->isblank("description", $locale->text('Description missing!'));
+
+  AM->save_buchungsgruppe(\%myconfig, \%$form);
+  $form->redirect($locale->text('Buchungsgruppe gespeichert!'));
+
+  $lxdebug->leave_sub();
+}
+
+sub delete_buchungsgruppe {
+  $lxdebug->enter_sub();
+
+  AM->delete_buchungsgruppe(\%myconfig, \%$form);
+  $form->redirect($locale->text('Buchungsgruppe gelöscht!'));
+
+  $lxdebug->leave_sub();
+}
+
+
+sub add_printer {
+  $lxdebug->enter_sub();
+
+  $form->{title} = "Add";
+
+  $form->{callback} =
+    "$form->{script}?action=add_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    unless $form->{callback};
+
+  &printer_header;
+  &form_footer;
+
+  $lxdebug->leave_sub();
+}
+
+sub edit_printer {
+  $lxdebug->enter_sub();
+
+  $form->{title} = "Edit";
+
+  AM->get_printer(\%myconfig, \%$form);
+
+  &printer_header;
+
+  $form->{orphaned} = 1;
+  &form_footer;
+
+  $lxdebug->leave_sub();
+}
+
+sub list_printer {
+  $lxdebug->enter_sub();
+
+  AM->printer(\%myconfig, \%$form);
+
+  $form->{callback} =
+    "$form->{script}?action=list_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+
+  $callback = $form->escape($form->{callback});
+
+  $form->{title} = $locale->text('Printer');
+
+  @column_index = qw(printer_description printer_command template_code);
+
+  $column_header{printer_description} =
+      qq|<th class=listheading width=60%>|
+    . $locale->text('Printer Description')
+    . qq|</th>|;
+  $column_header{printer_command} =
+      qq|<th class=listheading width=10%>|
+    . $locale->text('Printer Command')
+    . qq|</th>|;
+  $column_header{template_code} =
+      qq|<th class=listheading>|
+    . $locale->text('Template Code')
+    . 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>
+|;
+
+
+    $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_command}           = qq|<td align=right>$ref->{printer_command}</td>|;
+    $column_data{template_code} =
+      qq|<td align=right>$ref->{template_code}</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=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|">|;
+
+  if ($form->{menubar}) {
+    require "$form->{path}/menu.pl";
+    &menubar;
+  }
+
+  print qq|
+
+  </form>
+
+  </body>
+  </html>
+|;
+
+  $lxdebug->leave_sub();
+}
+
+sub printer_header {
+  $lxdebug->enter_sub();
+
+  $form->{title}    = $locale->text("$form->{title} Printer");
+
+  # $locale->text('Add Printer')
+  # $locale->text('Edit Printer')
+
+  $form->{printer_description} =~ s/\"/&quot;/g;
+  $form->{template_code} =~ s/\"/&quot;/g;
+  $form->{printer_command} =~ s/\"/&quot;/g;
+
+
+  $form->header;
+
+  print qq|
+<body>
+
+<form method=post action=$form->{script}>
+
+<input type=hidden name=id value=$form->{id}>
+<input type=hidden name=type value=printer>
+
+<table width=100%>
+  <tr>
+    <th class=listtop colspan=2>$form->{title}</th>
+  </tr>
+  <tr height="5"></tr>
+  <tr>
+    <th align=right>| . $locale->text('Printer') . qq|</th>
+    <td><input name=printer_description size=30 value="$form->{printer_description}"></td>
+  <tr>
+  <tr>
+    <th align=right>| . $locale->text('Printer Command') . qq|</th>
+    <td><input name=printer_command size=30 value="$form->{printer_command}"></td>
+  </tr>
+  <tr>
+    <th align=right>| . $locale->text('Template Code') . qq|</th>
+    <td><input name=template_code size=5 value="$form->{template_code}"></td>
+  </tr>
+  <td colspan=2><hr size=3 noshade></td>
+  </tr>
+</table>
+|;
+
+  $lxdebug->leave_sub();
+}
+
+sub save_printer {
+  $lxdebug->enter_sub();
+
+  $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();
+}
+
+sub delete_printer {
+  $lxdebug->enter_sub();
+
+  AM->delete_printer(\%myconfig, \%$form);
+  $form->redirect($locale->text('Printer deleted!'));
+
+  $lxdebug->leave_sub();
+}
+
+
+sub add_adr {
+  $lxdebug->enter_sub();
+
+  $form->{title} = "Add";
+
+  $form->{callback} =
+    "$form->{script}?action=add_adr&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    unless $form->{callback};
+
+  &adr_header;
+  &form_footer;
+
+  $lxdebug->leave_sub();
+}
+
+sub edit_adr {
+  $lxdebug->enter_sub();
+
+  $form->{title} = "Edit";
+
+  AM->get_adr(\%myconfig, \%$form);
+
+  &adr_header;
+
+  $form->{orphaned} = 1;
+  &form_footer;
+
+  $lxdebug->leave_sub();
+}
+
+sub list_adr {
+  $lxdebug->enter_sub();
+
+  AM->adr(\%myconfig, \%$form);
+
+  $form->{callback} =
+    "$form->{script}?action=list_adr&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+
+  $callback = $form->escape($form->{callback});
+
+  $form->{title} = $locale->text('ADR');
+
+  @column_index = qw(adr_code adr_description);
+
+  $column_header{adr_description} =
+      qq|<th class=listheading width=60%>|
+    . $locale->text('ADR Description')
+    . qq|</th>|;
+  $column_header{adr_code} =
+      qq|<th class=listheading width=10%>|
+    . $locale->text('ADR Code')
+    . 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>
+|;
+
+
+    $column_data{adr_code} =
+      qq|<td><a href=$form->{script}?action=edit_adr&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{adr_code}</td>|;
+    $column_data{adr_description}           = qq|<td align=left>$ref->{adr_description}</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=adr>
+
+<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|">|;
+
+  if ($form->{menubar}) {
+    require "$form->{path}/menu.pl";
+    &menubar;
+  }
+
+  print qq|
+
+  </form>
+
+  </body>
+  </html>
+|;
+
+  $lxdebug->leave_sub();
+}
+
+sub adr_header {
+  $lxdebug->enter_sub();
+
+  $form->{title}    = $locale->text("$form->{title} ADR");
+
+  # $locale->text('Add ADR')
+  # $locale->text('Edit ADR')
+
+  $form->{adr_description} =~ s/\"/&quot;/g;
+  $form->{adr_code} =~ s/\"/&quot;/g;
+
+
+  $form->header;
+
+  print qq|
+<body>
+
+<form method=post action=$form->{script}>
+
+<input type=hidden name=id value=$form->{id}>
+<input type=hidden name=type value=adr>
+
+<table width=100%>
+  <tr>
+    <th class=listtop colspan=2>$form->{title}</th>
+  </tr>
+  <tr height="5"></tr>
+  <tr>
+    <th align=right>| . $locale->text('ADR Code') . qq|</th>
+    <td><input name=adr_code size=30 value="$form->{adr_code}"></td>
+  <tr>
+  <tr>
+    <th align=right>| . $locale->text('ADR Description') . qq|</th>
+    <td><input name=adr_description size=60 value="$form->{adr_description}"></td>
+  </tr>
+  <td colspan=2><hr size=3 noshade></td>
+  </tr>
+</table>
+|;
+
+  $lxdebug->leave_sub();
+}
+
+sub save_adr {
+  $lxdebug->enter_sub();
+
+  $form->isblank("adr_description", $locale->text('ADR Description missing!'));
+  $form->isblank("adr_code", $locale->text('ADR Code missing!'));
+  AM->save_adr(\%myconfig, \%$form);
+  $form->redirect($locale->text('ADR saved!'));
+
+  $lxdebug->leave_sub();
+}
+
+
+sub delete_adr {
+  $lxdebug->enter_sub();
+
+  AM->delete_adr(\%myconfig, \%$form);
+  $form->redirect($locale->text('ADR deleted!'));
+
+  $lxdebug->leave_sub();
+}
+
+
+sub add_payment {
+  $lxdebug->enter_sub();
+
+  $form->{title} = "Add";
+
+  $form->{callback} =
+    "$form->{script}?action=add_payment&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    unless $form->{callback};
+
+  &payment_header;
+  &form_footer;
+
+  $lxdebug->leave_sub();
+}
+
+sub edit_payment {
+  $lxdebug->enter_sub();
+
+  $form->{title} = "Edit";
+
+  AM->get_payment(\%myconfig, \%$form);
+
+  &payment_header;
+
+  $form->{orphaned} = 1;
+  &form_footer;
+
+  $lxdebug->leave_sub();
+}
+
+sub list_payment {
+  $lxdebug->enter_sub();
+
+  AM->payment(\%myconfig, \%$form);
+
+  $form->{callback} =
+    "$form->{script}?action=list_payment&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+
+  $callback = $form->escape($form->{callback});
+
+  $form->{title} = $locale->text('Payment Terms');
+
+  @column_index = qw(description description_long terms_netto terms_skonto percent_skonto);
+
+  $column_header{description} =
+      qq|<th class=listheading>|
+    . $locale->text('Description')
+    . qq|</th>|;
+  $column_header{description_long} =
+      qq|<th class=listheading>|
+    . $locale->text('Long Description')
+    . qq|</th>|;
+  $column_header{terms_netto} =
+      qq|<th class=listheading>|
+    . $locale->text('Netto Terms')
+    . qq|</th>|;
+  $column_header{terms_skonto} =
+      qq|<th class=listheading>|
+    . $locale->text('Skonto Terms')
+    . qq|</th>|;
+  $column_header{percent_skonto} =
+      qq|<th class=listheading>|
+    . $locale->text('Skonto')
+    . 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>
+|;
+
+
+    $column_data{description} =
+      qq|<td><a href=$form->{script}?action=edit_payment&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
+    $column_data{description_long}           = qq|<td align=right>$ref->{description_long}</td>|;
+    $column_data{terms_netto} =
+      qq|<td align=right>$ref->{terms_netto}</td>|;
+    $column_data{terms_skonto} =
+      qq|<td align=right>$ref->{terms_skonto}</td>|;
+    $column_data{percent_skonto} =
+      qq|<td align=right>$ref->{percent_skonto} %</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=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|">|;
+
+  if ($form->{menubar}) {
+    require "$form->{path}/menu.pl";
+    &menubar;
+  }
+
+  print qq|
+
+  </form>
+
+  </body>
+  </html>
+|;
+
+  $lxdebug->leave_sub();
+}
+
+sub payment_header {
+  $lxdebug->enter_sub();
+
+  $form->{title}    = $locale->text("$form->{title} Payment Terms");
+
+  # $locale->text('Add Payment Terms')
+  # $locale->text('Edit Payment Terms')
+
+  $form->{description} =~ s/\"/&quot;/g;
+
+
+
+  $form->header;
+
+  print qq|
+<body>
+
+<form method=post action=$form->{script}>
+
+<input type=hidden name=id value=$form->{id}>
+<input type=hidden name=type value=payment>
+
+<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><input name=description size=30 value="$form->{description}"></td>
+  <tr>
+  <tr>
+    <th align=right>| . $locale->text('Ranking') . qq|</th>
+    <td><input name=ranking size=30 value="$form->{ranking}"></td>
+  <tr>
+  <tr>
+    <th align=right>| . $locale->text('Long Description') . qq|</th>
+    <td><input name=description_long size=50 value="$form->{description_long}"></td>
+  </tr>
+  <tr>
+    <th align=right>| . $locale->text('Netto Terms') . qq|</th>
+    <td><input name=terms_netto size=10 value="$form->{terms_netto}"></td>
+  </tr>
+  <tr>
+    <th align=right>| . $locale->text('Skonto Terms') . qq|</th>
+    <td><input name=terms_skonto size=10 value="$form->{terms_skonto}"></td>
+  </tr>  
+  <tr>
+    <th align=right>| . $locale->text('Skonto') . qq| %</th>
+    <td><input name=percent_skonto size=10 value="$form->{percent_skonto}"></td>
+  </tr> 
+  <td colspan=2><hr size=3 noshade></td>
+  </tr>
+</table>
+|;
+
+  $lxdebug->leave_sub();
+}
+
+sub save_payment {
+  $lxdebug->enter_sub();
+
+  $form->isblank("description", $locale->text('Language missing!'));
+  AM->save_payment(\%myconfig, \%$form);
+  $form->redirect($locale->text('Payment Terms saved!'));
+
+  $lxdebug->leave_sub();
+}
+
+sub delete_payment {
+  $lxdebug->enter_sub();
+
+  AM->delete_payment(\%myconfig, \%$form);
+  $form->redirect($locale->text('Payment terms deleted!'));
+
+  $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};
+
+  &sic_header;
+  &form_footer;
+
+  $lxdebug->leave_sub();
+}
+
+sub edit_sic {
+  $lxdebug->enter_sub();
+
+  $form->{title} = "Edit";
+
+  AM->get_sic(\%myconfig, \%$form);
+
+  &sic_header;
+
+  $form->{orphaned} = 1;
+  &form_footer;
+
+  $lxdebug->leave_sub();
+}
+
+sub list_sic {
+  $lxdebug->enter_sub();
+
+  AM->sic(\%myconfig, \%$form);
+
+  $form->{callback} =
+    "$form->{script}?action=list_sic&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+
+  $callback = $form->escape($form->{callback});
+
+  $form->{title} = $locale->text('Standard Industrial Codes');
+
+  @column_index = qw(code description);
+
+  $column_header{code} =
+    qq|<th class=listheading>| . $locale->text('Code') . qq|</th>|;
+  $column_header{description} =
+    qq|<th class=listheading>| . $locale->text('Description') . 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;
+
+    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>|;
+
+    } else {
+      print qq|
+        <tr valign=top class=listrow$i>
+|;
+
+      $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>|;
+
+    }
+
+    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=sic>
+
+<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|">|;
+
+  if ($form->{menubar}) {
+    require "$form->{path}/menu.pl";
+    &menubar;
+  }
+
+  print qq|
+  </form>
+
+  </body>
+  </html>
+|;
+
+  $lxdebug->leave_sub();
+}
+
+sub sic_header {
+  $lxdebug->enter_sub();
+
+  $form->{title} = $locale->text("$form->{title} SIC");
+
+  # $locale->text('Add SIC')
+  # $locale->text('Edit SIC')
+
+  $form->{code}        =~ s/\"/&quot;/g;
+  $form->{description} =~ s/\"/&quot;/g;
+
+  $checked = ($form->{sictype} eq 'H') ? "checked" : "";
+
+  $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}>
+
+<table width=100%>
+  <tr>
+    <th class=listtop colspan=2>$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>
+  </tr>
+</table>
+|;
+
+  $lxdebug->leave_sub();
+}
+
+sub save_sic {
+  $lxdebug->enter_sub();
+
+  $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!'));
+
+  $lxdebug->leave_sub();
+}
+
+sub delete_sic {
+  $lxdebug->enter_sub();
+
+  AM->delete_sic(\%myconfig, \%$form);
+  $form->redirect($locale->text('SIC deleted!'));
+
+  $lxdebug->leave_sub();
+}
+
+sub display_stylesheet {
+  $lxdebug->enter_sub();
+
+  $form->{file} = "css/$myconfig{stylesheet}";
+  &display_form;
+
+  $lxdebug->leave_sub();
+}
+
+sub display_form {
+  $lxdebug->enter_sub();
+
+  $form->{file} =~ s/^(.:)*?\/|\.\.\///g;
+  $form->{file} =~ s/^\/*//g;
+  $form->{file} =~ s/$userspath//;
+
+  $form->error("$!: $form->{file}") unless -f $form->{file};
+
+  AM->load_template(\%$form);
+
+  $form->{title} = $form->{file};
+
+  # if it is anything but html
+  if ($form->{file} !~ /\.html$/) {
+    $form->{body} = "<pre>\n$form->{body}\n</pre>";
+  }
+
+  $form->header;
+
+  print qq|
+<body>
+
+$form->{body}
+
+<form method=post action=$form->{script}>
+
+<input name=file type=hidden value=$form->{file}>
+<input name=type type=hidden value=template>
+
+<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=action type=submit class=submit value="|
+    . $locale->text('Edit') . qq|">|;
+
+  if ($form->{menubar}) {
+    require "$form->{path}/menu.pl";
+    &menubar;
+  }
+
+  print qq|
+  </form>
+
+</body>
+</html>
+|;
+
+  $lxdebug->leave_sub();
+}
+
+sub edit_template {
+  $lxdebug->enter_sub();
+
+  AM->load_template(\%$form);
+
+  $form->{title} = $locale->text('Edit Template');
+
+  # convert &nbsp to &amp;nbsp;
+  $form->{body} =~ s/&nbsp;/&amp;nbsp;/gi;
+
+  $form->header;
+
+  print qq|
+<body>
+
+<form method=post action=$form->{script}>
+
+<input name=file type=hidden value=$form->{file}>
+<input name=type type=hidden value=template>
+
+<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="$form->{script}?action=display_form&file=$form->{file}&path=$form->{path}&login=$form->{login}&password=$form->{password}">
+
+<textarea name=body rows=25 cols=70>
+$form->{body}
+</textarea>
+
+<br>
+<input type=submit class=submit name=action value="|
+    . $locale->text('Save') . qq|">|;
+
+  if ($form->{menubar}) {
+    require "$form->{path}/menu.pl";
+    &menubar;
+  }
+
+  print q|
+  </form>
+
+
+</body>
+</html>
+|;
+
+  $lxdebug->leave_sub();
+}
+
+sub save_template {
+  $lxdebug->enter_sub();
+
+  AM->save_template(\%$form);
+  $form->redirect($locale->text('Template saved!'));
+
+  $lxdebug->leave_sub();
+}
+
+sub config {
+  $lxdebug->enter_sub();
+
+  # get defaults for account numbers and last numbers
+  AM->defaultaccounts(\%myconfig, \%$form);
+
+  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";
+  }
+
+  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";
+  }
+
+  foreach $item (qw(name company address signature)) {
+    $myconfig{$item} =~ s/\"/&quot;/g;
+  }
+
+  foreach $item (qw(address signature)) {
+    $myconfig{$item} =~ s/\\n/\r\n/g;
+  }
 
   %countrycodes = User->country_codes;
   $countrycodes = '';
   foreach $key (sort { $countrycodes{$a} cmp $countrycodes{$b} }
-                keys %countrycodes) {
+                keys %countrycodes
+    ) {
     $countrycodes .=
       ($myconfig{countrycode} eq $key)
       ? "<option selected value=$key>$countrycodes{$key}\n"
@@ -1613,6 +2883,19 @@ sub config {
   }
   $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} .=
@@ -1639,6 +2922,9 @@ sub config {
 
   $form->header;
 
+  if ($myconfig{menustyle} eq "old") { $oldS = "checked"; }
+  else { $newS = "checked"; }
+
   print qq|
 <body>
 
@@ -1690,9 +2976,14 @@ sub config {
 	  <td><select name=dateformat>$dateformat</select></td>
 	</tr>
 	<tr>
-	  <th align=right>| . $locale->text('Number Format') . qq|</th>
+	  <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>
+
 	<tr>
 	  <th align=right>| . $locale->text('Dropdown Limit') . qq|</th>
 	  <td><input name=vclimit size=10 value="$myconfig{vclimit}"></td>
@@ -1701,14 +2992,15 @@ sub config {
 	  <th align=right>| . $locale->text('Language') . qq|</th>
 	  <td><select name=countrycode>$countrycodes</select></td>
 	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Character Set') . qq|</th>
-	  <td><input name=charset size=20 value="$myconfig{charset}"></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=neu $newS>&nbsp;New
+  		  <input name=menustyle type=radio class=radio value=old $oldS>&nbsp;Old</td>
+	</tr>	
 	<input name=printer type=hidden value="$myconfig{printer}">
 	<tr class=listheading>
 	  <th colspan=2>&nbsp;</th>
@@ -1731,8 +3023,7 @@ sub config {
 	</tr>
 	<tr class=listheading>
 	  <th colspan=2>|
-    . $locale->text('Last Numbers & Default Accounts')
-    . qq|</th>
+    . $locale->text('Last Numbers & Default Accounts') . qq|</th>
 	</tr>
 	<tr>
 	  <td colspan=2>
@@ -1774,38 +3065,36 @@ sub config {
 		<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>
+    . $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 Sales Order Number')
-    . qq|</th>
-		<td><input name=sonumber size=10 value=$form->{defaults}{sonumber}></td>
+    . $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>
+    . $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 Purchase Order Number')
-    . qq|</th>
+    . $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>
+    . $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>
+    . $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>
+    . $locale->text('Last Service Number') . qq|</th>
 		<td><input name=servicenumber size=10 value=$form->{defaults}{servicenumber}></td>
 	      </tr>
 	      <tr>
@@ -1946,8 +3235,7 @@ sub audit_control {
       <table>
 	<tr>
 	  <td>|
-    . $locale->text('Enforce transaction reversal for all dates')
-    . qq|</th>
+    . $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}> |
@@ -2199,3 +3487,131 @@ sub continue {
 
   $lxdebug->leave_sub();
 }
+
+sub edit_units {
+  $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}));
+
+  @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}))));
+  }
+  map({ $_->{"factor"} = $form->format_amount(\%myconfig, $_->{"factor"}, 5) if ($_->{"factor"}); } @unit_list);
+
+  $units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"});
+  $ddbox = AM->unit_select_data($units, undef, 1);
+
+  $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 }));
+
+  $lxdebug->leave_sub();
+}
+
+sub add_unit {
+  $lxdebug->enter_sub();
+
+  $form->isblank("new_name", $locale->text("The name is missing."));
+  $units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"});
+  $form->show_generic_error($locale->text("A unit with this name does already exist.")) if ($units->{$form->{"new_name"}});
+
+  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"}}));
+
+    $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"};
+  }
+
+  AM->add_unit(\%myconfig, $form, $form->{"new_name"}, $base_unit, $factor, $form->{"unit_type"});
+
+  $form->{"saved_message"} = $locale->text("The unit has been saved.");
+
+  edit_units();
+
+  $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);
+
+  $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));
+    }
+
+    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;
+      next;
+    }
+
+    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->{"delete_$i"}) {
+      push(@delete_units, $old_unit->{"name"});
+      next;
+    }
+
+    $form->isblank("name_$i", sprintf($locale->text("The name is missing in row %d."), $i));
+
+    $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;
+  }
+
+  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;
+    }
+  }
+
+  foreach $unit (values(%{$new_units})) {
+    next if ($unit->{"unchanged_unit"});
+
+    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"}));
+      }
+    }
+  }
+
+  #print(STDERR Dumper($delete_units));
+  #print(STDERR Dumper($new_units));
+
+  AM->save_units(\%myconfig, $form, $form->{"unit_type"}, $new_units, \@delete_units);
+
+  $form->{"saved_message"} = $locale->text("The units have been saved.");
+
+  edit_units();
+
+  $lxdebug->leave_sub();
+}