Merge branch 'tax_festsetzen'

[mfinanz.git] / bin / mozilla / am.pl

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index bcf934ed1ac1fc624df7dd9553d559caa94eb122..bcb39d258f066a65813f4ca81a272541914ae4be 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -43,11 +43,8 @@ use SL::USTVA;
 use SL::Iconv;
 use SL::TODO;
 use SL::Printer;
 use SL::Iconv;
 use SL::TODO;
 use SL::Printer;

-use CGI::Ajax;

 use CGI;
 
 use CGI;
 

-use Data::Dumper;
-

 require "bin/mozilla/common.pl";
 
 use strict;
 require "bin/mozilla/common.pl";
 
 use strict;


@@ -147,7 +144,7 @@ sub account_header {
       rate           => '',
       taxkey_id      => '',
       pos_ustva      => '',
       rate           => '',
       taxkey_id      => '',
       pos_ustva      => '',

-      startdate      => '',
+      startdate      => $form->{account_exists} ? '' : DateTime->new(year => 1970, month => 1, day => 1)->to_lxoffice,

     };
 
     push @{ $form->{ACCOUNT_TAXKEYS} }, $newtaxkey_ref;
     };
 
     push @{ $form->{ACCOUNT_TAXKEYS} }, $newtaxkey_ref;


@@ -331,31 +328,31 @@ sub account_header {
   }
 
   # preselection chart type
   }
 
   # preselection chart type

-  my $select_charttype = q{};
-
-  my %charttype = (
-      'A'  => $locale->text('Account'),
-      'H'  => $locale->text('Heading'),
-  );
+  my @all_charttypes = ({'name' => $locale->text('Account'), 'value' => 'A'},
+                        {'name' => $locale->text('Heading'), 'value' => 'H'},
+    );
+  my $selected_charttype = $form->{charttype};

 
 

-  foreach my $item ( sort({ $a <=> $b } keys %charttype) ) {
-    if ($item eq $form->{charttype}) {
-      $select_charttype .= qq|<option value="$item" selected="selected">$charttype{$item}\n|;

 
 

-    } else {
-      $select_charttype .= qq|<option value="$item">$charttype{$item}\n|;
+  # account where AR_tax or AP_tax is set are not orphaned if they are used as
+  # tax-o-matic account
+  if ( $form->{id} && $form->{orphaned} && ($form->{link} =~ m/(AP_tax|AR_tax)/) ) {
+    if (SL::DB::Manager::Tax->find_by(chart_id => $form->{id})) {
+      $form->{orphaned} = 0;

     }
     }

-

   }
 
   my $ChartTypeIsAccount = ($form->{charttype} eq "A") ? "1":"";
   }
 
   my $ChartTypeIsAccount = ($form->{charttype} eq "A") ? "1":"";

