X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=0ce8c2ee6d371106e68626fec8b151b91b757a06;hb=da10bf753ae49b8322e79fc1bb9276a092403b9a;hp=2a522808c9a86c45d87925c0ace5a724084f4fcb;hpb=54e4131e091831e00a861fe2c4f53e344b87ddca;p=kivitendo-erp.git

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 2a522808c..0ce8c2ee6 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -40,6 +40,10 @@ use Data::Dumper;
 
 1;
 
+
+
+require "$form->{path}/common.pl";
+
 # end of main
 
 sub add    { &{"add_$form->{type}"} }
@@ -92,14 +96,16 @@ sub account_header {
   $form->{description} =~ s/\"/"/g;
 
   if (@{ $form->{TAXKEY} }) {
-    $form->{selecttaxkey} = "<option value=0>Keine Steuer 0%\n";
-    foreach $item (@{ $form->{TAXKEY} }) {
-      if ($item->{taxkey} == $form->{taxkey_id}) {
+    foreach my $item (@{ $form->{TAXKEY} }) {
+
+      $item->{rate} = $item->{rate} * 100 . '%';
+
+      if ($item->{tax} == $form->{tax}) {
         $form->{selecttaxkey} .=
-          "<option value=$item->{taxkey} selected>$item->{taxdescription}\n";
+          "<option value=$item->{tax} selected>$item->{taxdescription} ($item->{rate})\n";
       } else {
         $form->{selecttaxkey} .=
-          "<option value=$item->{taxkey}>$item->{taxdescription}\n";
+          "<option value=$item->{tax}>$item->{taxdescription} ($item->{rate})\n";
       }
 
     }
@@ -108,11 +114,11 @@ sub account_header {
   $taxkey = qq|
 	      <tr>
 		<th align=right>| . $locale->text('Steuersatz') . qq|</th>
-		<td><select name=taxkey_id>$form->{selecttaxkey}</select></td>
-		<input type=hidden name=selecttaxkey value="$form->{selecttaxkey}">
+		<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>|;
 
-  #print(STDERR Dumper($form->{NEWACCOUNT}));
   if (@{ $form->{NEWACCOUNT} }) {
     if (!$form->{new_chart_valid}) {
       $form->{selectnewaccount} = "<option value=></option>";
@@ -174,10 +180,14 @@ sub account_header {
             76  => $locale->text('UStVA-Nr. 76'),
             77  => $locale->text('UStVA-Nr. 77'),
             80  => $locale->text('UStVA-Nr. 80'),
+            81  => $locale->text('UStVA-Nr. 81 left'),
+            811 => $locale->text('UStVA-Nr. 81 right'),
             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'),
+            89  => $locale->text('UStVA-Nr. 89 left'),
+            891 => $locale->text('UStVA-Nr. 89 right'),
             91  => $locale->text('UStVA-Nr. 91'),
             93  => $locale->text('UStVA-Nr. 93 left'),
             931 => $locale->text('UStVA-Nr. 93 right'),
@@ -292,22 +302,23 @@ sub account_header {
 		<input type=hidden name=selectbwa value="$form->{selectbwa}">
 	      </tr>|;
 
-  $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>|;
+# 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!
   # type=submit $locale->text('Add Account')
@@ -329,8 +340,8 @@ sub account_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 values=$form->{fxgain_accno_id}>
-<input type=hidden name=fxloss_accno_id values=$form->{fxloss_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}>
 
 <table border=0 width=100%>
   <tr>
@@ -357,10 +368,14 @@ sub account_header {
     . $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|</td>
+    . $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;|
@@ -426,7 +441,7 @@ sub account_header {
 		<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('COGS') . qq|\n<br>
+      . $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>
@@ -476,7 +491,6 @@ sub form_footer {
 <input type=hidden name=password value=$form->{password}>
 
 <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="|
@@ -489,11 +503,6 @@ sub form_footer {
       . $locale->text('Delete') . qq|">|;
   }
 
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
-
   print qq|
 </form>
 
@@ -528,36 +537,7 @@ sub list_account {
   $callback =
     "$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&password=$form->{password}";
 
-  @column_index = qw(accno gifi_accno description debit credit link);
-
-  $column_header{accno} = qq|<th>| . $locale->text('Account') . qq|</a></th>|;
-  $column_header{gifi_accno} =
-    qq|<th>| . $locale->text('GIFI') . qq|</a></th>|;
-  $column_header{description} =
-    qq|<th>| . $locale->text('Description') . qq|</a></th>|;
-  $column_header{debit}  = qq|<th>| . $locale->text('Debit') . qq|</a></th>|;
-  $column_header{credit} = qq|<th>| . $locale->text('Credit') . qq|</a></th>|;
-  $column_header{link}   = qq|<th>| . $locale->text('Link') . qq|</a></th>|;
-
   $form->header;
-  $colspan = $#column_index + 1;
-
-  print qq|
-<body>
-
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=$colspan>$form->{title}</th>
-  </tr>
-  <tr height=5></tr>
-  <tr class=listheading>
-|;
-
-  map { print "$column_header{$_}\n" } @column_index;
-
-  print qq|
-</tr>
-|;
 
   # escape callback
   $callback = $form->escape($callback);
@@ -576,50 +556,66 @@ sub list_account {
         $form->format_amount(\%myconfig, -$ca->{amount}, 2, "&nbsp;");
     }
 
-    $ca->{link} =~ s/:/<br>/og;
-
-    if ($ca->{charttype} eq "H") {
-      print qq|<tr class=listheading>|;
-
-      $column_data{accno} =
-        qq|<th><a href=$form->{script}?action=edit_account&id=$ca->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{accno}</a></th>|;
-      $column_data{gifi_accno} =
-        qq|<th><a href=$form->{script}?action=edit_gifi&accno=$ca->{gifi_accno}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{gifi_accno}</a>&nbsp;</th>|;
-      $column_data{description} = qq|<th>$ca->{description}&nbsp;</th>|;
-      $column_data{debit}       = qq|<th>&nbsp;</th>|;
-      $column_data{credit}      = qq| <th>&nbsp;</th>|;
-      $column_data{link}        = qq|<th>&nbsp;</th>|;
-
-    } else {
-      $i++;
-      $i %= 2;
-      print qq|
-<tr valign=top class=listrow$i>|;
-      $column_data{accno} =
-        qq|<td><a href=$form->{script}?action=edit_account&id=$ca->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{accno}</a></td>|;
-      $column_data{gifi_accno} =
-        qq|<td><a href=$form->{script}?action=edit_gifi&accno=$ca->{gifi_accno}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{gifi_accno}</a>&nbsp;</td>|;
-      $column_data{description} = qq|<td>$ca->{description}&nbsp;</td>|;
-      $column_data{debit}       = qq|<td align=right>$ca->{debit}</td>|;
-      $column_data{credit}      = qq|<td align=right>$ca->{credit}</td>|;
-      $column_data{link}        = qq|<td>$ca->{link}&nbsp;</td>|;
-
+    my @links = split( q{:}, $ca->{link});
+    
+    $ca->{link} = q{};
+    
+    foreach my $link (@links){
+      $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')
+               : ( $link eq 'AR_paid' )       ? $locale->text('Account Link AR_paid')
+               : ( $link eq 'AR_tax' )        ? $locale->text('Account Link AR_tax')
+               : ( $link eq 'AP_amount' )     ? $locale->text('Account Link AP_amount')
+               : ( $link eq 'AP_paid' )       ? $locale->text('Account Link AP_paid')
+               : ( $link eq 'AP_tax' )        ? $locale->text('Account Link AP_tax')
+               : ( $link eq 'IC_sale' )       ? $locale->text('Account Link IC_sale')
+               : ( $link eq 'IC_cogs' )       ? $locale->text('Account Link IC_cogs')
+               : ( $link eq 'IC_taxpart' )    ? $locale->text('Account Link IC_taxpart')
+               : ( $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')
+               : $locale->text('Unknown Link') . ': ' . $link;
+      
+      $ca->{link} .= qq|[| . $link . qq|]&nbsp;|;
     }
-
-    map { print "$column_data{$_}\n" } @column_index;
-
-    print "</tr>\n";
+    
+    $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')
+                    : ($ca->{category} eq 'L') ? $locale->text('Account Category L')
+                    : ($ca->{category} eq 'I') ? $locale->text('Account Category I')
+                    : ($ca->{category} eq 'Q') ? $locale->text('Account Category Q')
+                    : ($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|;
   }
-
-  print qq|
-  <tr><td colspan=$colspan><hr size=3 noshade></td></tr>
-</table>
-
-</body>
-</html>
-|;
-
+  
+  my $parameters_ref = {
+  
+  
+  #   hidden_variables                => $_hidden_variables_ref,
+  };
+  
+  # Ausgabe des Templates
+  print($form->parse_html_template('am/list_accounts', $parameters_ref));
+  
   $lxdebug->leave_sub();
+  
+
 }
 
 sub delete_account {
@@ -642,236 +638,6 @@ sub delete_account {
   $lxdebug->leave_sub();
 }
 
-sub list_gifi {
-  $lxdebug->enter_sub();
-
-  @{ $form->{fields} } = (accno, description);
-  $form->{table}     = "gifi";
-  $form->{sortorder} = "accno";
-
-  AM->gifi_accounts(\%myconfig, \%$form);
-
-  $form->{title} = $locale->text('GIFI');
-
-  # construct callback
-  $callback =
-    "$form->{script}?action=list_gifi&path=$form->{path}&login=$form->{login}&password=$form->{password}";
-
-  @column_index = qw(accno description);
-
-  $column_header{accno} = qq|<th>| . $locale->text('GIFI') . qq|</a></th>|;
-  $column_header{description} =
-    qq|<th>| . $locale->text('Description') . qq|</a></th>|;
-
-  $form->header;
-  $colspan = $#column_index + 1;
-
-  print qq|
-<body>
-
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=$colspan>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr class=listheading>
-|;
-
-  map { print "$column_header{$_}\n" } @column_index;
-
-  print qq|
-</tr>
-|;
-
-  # escape callback
-  $callback = $form->escape($callback);
-
-  foreach $ca (@{ $form->{ALL} }) {
-
-    $i++;
-    $i %= 2;
-
-    print qq|
-<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>|;
-
-    map { print "$column_data{$_}\n" } @column_index;
-
-    print "</tr>\n";
-  }
-
-  print qq|
-  <tr>
-    <td colspan=$colspan><hr size=3 noshade></td>
-  </tr>
-</table>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub add_gifi {
-  $lxdebug->enter_sub();
-
-  $form->{title} = "Add";
-
-  # construct callback
-  $form->{callback} =
-    "$form->{script}?action=list_gifi&path=$form->{path}&login=$form->{login}&password=$form->{password}";
-
-  $form->{coa} = 1;
-
-  &gifi_header;
-  &gifi_footer;
-
-  $lxdebug->leave_sub();
-}
-
-sub edit_gifi {
-  $lxdebug->enter_sub();
-
-  $form->{title} = "Edit";
-
-  AM->get_gifi(\%myconfig, \%$form);
-
-  &gifi_header;
-  &gifi_footer;
-
-  $lxdebug->leave_sub();
-}
-
-sub gifi_header {
-  $lxdebug->enter_sub();
-
-  $form->{title} = $locale->text("$form->{title} GIFI");
-
-  # $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|">|;
-    }
-  }
-
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
-
-  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();
 
@@ -995,14 +761,8 @@ sub list_department {
 <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;
-  }
+    . $locale->text('Add') . qq|">
 
-  print qq|
   </form>
 
   </body>
@@ -1087,29 +847,29 @@ sub delete_department {
   $lxdebug->leave_sub();
 }
 
-sub add_business {
+sub add_lead {
   $lxdebug->enter_sub();
 
   $form->{title} = "Add";
 
   $form->{callback} =
-    "$form->{script}?action=add_business&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    "$form->{script}?action=add_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
 
-  &business_header;
+  &lead_header;
   &form_footer;
 
   $lxdebug->leave_sub();
 }
 
-sub edit_business {
+sub edit_lead {
   $lxdebug->enter_sub();
 
   $form->{title} = "Edit";
 
-  AM->get_business(\%myconfig, \%$form);
+  AM->get_lead(\%myconfig, \%$form);
 
-  &business_header;
+  &lead_header;
 
   $form->{orphaned} = 1;
   &form_footer;
@@ -1117,32 +877,24 @@ sub edit_business {
   $lxdebug->leave_sub();
 }
 
-sub list_business {
+sub list_lead {
   $lxdebug->enter_sub();
 
-  AM->business(\%myconfig, \%$form);
+  AM->lead(\%myconfig, \%$form);
 
   $form->{callback} =
-    "$form->{script}?action=list_business&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+    "$form->{script}?action=list_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}";
 
   $callback = $form->escape($form->{callback});
 
-  $form->{title} = $locale->text('Type of Business');
+  $form->{title} = $locale->text('Lead');
 
-  @column_index = qw(description discount customernumberinit);
+  @column_index = qw(description cost profit);
 
   $column_header{description} =
-      qq|<th class=listheading width=60%>|
+      qq|<th class=listheading width=100%>|
     . $locale->text('Description')
     . qq|</th>|;
-  $column_header{discount} =
-      qq|<th class=listheading width=10%>|
-    . $locale->text('Discount')
-    . qq| %</th>|;
-  $column_header{customernumberinit} =
-      qq|<th class=listheading>|
-    . $locale->text('Customernumberinit')
-    . qq|</th>|;
 
   $form->header;
 
@@ -1154,10 +906,7 @@ sub list_business {
     <th class=listtop>$form->{title}</th>
   </tr>
   <tr height="5"></tr>
-  <tr>
-    <td>
-      <table width=100%>
-        <tr class=listheading>
+  <tr class=listheading>
 |;
 
   map { print "$column_header{$_}\n" } @column_index;
@@ -1175,17 +924,10 @@ 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}";
+	$lead = $ref->{lead};
+	
     $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>|;
-    $column_data{discount}           = qq|<td align=right>$discount</td>|;
-    $column_data{customernumberinit} =
-      qq|<td align=right>$ref->{customernumberinit}</td>|;
+      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>|;
 
     map { print "$column_data{$_}\n" } @column_index;
 
@@ -1195,9 +937,6 @@ sub list_business {
   }
 
   print qq|
-      </table>
-    </td>
-  </tr>
   <tr>
   <td><hr size=3 noshade></td>
   </tr>
@@ -1208,21 +947,210 @@ sub list_business {
 
 <input name=callback type=hidden value="$form->{callback}">
 
-<input type=hidden name=type value=business>
+<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|">|;
+    . $locale->text('Add') . qq|">
+
+  </form>
+
+  </body>
+  </html>
+|;
+
+  $lxdebug->leave_sub();
+}
+
+sub lead_header {
+  $lxdebug->enter_sub();
+
+  $form->{title} = $locale->text("$form->{title} Lead");
+
+  # $locale->text('Add Lead')
+  # $locale->text('Edit Lead')
+
+  $form->{description} =~ s/\"/&quot;/g;
+
+  $description =
+      qq|<input name=description size=50 value="$form->{lead}">|;
+
+  $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=lead>
+
+<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>
+    <td colspan=2><hr size=3 noshade></td>
+  </tr>
+</table>
+|;
+
+  $lxdebug->leave_sub();
+}
+
+sub save_lead {
+  $lxdebug->enter_sub();
+
+  $form->isblank("description", $locale->text('Description missing!'));
+  AM->save_lead(\%myconfig, \%$form);
+  $form->redirect($locale->text('lead saved!'));
+
+  $lxdebug->leave_sub();
+}
+
+sub delete_lead {
+  $lxdebug->enter_sub();
+
+  AM->delete_lead(\%myconfig, \%$form);
+  $form->redirect($locale->text('lead deleted!'));
+
+  $lxdebug->leave_sub();
+}
+
+sub add_business {
+  $lxdebug->enter_sub();
+
+  $form->{title} = "Add";
+
+  $form->{callback} =
+    "$form->{script}?action=add_business&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    unless $form->{callback};
+
+  &business_header;
+  &form_footer;
+
+  $lxdebug->leave_sub();
+}
+
+sub edit_business {
+  $lxdebug->enter_sub();
+
+  $form->{title} = "Edit";
+
+  AM->get_business(\%myconfig, \%$form);
+
+  &business_header;
+
+  $form->{orphaned} = 1;
+  &form_footer;
+
+  $lxdebug->leave_sub();
+}
+
+sub list_business {
+  $lxdebug->enter_sub();
+
+  AM->business(\%myconfig, \%$form);
+
+  $form->{callback} =
+    "$form->{script}?action=list_business&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+
+  $callback = $form->escape($form->{callback});
+
+  $form->{title} = $locale->text('Type of Business');
+
+  @column_index = qw(description discount customernumberinit);
+
+  $column_header{description} =
+      qq|<th class=listheading width=60%>|
+    . $locale->text('Description')
+    . qq|</th>|;
+  $column_header{discount} =
+      qq|<th class=listheading width=10%>|
+    . $locale->text('Discount')
+    . qq| %</th>|;
+  $column_header{customernumberinit} =
+      qq|<th class=listheading>|
+    . $locale->text('Customernumberinit')
+    . 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>
+|;
+
+    $discount =
+      $form->format_amount(\%myconfig, $ref->{discount} * 100);
+    $description =
+      $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>|;
+    $column_data{discount}           = qq|<td align=right>$discount</td>|;
+    $column_data{customernumberinit} =
+      qq|<td align=right>$ref->{customernumberinit}</td>|;
+
+    map { print "$column_data{$_}\n" } @column_index;
 
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
+    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|">
 
   </form>
 
@@ -1237,7 +1165,6 @@ sub business_header {
   $lxdebug->enter_sub();
 
   $form->{title}    = $locale->text("$form->{title} Business");
-  $form->{salesman} = "checked" if $form->{salesman};
 
   # $locale->text('Add Business')
   # $locale->text('Edit Business')
@@ -1273,10 +1200,6 @@ 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>
@@ -1289,6 +1212,7 @@ sub save_business {
   $lxdebug->enter_sub();
 
   $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!'));
 
@@ -1346,7 +1270,7 @@ sub list_language {
 
   $form->{title} = $locale->text('Languages');
 
-  @column_index = qw(description template_code article_code);
+  @column_index = qw(description template_code article_code output_numberformat output_dateformat output_longdates);
 
   $column_header{description} =
       qq|<th class=listheading width=60%>|
@@ -1360,6 +1284,18 @@ sub list_language {
       qq|<th class=listheading>|
     . $locale->text('Article Code')
     . qq|</th>|;
+  $column_header{output_numberformat} =
+      qq|<th class=listheading>|
+    . $locale->text('Number Format')
+    . qq|</th>|;
+  $column_header{output_dateformat} =
+      qq|<th class=listheading>|
+    . $locale->text('Date Format')
+    . qq|</th>|;
+  $column_header{output_longdates} =
+      qq|<th class=listheading>|
+    . $locale->text('Long Dates')
+    . qq|</th>|;
 
   $form->header;
 
@@ -1398,6 +1334,20 @@ sub list_language {
     $column_data{template_code}           = qq|<td align=right>$ref->{template_code}</td>|;
     $column_data{article_code} =
       qq|<td align=right>$ref->{article_code}</td>|;
+    $column_data{output_numberformat} =
+      "<td nowrap>" .
+      ($ref->{output_numberformat} ? $ref->{output_numberformat} :
+       $locale->text("use program settings")) .
+      "</td>";
+    $column_data{output_dateformat} =
+      "<td nowrap>" .
+      ($ref->{output_dateformat} ? $ref->{output_dateformat} :
+       $locale->text("use program settings")) .
+      "</td>";
+    $column_data{output_longdates} =
+      "<td nowrap>" .
+      ($ref->{output_longdates} ? $locale->text("Yes") : $locale->text("No")) .
+      "</td>";
 
     map { print "$column_data{$_}\n" } @column_index;
 
@@ -1427,14 +1377,7 @@ sub list_language {
 <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|
+    . $locale->text('Add') . qq|">
 
   </form>
 
@@ -1460,6 +1403,28 @@ sub language_header {
 
   $form->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)) {
+    $numberformat .=
+      ($item eq $form->{output_numberformat})
+      ? "<option selected>$item"
+      : "<option>$item"
+      . "</option>";
+  }
+
+  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)) {
+    $dateformat .=
+      ($item eq $form->{output_dateformat})
+      ? "<option selected>$item"
+      : "<option>$item"
+      . "</option>";
+  }
+
   print qq|
 <body>
 
@@ -1475,15 +1440,33 @@ sub language_header {
   <tr height="5"></tr>
   <tr>
     <th align=right>| . $locale->text('Language') . qq|</th>
-    <td><input name=description size=30 value="$form->{description}"></td>
+    <td><input name=description size=30 value="| . $form->quote($form->{description}) . qq|"></td>
   <tr>
   <tr>
     <th align=right>| . $locale->text('Template Code') . qq|</th>
-    <td><input name=template_code size=5 value=$form->{template_code}></td>
+    <td><input name=template_code size=5 value="| . $form->quote($form->{template_code}) . qq|"></td>
   </tr>
   <tr>
     <th align=right>| . $locale->text('Article Code') . qq|</th>
-    <td><input name=article_code size=10 value=$form->{article_code}></td>
+    <td><input name=article_code size=10 value="| . $form->quote($form->{article_code}) . qq|"></td>
+  </tr>
+  <tr>
+    <th align=right>| . $locale->text('Number Format') . qq|</th>
+    <td><select name="output_numberformat">$numberformat</select></td>
+  </tr>
+  <tr>
+    <th align=right>| . $locale->text('Date Format') . qq|</th>
+    <td><select name="output_dateformat">$dateformat</select></td>
+  </tr>
+  <tr>
+    <th align=right>| . $locale->text('Long Dates') . qq|</th>
+    <td><input type="radio" name="output_longdates" value="1"| .
+    ($form->{output_longdates} ? " checked" : "") .
+    qq|>| . $locale->text("Yes") .
+    qq|<input type="radio" name="output_longdates" value="0"| .
+    ($form->{output_longdates} ? "" : " checked") .
+    qq|>| . $locale->text("No") .
+    qq|</td>
   </tr>
   <td colspan=2><hr size=3 noshade></td>
   </tr>
@@ -1526,6 +1509,11 @@ sub add_buchungsgruppe {
     "$form->{script}?action=add_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
   AM->get_buchungsgruppe(\%myconfig, \%$form);
+  $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"};
+  for (my $i = 0; 4 > $i; $i++) {
+    map({ $form->{"${_}_accno_id_$i"} = $form->{"std_${_}_accno_id"}; }
+        qw(income expense));
+  }
 
   &buchungsgruppe_header;
   &form_footer;
@@ -1559,14 +1547,26 @@ sub list_buchungsgruppe {
 
   $form->{title} = $locale->text('Buchungsgruppen');
 
-  @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 );
+  @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 );
 
+  $column_header{up} =
+      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" width="16">|
+    . qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">|
+    . qq|</th>|;
   $column_header{description} =
-      qq|<th class=listheading width=60%>|
+      qq|<th class="listheading" width="40%">|
     . $locale->text('Description')
     . qq|</th>|;
   $column_header{inventory_accno} =
-      qq|<th class=listheading width=10%>|
+      qq|<th class=listheading>|
     . $locale->text('Bestandskonto')
     . qq|</th>|;
   $column_header{income_accno_0} =
@@ -1579,19 +1579,19 @@ sub list_buchungsgruppe {
     . qq|</th>|;
   $column_header{income_accno_1} =
       qq|<th class=listheading>|
-    . $locale->text('Erlöse EU o. UStId')
+    . $locale->text('Erlöse EU m. UStId')
     . qq|</th>|;
   $column_header{expense_accno_1} =
       qq|<th class=listheading>|
-    . $locale->text('Aufwand EU o. UStId')
+    . $locale->text('Aufwand EU m. UStId')
     . qq|</th>|;
   $column_header{income_accno_2} =
       qq|<th class=listheading>|
-    . $locale->text('Erlöse EU m. UStId')
+    . $locale->text('Erlöse EU o. UStId')
     . qq|</th>|;
   $column_header{expense_accno_2} =
       qq|<th class=listheading>|
-    . $locale->text('Aufwand EU m. UStId')
+    . $locale->text('Aufwand EU o. UStId')
     . qq|</th>|;
   $column_header{income_accno_3} =
       qq|<th class=listheading>|
@@ -1623,6 +1623,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 $row = 0;
   foreach $ref (@{ $form->{ALL} }) {
 
     $i++;
@@ -1632,6 +1637,27 @@ sub list_buchungsgruppe {
         <tr valign=top class=listrow$i>
 |;
 
+    if ($row) {
+      my $pref = $form->{ALL}->[$row - 1];
+      $column_data{up} =
+        qq|<td align="center" valign="center" width="16">| .
+        qq|<a href="${swap_link}id1=$ref->{id}&id2=$pref->{id}">| .
+        qq|<img border="0" src="image/up.png" alt="| . $locale->text("up") . qq|">| .
+        qq|</a></td>|;
+    } else {
+      $column_data{up} = qq|<td width="16">&nbsp;</td>|;
+    }
+
+    if ($row == (scalar(@{ $form->{ALL} }) - 1)) {
+      $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" width="16">| .
+        qq|<a href="${swap_link}id1=$ref->{id}&id2=$nref->{id}">| .
+        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>|;
@@ -1654,6 +1680,8 @@ sub list_buchungsgruppe {
     print qq|
 	</tr>
 |;
+
+    $row++;
   }
 
   print qq|
@@ -1677,14 +1705,7 @@ sub list_buchungsgruppe {
 <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|
+    . $locale->text('Add') . qq|">
 
   </form>
 
@@ -1703,50 +1724,33 @@ sub buchungsgruppe_header {
   # $locale->text('Buchungsgruppe hinzufügen')
   # $locale->text('Buchungsgruppe bearbeiten')
 
-  $form->{description} =~ s/\"/&quot;/g;
+  my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {});
+  my %acc_type_map = (
+    "IC" => $acc_inventory,
+    "IC_income" => $acc_income,
+    "IC_sale" => $acc_income,
+    "IC_expense" => $acc_expense,
+    "IC_cogs" => $acc_expense,
+    );
 
-  # build the popup menus
-  $form->{taxaccounts} = "";
-  foreach $key (keys %{ $form->{IC_links} }) {
+  foreach $key (keys(%acc_type_map)) {
     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 {
-
-        $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}";
-        }
-
-      }
+      $acc_type_map{$key}->{$ref->{"id"}} = $ref;
     }
   }
-  $form->{selectIC_income}  = $form->{selectIC_sale};
-  $form->{selectIC_expense} = $form->{selectIC_cogs};
-  $form->{IC_income}        = $form->{IC_sale};
-  $form->{IC_expense}       = $form->{IC_cogs};
+
+  foreach my $type (qw(IC IC_income IC_expense)) {
+    $form->{"select$type"} =
+      join("",
+           map({ "<option value=$_->{id} $_->{selected}>" .
+                   "$_->{accno}--" . H($_->{description}) . "</option>" }
+               sort({ $a->{"accno"} cmp $b->{"accno"} }
+                    values(%{$acc_type_map{$type}}))));
+  }
 
   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=$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;
@@ -1762,11 +1766,11 @@ sub buchungsgruppe_header {
 	      </tr>|;
   } else {
     $linkaccounts = qq|
-                <input type=hidden name=inventory_accno_id value=1>|;
-  }   
+                <input type=hidden name=inventory_accno_id value=$form->{inventory_accno_id}>|;
+  }
 
 
-    $linkaccounts .= qq|
+  $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>
@@ -1841,7 +1845,7 @@ sub buchungsgruppe_header {
   <tr height="5"></tr>
   <tr>
     <th align=right>| . $locale->text('Buchungsgruppe') . qq|</th>
-    <td><input name=description size=30 value="$form->{description}"></td>
+    <td><input name=description size=30 value="| . $form->quote($form->{description}) . qq|"></td>
   <tr>
   $linkaccounts
   <td colspan=2><hr size=3 noshade></td>
@@ -1872,6 +1876,15 @@ sub delete_buchungsgruppe {
   $lxdebug->leave_sub();
 }
 
+sub swap_buchungsgruppen {
+  $lxdebug->enter_sub();
+
+  AM->swap_sortkeys(\%myconfig, $form, "buchungsgruppen");
+  list_buchungsgruppe();
+
+  $lxdebug->leave_sub();
+}
+
 
 sub add_printer {
   $lxdebug->enter_sub();
@@ -1996,14 +2009,7 @@ sub list_printer {
 <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|
+    . $locale->text('Add') . qq|">
 
   </form>
 
@@ -2082,229 +2088,36 @@ sub delete_printer {
   $lxdebug->leave_sub();
 }
 
-
-sub add_adr {
+sub add_payment {
   $lxdebug->enter_sub();
 
   $form->{title} = "Add";
 
   $form->{callback} =
-    "$form->{script}?action=add_adr&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    "$form->{script}?action=add_payment&path=$form->{path}&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
 
-  &adr_header;
+  $form->{terms_netto} = 0;
+  $form->{terms_skonto} = 0;
+  $form->{percent_skonto} = 0;
+  my @languages = AM->language(\%myconfig, $form, 1);
+  map({ $_->{"language"} = $_->{"description"};
+        $_->{"language_id"} = $_->{"id"}; } @languages);
+  $form->{"TRANSLATION"} = \@languages;
+  &payment_header;
   &form_footer;
 
   $lxdebug->leave_sub();
 }
 
-sub edit_adr {
+sub edit_payment {
   $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);
+  AM->get_payment(\%myconfig, $form);
+  $form->{percent_skonto} =
+    $form->format_amount(\%myconfig, $form->{percent_skonto} * 100);
 
   &payment_header;
 
@@ -2319,15 +2132,23 @@ sub list_payment {
 
   AM->payment(\%myconfig, \%$form);
 
-  $form->{callback} =
-    "$form->{script}?action=list_payment&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+  $form->{callback} = build_std_url("action=list_payment");
 
   $callback = $form->escape($form->{callback});
 
   $form->{title} = $locale->text('Payment Terms');
 
-  @column_index = qw(description description_long terms_netto terms_skonto percent_skonto);
+  @column_index = qw(up down description description_long terms_netto
+                     terms_skonto percent_skonto);
 
+  $column_header{up} =
+      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" width="16">|
+    . qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">|
+    . qq|</th>|;
   $column_header{description} =
       qq|<th class=listheading>|
     . $locale->text('Description')
@@ -2371,6 +2192,9 @@ sub list_payment {
         </tr>
 |;
 
+  my $swap_link = build_std_url("action=swap_payment_terms");
+
+  my $row = 0;
   foreach $ref (@{ $form->{ALL} }) {
 
     $i++;
@@ -2380,21 +2204,48 @@ sub list_payment {
         <tr valign=top class=listrow$i>
 |;
 
+    if ($row) {
+      my $pref = $form->{ALL}->[$row - 1];
+      $column_data{up} =
+        qq|<td align="center" valign="center" width="16">| .
+        qq|<a href="${swap_link}&id1=$ref->{id}&id2=$pref->{id}">| .
+        qq|<img border="0" src="image/up.png" alt="| . $locale->text("up") . qq|">| .
+        qq|</a></td>|;
+    } else {
+      $column_data{up} = qq|<td width="16">&nbsp;</td>|;
+    }
+
+    if ($row == (scalar(@{ $form->{ALL} }) - 1)) {
+      $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" width="16">| .
+        qq|<a href="${swap_link}&id1=$ref->{id}&id2=$nref->{id}">| .
+        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_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>|;
+      qq|<td><a href="| .
+      build_std_url("action=edit_payment", "id=$ref->{id}", "callback=$callback") .
+      qq|">| . H($ref->{description}) . qq|</a></td>|;
+    $column_data{description_long} =
+      qq|<td>| . H($ref->{description_long}) . qq|</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>|;
+      qq|<td align=right>| .
+      $form->format_amount(\%myconfig, $ref->{percent_skonto} * 100) .
+      qq|%</td>|;
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
 	</tr>
 |;
+    $row++;
   }
 
   print qq|
@@ -2411,21 +2262,14 @@ sub list_payment {
 
 <input name=callback type=hidden value="$form->{callback}">
 
-<input type=hidden name=type value=business>
+<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|">|;
-
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
-
-  print qq|
+    . $locale->text('Add') . qq|">
 
   </form>
 
@@ -2467,14 +2311,26 @@ sub payment_header {
     <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>
+|;
+
+  foreach my $language (@{ $form->{"TRANSLATION"} }) {
+    print qq|
+  <tr>
+    <th align="right">| .
+    sprintf($locale->text('Translation (%s)'),
+            $language->{"language"})
+    . qq|</th>
+    <td><input name="description_long_$language->{language_id}" size="50"
+         value="| . Q($language->{"description_long"}) . qq|"></td>
+  </tr>
+|;
+  }
+
+  print qq|
   <tr>
     <th align=right>| . $locale->text('Netto Terms') . qq|</th>
     <td><input name=terms_netto size=10 value="$form->{terms_netto}"></td>
@@ -2490,7 +2346,38 @@ sub payment_header {
   <td colspan=2><hr size=3 noshade></td>
   </tr>
 </table>
-|;
+
+<p>| . $locale->text("You can use the following strings in the long " .
+                     "description and all translations. They will be " .
+                     "replaced by their actual values by Lx-Office " .
+                     "before they're output.")
+. qq|</p>
+
+<ul>
+  <li>| . $locale->text("&lt;%netto_date%&gt; -- Date the payment is due in " .
+                        "full")
+. qq|</li>
+  <li>| . $locale->text("&lt;%skonto_date%&gt; -- Date the payment is due " .
+                        "with discount")
+. qq|</li>
+  <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;%invtotal%&gt; -- Invoice total")
+. qq|</li>
+  <li>| . $locale->text("&lt;%currency%&gt; -- The selected currency")
+. qq|</li>
+  <li>| . $locale->text("&lt;%terms_netto%&gt; -- The number of days for " .
+                        "full payment")
+. qq|</li>
+  <li>| . $locale->text("&lt;%account_number%&gt; -- Your account number")
+. qq|</li>
+  <li>| . $locale->text("&lt;%bank%&gt; -- Your bank")
+. qq|</li>
+  <li>| . $locale->text("&lt;%bank_code%&gt; -- Your bank code")
+. qq|</li>
+</ul>|;
 
   $lxdebug->leave_sub();
 }
@@ -2498,7 +2385,9 @@ sub payment_header {
 sub save_payment {
   $lxdebug->enter_sub();
 
-  $form->isblank("description", $locale->text('Language missing!'));
+  $form->isblank("description", $locale->text('Description missing!'));
+  $form->{"percent_skonto"} =
+    $form->parse_amount(\%myconfig, $form->{percent_skonto}) / 100;
   AM->save_payment(\%myconfig, \%$form);
   $form->redirect($locale->text('Payment Terms saved!'));
 
@@ -2514,211 +2403,11 @@ sub delete_payment {
   $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 {
+sub swap_payment_terms {
   $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!'));
+  AM->swap_sortkeys(\%myconfig, $form, "payment_terms");
+  list_payment();
 
   $lxdebug->leave_sub();
 }
@@ -2767,14 +2456,8 @@ $form->{body}
 <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;
-  }
+    . $locale->text('Edit') . qq|">
 
-  print qq|
   </form>
 
 </body>
@@ -2816,14 +2499,8 @@ $form->{body}
 
 <br>
 <input type=submit class=submit name=action value="|
-    . $locale->text('Save') . qq|">|;
-
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
+    . $locale->text('Save') . qq|">
 
-  print q|
   </form>
 
 
@@ -2863,12 +2540,64 @@ sub config {
       : "<option>$item\n";
   }
 
-  foreach $item (qw(name company address signature)) {
-    $myconfig{$item} =~ s/\"/&quot;/g;
+  foreach $item (qw(name company address signature)) {
+    $myconfig{$item} =~ s/\"/&quot;/g;
+  }
+
+  foreach $item (qw(address signature)) {
+    $myconfig{$item} =~ s/\\n/\r\n/g;
+  }
+
+  @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" });
+  }
+
+  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>";
   }
 
-  foreach $item (qw(address signature)) {
-    $myconfig{$item} =~ s/\\n/\r\n/g;
+  if (!$myconfig{"default_media"}) {
+    $myconfig{"default_media"} = "screen";
+  }
+  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>|;
   }
 
   %countrycodes = User->country_codes;
@@ -2883,19 +2612,6 @@ 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} .=
@@ -2905,9 +2621,13 @@ sub config {
     }
   }
 
-  opendir CSS, "css/.";
-  @all = grep /.*\.css$/, readdir CSS;
-  closedir CSS;
+#  opendir CSS, "css/.";
+#  @all = grep /.*\.css$/, readdir CSS;
+#  closedir CSS;
+
+# css dir has styles that are not intended as general layouts.
+# reverting to hardcoded list
+  @all = qw(lx-office-erp.css Win2000.css);
 
   foreach $item (@all) {
     if ($item eq $myconfig{stylesheet}) {
@@ -2922,8 +2642,19 @@ sub config {
 
   $form->header;
 
-  if ($myconfig{menustyle} eq "old") { $oldS = "checked"; }
-  else { $newS = "checked"; }
+  if ($myconfig{menustyle} eq "old") {
+    $menustyle_old = "checked";
+  } elsif ($myconfig{menustyle} eq "neu") {
+    $menustyle_neu = "checked";
+  } elsif ($myconfig{menustyle} eq "v3") {
+    $menustyle_v3 = "checked";
+  }
+
+  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"});
 
   print qq|
 <body>
@@ -2979,10 +2710,6 @@ sub config {
 	  <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>
@@ -2998,10 +2725,43 @@ sub config {
 	</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>	
+	  <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>
+
+
 	<tr class=listheading>
 	  <th colspan=2>&nbsp;</th>
 	</tr>
@@ -3010,16 +2770,8 @@ sub config {
 	  <td><input name=businessnumber size=25 value="$myconfig{businessnumber}"></td>
 	</tr>
 	<tr>
-	  <td colspan=2>
-	    <table width=100%>
-	      <tr>
 		<th align=right>| . $locale->text('Year End') . qq| (mm/dd)</th>
 		<td><input name=yearend size=5 value=$form->{defaults}{yearend}></td>
-		<th align=right>| . $locale->text('Weight Unit') . qq|</th>
-		<td><input name=weightunit size=5 value="$form->{defaults}{weightunit}"></td>
-	      </tr>
-	    </table>
-	  </td>
 	</tr>
 	<tr class=listheading>
 	  <th colspan=2>|
@@ -3105,40 +2857,40 @@ sub config {
 	      </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>
-      </table>
+	</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>
@@ -3152,14 +2904,8 @@ sub config {
 
 <br>
 <input type=submit class=submit name=action value="|
-    . $locale->text('Save') . qq|">|;
-
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
+    . $locale->text('Save') . qq|">
 
-  print qq|
   </form>
 
 </body>
@@ -3183,26 +2929,6 @@ sub save_preferences {
   $lxdebug->leave_sub();
 }
 
-sub backup {
-  $lxdebug->enter_sub();
-
-  if ($form->{media} eq 'email') {
-    $form->error($locale->text('No email address for') . " $myconfig{name}")
-      unless ($myconfig{email});
-
-    $form->{OUT} = "$sendmail";
-
-  }
-
-  AM->backup(\%myconfig, \%$form, $userspath);
-
-  if ($form->{media} eq 'email') {
-    $form->redirect($locale->text('Backup sent to') . qq| $myconfig{email}|);
-  }
-
-  $lxdebug->leave_sub();
-}
-
 sub audit_control {
   $lxdebug->enter_sub();
 
@@ -3289,197 +3015,6 @@ sub doclose {
   $lxdebug->leave_sub();
 }
 
-sub add_warehouse {
-  $lxdebug->enter_sub();
-
-  $form->{title} = "Add";
-
-  $form->{callback} =
-    "$form->{script}?action=add_warehouse&path=$form->{path}&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
-
-  &warehouse_header;
-  &form_footer;
-
-  $lxdebug->leave_sub();
-}
-
-sub edit_warehouse {
-  $lxdebug->enter_sub();
-
-  $form->{title} = "Edit";
-
-  AM->get_warehouse(\%myconfig, \%$form);
-
-  &warehouse_header;
-  &form_footer;
-
-  $lxdebug->leave_sub();
-}
-
-sub list_warehouse {
-  $lxdebug->enter_sub();
-
-  AM->warehouses(\%myconfig, \%$form);
-
-  $form->{callback} =
-    "$form->{script}?action=list_warehouse&path=$form->{path}&login=$form->{login}&password=$form->{password}";
-
-  $callback = $form->escape($form->{callback});
-
-  $form->{title} = $locale->text('Warehouses');
-
-  @column_index = qw(description);
-
-  $column_header{description} =
-      qq|<th class=listheading width=100%>|
-    . $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;
-
-    print qq|
-        <tr valign=top class=listrow$i>
-|;
-
-    $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>|;
-
-    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=warehouse>
-
-<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 warehouse_header {
-  $lxdebug->enter_sub();
-
-  $form->{title} = $locale->text("$form->{title} Warehouse");
-
-  # $locale->text('Add Warehouse')
-  # $locale->text('Edit Warehouse')
-
-  $form->{description} =~ s/\"/&quot;/g;
-
-  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->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=type value=warehouse>
-
-<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>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub save_warehouse {
-  $lxdebug->enter_sub();
-
-  $form->isblank("description", $locale->text('Description missing!'));
-  AM->save_warehouse(\%myconfig, \%$form);
-  $form->redirect($locale->text('Warehouse saved!'));
-
-  $lxdebug->leave_sub();
-}
-
-sub delete_warehouse {
-  $lxdebug->enter_sub();
-
-  AM->delete_warehouse(\%myconfig, \%$form);
-  $form->redirect($locale->text('Warehouse deleted!'));
-
-  $lxdebug->leave_sub();
-}
-
 sub continue {
   $lxdebug->enter_sub();
 
@@ -3495,20 +3030,38 @@ sub edit_units {
   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}))));
+  @languages = AM->language(\%myconfig, $form, 1);
+
+  @unit_list = sort({ $a->{"sortkey"} <=> $b->{"sortkey"} } values(%{$units}));
+
+  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++;
   }
-  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);
 
+  my $updownlink = build_std_url("action=swap_units", "unit_type");
+
   $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 }));
+  print($form->parse_html_template("am/edit_units",
+                                   { "UNITS" => \@unit_list,
+                                     "NEW_BASE_UNIT_DDBOX" => $ddbox,
+                                     "LANGUAGES" => \@languages,
+                                     "updownlink" => $updownlink }));
 
   $lxdebug->leave_sub();
 }
@@ -3518,7 +3071,8 @@ sub add_unit {
 
   $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"}});
+  $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 ($base_unit, $factor);
   if ($form->{"new_base_unit"}) {
@@ -3530,7 +3084,16 @@ sub add_unit {
     $base_unit = $form->{"new_base_unit"};
   }
 
-  AM->add_unit(\%myconfig, $form, $form->{"new_name"}, $base_unit, $factor, $form->{"unit_type"});
+  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}"},
+         });
+  }
+
+  AM->add_unit(\%myconfig, $form, $form->{"new_name"}, $base_unit, $factor, $form->{"unit_type"}, \@languages);
 
   $form->{"saved_message"} = $locale->text("The unit has been saved.");
 
@@ -3539,12 +3102,32 @@ sub add_unit {
   $lxdebug->leave_sub();
 }
 
+sub set_unit_languages {
+  $lxdebug->enter_sub();
+
+  my ($unit, $languages, $idx) = @_;
+
+  $unit->{"LANGUAGES"} = [];
+
+  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();
+}
+
 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);
+
   $new_units = {};
   @delete_units = ();
   foreach $i (1..($form->{"rowcount"} * 1)) {
@@ -3556,6 +3139,7 @@ sub save_unit {
     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;
     }
 
@@ -3574,6 +3158,7 @@ sub save_unit {
     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);
   }
 
   foreach $unit (values(%{$new_units})) {
@@ -3604,9 +3189,6 @@ sub save_unit {
     }
   }
 
-  #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.");
@@ -3615,3 +3197,110 @@ sub save_unit {
 
   $lxdebug->leave_sub();
 }
+
+sub show_history_search {
+	$lxdebug->enter_sub();
+	
+	$form->{title} = $locale->text("History Search");
+    $form->header();
+    
+    print $form->parse_html_template("/common/search_history");
+	
+	$lxdebug->leave_sub();
+}
+
+sub show_am_history {
+	$lxdebug->enter_sub();
+	my %search = ( "Artikelnummer" => "parts",
+				   "Kundennummer"  => "customer",
+				   "Lieferantennummer" => "vendor",
+				   "Projektnummer" => "project",
+				   "Buchungsnummer" => "oe",
+				   "Eingangsrechnungnummer" => "ap",
+				   "Ausgangsrechnungnummer" => "ar"
+		);
+	my %searchNo = ( "Artikelnummer" => "partnumber",
+				     "Kundennummer"  => "customernumber",
+				     "Lieferantennummer" => "vendornumber",
+				     "Projektnummer" => "projectnummer",
+				     "Buchungsnummer" => "ordnumber",
+				     "Eingangsrechnungnummer" => "invnumber",
+				     "Ausgangsrechnungnummer" => "invnumber"
+		);
+	
+	my $restriction;
+	my $tempNo = 0;
+	foreach(split(/\,/, $form->{einschraenkungen})) {
+		if($tempNo == 0) {
+			$restriction .= " AND addition = '" . $_ . "'";
+			$tempNo = 1;
+		} 
+		else {
+			$restriction .= " OR addition = '" . $_ . "'";
+		}
+	}
+	
+	$restriction .= (($form->{transdate} ne "" && $form->{reqdate} ne "") 
+						? qq| AND st.itime::date >= '| . $form->{transdate} . qq|' AND st.itime::date <= '| . $form->{reqdate} . qq|'|
+						: (($form->{transdate} ne "" && $form->{reqdate} eq "") 
+							? qq| AND st.itime::date >= '| . $form->{transdate} . qq|'|
+							: ($form->{transdate} eq "" && $form->{reqdate} ne "") 
+								? qq| AND st.itime::date <= '| . $form->{reqdate} . qq|'|
+								: ""
+							)
+						);
+	
+	my $dbh = $form->dbconnect(\%myconfig);
+	
+	$restriction .= ($form->{mitarbeiter} eq "" ? "" 
+					: ($form->{mitarbeiter} =~ /^[0-9]*$/  
+						? " AND employee_id = " . $form->{mitarbeiter} 
+						: " AND employee_id = " . &get_employee_id($form->{mitarbeiter}, $dbh)));
+	
+	my $query = qq|SELECT id FROM $search{$form->{what2search}} 
+				   WHERE $searchNo{$form->{'what2search'}} ILIKE '$form->{"searchid"}' 
+				   |;
+	
+	my $sth = $dbh->prepare($query);
+	
+	$sth->execute() || $form->dberror($query);
+	
+	$form->{title} = $locale->text("History Search");
+	$form->header();
+	
+	while(my $hash_ref = $sth->fetchrow_hashref()){
+		print $form->parse_html_template("/common/show_history", 
+			{"DATEN" => $form->get_history($dbh,$hash_ref->{id},$restriction),
+			 "SUCCESS" => ($form->get_history($dbh,$hash_ref->{id},$restriction) != 0),
+			 "NONEWWINDOW" => "1"	
+			}
+		);
+	}
+	$dbh->disconnect();
+	
+	$lxdebug->leave_sub();
+}
+
+sub get_employee_id {
+	$lxdebug->enter_sub();
+	my $query = qq|SELECT id FROM employee WHERE name = '| . $_[0] . qq|'|;
+	my $sth = $_[1]->prepare($query);
+	$sth->execute() || $form->dberror($query);
+	my $return = $sth->fetch();
+	$sth->finish();
+	return ${$return}[0];
+	$lxdebug->leave_sub();
+}
+
+sub swap_units {
+  $lxdebug->enter_sub();
+
+  my $dir = $form->{"dir"} eq "down" ? "down" : "up";
+  my $unit_type = $form->{"unit_type"} eq "dimension" ?
+    "dimension" : "service";
+  AM->swap_units(\%myconfig, $form, $dir, $form->{"name"}, $unit_type);
+
+  edit_units();
+
+  $lxdebug->leave_sub();
+}