Einige zu übersetzende deutsche Begriffe versucht, ins Englische zu übersetzen, damit...
[kivitendo-erp.git] / bin / mozilla / am.pl
index fcaf0b2..c4f2a29 100644 (file)
@@ -35,21 +35,23 @@ use SL::AM;
 use SL::CA;
 use SL::Form;
 use SL::User;
+use SL::USTVA;
+use CGI::Ajax;
+use CGI;
 
 use Data::Dumper;
 
 1;
 
-
-
-require "$form->{path}/common.pl";
+require "bin/mozilla/common.pl";
 
 # end of main
 
-sub add    { &{"add_$form->{type}"} }
-sub edit   { &{"edit_$form->{type}"} }
-sub save   { &{"save_$form->{type}"} }
-sub delete { &{"delete_$form->{type}"} }
+sub add      { call_sub("add_$form->{type}"); }
+sub delete   { call_sub("delete_$form->{type}"); }
+sub save     { call_sub("save_$form->{type}"); }
+sub edit     { call_sub("edit_$form->{type}"); }
+sub continue { call_sub($form->{"nextsub"}); }
 
 sub add_account {
   $lxdebug->enter_sub();
@@ -59,7 +61,7 @@ sub add_account {
   AM->get_account(\%myconfig, \%$form);
 
   $form->{callback} =
-    "$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    "$form->{script}?action=list_account&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
 
   &account_header;
@@ -87,131 +89,108 @@ sub edit_account {
 sub account_header {
   $lxdebug->enter_sub();
 
+  if ( $form->{action} eq 'edit_account') {
+    $form->{account_exists} = '1';
+  } 
+  
   $form->{title} = $locale->text("$form->{title} Account");
 
-  $checked{ $form->{charttype} } = "checked";
-  $checked{"$form->{category}_"} = "checked";
-  $checked{CT_tax} = ($form->{CT_tax}) ? "" : "checked";
+  $form->{"$form->{charttype}_checked"} = "checked";
+  $form->{"$form->{category}_checked"}  = "checked";
 
-  $form->{description} =~ s/\"/"/g;
+  $form->{select_tax} = "";
+
+  my @tax_report_pos = USTVA->report_variables({
+      myconfig   => \%myconfig, 
+      form       => $form, 
+      type       => '', 
+      attribute  => 'position',
+      calc       => '',
+  });
 
   if (@{ $form->{TAXKEY} }) {
-    foreach $item (@{ $form->{TAXKEY} }) {
-      if ($item->{tax} == $form->{tax}) {
-        $form->{selecttaxkey} .=
-          "<option value=$item->{tax} selected>$item->{taxdescription}\n";
-      } else {
-        $form->{selecttaxkey} .=
-          "<option value=$item->{tax}>$item->{taxdescription}\n";
-      }
+    foreach my $item (@{ $form->{TAXKEY} }) {
+      $item->{rate} = $item->{rate} * 100 . '%';
+    }
 
+    # Fill in empty row for new Taxkey
+    $newtaxkey_ref = {
+      id             => '',
+      chart_id       => '',
+      accno          => '',
+      tax_id         => '',
+      taxdescription => '',
+      rate           => '',
+      taxkey_id      => '',
+      pos_ustva      => '',
+      startdate      => '',
+    };
+
+    push @{ $form->{ACCOUNT_TAXKEYS} }, $newtaxkey_ref;
+
+    my $i = 0;
+    foreach my $taxkey_used (@{ $form->{ACCOUNT_TAXKEYS} } ) {
+
+      # Fill in a runningnumber
+      $form->{ACCOUNT_TAXKEYS}[$i]{runningnumber} = $i;
+
+      # Fill in the Taxkeys as select options
+      foreach my $item (@{ $form->{TAXKEY} }) {
+        if ($item->{id} == $taxkey_used->{tax_id}) {
+          $form->{ACCOUNT_TAXKEYS}[$i]{selecttaxkey} .=
+            qq|<option value="$item->{id}" selected="selected">|
+            . sprintf("%.2d", $item->{taxkey}) 
+            . qq|. $item->{taxdescription} ($item->{rate}) |
+            . $locale->text('Tax-o-matic Account') 
+            . qq|: $item->{chart_accno}\n|;
+        } 
+        else {
+          $form->{ACCOUNT_TAXKEYS}[$i]{selecttaxkey} .=
+            qq|<option value="$item->{id}">|
+            . sprintf("%.2d", $item->{taxkey}) 
+            . qq|. $item->{taxdescription} ($item->{rate}) |
+            . $locale->text('Tax-o-matic Account')
+            . qq|: $item->{chart_accno}\n|;
+        }
+
+      }
+      
+      # Fill in the USTVA Numbers as select options
+      foreach my $item ( '', sort({ $a cmp $b } @tax_report_pos) ) {
+        if ($item eq ''){
+          $form->{ACCOUNT_TAXKEYS}[$i]{select_tax} .= qq|<option value="" selected="selected">-\n|;
+        } 
+        elsif ( $item == $taxkey_used->{pos_ustva} ) {
+          $form->{ACCOUNT_TAXKEYS}[$i]{select_tax} .= qq|<option value="$item" selected="selected">$item\n|;
+        }
+        else {
+          $form->{ACCOUNT_TAXKEYS}[$i]{select_tax} .= qq|<option value="$item">$item\n|;
+        }
+
+      }      
+
+      $i++;
     }
   }
 
-  $taxkey = qq|
-             <tr>
-               <th align=right>| . $locale->text('Steuersatz') . qq|</th>
-               <td><select name=tax>$form->{selecttaxkey}</select></td>
-               <th align=right>| . $locale->text('Gültig ab') . qq|</th>
-                <td><input name=startdate value="$form->{startdate}"></td>
-             </tr>|;
-
+  # Newaccount Folgekonto 
   if (@{ $form->{NEWACCOUNT} }) {
     if (!$form->{new_chart_valid}) {
-      $form->{selectnewaccount} = "<option value=></option>";
+      $form->{selectnewaccount} = qq|<option value=""> |. $locale->text('None') .q|</option>|;
     }
     foreach $item (@{ $form->{NEWACCOUNT} }) {
       if ($item->{id} == $form->{new_chart_id}) {
         $form->{selectnewaccount} .=
-          "<option value=$item->{id} selected>$item->{accno}--$item->{description}</option>";
+          qq|<option value="$item->{id}" selected>$item->{accno}--$item->{description}</option>|;
       } elsif (!$form->{new_chart_valid}) {
         $form->{selectnewaccount} .=
-          "<option value=$item->{id}>$item->{accno}--$item->{description}</option>";
+          qq|<option value="$item->{id}">$item->{accno}--$item->{description}</option>|;
       }
 
     }
   }
 
-  $newaccount = qq|
-             <tr>
-                <td colspan=2>
-                  <table>
-                    <tr>
-                     <th align=right>| . $locale->text('Folgekonto') . qq|</th>
-                     <td><select name=new_chart_id>$form->{selectnewaccount}</select></td>
-                      <th align=right>| . $locale->text('Gültig ab') . qq|</th>
-                     <td><input name=valid_from value="$form->{valid_from}"></td>
-                    </tr>
-                  </table>
-                </td>
-             </tr>|;
-
-  $form->{selectustva} = "<option>\n";
-
-  %ustva = (35  => $locale->text('UStVA-Nr. 35'),
-            36  => $locale->text('UStVA-Nr. 36'),
-            39  => $locale->text('UStVA-Nr. 39'),
-            41  => $locale->text('UStVA-Nr. 41'),
-            42  => $locale->text('UStVA-Nr. 42'),
-            43  => $locale->text('UStVA-Nr. 43'),
-            44  => $locale->text('UStVA-Nr. 44'),
-            45  => $locale->text('UStVA-Nr. 45'),
-            48  => $locale->text('UStVA-Nr. 48'),
-            49  => $locale->text('UStVA-Nr. 49'),
-            51  => $locale->text('UStVA-Nr. 51 left'),
-            511 => $locale->text('UStVA-Nr. 51 right'),
-            52  => $locale->text('UStVA-Nr. 52'),
-            53  => $locale->text('UStVA-Nr. 53'),
-            59  => $locale->text('UStVA-Nr. 59'),
-            60  => $locale->text('UStVA-Nr. 60'),
-            61  => $locale->text('UStVA-Nr. 61'),
-            62  => $locale->text('UStVA-Nr. 62'),
-            63  => $locale->text('UStVA-Nr. 63'),
-            64  => $locale->text('UStVA-Nr. 64'),
-            65  => $locale->text('UStVA-Nr. 65'),
-            66  => $locale->text('UStVA-Nr. 66'),
-            67  => $locale->text('UStVA-Nr. 67'),
-            69  => $locale->text('UStVA-Nr. 69'),
-            73  => $locale->text('UStVA-Nr. 73'),
-            74  => $locale->text('UStVA-Nr. 74'),
-            76  => $locale->text('UStVA-Nr. 76'),
-            77  => $locale->text('UStVA-Nr. 77'),
-            80  => $locale->text('UStVA-Nr. 80'),
-            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'),
-            94  => $locale->text('UStVA-Nr. 94'),
-            95  => $locale->text('UStVA-Nr. 95'),
-            96  => $locale->text('UStVA-Nr. 96'),
-            97  => $locale->text('UStVA-Nr. 97 links'),
-            971 => $locale->text('UStVA-Nr. 97 rechts'),
-            98  => $locale->text('UStVA-Nr. 98'));
-
-  foreach $item (sort({ $a cmp $b } keys %ustva)) {
-    if ($item == $form->{pos_ustva}) {
-      $form->{selectustva} .= "<option value=$item selected>$ustva{$item}\n";
-    } else {
-      $form->{selectustva} .= "<option value=$item>$ustva{$item}\n";
-    }
-
-  }
-
-  $ustva = qq|
-             <tr>
-               <th align=right>| . $locale->text('Umsatzsteuervoranmeldung') . qq|</th>
-               <td><select name=pos_ustva>$form->{selectustva}</select></td>
-               <input type=hidden name=selectustva value="$form->{selectustva}">
-             </tr>|;
-
-  $form->{selecteur} = "<option>\n";
+  $select_eur = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
   %eur = (1  => "Umsatzerlöse",
           2  => "sonstige Erlöse",
           3  => "Privatanteile",
@@ -245,21 +224,14 @@ sub account_header {
           31 => "Betriebliche Steuern");
   foreach $item (sort({ $a <=> $b } keys(%eur))) {
     if ($item == $form->{pos_eur}) {
-      $form->{selecteur} .= "<option value=$item selected>$eur{$item}\n";
+      $select_eur .= qq|<option value=$item selected>|. sprintf("%.2d", $item) .qq|. $eur{$item}</option>\n|;
     } else {
-      $form->{selecteur} .= "<option value=$item>$eur{$item}\n";
+      $select_eur .= qq|<option value=$item>|. sprintf("%.2d", $item) .qq|. $eur{$item}</option>\n|;
     }
 
   }
 
-  $eur = qq|
-             <tr>
-               <th align=right>| . $locale->text('EUER') . qq|</th>
-               <td><select name=pos_eur>$form->{selecteur}</select></td>
-               <input type=hidden name=selecteur value="$form->{selecteur}">
-             </tr>|;
-
-  $form->{selectbwa} = "<option>\n";
+  $select_bwa = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
 
   %bwapos = (1  => 'Umsatzerlöse',
              2  => 'Best.Verdg.FE/UE',
@@ -285,193 +257,87 @@ sub account_header {
              35 => 'Steuern Eink.u.Ertr.');
   foreach $item (sort({ $a <=> $b } keys %bwapos)) {
     if ($item == $form->{pos_bwa}) {
-      $form->{selectbwa} .= "<option value=$item selected>$bwapos{$item}\n";
+      $select_bwa .= qq|<option value="$item" selected>|. sprintf("%.2d", $item) .qq|. $bwapos{$item}\n|;
     } else {
-      $form->{selectbwa} .= "<option value=$item>$bwapos{$item}\n";
+      $select_bwa .= qq|<option value="$item">|. sprintf("%.2d", $item) .qq|. $bwapos{$item}\n|;
     }
 
   }
 
-  $bwa = qq|
-             <tr>
-               <th align=right>| . $locale->text('BWA') . qq|</th>
-               <td><select name=pos_bwa>$form->{selectbwa}</select></td>
-               <input type=hidden name=selectbwa value="$form->{selectbwa}">
-             </tr>|;
+# Wieder hinzugefügt zu evaluationszwecken (us) 09.03.2007
+  $select_bilanz = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
+  foreach $item ((1, 2, 3, 4)) {
+    if ($item == $form->{pos_bilanz}) {
+      $select_bilanz .= qq|<option value=$item selected>|. sprintf("%.2d", $item) .qq|.\n|;
+    } else {
+      $select_bilanz .= qq|<option value=$item>|. sprintf("%.2d", $item) .qq|.\n|;
+    }
 
-# Entfernt bis es ordentlich umgesetzt wird (hli) 30.03.2006
-#  $form->{selectbilanz} = "<option>\n";
-#  foreach $item ((1, 2, 3, 4)) {
-#    if ($item == $form->{pos_bilanz}) {
-#      $form->{selectbilanz} .= "<option value=$item selected>$item\n";
-#    } else {
-#      $form->{selectbilanz} .= "<option value=$item>$item\n";
-#    }
-#
-#  }
-#
-#  $bilanz = qq|
-#            <tr>
-#              <th align=right>| . $locale->text('Bilanz') . qq|</th>
-#              <td><select name=pos_bilanz>$form->{selectbilanz}</select></td>
-#              <input type=hidden name=selectbilanz value="$form->{selectbilanz}">
-#            </tr>|;
-
-  # this is for our parser only!
+  }
+
+  # this is for our parser only! Do not remove.
   # type=submit $locale->text('Add Account')
   # type=submit $locale->text('Edit Account')
+  
   $form->{type} = "account";
 
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
+  # preselections category
+  $select_category = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
+
+  %category = (
+      'A'  => $locale->text('Asset'),
+      'L'  => $locale->text('Liability'),
+      'Q'  => $locale->text('Equity'),
+      'I'  => $locale->text('Revenue'),      
+      'E'  => $locale->text('Expense'),
+      'C'  => $locale->text('Costs'),
+  );
+  foreach $item ( sort({ $a <=> $b } keys %category) ) {
+    if ($item eq $form->{category}) {
+      $select_category .= qq|<option value="$item" selected="selected">$category{$item} (|. sprintf("%s", $item) .qq|)\n|;
+    } else {
+      $select_category .= qq|<option value="$item">$category{$item} (|. sprintf("%s", $item) .qq|)\n|;
+    }
 
-<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}>
+  }
+  
+  # preselection chart type
+  my $select_charttype = q{};
 
-<input type=hidden name=inventory_accno_id value=$form->{inventory_accno_id}>
-<input type=hidden name=income_accno_id value=$form->{income_accno_id}>
-<input type=hidden name=expense_accno_id value=$form->{expense_accno_id}>
-<input type=hidden name=fxgain_accno_id value=$form->{fxgain_accno_id}>
-<input type=hidden name=fxloss_accno_id value=$form->{fxloss_accno_id}>
+  my %charttype = (
+      'A'  => $locale->text('Account'),
+      'H'  => $locale->text('Header'),
+  );
+  
+  foreach $item ( sort({ $a <=> $b } keys %charttype) ) {
+    if ($item eq $form->{charttype}) {
+      $select_charttype .= qq|<option value="$item" selected="selected">$charttype{$item}\n|;
 
-<table border=0 width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr valign=top>
-    <td>
-      <table>
-       <tr>
-         <th align=right>| . $locale->text('Account Number') . qq|</th>
-         <td><input name=accno size=20 value=$form->{accno}></td>
-       </tr>
-       <tr>
-         <th align=right>| . $locale->text('Description') . qq|</th>
-         <td><input name=description size=40 value="$form->{description}"></td>
-       </tr>
-       <tr>
-         <th align=right>| . $locale->text('Account Type') . qq|</th>
-         <td>
-           <table>
-             <tr valign=top>
-               <td><input name=category type=radio class=radio value=A $checked{A_}>&nbsp;|
-    . $locale->text('Asset') . qq|\n<br>
-               <input name=category type=radio class=radio value=L $checked{L_}>&nbsp;|
-    . $locale->text('Liability') . qq|\n<br>
-               <input name=category type=radio class=radio value=Q $checked{Q_}>&nbsp;|
-    . $locale->text('Equity') . qq|\n<br>
-               <input name=category type=radio class=radio value=I $checked{I_}>&nbsp;|
-    . $locale->text('Revenue') . qq|\n<br>
-               <input name=category type=radio class=radio value=E $checked{E_}>&nbsp;|
-    . $locale->text('Expense') . qq|<br>
-               <input name=category type=radio class=radio value=C $checked{C_}>&nbsp;|
-    . $locale->text('Costs') . qq|</td>
-               <td width=50>&nbsp;</td>
-               <td>
-               <input name=charttype type=radio class=radio value="H" $checked{H}>&nbsp;|
-    . $locale->text('Heading') . qq|<br>
-               <input name=charttype type=radio class=radio value="A" $checked{A}>&nbsp;|
-    . $locale->text('Account') . qq|</td>
-             </tr>
-           </table>
-         </td>
-       </tr>
-|;
+    } else {
+      $select_charttype .= qq|<option value="$item">$charttype{$item}\n|;
+    }
 
-  if ($form->{charttype} eq "A") {
-    print qq|
-       <tr>
-         <td colspan=2>
-           <table>
-             <tr>
-               <th align=left>|
-      . $locale->text('Is this a summary account to record') . qq|</th>
-               <td>
-               <input name=AR type=checkbox class=checkbox value=AR $form->{AR}>&nbsp;|
-      . $locale->text('AR')
-      . qq|&nbsp;<input name=AP type=checkbox class=checkbox value=AP $form->{AP}>&nbsp;|
-      . $locale->text('AP')
-      . qq|&nbsp;<input name=IC type=checkbox class=checkbox value=IC $form->{IC}>&nbsp;|
-      . $locale->text('Inventory')
-      . qq|</td>
-             </tr>
-           </table>
-         </td>
-       </tr>
-       <tr>
-         <th colspan=2>| . $locale->text('Include in drop-down menus') . qq|</th>
-       </tr>
-       <tr valign=top>
-         <td colspan=2>
-           <table width=100%>
-             <tr>
-               <th align=left>| . $locale->text('Receivables') . qq|</th>
-               <th align=left>| . $locale->text('Payables') . qq|</th>
-               <th align=left>| . $locale->text('Parts Inventory') . qq|</th>
-               <th align=left>| . $locale->text('Service Items') . qq|</th>
-             </tr>
-             <tr>
-               <td>
-               <input name=AR_amount type=checkbox class=checkbox value=AR_amount $form->{AR_amount}>&nbsp;|
-      . $locale->text('Revenue') . qq|\n<br>
-               <input name=AR_paid type=checkbox class=checkbox value=AR_paid $form->{AR_paid}>&nbsp;|
-      . $locale->text('Receipt') . qq|\n<br>
-               <input name=AR_tax type=checkbox class=checkbox value=AR_tax $form->{AR_tax}>&nbsp;|
-      . $locale->text('Tax') . qq|
-               </td>
-               <td>
-               <input name=AP_amount type=checkbox class=checkbox value=AP_amount $form->{AP_amount}>&nbsp;|
-      . $locale->text('Expense/Asset') . qq|\n<br>
-               <input name=AP_paid type=checkbox class=checkbox value=AP_paid $form->{AP_paid}>&nbsp;|
-      . $locale->text('Payment') . qq|\n<br>
-               <input name=AP_tax type=checkbox class=checkbox value=AP_tax $form->{AP_tax}>&nbsp;|
-      . $locale->text('Tax') . qq|
-               </td>
-               <td>
-               <input name=IC_sale type=checkbox class=checkbox value=IC_sale $form->{IC_sale}>&nbsp;|
-      . $locale->text('Revenue') . qq|\n<br>
-               <input name=IC_cogs type=checkbox class=checkbox value=IC_cogs $form->{IC_cogs}>&nbsp;|
-      . $locale->text('Expense') . qq|\n<br>
-               <input name=IC_taxpart type=checkbox class=checkbox value=IC_taxpart $form->{IC_taxpart}>&nbsp;|
-      . $locale->text('Tax') . qq|
-               </td>
-               <td>
-               <input name=IC_income type=checkbox class=checkbox value=IC_income $form->{IC_income}>&nbsp;|
-      . $locale->text('Revenue') . qq|\n<br>
-               <input name=IC_expense type=checkbox class=checkbox value=IC_expense $form->{IC_expense}>&nbsp;|
-      . $locale->text('Expense') . qq|\n<br>
-               <input name=IC_taxservice type=checkbox class=checkbox value=IC_taxservice $form->{IC_taxservice}>&nbsp;|
-      . $locale->text('Tax') . qq|
-               </td>
-             </tr>
-           </table>
-         </td>
-       </tr>
-|;
   }
 
-  print qq|
-        $taxkey
-        $ustva
-        $eur
-       $bwa
-        $bilanz
-      </table>
-    </td>
-  </tr>
-  $newaccount
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
+  my $ChartTypeIsAccount = ($form->{charttype} eq "A") ? "1":"";
+  
+  $form->header();
+  
+  my $parameters_ref = {
+    ChartTypeIsAccount         => $ChartTypeIsAccount,
+    select_category            => $select_category,
+    select_charttype           => $select_charttype,
+    newaccount                 => $newaccount,
+    checked                    => $checked,
+    select_bwa                 => $select_bwa,
+    select_bilanz              => $select_bilanz,
+    select_eur                 => $select_eur,
+  };
+  
+  # Ausgabe des Templates
+  print($form->parse_html_template('am/edit_accounts', $parameters_ref));
+
 
   $lxdebug->leave_sub();
 }
@@ -483,7 +349,6 @@ sub form_footer {
 
 <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}>
 
@@ -513,8 +378,12 @@ sub form_footer {
 sub save_account {
   $lxdebug->enter_sub();
 
-  $form->isblank("accno",    $locale->text('Account Number missing!'));
-  $form->isblank("category", $locale->text('Account Type missing!'));
+  $form->isblank("accno",       $locale->text('Account Number missing!'));
+  $form->isblank("description", $locale->text('Account Description missing!'));
+  
+  if ($form->{charttype} eq 'A'){
+    $form->isblank("category",  $locale->text('Account Type missing!'));
+  }
 
   $form->redirect($locale->text('Account saved!'))
     if (AM->save_account(\%myconfig, \%$form));
@@ -530,6 +399,76 @@ sub list_account {
 
   $form->{title} = $locale->text('Chart of Accounts');
 
+  # construct callback
+  $callback =
+    "$form->{script}?action=list_account&login=$form->{login}&password=$form->{password}";
+
+
+
+  # escape callback
+  $callback = $form->escape($callback);
+
+  foreach $ca (@{ $form->{CA} }) {
+
+    $ca->{debit}  = "&nbsp;";
+    $ca->{credit} = "&nbsp;";
+
+    if ($ca->{amount} > 0) {
+      $ca->{credit} =
+        $form->format_amount(\%myconfig, $ca->{amount}, 2, "&nbsp;");
+    }
+    if ($ca->{amount} < 0) {
+      $ca->{debit} =
+        $form->format_amount(\%myconfig, -1 * $ca->{amount}, 2, "&nbsp;");
+    }
+    $ca->{heading}   = ( $ca->{charttype} eq 'H' ) ? 1:''; 
+    $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|;
+  }
+  
+  # Ajax 
+  my $list_account_details_url = 
+              "$form->{script}?login=$form->{login}&path=$form->{path}"
+             ."&password=$form->{password}&action=list_account_details&";
+  
+  
+  my $pjx = new CGI::Ajax( 
+             'list_account_details' => $list_account_details_url 
+  );
+
+  # Eneable AJAX debuging
+  #$pjx->DEBUG(1);
+  #$pjx->JSDEBUG(1);
+    
+  push(@ { $form->{AJAX} }, $pjx);
+  
+  $form->header;
+  
+  
+  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 list_account_details {
+# Ajax Funktion aus list_account_details  
+  $lxdebug->enter_sub();
+
+  my $chart_id = $form->{args};
+  
+  CA->all_accounts(\%myconfig, \%$form, $chart_id);
+
+  $form->{title} = $locale->text('Chart of Accounts');
+
   # construct callback
   $callback =
     "$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&password=$form->{password}";
@@ -550,7 +489,7 @@ sub list_account {
     }
     if ($ca->{amount} < 0) {
       $ca->{debit} =
-        $form->format_amount(\%myconfig, -$ca->{amount}, 2, "&nbsp;");
+        $form->format_amount(\%myconfig, -1 * $ca->{amount}, 2, "&nbsp;");
     }
 
     my @links = split( q{:}, $ca->{link});
@@ -573,10 +512,10 @@ sub list_account {
                : ( $link eq 'IC_income' )     ? $locale->text('Account Link IC_income')
                : ( $link eq 'IC_expense' )    ? $locale->text('Account Link IC_expense')
                : ( $link eq 'IC_taxservice' ) ? $locale->text('Account Link IC_taxservice')
-               : ( $link eq 'CT_tax' )        ? $locale->text('Account Link CT_tax')
+#               : ( $link eq 'CT_tax' )        ? $locale->text('Account Link CT_tax')
                : $locale->text('Unknown Link') . ': ' . $link;
       
-      $ca->{link} .= qq|[| . $link . qq|]&nbsp;|;
+      $ca->{link} .= ($link ne '') ?  "[$link] ":'';
     }
     
     $ca->{startdate}      =~ s/,/<br>/og;
@@ -584,7 +523,7 @@ sub list_account {
     $ca->{taxkey}         =~ s/,/<br>/og;
     $ca->{taxaccount}     =~ s/,/<br>/og;
     $ca->{taxdescription} =~ s/,/<br>/og;
-    $ca->{datevautomatik} = ($ca->{datevautomatik}) ? $locale->text('On'):q{};
+    $ca->{datevautomatik} = ($ca->{datevautomatik}) ? $locale->text('On'):$locale->text('Off');
 
     $ca->{category} = ($ca->{category} eq 'A') ? $locale->text('Account Category A')
                     : ($ca->{category} eq 'E') ? $locale->text('Account Category E')
@@ -597,10 +536,13 @@ sub list_account {
 
     $ca->{link_edit_account} = 
         qq|$form->{script}?action=edit_account&id=$ca->{id}|
-       .qq|&path=$form->{path}&login=$form->{login}|
+       .qq|&login=$form->{login}|
        .qq|&password=$form->{password}&callback=$callback|;
   }
-  
+
+
+
+
   my $parameters_ref = {
   
   
@@ -608,10 +550,13 @@ sub list_account {
   };
   
   # Ausgabe des Templates
-  print($form->parse_html_template('am/list_accounts', $parameters_ref));
+  #my $q = CGI->new();
+  my $result = $form->parse_html_template('am/list_account_details', $parameters_ref);
   
+  print $result;
+#  print "chart_id:$chart_id, form->chartid:$form->{chart_id}, rest=$rest";
+      
   $lxdebug->leave_sub();
-  
 
 }
 
@@ -642,7 +587,7 @@ sub add_department {
   $form->{role}  = "P";
 
   $form->{callback} =
-    "$form->{script}?action=add_department&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    "$form->{script}?action=add_department&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
 
   &department_header;
@@ -670,7 +615,7 @@ sub list_department {
   AM->departments(\%myconfig, \%$form);
 
   $form->{callback} =
-    "$form->{script}?action=list_department&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+    "$form->{script}?action=list_department&login=$form->{login}&password=$form->{password}";
 
   $callback = $form->escape($form->{callback});
 
@@ -726,7 +671,7 @@ sub list_department {
     $profitcenter = ($ref->{role} eq "P") ? "X" : "";
 
     $column_data{description} =
-      qq|<td><a href=$form->{script}?action=edit_department&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
+      qq|<td><a href=$form->{script}?action=edit_department&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
     $column_data{cost}   = qq|<td align=center>$costcenter</td>|;
     $column_data{profit} = qq|<td align=center>$profitcenter</td>|;
 
@@ -753,7 +698,6 @@ sub list_department {
 
 <input type=hidden name=type value=department>
 
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 
@@ -850,7 +794,7 @@ sub add_lead {
   $form->{title} = "Add";
 
   $form->{callback} =
-    "$form->{script}?action=add_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    "$form->{script}?action=add_lead&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
 
   &lead_header;
@@ -880,7 +824,7 @@ sub list_lead {
   AM->lead(\%myconfig, \%$form);
 
   $form->{callback} =
-    "$form->{script}?action=list_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+    "$form->{script}?action=list_lead&login=$form->{login}&password=$form->{password}";
 
   $callback = $form->escape($form->{callback});
 
@@ -924,7 +868,7 @@ sub list_lead {
        $lead = $ref->{lead};
        
     $column_data{description} =
-      qq|<td><a href=$form->{script}?action=edit_lead&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{lead}</td>|;
+      qq|<td><a href=$form->{script}?action=edit_lead&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{lead}</td>|;
 
     map { print "$column_data{$_}\n" } @column_index;
 
@@ -946,7 +890,6 @@ sub list_lead {
 
 <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}>
 
@@ -1027,7 +970,7 @@ sub add_business {
   $form->{title} = "Add";
 
   $form->{callback} =
-    "$form->{script}?action=add_business&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    "$form->{script}?action=add_business&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
 
   &business_header;
@@ -1057,7 +1000,7 @@ sub list_business {
   AM->business(\%myconfig, \%$form);
 
   $form->{callback} =
-    "$form->{script}?action=list_business&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+    "$form->{script}?action=list_business&login=$form->{login}&password=$form->{password}";
 
   $callback = $form->escape($form->{callback});
 
@@ -1110,13 +1053,11 @@ sub list_business {
 |;
 
     $discount =
-      $form->format_amount(\%myconfig, $ref->{discount} * 100, 1, "&nbsp");
+      $form->format_amount(\%myconfig, $ref->{discount} * 100);
     $description =
-      ($ref->{salesman})
-      ? "<b>$ref->{description}</b>"
-      : "$ref->{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>|;
+      qq|<td><a href=$form->{script}?action=edit_business&id=$ref->{id}&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>|;
@@ -1144,7 +1085,6 @@ sub list_business {
 
 <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}>
 
@@ -1164,7 +1104,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')
@@ -1200,10 +1139,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>
@@ -1216,6 +1151,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!'));
 
@@ -1237,7 +1173,7 @@ sub add_language {
   $form->{title} = "Add";
 
   $form->{callback} =
-    "$form->{script}?action=add_language&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    "$form->{script}?action=add_language&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
 
   &language_header;
@@ -1267,7 +1203,7 @@ sub list_language {
   AM->language(\%myconfig, \%$form);
 
   $form->{callback} =
-    "$form->{script}?action=list_language&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+    "$form->{script}?action=list_language&login=$form->{login}&password=$form->{password}";
 
   $callback = $form->escape($form->{callback});
 
@@ -1333,7 +1269,7 @@ sub list_language {
 
 
     $column_data{description} =
-      qq|<td><a href=$form->{script}?action=edit_language&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
+      qq|<td><a href=$form->{script}?action=edit_language&id=$ref->{id}&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>|;
@@ -1375,7 +1311,6 @@ sub list_language {
 
 <input type=hidden name=type value=language>
 
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 
@@ -1509,7 +1444,7 @@ sub add_buchungsgruppe {
   $form->{title} = "Add";
 
   $form->{callback} =
-    "$form->{script}?action=add_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    "$form->{script}?action=add_buchungsgruppe&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
   AM->get_buchungsgruppe(\%myconfig, \%$form);
   $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"};
@@ -1544,7 +1479,7 @@ sub list_buchungsgruppe {
   AM->buchungsgruppe(\%myconfig, \%$form);
 
   $form->{callback} =
-    "$form->{script}?action=list_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+    "$form->{script}?action=list_buchungsgruppe&login=$form->{login}&password=$form->{password}";
 
   $callback = $form->escape($form->{callback});
 
@@ -1574,35 +1509,35 @@ sub list_buchungsgruppe {
     . qq|</th>|;
   $column_header{income_accno_0} =
       qq|<th class=listheading>|
-    . $locale->text('Erlöse Inland')
+    . $locale->text('National Revenues')
     . qq|</th>|;
   $column_header{expense_accno_0} =
       qq|<th class=listheading>|
-    . $locale->text('Aufwand Inland')
+    . $locale->text('National Expenses')
     . qq|</th>|;
   $column_header{income_accno_1} =
       qq|<th class=listheading>|
-    . $locale->text('Erlöse EU m. UStId')
+    . $locale->text('Revenues EU with UStId')
     . qq|</th>|;
   $column_header{expense_accno_1} =
       qq|<th class=listheading>|
-    . $locale->text('Aufwand EU m. UStId')
+    . $locale->text('Expenses EU with UStId')
     . qq|</th>|;
   $column_header{income_accno_2} =
       qq|<th class=listheading>|
-    . $locale->text('Erlöse EU o. UStId')
+    . $locale->text('Revenues EU without UStId')
     . qq|</th>|;
   $column_header{expense_accno_2} =
       qq|<th class=listheading>|
-    . $locale->text('Aufwand EU o. UStId')
+    . $locale->text('Expenses EU without UStId')
     . qq|</th>|;
   $column_header{income_accno_3} =
       qq|<th class=listheading>|
-    . $locale->text('Erlöse Ausland')
+    . $locale->text('Foreign Revenues')
     . qq|</th>|;
   $column_header{expense_accno_3} =
       qq|<th class=listheading>|
-    . $locale->text('Aufwand Ausland')
+    . $locale->text('Foreign Expenses')
     . qq|</th>|;
   $form->header;
 
@@ -1628,7 +1563,7 @@ sub list_buchungsgruppe {
 
   my $swap_link = qq|$form->{script}?action=swap_buchungsgruppen&|;
   map({ $swap_link .= $_ . "=" . $form->escape($form->{$_}) . "&" }
-      qw(login password path));
+      qw(login password));
 
   my $row = 0;
   foreach $ref (@{ $form->{ALL} }) {
@@ -1645,7 +1580,7 @@ sub list_buchungsgruppe {
       $column_data{up} =
         qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}id1=$ref->{id}&id2=$pref->{id}">| .
-        qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">| .
+        qq|<img border="0" src="image/up.png" alt="| . $locale->text("up") . qq|">| .
         qq|</a></td>|;
     } else {
       $column_data{up} = qq|<td width="16">&nbsp;</td>|;
@@ -1658,12 +1593,12 @@ sub list_buchungsgruppe {
       $column_data{down} =
         qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}id1=$ref->{id}&id2=$nref->{id}">| .
-        qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">| .
+        qq|<img border="0" src="image/down.png" alt="| . $locale->text("down") . qq|">| .
         qq|</a></td>|;
     }
 
     $column_data{description} =
-      qq|<td><a href=$form->{script}?action=edit_buchungsgruppe&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
+      qq|<td><a href=$form->{script}?action=edit_buchungsgruppe&id=$ref->{id}&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>|;
@@ -1703,7 +1638,6 @@ sub list_buchungsgruppe {
 
 <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}>
 
@@ -1724,8 +1658,8 @@ sub buchungsgruppe_header {
 
   $form->{title}    = $locale->text("$form->{title} Buchungsgruppe");
 
-  # $locale->text('Buchungsgruppe hinzufügen')
-  # $locale->text('Buchungsgruppe bearbeiten')
+  # $locale->text('Add Accounting Group')
+  # $locale->text('Edit Accounting Group')
 
   my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {});
   my %acc_type_map = (
@@ -1775,11 +1709,11 @@ sub buchungsgruppe_header {
 
   $linkaccounts .= qq|
              <tr>
-               <th align=right>| . $locale->text('Erlöse Inland') . qq|</th>
+               <th align=right>| . $locale->text('National Revenues') . qq|</th>
                <td><select name=income_accno_id_0>$form->{selectIC_income}</select></td>
              </tr>
              <tr>
-               <th align=right>| . $locale->text('Aufwand Inland') . qq|</th>
+               <th align=right>| . $locale->text('National Expenses') . qq|</th>
                <td><select name=expense_accno_id_0>$form->{selectIC_expense}</select></td>
              </tr>|;
   if ($form->{id}) {
@@ -1789,11 +1723,11 @@ sub buchungsgruppe_header {
     $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>
+               <th align=right>| . $locale->text('Revenues EU with UStId') . qq|</th>
                <td><select name=income_accno_id_1>$form->{selectIC_income}</select></td>
              </tr>
              <tr>
-               <th align=right>| . $locale->text('Aufwand EU m UStId') . qq|</th>
+               <th align=right>| . $locale->text('Expenses EU with UStId') . qq|</th>
                <td><select name=expense_accno_id_1>$form->{selectIC_expense}</select></td>
              </tr>|;
 
@@ -1805,11 +1739,11 @@ sub buchungsgruppe_header {
   }
 
   $linkaccounts .= qq|       <tr>
-               <th align=right>| . $locale->text('Erlöse EU o. UStId') . qq|</th>
+               <th align=right>| . $locale->text('Revenues EU without UStId') . qq|</th>
                <td><select name=income_accno_id_2>$form->{selectIC_income}</select></td>
              </tr>
              <tr>
-               <th align=right>| . $locale->text('Aufwand EU o. UStId') . qq|</th>
+               <th align=right>| . $locale->text('Expenses EU without UStId') . qq|</th>
                <td><select name=expense_accno_id_2>$form->{selectIC_expense}</select></td>
              </tr>|;
 
@@ -1821,11 +1755,11 @@ sub buchungsgruppe_header {
   }
 
   $linkaccounts .= qq|       <tr>
-               <th align=right>| . $locale->text('Erlöse Ausland') . qq|</th>
+               <th align=right>| . $locale->text('Foreign Revenues') . qq|</th>
                <td><select name=income_accno_id_3>$form->{selectIC_income}</select></td>
              </tr>
              <tr>
-               <th align=right>| . $locale->text('Aufwand Ausland') . qq|</th>
+               <th align=right>| . $locale->text('Foreign Expenses') . qq|</th>
                <td><select name=expense_accno_id_3>$form->{selectIC_expense}</select></td>
              </tr>
 |;
@@ -1865,7 +1799,7 @@ sub save_buchungsgruppe {
   $form->isblank("description", $locale->text('Description missing!'));
 
   AM->save_buchungsgruppe(\%myconfig, \%$form);
-  $form->redirect($locale->text('Buchungsgruppe gespeichert!'));
+  $form->redirect($locale->text('Accounting Group saved!'));
 
   $lxdebug->leave_sub();
 }
@@ -1874,7 +1808,7 @@ sub delete_buchungsgruppe {
   $lxdebug->enter_sub();
 
   AM->delete_buchungsgruppe(\%myconfig, \%$form);
-  $form->redirect($locale->text('Buchungsgruppe gelöscht!'));
+  $form->redirect($locale->text('Accounting Group deleted!'));
 
   $lxdebug->leave_sub();
 }
@@ -1895,7 +1829,7 @@ sub add_printer {
   $form->{title} = "Add";
 
   $form->{callback} =
-    "$form->{script}?action=add_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    "$form->{script}?action=add_printer&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
 
   &printer_header;
@@ -1925,7 +1859,7 @@ sub list_printer {
   AM->printer(\%myconfig, \%$form);
 
   $form->{callback} =
-    "$form->{script}?action=list_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}";
+    "$form->{script}?action=list_printer&login=$form->{login}&password=$form->{password}";
 
   $callback = $form->escape($form->{callback});
 
@@ -1979,7 +1913,7 @@ sub list_printer {
 
 
     $column_data{printer_description} =
-      qq|<td><a href=$form->{script}?action=edit_printer&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{printer_description}</td>|;
+      qq|<td><a href=$form->{script}?action=edit_printer&id=$ref->{id}&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>|;
@@ -2007,7 +1941,6 @@ sub list_printer {
 
 <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}>
 
@@ -2091,14 +2024,13 @@ sub delete_printer {
   $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}"
+    "$form->{script}?action=add_payment&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
 
   $form->{terms_netto} = 0;
@@ -2213,7 +2145,7 @@ sub list_payment {
       $column_data{up} =
         qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}&id1=$ref->{id}&id2=$pref->{id}">| .
-        qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">| .
+        qq|<img border="0" src="image/up.png" alt="| . $locale->text("up") . qq|">| .
         qq|</a></td>|;
     } else {
       $column_data{up} = qq|<td width="16">&nbsp;</td>|;
@@ -2226,7 +2158,7 @@ sub list_payment {
       $column_data{down} =
         qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}&id1=$ref->{id}&id2=$nref->{id}">| .
-        qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">| .
+        qq|<img border="0" src="image/down.png" alt="| . $locale->text("down") . qq|">| .
         qq|</a></td>|;
     }
 
@@ -2268,7 +2200,6 @@ sub list_payment {
 
 <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}>
 
@@ -2416,317 +2347,6 @@ sub swap_payment_terms {
   $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|">
-
-  </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|">
-
-  </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|">
-
-  </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();
 
@@ -2828,9 +2448,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}) {
@@ -3101,7 +2725,6 @@ print qq|      </table>
   </tr>
 </table>
 
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 
@@ -3132,26 +2755,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();
 
@@ -3172,7 +2775,6 @@ sub audit_control {
 
 <form method=post action=$form->{script}>
 
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 
@@ -3238,14 +2840,6 @@ sub doclose {
   $lxdebug->leave_sub();
 }
 
-sub continue {
-  $lxdebug->enter_sub();
-
-  &{ $form->{nextsub} };
-
-  $lxdebug->leave_sub();
-}
-
 sub edit_units {
   $lxdebug->enter_sub();
 
@@ -3421,6 +3015,105 @@ 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",
+           "Mahnungsnummer" => "dunning"
+               );
+       my %searchNo = ( "Artikelnummer" => "partnumber",
+                                    "Kundennummer"  => "customernumber",
+                                    "Lieferantennummer" => "vendornumber",
+                                    "Projektnummer" => "projectnummer",
+                                    "Buchungsnummer" => "ordnumber",
+                                    "Eingangsrechnungnummer" => "invnumber",
+                                    "Ausgangsrechnungnummer" => "invnumber",
+             "Mahnungsnummer" => "dunning_id"
+               );
+       
+       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);
+       my $searchSNumber = $searchNo{$form->{'what2search'}} . qq|_| . $form->{'searchid'};
+       $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 trans_id AS id FROM history_erp WHERE sNumbers = '$searchSNumber' |;
+
+  my $sth = $dbh->prepare($query);
+       
+       $sth->execute() || $form->dberror($query);
+       
+  if($sth->fetch() <= 0) {
+    $sth->finish();
+    my $query = qq|SELECT id FROM $search{$form->{what2search}} 
+           WHERE $searchNo{$form->{'what2search'}} ILIKE '$form->{"searchid"}' 
+           |;
+  }
+  $sth->execute() || $form->dberror($query);  
+       $form->{title} = $locale->text("History Search");
+       $form->header();
+       my $daten = "";
+       while(my $hash_ref = $sth->fetchrow_hashref()){
+    $daten =  $form->get_history($dbh,$hash_ref->{id},$restriction);
+  }
+       $dbh->disconnect();
+       print $form->parse_html_template("/common/show_history", 
+    {"DATEN" => $daten,
+     "SUCCESS" => ($daten != 0 ? 1 : 0),
+     "NONEWWINDOW" => 1
+    });
+       $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();