+  my $AccountIsPosted = ($form->{orphaned} ) ? "":"1";

 
   $form->header();
 
   my $parameters_ref = {
     ChartTypeIsAccount         => $ChartTypeIsAccount,
 
   $form->header();
 
   my $parameters_ref = {
     ChartTypeIsAccount         => $ChartTypeIsAccount,

+    AccountIsPosted            => $AccountIsPosted,

     select_category            => $select_category,
     select_category            => $select_category,

-    select_charttype           => $select_charttype,
+    all_charttypes             => \@all_charttypes,
+    selected_charttype         => $selected_charttype,

     select_bwa                 => $select_bwa,
     select_bilanz              => $select_bilanz,
     select_eur                 => $select_eur,
     select_bwa                 => $select_bwa,
     select_bilanz              => $select_bilanz,
     select_eur                 => $select_eur,


@@ -369,44 +366,18 @@ sub account_header {
 }
 
 sub form_footer {
 }
 
 sub form_footer {

-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  print qq|
-
-<input name=callback type=hidden value="| . H($form->{callback}) . qq|">
-
-<br>|;
-  if ((!$form->{id}) || ($form->{id} && $form->{orphaned}) || (($form->{type} eq "account") && (!$form->{new_chart_valid}))) {
-    print qq|
-<input type=submit class=submit name=action value="|
-    . $locale->text('Save') . qq|">
-|;
-}
-
-  if ($form->{id} && $form->{orphaned}) {
-    print qq|<input type=submit class=submit name=action value="|
-      . $locale->text('Delete') . qq|">|;
-  }
-
-  if ($form->{id} && $form->{type} eq "account") {
-    print qq|
-    <input class=submit type=submit name=action value="|
-      . $locale->text('Save as new') . qq|">|;
-  }
-
-  print qq|
-</form>
-
-</body>
-</html>
-|;
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');
+
+  print $::form->parse_html_template('am/form_footer', {
+    show_save        => !$::form->{id}
+                     || ($::form->{id} && $::form->{orphaned})
+                     || ($::form->{type} eq "account" && !$::form->{new_chart_valid}),
+    show_delete      => $::form->{id} && $::form->{orphaned},
+    show_save_as_new => $::form->{id} && $::form->{type} eq "account",
+  });

 
 

-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;

 }
 
 sub save_account {
 }
 
 sub save_account {


@@ -423,6 +394,17 @@ sub save_account {
 
   if ($form->{charttype} eq 'A'){
     $form->isblank("category",  $locale->text('Account Type missing!'));
 
   if ($form->{charttype} eq 'A'){
     $form->isblank("category",  $locale->text('Account Type missing!'));

+
+    my $found_valid_taxkey = 0;
+    foreach my $i (0 .. 10) { # 10 is maximum count of taxkeys in form
+      if ($form->{"taxkey_startdate_$i"} and !$form->{"taxkey_del_$i"}) {
+        $found_valid_taxkey = 1;
+        last;
+      }
+    }
+    if ($found_valid_taxkey == 0) {
+      $form->error($locale->text('A valid taxkey is missing!'));
+    }

   }
 
   $form->redirect($locale->text('Account saved!'))
   }
 
   $form->redirect($locale->text('Account saved!'))


@@ -455,10 +437,6 @@ sub save_as_new_account {
   }
 
   $form->{id} = 0;
   }
 
   $form->{id} = 0;

-  if ($form->{"original_accno"} &&
-      ($form->{"accno"} eq $form->{"original_accno"})) {
-    $form->error($locale->text('Account Number already used!'));
-  }

   $form->redirect($locale->text('Account saved!'))
     if (AM->save_account(\%myconfig, \%$form));
   $form->error($locale->text('Cannot save account!'));
   $form->redirect($locale->text('Account saved!'))
     if (AM->save_account(\%myconfig, \%$form));
   $form->error($locale->text('Cannot save account!'));


@@ -495,16 +473,7 @@ sub list_account {
     $ca->{link_edit_account} = $link_edit_account . '&id=' . E($ca->{id});
   }
 
     $ca->{link_edit_account} = $link_edit_account . '&id=' . E($ca->{id});
   }
 

-  # Ajax
-  my $pjx = new CGI::Ajax('list_account_details' => build_std_url('action=list_account_details'));
-
-  # Eneable AJAX debuging
-  #$pjx->DEBUG(1);
-  #$pjx->JSDEBUG(1);
-
-  push(@ { $form->{AJAX} }, $pjx);
-
-  $form->{stylesheets} = "list_accounts.css";
+  $::request->{layout}->use_stylesheet("list_accounts.css");

   $form->{title}       = $locale->text('Chart of Accounts');
 
   $form->header;
   $form->{title}       = $locale->text('Chart of Accounts');
 
   $form->header;


@@ -570,7 +539,6 @@ sub list_account_details {
                : ( $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 '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} .= ($link ne '') ?  "[$link] ":'';
     }
                : $locale->text('Unknown Link') . ': ' . $link;
       $ca->{link} .= ($link ne '') ?  "[$link] ":'';
     }


@@ -586,9 +554,8 @@ sub list_account_details {
   }
 
   $form->{title} = $locale->text('Chart of Accounts');
   }
 
   $form->{title} = $locale->text('Chart of Accounts');

-  $form->header();

 
 

-  print $form->parse_html_template('am/list_account_details');
+  print $form->ajax_response_header, $form->parse_html_template('am/list_account_details');

 
   $main::lxdebug->leave_sub();
 
 
   $main::lxdebug->leave_sub();
 


@@ -603,1376 +570,90 @@ sub delete_account {
 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

-  $form->{title} = $locale->text('Delete Account');
-
-  foreach my $id (
-    qw(inventory_accno_id income_accno_id expense_accno_id fxgain_accno_id fxloss_accno_id)
-    ) {
-    if ($form->{id} == $form->{$id}) {
-      $form->error($locale->text('Cannot delete default account!'));
-    }
-  }
-
-  $form->redirect($locale->text('Account deleted!'))
-    if (AM->delete_account(\%myconfig, \%$form));
-  $form->error($locale->text('Cannot delete account!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub add_department {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  $main::auth->assert('config');
-
-  $form->{title} = "Add";
-  $form->{role}  = "P";
-
-  $form->{callback} = "am.pl?action=add_department" unless $form->{callback};
-
-  &department_header;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub edit_department {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  $form->{title} = "Edit";
-
-  AM->get_department(\%myconfig, \%$form);
-
-  &department_header;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub list_department {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->departments(\%myconfig, \%$form);
-
-  $form->{callback} = "am.pl?action=list_department";
-
-  my $callback = $form->escape($form->{callback});
-
-  $form->{title} = $locale->text('Departments');
-
-  my @column_index = qw(description cost profit);
-  my %column_header;
-  $column_header{description} =
-      qq|<th class=listheading width=90%>|
-    . $locale->text('Description')
-    . qq|</th>|;
-  $column_header{cost} =
-      qq|<th class=listheading nowrap>|
-    . $locale->text('Cost Center')
-    . qq|</th>|;
-  $column_header{profit} =
-      qq|<th class=listheading nowrap>|
-    . $locale->text('Profit Center')
-    . qq|</th>|;
-
-  $form->header;
-
-  print qq|
-<body>
-
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table width=100%>
-        <tr class=listheading>
-|;
-
-  map { print "$column_header{$_}\n" } @column_index;
-
-  print qq|
-        </tr>
-|;
-
-  my ($i, %column_data);
-  foreach my $ref (@{ $form->{ALL} }) {
-
-    $i++;
-    $i %= 2;
-
-    print qq|
-        <tr valign=top class=listrow$i>
-|;
-
-    my $costcenter   = ($ref->{role} eq "C") ? "X" : "";
-    my $profitcenter = ($ref->{role} eq "P") ? "X" : "";
-
-    $column_data{description} =
-      qq|<td><a href="am.pl?action=edit_department&id=$ref->{id}&callback=$callback">$ref->{description}</td>|;
-    $column_data{cost}   = qq|<td align=center>$costcenter</td>|;
-    $column_data{profit} = qq|<td align=center>$profitcenter</td>|;
-
-    map { print "$column_data{$_}\n" } @column_index;
-
-    print qq|
-        </tr>
-|;
-  }
-
-  print qq|
-      </table>
-    </td>
-  </tr>
-  <tr>
-  <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<br>
-<form method=post action=am.pl>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=type value=department>
-
-<input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
-
-  </form>
-
-  </body>
-  </html>
-|;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub department_header {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->{title} = $locale->text("$form->{title} Department");
-
-  # $locale->text('Add Department')
-  # $locale->text('Edit Department')
-
-  $form->{description} =~ s/\"/&quot;/g;
-
-  my ($rows, $description);
-  if (($rows = $form->numtextrows($form->{description}, 60)) > 1) {
-    $description =
-      qq|<textarea name="description" rows=$rows cols=60 wrap=soft>$form->{description}</textarea>|;
-  } else {
-    $description =
-      qq|<input name=description size=60 value="$form->{description}">|;
-  }
-
-  my $costcenter   = "checked" if $form->{role} eq "C";
-  my $profitcenter = "checked" if $form->{role} eq "P";
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=am.pl>
-
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=type value=department>
-
-<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></td>
-    <td><input type=radio style=radio name=role value="C" $costcenter> |
-    . $locale->text('Cost Center') . qq|
-        <input type=radio style=radio name=role value="P" $profitcenter> |
-    . $locale->text('Profit Center') . qq|
-    </td>
-  <tr>
-    <td colspan=2><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub save_department {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->isblank("description", $locale->text('Description missing!'));
-  AM->save_department(\%myconfig, \%$form);
-  $form->redirect($locale->text('Department saved!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub delete_department {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->delete_department(\%myconfig, \%$form);
-  $form->redirect($locale->text('Department deleted!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub add_lead {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  $main::auth->assert('config');
-
-  $form->{title} = "Add";
-
-  $form->{callback} = "am.pl?action=add_lead" unless $form->{callback};
-
-  &lead_header;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub edit_lead {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  $form->{title} = "Edit";
-
-  AM->get_lead(\%myconfig, \%$form);
-
-  &lead_header;
-
-  $form->{orphaned} = 1;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub list_lead {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->lead(\%myconfig, \%$form);
-
-  $form->{callback} = "am.pl?action=list_lead";
-
-  my $callback = $form->escape($form->{callback});
-
-  $form->{title} = $locale->text('Lead');
-
-  my @column_index = qw(description cost profit);
-  my %column_header;
-  $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 class=listheading>
-|;
-
-  map { print "$column_header{$_}\n" } @column_index;
-
-  print qq|
-  </tr>
-|;
-
-  my ($i, %column_data);
-  foreach my $ref (@{ $form->{ALL} }) {
-
-    $i++;
-    $i %= 2;
-
-    print qq|
-  <tr valign=top class=listrow$i>
-|;
-
-#    $lead = $ref->{lead};
-
-    $column_data{description} = qq|<td><a href="am.pl?action=edit_lead&id=$ref->{id}&callback=$callback">$ref->{lead}</td>|;
-
-    map { print "$column_data{$_}\n" } @column_index;
-
-    print qq|
-  </tr>
-|;
-  }
-
-  print qq|
-  <tr>
-  <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<br>
-<form method=post action=am.pl>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=type value=lead>
-
-<input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
-
-  </form>
-
-  </body>
-  </html>
-|;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub lead_header {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->{title} = $locale->text("$form->{title} Lead");
-
-  # $locale->text('Add Lead')
-  # $locale->text('Edit Lead')
-
-  $form->{description} =~ s/\"/&quot;/g;
-
-  my $description =
-      qq|<input name=description size=50 value="$form->{lead}">|;
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=am.pl>
-
-<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>
-|;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub save_lead {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->isblank("description", $locale->text('Description missing!'));
-  AM->save_lead(\%myconfig, \%$form);
-  $form->redirect($locale->text('lead saved!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub delete_lead {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->delete_lead(\%myconfig, \%$form);
-  $form->redirect($locale->text('lead deleted!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub add_business {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  $main::auth->assert('config');
-
-  $form->{title} = "Add";
-
-  $form->{callback} = "am.pl?action=add_business" unless $form->{callback};
-
-  &business_header;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub edit_business {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $form->{title} = "Edit";
-
-  AM->get_business(\%myconfig, \%$form);
-
-  &business_header;
-
-  $form->{orphaned} = 1;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub list_business {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->business(\%myconfig, \%$form);
-
-  $form->{callback} = "am.pl?action=list_business";
-
-  my $callback = $form->escape($form->{callback});
-
-  $form->{title} = $locale->text('Type of Business');
-
-  my @column_index = qw(description discount customernumberinit);
-  push @column_index, 'salesman' if $::lx_office_conf{system}->{vertreter};
-  my %column_header;
-  $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>|;
-  $column_header{salesman} =
-      qq|<th class=listheading>|
-    . $locale->text('Representative')
-    . 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>
-|;
-
-  my ($i, %column_data);
-  foreach my $ref (@{ $form->{ALL} }) {
-
-    $i++;
-    $i %= 2;
-
-    print qq|
-        <tr valign=top class=listrow$i>
-|;
-
-    my $discount    = $form->format_amount(\%myconfig, $ref->{discount} * 100);
-    my $description = $ref->{description};
-    $column_data{description} = qq|<td><a href="am.pl?action=edit_business&id=$ref->{id}&callback=$callback">$description</td>|;
-    $column_data{discount}           = qq|<td align=right>$discount</td>|;
-    $column_data{customernumberinit} =
-      qq|<td align=right>$ref->{customernumberinit}</td>|;
-    $column_data{salesman} = '<td>' . ($ref->{salesman} ? $::locale->text('Yes') : $::locale->text('No')) . '</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=am.pl>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=type value=business>
-
-<input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
-
-  </form>
-
-  </body>
-  </html>
-|;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub business_header {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->{title}    = $locale->text("$form->{title} Business");
-
-  # $locale->text('Add Business')
-  # $locale->text('Edit Business')
-
-  $form->{description} =~ s/\"/&quot;/g;
-  $form->{discount} =
-    $form->format_amount(\%myconfig, $form->{discount} * 100);
-
-  my $salesman_code;
-  if ($::lx_office_conf{system}->{vertreter}) {
-    $salesman_code = qq|
-  <tr>
-    <th align="right">| . $locale->text('Representative') . qq|</th>
-    <td>| . $::cgi->checkbox(-name => "salesman", -value => 1, -label => '', 'checked' => $form->{salesman} ? 1 : 0) . qq|</td>
-  </tr>
-|;
-  } else {
-    $salesman_code = $::cgi->hidden(-name => 'salesman', -value => $form->{salesman} ? 1 : 0);
-  }
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=am.pl>
-
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=type value=business>
-
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=2>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <th align=right>| . $locale->text('Type of Business') . qq|</th>
-    <td><input name=description size=30 value="$form->{description}"></td>
-  <tr>
-  <tr>
-    <th align=right>| . $locale->text('Discount') . qq| %</th>
-    <td><input name=discount size=5 value=$form->{discount}></td>
-  </tr>
-  <tr>
-    <th align=right>| . $locale->text('Customernumberinit') . qq|</th>
-    <td><input name=customernumberinit size=10 value=$form->{customernumberinit}></td>
-  </tr>
-$salesman_code
-  <td colspan=2><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub save_business {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->isblank("description", $locale->text('Description missing!'));
-  $form->{discount} = $form->parse_amount(\%myconfig, $form->{discount}) / 100;
-  AM->save_business(\%myconfig, \%$form);
-  $form->redirect($locale->text('Business saved!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub delete_business {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->delete_business(\%myconfig, \%$form);
-  $form->redirect($locale->text('Business deleted!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub add_language {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  $main::auth->assert('config');
-
-  $form->{title} = "Add";
-
-  $form->{callback} = "am.pl?action=add_language" unless $form->{callback};
-
-  &language_header;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub edit_language {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  $form->{title} = "Edit";
-
-  AM->get_language(\%myconfig, \%$form);
-
-  &language_header;
-
-  $form->{orphaned} = 1;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub list_language {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->language(\%myconfig, \%$form);
-
-  $form->{callback} = "am.pl?action=list_language";
-
-  my $callback = $form->escape($form->{callback});
-
-  $form->{title} = $locale->text('Languages');
-
-  my @column_index = qw(description template_code article_code output_numberformat output_dateformat output_longdates);
-  my %column_header;
-  $column_header{description} =
-      qq|<th class=listheading width=60%>|
-    . $locale->text('Description')
-    . qq|</th>|;
-  $column_header{template_code} =
-      qq|<th class=listheading width=10%>|
-    . $locale->text('Template Code')
-    . qq|</th>|;
-  $column_header{article_code} =
-      qq|<th class=listheading>|
-    . $locale->text('Article Code')
-    . qq|</th>|;
-  $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;
-
-  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>
-|;
-
-  my ($i, %column_data);
-  foreach my $ref (@{ $form->{ALL} }) {
-
-    $i++;
-    $i %= 2;
-
-    print qq|
-        <tr valign=top class=listrow$i>
-|;
-
-
-    $column_data{description} =
-      qq|<td><a href="am.pl?action=edit_language&id=$ref->{id}&callback=$callback">$ref->{description}</td>|;
-    $column_data{template_code}           = qq|<td align=right>$ref->{template_code}</td>|;
-    $column_data{article_code} =
-      qq|<td align=right>$ref->{article_code}</td>|;
-    $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;
-
-    print qq|
-        </tr>
-|;
-  }
-
-  print qq|
-      </table>
-    </td>
-  </tr>
-  <tr>
-  <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<br>
-<form method=post action=am.pl>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=type value=language>
-
-<input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
-
-  </form>
-
-  </body>
-  </html>
-|;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub language_header {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->{title}    = $locale->text("$form->{title} Language");
-
-  # $locale->text('Add Language')
-  # $locale->text('Edit Language')
-
-  $form->{description} =~ s/\"/&quot;/g;
-  $form->{template_code} =~ s/\"/&quot;/g;
-  $form->{article_code} =~ s/\"/&quot;/g;
-
-
-  $form->header;
-
-  my $numberformat =
-    qq|<option value="">| . $locale->text("use program settings") .
-    qq|</option>|;
-  foreach my $item (('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 my $item (qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd)) {
-    $dateformat .=
-      ($item eq $form->{output_dateformat})
-      ? "<option selected>$item"
-      : "<option>$item"
-      . "</option>";
-  }
-
-  print qq|
-<body>
-
-<form method=post action=am.pl>
-
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=type value=language>
-
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=2>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <th align=right>| . $locale->text('Language') . qq|</th>
-    <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->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->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>
-</table>
-|;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub save_language {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->isblank("description", $locale->text('Language missing!'));
-  $form->isblank("template_code", $locale->text('Template Code missing!'));
-  $form->isblank("article_code", $locale->text('Article Code missing!'));
-  AM->save_language(\%myconfig, \%$form);
-  $form->redirect($locale->text('Language saved!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub delete_language {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->delete_language(\%myconfig, \%$form);
-  $form->redirect($locale->text('Language deleted!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-
-sub add_buchungsgruppe {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  # $locale->text("Add Buchungsgruppe")
-  # $locale->text("Edit Buchungsgruppe")
-  $form->{title} = "Add";
-
-  $form->{callback} = "am.pl?action=add_buchungsgruppe" unless $form->{callback};
-
-  AM->get_buchungsgruppe(\%myconfig, \%$form);
-  $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"};
-  for (my $i = 0; 4 > $i; $i++) {
-    map({ $form->{"${_}_accno_id_$i"} = $form->{"std_${_}_accno_id"}; }
-        qw(income expense));
-  }
-
-  &buchungsgruppe_header;
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub edit_buchungsgruppe {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  $form->{title} = "Edit";
-
-  AM->get_buchungsgruppe(\%myconfig, \%$form);
-
-  &buchungsgruppe_header;
-
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub list_buchungsgruppe {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->buchungsgruppe(\%myconfig, \%$form);
-
-  $form->{callback} = "am.pl?action=list_buchungsgruppe";
-
-  my $callback = $form->escape($form->{callback});
-
-  $form->{title} = $locale->text('Buchungsgruppen');
-
-  my @column_index = qw(up down description inventory_accno
-                     income_accno_0 expense_accno_0
-                     income_accno_1 expense_accno_1
-                     income_accno_2 expense_accno_2
-                     income_accno_3 expense_accno_3 );
-  my %column_header;
-  $column_header{up} =
-      qq|<th class="listheading" 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="40%">|
-    . $locale->text('Description')
-    . qq|</th>|;
-  $column_header{inventory_accno} =
-      qq|<th class=listheading>|
-    . $locale->text('Bestandskonto')
-    . qq|</th>|;
-  $column_header{income_accno_0} =
-      qq|<th class=listheading>|
-    . $locale->text('National Revenues')
-    . qq|</th>|;
-  $column_header{expense_accno_0} =
-      qq|<th class=listheading>|
-    . $locale->text('National Expenses')
-    . qq|</th>|;
-  $column_header{income_accno_1} =
-      qq|<th class=listheading>|
-    . $locale->text('Revenues EU with UStId')
-    . qq|</th>|;
-  $column_header{expense_accno_1} =
-      qq|<th class=listheading>|
-    . $locale->text('Expenses EU with UStId')
-    . qq|</th>|;
-  $column_header{income_accno_2} =
-      qq|<th class=listheading>|
-    . $locale->text('Revenues EU without UStId')
-    . qq|</th>|;
-  $column_header{expense_accno_2} =
-      qq|<th class=listheading>|
-    . $locale->text('Expenses EU without UStId')
-    . qq|</th>|;
-  $column_header{income_accno_3} =
-      qq|<th class=listheading>|
-    . $locale->text('Foreign Revenues')
-    . qq|</th>|;
-  $column_header{expense_accno_3} =
-      qq|<th class=listheading>|
-    . $locale->text('Foreign Expenses')
-    . 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>
-|;
-
-  my $swap_link = qq|am.pl?action=swap_buchungsgruppen&|;
-
-  my $row = 0;
-  my ($i, %column_data);
-  foreach my $ref (@{ $form->{ALL} }) {
-
-    $i++;
-    $i %= 2;
-
-    print qq|
-        <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>|;
-    }
+  $form->{title} = $locale->text('Delete Account');

 
 

-    $column_data{description} = qq|<td><a href="am.pl?action=edit_buchungsgruppe&id=$ref->{id}&callback=$callback">$ref->{description}</td>|;
-    $column_data{inventory_accno}           = qq|<td align=right>$ref->{inventory_accno}</td>|;
-    $column_data{income_accno_0} =
-      qq|<td align=right>$ref->{income_accno_0}</td>|;
-    $column_data{expense_accno_0}           = qq|<td align=right>$ref->{expense_accno_0}</td>|;
-    $column_data{income_accno_1} =
-      qq|<td align=right>$ref->{income_accno_1}</td>|;
-    $column_data{expense_accno_1}           = qq|<td align=right>$ref->{expense_accno_1}</td>|;
-    $column_data{income_accno_2} =
-      qq|<td align=right>$ref->{income_accno_2}</td>|;
-    $column_data{expense_accno_2}           = qq|<td align=right>$ref->{expense_accno_2}</td>|;
-    $column_data{income_accno_3} =
-      qq|<td align=right>$ref->{income_accno_3}</td>|;
-    $column_data{expense_accno_3}           = qq|<td align=right>$ref->{expense_accno_3}</td>|;
-
-    map { print "$column_data{$_}\n" } @column_index;
-
-    print qq|
-        </tr>
-|;
-
-    $row++;
+  foreach my $id (
+    qw(inventory_accno_id income_accno_id expense_accno_id fxgain_accno_id fxloss_accno_id)
+    ) {
+    if ($form->{id} == $form->{$id}) {
+      $form->error($locale->text('Cannot delete default account!'));
+    }

   }
 
   }
 

-  print qq|
-      </table>
-    </td>
-  </tr>
-  <tr>
-  <td><hr size=3 noshade></td>
-  </tr>
-</table>
+  $form->redirect($locale->text('Account deleted!'))
+    if (AM->delete_account(\%myconfig, \%$form));
+  $form->error($locale->text('Cannot delete account!'));
+
+  $main::lxdebug->leave_sub();
+}

 
 

-<br>
-<form method=post action=am.pl>
+sub add_lead {
+  $main::lxdebug->enter_sub();

 
 

-<input name=callback type=hidden value="$form->{callback}">
+  my $form     = $main::form;

 
 

-<input type=hidden name=type value=buchungsgruppe>
+  $main::auth->assert('config');

 
 

-<input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
+  $form->{title} = "Add";

 
 

-  </form>
+  $form->{callback} = "am.pl?action=add_lead" unless $form->{callback};

 
 

-  </body>
-  </html>
-|;
+  &lead_header;
+  &form_footer;

 
   $main::lxdebug->leave_sub();
 }
 
 
   $main::lxdebug->leave_sub();
 }
 

-sub buchungsgruppe_header {
+sub edit_lead {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;

-  my $locale   = $main::locale;
+  my %myconfig = %main::myconfig;

 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

-  $form->{title}    = $locale->text("$form->{title} Buchungsgruppe");
-
-  # $locale->text('Add Accounting Group')
-  # $locale->text('Edit Accounting Group')
+  $form->{title} = "Edit";

 
 

-  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,
-    );
+  AM->get_lead(\%myconfig, \%$form);

 
 

-  foreach my $key (keys(%acc_type_map)) {
-    foreach my $ref (@{ $form->{IC_links}{$key} }) {
-      $acc_type_map{$key}->{$ref->{"id"}} = $ref;
-    }
-  }
+  &lead_header;

 
 

-  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}}))));
-  }
+  $form->{orphaned} = 1;
+  &form_footer;

 
 

-  if ($form->{id}) {
-    $form->{selectIC} =~ s/selected//g;
-    $form->{selectIC} =~ s/ value=\Q$form->{inventory_accno_id}\E/  value=$form->{inventory_accno_id} selected/;
-    $form->{selectIC_income} =~ s/selected//g;
-    $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_0}\E/  value=$form->{income_accno_id_0} selected/;
-    $form->{selectIC_expense} =~ s/selected//g;
-    $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_0}\E/  value=$form->{expense_accno_id_0} selected/;
-  }
+  $main::lxdebug->leave_sub();
+}

 
 

-  my $linkaccounts;
-  if (!$::lx_office_conf{system}->{eur}) {
-    $linkaccounts = qq|
-               <tr>
-                <th align=right>| . $locale->text('Inventory') . qq|</th>
-                <td><select name=inventory_accno_id>$form->{selectIC}</select></td>
-                <input name=selectIC type=hidden value="$form->{selectIC}">
-              </tr>|;
-  } else {
-    $linkaccounts = qq|
-                <input type=hidden name=inventory_accno_id value=$form->{inventory_accno_id}>|;
-  }
+sub list_lead {
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');

 
 

+  AM->lead(\%::myconfig, $::form);

 
 

-  $linkaccounts .= qq|
-              <tr>
-                <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('National Expenses') . qq|</th>
-                <td><select name=expense_accno_id_0>$form->{selectIC_expense}</select></td>
-              </tr>|;
-  if ($form->{id}) {
-    $form->{selectIC_income} =~ s/selected//g;
-    $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_1}\E/  value=$form->{income_accno_id_1} selected/;
-    $form->{selectIC_expense} =~ s/selected//g;
-    $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_1}\E/  value=$form->{expense_accno_id_1} selected/;
-  }
-  $linkaccounts .= qq|              <tr>
-                <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('Expenses EU with UStId') . qq|</th>
-                <td><select name=expense_accno_id_1>$form->{selectIC_expense}</select></td>
-              </tr>|;
-
-  if ($form->{id}) {
-    $form->{selectIC_income} =~ s/selected//g;
-    $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_2}\E/  value=$form->{income_accno_id_2} selected/;
-    $form->{selectIC_expense} =~ s/selected//g;
-    $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_2}\E/  value=$form->{expense_accno_id_2} selected/;
-  }
+  $::form->{callback} = "am.pl?action=list_lead";
+  $::form->{title}    = $::locale->text('Lead');

 
 

-  $linkaccounts .= qq|              <tr>
-                <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('Expenses EU without UStId') . qq|</th>
-                <td><select name=expense_accno_id_2>$form->{selectIC_expense}</select></td>
-              </tr>|;
-
-  if ($form->{id}) {
-    $form->{selectIC_income} =~ s/selected//g;
-    $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_3}\E/  value=$form->{income_accno_id_3} selected/;
-    $form->{selectIC_expense} =~ s/selected//g;
-    $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_3}\E/  value=$form->{expense_accno_id_3} selected/;
-  }
+  $::form->header;
+  print $::form->parse_html_template('am/lead_list');

 
 

-  $linkaccounts .= qq|              <tr>
-                <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('Foreign Expenses') . qq|</th>
-                <td><select name=expense_accno_id_3>$form->{selectIC_expense}</select></td>
-              </tr>
-|;
+  $::lxdebug->leave_sub;
+}

 
 

+sub lead_header {
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');

 
 

-  $form->header;
+  # $locale->text('Add Lead')
+  # $locale->text('Edit Lead')
+  $::form->{title} = $::locale->text("$::form->{title} Lead");

 
 

-  print qq|
-<body>
-
-<form method=post action=am.pl>
-
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=type value=buchungsgruppe>
-
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=2>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <th align=right>| . $locale->text('Buchungsgruppe') . qq|</th>
-    <td><input name=description size=30 value="| . $form->quote($form->{description}) . qq|"></td>
-  <tr>
-  $linkaccounts
-  <td colspan=2><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
+  $::form->header;
+  print $::form->parse_html_template('am/lead_header');

 
 

-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;

 }
 
 }
 

-sub save_buchungsgruppe {
+sub save_lead {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;


@@ -1982,14 +663,13 @@ sub save_buchungsgruppe {
   $main::auth->assert('config');
 
   $form->isblank("description", $locale->text('Description missing!'));
   $main::auth->assert('config');
 
   $form->isblank("description", $locale->text('Description missing!'));

-
-  AM->save_buchungsgruppe(\%myconfig, \%$form);
-  $form->redirect($locale->text('Accounting Group saved!'));
+  AM->save_lead(\%myconfig, \%$form);
+  $form->redirect($locale->text('lead saved!'));

 
   $main::lxdebug->leave_sub();
 }
 
 
   $main::lxdebug->leave_sub();
 }
 

-sub delete_buchungsgruppe {
+sub delete_lead {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;


@@ -1998,27 +678,30 @@ sub delete_buchungsgruppe {
 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

-  AM->delete_buchungsgruppe(\%myconfig, \%$form);
-  $form->redirect($locale->text('Accounting Group deleted!'));
+  AM->delete_lead(\%myconfig, \%$form);
+  $form->redirect($locale->text('lead deleted!'));

 
   $main::lxdebug->leave_sub();
 }
 
 
   $main::lxdebug->leave_sub();
 }
 

-sub swap_buchungsgruppen {
+sub add_language {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;

-  my %myconfig = %main::myconfig;

 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

-  AM->swap_sortkeys(\%myconfig, $form, "buchungsgruppen");
-  list_buchungsgruppe();
+  $form->{title} = "Add";
+
+  $form->{callback} = "am.pl?action=add_language" unless $form->{callback};
+
+  &language_header;
+  &form_footer;

 
   $main::lxdebug->leave_sub();
 }
 
 
   $main::lxdebug->leave_sub();
 }
 

-sub add_payment {
+sub edit_language {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;


@@ -2026,46 +709,71 @@ sub add_payment {
 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

-  $form->{title} = "Add";
+  $form->{title} = "Edit";
+
+  AM->get_language(\%myconfig, \%$form);

 
 

-  $form->{callback} = "am.pl?action=add_payment" unless $form->{callback};
+  &language_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->{orphaned} = 1;

   &form_footer;
 
   $main::lxdebug->leave_sub();
 }
 
   &form_footer;
 
   $main::lxdebug->leave_sub();
 }
 

-sub edit_payment {
+sub list_language {
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');
+
+  AM->language(\%::myconfig, $::form);
+
+  $::form->{callback} = "am.pl?action=list_language";
+  $::form->{title}   = $::locale->text('Languages');
+
+  $::form->header;
+
+  print $::form->parse_html_template('am/language_list');
+
+  $::lxdebug->leave_sub;
+}
+
+sub language_header {
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');
+
+  # $locale->text('Add Language')
+  # $locale->text('Edit Language')
+  $::form->{title} = $::locale->text("$::form->{title} Language");
+
+  $::form->header;
+
+  print $::form->parse_html_template('am/language_header', {
+    numberformats => [ '1,000.00', '1000.00', '1.000,00', '1000,00' ],
+    dateformats => [ qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd) ],
+  });
+
+  $::lxdebug->leave_sub;
+}
+
+sub save_language {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   my %myconfig = %main::myconfig;

+  my $locale   = $main::locale;

 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

-  $form->{title} = "Edit";
-
-  AM->get_payment(\%myconfig, $form);
-  $form->{percent_skonto} =
-    $form->format_amount(\%myconfig, $form->{percent_skonto} * 100);
-
-  &payment_header;
-
-  $form->{orphaned} = 1;
-  &form_footer;
+  $form->isblank("description", $locale->text('Language missing!'));
+  $form->isblank("template_code", $locale->text('Template Code missing!'));
+  $form->isblank("article_code", $locale->text('Article Code missing!'));
+  AM->save_language(\%myconfig, \%$form);
+  $form->redirect($locale->text('Language saved!'));

 
   $main::lxdebug->leave_sub();
 }
 
 
   $main::lxdebug->leave_sub();
 }
 

-sub list_payment {
+sub delete_language {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;


@@ -2074,267 +782,114 @@ sub list_payment {
 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

-  AM->payment(\%myconfig, \%$form);
-
-  $form->{callback} = build_std_url("action=list_payment");
-
-  my $callback = $form->escape($form->{callback});
-
-  $form->{title} = $locale->text('Payment Terms');
-
-  my @column_index = qw(up down description description_long terms_netto
-                     terms_skonto percent_skonto);
-  my %column_header;
-  $column_header{up} =
-      qq|<th class="listheading" align="center" valign="center" 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')
-    . qq|</th>|;
-  $column_header{description_long} =
-      qq|<th class=listheading>|
-    . $locale->text('Long Description')
-    . qq|</th>|;
-  $column_header{terms_netto} =
-      qq|<th class=listheading>|
-    . $locale->text('Netto Terms')
-    . qq|</th>|;
-  $column_header{terms_skonto} =
-      qq|<th class=listheading>|
-    . $locale->text('Skonto Terms')
-    . qq|</th>|;
-  $column_header{percent_skonto} =
-      qq|<th class=listheading>|
-    . $locale->text('Skonto')
-    . qq| %</th>|;
+  AM->delete_language(\%myconfig, \%$form);
+  $form->redirect($locale->text('Language deleted!'));

 
 

-  $form->header;
+  $main::lxdebug->leave_sub();
+}

 
 

-  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>
-|;
+sub add_buchungsgruppe {
+  $main::lxdebug->enter_sub();

 
 

-  map { print "$column_header{$_}\n" } @column_index;
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;

 
 

-  print qq|
-        </tr>
-|;
+  $main::auth->assert('config');

 
 

-  my $swap_link = build_std_url("action=swap_payment_terms");
+  # $locale->text("Add Buchungsgruppe")
+  # $locale->text("Edit Buchungsgruppe")
+  $form->{title} = "Add";

 
 

-  my $row = 0;
-  my ($i, %column_data);
-  foreach my $ref (@{ $form->{ALL} }) {
+  $form->{callback} = "am.pl?action=add_buchungsgruppe" unless $form->{callback};

 
 

-    $i++;
-    $i %= 2;
-
-    print qq|
-        <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>|;
-    }
+  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));
+  }

 
 

-    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>|;
-    }
+  &buchungsgruppe_header;
+  &form_footer;

 
 

-    $column_data{description} =
-      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>| .
-      $form->format_amount(\%myconfig, $ref->{percent_skonto} * 100) .
-      qq|%</td>|;
-    map { print "$column_data{$_}\n" } @column_index;
-
-    print qq|
-       </tr>
-|;
-    $row++;
-  }
+  $main::lxdebug->leave_sub();
+}

 
 

-  print qq|
-      </table>
-    </td>
-  </tr>
-  <tr>
-  <td><hr size=3 noshade></td>
-  </tr>
-</table>
+sub edit_buchungsgruppe {
+  $main::lxdebug->enter_sub();

 
 

-<br>
-<form method=post action=am.pl>
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;

 
 

-<input name=callback type=hidden value="$form->{callback}">
+  $main::auth->assert('config');

 
 

-<input type=hidden name=type value=payment>
+  $form->{title} = "Edit";

 
 

-<input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
+  AM->get_buchungsgruppe(\%myconfig, \%$form);

 
 

-  </form>
+  &buchungsgruppe_header;

 
 

-  </body>
-  </html>
-|;
+  &form_footer;

 
   $main::lxdebug->leave_sub();
 }
 
 
   $main::lxdebug->leave_sub();
 }
 

-sub payment_header {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my $locale   = $main::locale;
+sub list_buchungsgruppe {
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');

 
 

-  $main::auth->assert('config');
+  AM->buchungsgruppe(\%::myconfig, $::form);

 
 

-  $form->{title}    = $locale->text("$form->{title} Payment Terms");
+  $::form->{callback} = "am.pl?action=list_buchungsgruppe";
+  $::form->{title}    = $::locale->text('Buchungsgruppen');
+  $::form->header;

 
 

-  # $locale->text('Add Payment Terms')
-  # $locale->text('Edit Payment Terms')
+  print $::form->parse_html_template('am/buchungsgruppe_list', {
+    swap_link => qq|am.pl?action=swap_buchungsgruppen&|,
+  });

 
 

-  $form->{description} =~ s/\"/&quot;/g;
+  $::lxdebug->leave_sub;
+}

 
 

+sub buchungsgruppe_header {
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');

 
 

+  # $locale->text('Add Accounting Group')
+  # $locale->text('Edit Accounting Group')
+  $::form->{title}    = $::locale->text("$::form->{title} Buchungsgruppe");

 
 

-  $form->header;
+  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,
+  );

 
 

-  print qq|
-<body>
-
-<form method=post action=am.pl>
-
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=type value=payment>
-
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=2>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <th align=right>| . $locale->text('Description') . qq|</th>
-    <td><input name=description size=30 value="$form->{description}"></td>
-  <tr>
-  <tr>
-    <th align=right>| . $locale->text('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>
-|;
+  for my $key (keys %acc_type_map) {
+    for my $ref (@{ $::form->{IC_links}{$key} }) {
+      $acc_type_map{$key}{$ref->{id}} = $ref;
+    }

   }
 
   }
 

-  print qq|
-  <tr>
-    <th align=right>| . $locale->text('Netto Terms') . qq|</th>
-    <td><input name=terms_netto size=10 value="$form->{terms_netto}"></td>
-  </tr>
-  <tr>
-    <th align=right>| . $locale->text('Skonto Terms') . qq|</th>
-    <td><input name=terms_skonto size=10 value="$form->{terms_skonto}"></td>
-  </tr>
-  <tr>
-    <th align=right>| . $locale->text('Skonto') . qq| %</th>
-    <td><input name=percent_skonto size=10 value="$form->{percent_skonto}"></td>
-  </tr>
-  <td colspan=2><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<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;%skonto_in_percent%&gt; -- The discount in percent")
-. qq|</li>
-  <li>| . $locale->text("&lt;%total%&gt; -- Amount payable")
-. qq|</li>
-  <li>| . $locale->text("&lt;%total_wo_skonto%&gt; -- Amount payable less discount")
-. qq|</li>
-  <li>| . $locale->text("&lt;%invtotal%&gt; -- Invoice total")
-. qq|</li>
-  <li>| . $locale->text("&lt;%invtotal_wo_skonto%&gt; -- Invoice total less discount")
-. qq|</li>
-  <li>| . $locale->text("&lt;%currency%&gt; -- The selected currency")
-. qq|</li>
-  <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>|;
+  my %sorted_accounts = map {
+    $_ => [ sort { $a->{accno} cmp $b->{accno} } values %{ $acc_type_map{$_} } ],
+  } keys %acc_type_map;

 
 

-  $main::lxdebug->leave_sub();
+  $::form->header;
+  print $::form->parse_html_template('am/buchungsgruppe_header', {
+    accounts      => \%sorted_accounts,
+    account_label => sub { "$_[0]{accno}--$_[0]{description}" },
+  });
+
+  $::lxdebug->leave_sub;

 }
 
 }
 

-sub save_payment {
+sub save_buchungsgruppe {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;


@@ -2344,15 +899,14 @@ sub save_payment {
   $main::auth->assert('config');
 
   $form->isblank("description", $locale->text('Description missing!'));
   $main::auth->assert('config');
 
   $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!'));
+
+  AM->save_buchungsgruppe(\%myconfig, \%$form);
+  $form->redirect($locale->text('Accounting Group saved!'));

 
   $main::lxdebug->leave_sub();
 }
 
 
   $main::lxdebug->leave_sub();
 }
 

-sub delete_payment {
+sub delete_buchungsgruppe {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;


@@ -2361,13 +915,13 @@ sub delete_payment {
 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

-  AM->delete_payment(\%myconfig, \%$form);
-  $form->redirect($locale->text('Payment terms deleted!'));
+  AM->delete_buchungsgruppe(\%myconfig, \%$form);
+  $form->redirect($locale->text('Accounting Group deleted!'));

 
   $main::lxdebug->leave_sub();
 }
 
 
   $main::lxdebug->leave_sub();
 }
 

-sub swap_payment_terms {
+sub swap_buchungsgruppen {

   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;


@@ -2375,8 +929,8 @@ sub swap_payment_terms {
 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

-  AM->swap_sortkeys(\%myconfig, $form, "payment_terms");
-  list_payment();
+  AM->swap_sortkeys(\%myconfig, $form, "buchungsgruppen");
+  list_buchungsgruppe();

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -2394,6 +948,11 @@ sub edit_defaults {
 
   map { $form->{"defaults_${_}"} = $form->{defaults}->{$_} } keys %{ $form->{defaults} };
 
 
   map { $form->{"defaults_${_}"} = $form->{defaults}->{$_} } keys %{ $form->{defaults} };
 

+  # default language
+  my $all_languages = SL::DB::Manager::Language->get_all;
+
+# cash = IST-Versteuerung, accrual = SOLL-Versteuerung
+

   foreach my $key (keys %{ $form->{IC} }) {
     foreach my $accno (sort keys %{ $form->{IC}->{$key} }) {
       my $array = "ACCNOS_" . uc($key);
   foreach my $key (keys %{ $form->{IC} }) {
     foreach my $accno (sort keys %{ $form->{IC}->{$key} }) {
       my $array = "ACCNOS_" . uc($key);


@@ -2411,7 +970,8 @@ sub edit_defaults {
   $form->{title} = $locale->text('Ranges of numbers and default accounts');
 
   $form->header();
   $form->{title} = $locale->text('Ranges of numbers and default accounts');
 
   $form->header();

-  print $form->parse_html_template('am/edit_defaults');
+  print $form->parse_html_template('am/edit_defaults',
+                                   { ALL_LANGUAGES => $all_languages, });

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -2453,7 +1013,7 @@ sub config {
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
 
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
 

-  _build_cfg_options('dateformat', qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd));
+  _build_cfg_options('dateformat', qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd));

   _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00'));
 
   my @formats = ();
   _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00'));
 
   my @formats = ();


@@ -2499,14 +1059,7 @@ sub config {
     { 'name' => $locale->text('Queue'),   'value' => 'queue',   'selected' => $selected{queue}, },
     ];
 
     { 'name' => $locale->text('Queue'),   'value' => 'queue',   'selected' => $selected{queue}, },
     ];
 

-  $form->{PRINTERS} = [];
-  foreach my $printer (SL::Printer->all_printers(%::myconfig)) {
-    push @{ $form->{PRINTERS} }, {
-      'name'     => $printer->{printer_description},
-      'value'    => $printer->{id},
-      'selected' => $printer->{id} == $myconfig{default_printer_id},
-    };
-  }
+  $form->{PRINTERS} = [ SL::Printer->all_printers(%::myconfig) ];

 
   my %countrycodes = User->country_codes;
 
 
   my %countrycodes = User->country_codes;
 


@@ -2520,7 +1073,7 @@ sub config {
   }
 
   $form->{STYLESHEETS} = [];
   }
 
   $form->{STYLESHEETS} = [];

-  foreach my $item (qw(lx-office-erp.css Win2000.css Mobile.css)) {
+  foreach my $item (qw(lx-office-erp.css Mobile.css kivitendo.css)) {

     push @{ $form->{STYLESHEETS} }, {
       'name'     => $item,
       'value'    => $item,
     push @{ $form->{STYLESHEETS} }, {
       'name'     => $item,
       'value'    => $item,


@@ -2578,55 +1131,17 @@ sub save_preferences {
 }
 
 sub audit_control {
 }
 
 sub audit_control {

-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->{title} = $locale->text('Audit Control');
-
-  AM->closedto(\%myconfig, \%$form);
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=am.pl>
-
-<table width=100%>
-  <tr><th class=listtop>$form->{title}</th></tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <th>| . $locale->text('Close Books up to') . qq|</th>
-          <td><input name=closedto size=11 title="$myconfig{dateformat}" value=$form->{closedto}></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-
-<hr size=3 noshade>
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');

 
 

-<br>
-<input type=hidden name=nextsub value=doclose>
+  $::form->{title} = $::locale->text('Audit Control');

 
 

-<input type=submit class=submit name=action value="|
-    . $locale->text('Continue') . qq|">
+  AM->closedto(\%::myconfig, $::form);

 
 

-</form>
+  $::form->header;
+  print $::form->parse_html_template('am/audit_control');

 
 

-</body>
-</html>
-|;
-
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;

 }
 
 sub doclose {
 }
 
 sub doclose {


@@ -2687,15 +1202,13 @@ sub edit_units {
   $units = AM->retrieve_units(\%myconfig, $form);
   my $ddbox = AM->unit_select_data($units, undef, 1);
 
   $units = AM->retrieve_units(\%myconfig, $form);
   my $ddbox = AM->unit_select_data($units, undef, 1);
 

-  my $updownlink = build_std_url("action=swap_units");
-

   $form->{"title"} = $locale->text("Add and edit units");
   $form->header();
   print($form->parse_html_template("am/edit_units",
                                    { "UNITS"               => \@unit_list,
                                      "NEW_BASE_UNIT_DDBOX" => $ddbox,
                                      "LANGUAGES"           => \@languages,
   $form->{"title"} = $locale->text("Add and edit units");
   $form->header();
   print($form->parse_html_template("am/edit_units",
                                    { "UNITS"               => \@unit_list,
                                      "NEW_BASE_UNIT_DDBOX" => $ddbox,
                                      "LANGUAGES"           => \@languages,

-                                     "updownlink"          => $updownlink }));
+                                   }));

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -2897,7 +1410,8 @@ sub show_am_history {
 
   my $dbh = $form->dbconnect(\%myconfig);
 
 
   my $dbh = $form->dbconnect(\%myconfig);
 

-  my $restriction  = qq| AND (| . join(' OR ', map { " addition = " . $dbh->quote($_) } split(m/\,/, $form->{einschraenkungen})) . qq|)| if $form->{einschraenkungen};
+  my $restriction;
+  $restriction     = qq| AND (| . join(' OR ', map { " addition = " . $dbh->quote($_) } split(m/\,/, $form->{einschraenkungen})) . qq|)| if $form->{einschraenkungen};

   $restriction    .= qq| AND h.itime::date >= | . conv_dateq($form->{fromdate})                                                          if $form->{fromdate};
   $restriction    .= qq| AND h.itime::date <= | . conv_dateq($form->{todate})                                                            if $form->{todate};
   if ($form->{mitarbeiter} =~ m/^\d+$/) {
   $restriction    .= qq| AND h.itime::date >= | . conv_dateq($form->{fromdate})                                                          if $form->{fromdate};
   $restriction    .= qq| AND h.itime::date <= | . conv_dateq($form->{todate})                                                            if $form->{todate};
   if ($form->{mitarbeiter} =~ m/^\d+$/) {


@@ -2933,22 +1447,6 @@ sub show_am_history {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

-sub swap_units {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  my $dir = $form->{"dir"} eq "down" ? "down" : "up";
-  AM->swap_units(\%myconfig, $form, $dir, $form->{"name"});
-
-  edit_units();
-
-  $main::lxdebug->leave_sub();
-}
-

 sub add_tax {
   $main::lxdebug->enter_sub();
 
 sub add_tax {
   $main::lxdebug->enter_sub();
 


@@ -2993,7 +1491,11 @@ sub edit_tax {
 
   $form->header();
 
 
   $form->header();
 

+  #set readonly if the there are entries in acc_trans with the tax
+  my $readonly = $form->{tax_already_used} ? 'readonly' : '';
+

   my $parameters_ref = {
   my $parameters_ref = {

+    readonly => $readonly, 

   };
 
   # Ausgabe des Templates
   };
 
   # Ausgabe des Templates


@@ -3054,12 +1556,16 @@ sub save_tax {
 
   $main::auth->assert('config');
 
 
   $main::auth->assert('config');
 

-  $form->isblank("rate", $locale->text('Taxrate missing!'));
-  $form->isblank("taxdescription", $locale->text('Taxdescription  missing!'));
-  $form->isblank("taxkey", $locale->text('Taxkey  missing!'));
+  $form->error($locale->text('Taxkey  missing!')) unless length($form->{taxkey}) != 0;
+  $form->error($locale->text('Taxdescription  missing!')) unless length($form->{taxdescription}) != 0;
+  $form->error($locale->text('Taxrate missing!')) unless length($form->{rate}) != 0;

 
   $form->{rate} = $form->parse_amount(\%myconfig, $form->{rate});
 
 
   $form->{rate} = $form->parse_amount(\%myconfig, $form->{rate});
 

+  if ($form->{taxkey} == 0 and $form->{rate} > 0) {
+    $form->error($locale->text('Taxkey 0 is reserved for rate 0'));
+  }
+

   if ( $form->{rate} < 0 || $form->{rate} >= 100 ) {
     $form->error($locale->text('Tax Percent is a number between 0 and 100'));
   }
   if ( $form->{rate} < 0 || $form->{rate} >= 100 ) {
     $form->error($locale->text('Tax Percent is a number between 0 and 100'));
   }


@@ -3099,7 +1605,7 @@ sub add_price_factor {
 
   $form->{title}      = $locale->text('Add Price Factor');
   $form->{callback} ||= build_std_url('action=add_price_factor');
 
   $form->{title}      = $locale->text('Add Price Factor');
   $form->{callback} ||= build_std_url('action=add_price_factor');

-  $form->{fokus}      = 'description';
+  $::request->{layout}->focus('#description');

 
   $form->header();
   print $form->parse_html_template('am/edit_price_factor');
 
   $form->header();
   print $form->parse_html_template('am/edit_price_factor');


@@ -3118,7 +1624,7 @@ sub edit_price_factor {
 
   $form->{title}      = $locale->text('Edit Price Factor');
   $form->{callback} ||= build_std_url('action=add_price_factor');
 
   $form->{title}      = $locale->text('Edit Price Factor');
   $form->{callback} ||= build_std_url('action=add_price_factor');

-  $form->{fokus}      = 'description';
+  $::request->{layout}->focus('#description');

 
   AM->get_price_factor(\%myconfig, $form);
 
 
   AM->get_price_factor(\%myconfig, $form);
 


@@ -3141,16 +1647,8 @@ sub list_price_factors {
 
   AM->get_all_price_factors(\%myconfig, \%$form);
 
 
   AM->get_all_price_factors(\%myconfig, \%$form);
 

-  my $previous;

   foreach my $current (@{ $form->{PRICE_FACTORS} }) {
   foreach my $current (@{ $form->{PRICE_FACTORS} }) {

-    if ($previous) {
-      $previous->{next_id}    = $current->{id};
-      $current->{previous_id} = $previous->{id};
-    }
-

     $current->{factor} = $form->format_amount(\%myconfig, $current->{factor} * 1);
     $current->{factor} = $form->format_amount(\%myconfig, $current->{factor} * 1);

-
-    $previous = $current;

   }
 
   $form->{callback} = build_std_url('action=list_price_factors');
   }
 
   $form->{callback} = build_std_url('action=list_price_factors');


@@ -3204,20 +1702,6 @@ sub delete_price_factor {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

-sub swap_price_factors {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  AM->swap_sortkeys(\%myconfig, $form, 'price_factors');
-  list_price_factors();
-
-  $main::lxdebug->leave_sub();
-}
-

 sub add_warehouse {
   $main::lxdebug->enter_sub();
 
 sub add_warehouse {
   $main::lxdebug->enter_sub();
 


@@ -3228,7 +1712,7 @@ sub add_warehouse {
 
   $form->{title}      = $locale->text('Add Warehouse');
   $form->{callback} ||= build_std_url('action=add_warehouse');
 
   $form->{title}      = $locale->text('Add Warehouse');
   $form->{callback} ||= build_std_url('action=add_warehouse');

-  $form->{fokus}      = 'description';
+  $::request->{layout}->focus('#description');

 
   $form->header();
   print $form->parse_html_template('am/edit_warehouse');
 
   $form->header();
   print $form->parse_html_template('am/edit_warehouse');


@@ -3251,7 +1735,7 @@ sub edit_warehouse {
 
   $form->{title}      = $locale->text('Edit Warehouse');
   $form->{callback} ||= build_std_url('action=list_warehouses');
 
   $form->{title}      = $locale->text('Edit Warehouse');
   $form->{callback} ||= build_std_url('action=list_warehouses');

-  $form->{fokus}      = 'description';
+  $::request->{layout}->focus('#description');

 
   $form->header();
   print $form->parse_html_template('am/edit_warehouse');
 
   $form->header();
   print $form->parse_html_template('am/edit_warehouse');


@@ -3270,16 +1754,6 @@ sub list_warehouses {
 
   AM->get_all_warehouses(\%myconfig, $form);
 
 
   AM->get_all_warehouses(\%myconfig, $form);
 

-  my $previous;
-  foreach my $current (@{ $form->{WAREHOUSES} }) {
-    if ($previous) {
-      $previous->{next_id}    = $current->{id};
-      $current->{previous_id} = $previous->{id};
-    }
-
-    $previous = $current;
-  }
-

   $form->{callback} = build_std_url('action=list_warehouses');
   $form->{title}    = $locale->text('Warehouses');
   $form->{url_base} = build_std_url('callback');
   $form->{callback} = build_std_url('action=list_warehouses');
   $form->{title}    = $locale->text('Warehouses');
   $form->{url_base} = build_std_url('callback');


@@ -3312,20 +1786,6 @@ sub save_warehouse {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

-sub swap_warehouses {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('config');
-
-  AM->swap_sortkeys(\%myconfig, $form, 'warehouse');
-  list_warehouses();
-
-  $main::lxdebug->leave_sub();
-}
-

 sub delete_warehouse {
   $main::lxdebug->enter_sub();
 
 sub delete_warehouse {
   $main::lxdebug->enter_sub();