X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAM.pm;h=cbbfae03f61b3735798cc46bf07a2b5738bf59df;hb=8e5b1f0e363dd22883e931006b8ac414bad9bbc5;hp=2b08cabc032529a635ded1f28993fce32e17341e;hpb=e07e9534d0c611913e31bc620c65e46701e5f000;p=kivitendo-erp.git

diff --git a/SL/AM.pm b/SL/AM.pm
index 2b08cabc0..cbbfae03f 100644
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -37,8 +37,18 @@
 
 package AM;
 
+use Carp;
 use Data::Dumper;
+use Encode;
+use List::MoreUtils qw(any);
 use SL::DBUtils;
+use SL::DB::AuthUser;
+use SL::DB::Default;
+use SL::DB::Employee;
+use SL::DB::Chart;
+use SL::GenericTranslations;
+
+use strict;
 
 sub get_account {
   $main::lxdebug->enter_sub();
@@ -47,24 +57,27 @@ sub get_account {
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  my $query =
-    qq!SELECT c.accno, c.description, c.charttype, c.gifi_accno, c.category,! .
-    qq!  c.link, c.pos_bilanz, c.pos_eur, c.new_chart_id, c.valid_from, ! .
-    qq!  c.pos_bwa, ! .
-    qq!  tk.taxkey_id, tk.pos_ustva, tk.tax_id, ! .
-    qq!  tk.tax_id || '--' || tk.taxkey_id AS tax, tk.startdate ! .
-    qq!FROM chart c ! .
-    qq!LEFT JOIN taxkeys tk ! .
-    qq!ON (c.id=tk.chart_id AND tk.id = ! .
-    qq!  (SELECT id FROM taxkeys ! .
-    qq!   WHERE taxkeys.chart_id = c.id AND startdate <= current_date ! .
-    qq!   ORDER BY startdate DESC LIMIT 1)) ! .
-    qq!WHERE c.id = ?!;
-
+  my $query = qq{
+    SELECT c.accno, c.description, c.charttype, c.category,
+      c.link, c.pos_bilanz, c.pos_eur, c.new_chart_id, c.valid_from,
+      c.pos_bwa, datevautomatik,
+      tk.taxkey_id, tk.pos_ustva, tk.tax_id,
+      tk.tax_id || '--' || tk.taxkey_id AS tax, tk.startdate
+    FROM chart c
+    LEFT JOIN taxkeys tk
+    ON (c.id=tk.chart_id AND tk.id =
+      (SELECT id FROM taxkeys
+       WHERE taxkeys.chart_id = c.id AND startdate <= current_date
+       ORDER BY startdate DESC LIMIT 1))
+    WHERE c.id = ?
+    };
+
+
+  $main::lxdebug->message(LXDebug->QUERY(), "\$query=\n $query");
   my $sth = $dbh->prepare($query);
   $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})");
 
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  my $ref = $sth->fetchrow_hashref("NAME_lc");
 
   foreach my $key (keys %$ref) {
     $form->{"$key"} = $ref->{"$key"};
@@ -75,24 +88,36 @@ sub get_account {
   # get default accounts
   $query = qq|SELECT inventory_accno_id, income_accno_id, expense_accno_id
               FROM defaults|;
+  $main::lxdebug->message(LXDebug->QUERY(), "\$query=\n $query");
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
-  $ref = $sth->fetchrow_hashref(NAME_lc);
+  $ref = $sth->fetchrow_hashref("NAME_lc");
 
-  map { $form->{$_} = $ref->{$_} } keys %ref;
+  map { $form->{$_} = $ref->{$_} } keys %{ $ref };
 
   $sth->finish;
 
+
+
   # get taxkeys and description
-  $query = qq§SELECT id, taxkey,id||'--'||taxkey AS tax, taxdescription
-              FROM tax ORDER BY taxkey§;
+  $query = qq{
+    SELECT
+      id,
+      (SELECT accno FROM chart WHERE id=tax.chart_id) AS chart_accno,
+      taxkey,
+      id||'--'||taxkey AS tax,
+      taxdescription,
+      rate
+    FROM tax ORDER BY taxkey
+  };
+  $main::lxdebug->message(LXDebug->QUERY(), "\$query=\n $query");
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
   $form->{TAXKEY} = [];
 
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
     push @{ $form->{TAXKEY} }, $ref;
   }
 
@@ -100,20 +125,58 @@ sub get_account {
   if ($form->{id}) {
     # get new accounts
     $query = qq|SELECT id, accno,description
-                FROM chart WHERE link = ?|;
+                FROM chart
+                WHERE link = ?
+                ORDER BY accno|;
+    $main::lxdebug->message(LXDebug->QUERY(), "\$query=\n $query");
     $sth = $dbh->prepare($query);
     $sth->execute($form->{link}) || $form->dberror($query . " ($form->{link})");
 
     $form->{NEWACCOUNT} = [];
-    while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+    while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
       push @{ $form->{NEWACCOUNT} }, $ref;
     }
 
     $sth->finish;
+
+    # get the taxkeys of account
+
+    $query = qq{
+      SELECT
+        tk.id,
+        tk.chart_id,
+        c.accno,
+        tk.tax_id,
+        t.taxdescription,
+        t.rate,
+        tk.taxkey_id,
+        tk.pos_ustva,
+        tk.startdate
+      FROM taxkeys tk
+      LEFT JOIN   tax t ON (t.id = tk.tax_id)
+      LEFT JOIN chart c ON (c.id = t.chart_id)
+
+      WHERE tk.chart_id = ?
+      ORDER BY startdate DESC
+    };
+    $main::lxdebug->message(LXDebug->QUERY(), "\$query=\n $query");
+    $sth = $dbh->prepare($query);
+
+    $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})");
+
+    $form->{ACCOUNT_TAXKEYS} = [];
+
+    while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
+      push @{ $form->{ACCOUNT_TAXKEYS} }, $ref;
+    }
+
+    $sth->finish;
+
   }
   # check if we have any transactions
   $query = qq|SELECT a.trans_id FROM acc_trans a
               WHERE a.chart_id = ?|;
+  $main::lxdebug->message(LXDebug->QUERY(), "\$query=\n $query");
   $sth = $dbh->prepare($query);
   $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})");
 
@@ -126,6 +189,7 @@ sub get_account {
   if ($form->{new_chart_id}) {
     $query = qq|SELECT current_date-valid_from FROM chart
                 WHERE id = ?|;
+    $main::lxdebug->message(LXDebug->QUERY(), "\$query=\n $query");
     my ($count) = selectrow_query($form, $dbh, $query, $form->{id});
     if ($count >=0) {
       $form->{new_chart_valid} = 1;
@@ -141,15 +205,23 @@ sub get_account {
 sub save_account {
   $main::lxdebug->enter_sub();
 
+  # TODO: it should be forbidden to change an account to a heading if there
+  # have been bookings to this account in the past
+
   my ($self, $myconfig, $form) = @_;
 
   # connect to database, turn off AutoCommit
   my $dbh = $form->dbconnect_noauto($myconfig);
 
+  for (qw(AR_include_in_dropdown AP_include_in_dropdown summary_account)) {
+    $form->{$form->{$_}} = $form->{$_} if $form->{$_};
+  }
+
   # sanity check, can't have AR with AR_...
   if ($form->{AR} || $form->{AP} || $form->{IC}) {
-    map { delete $form->{$_} }
-      qw(AR_amount AR_tax AR_paid AP_amount AP_tax AP_paid IC_sale IC_cogs IC_taxpart IC_income IC_expense IC_taxservice CT_tax);
+    if (any { $form->{$_} } qw(AR_amount AR_tax AR_paid AP_amount AP_tax AP_paid IC_sale IC_cogs IC_taxpart IC_income IC_expense IC_taxservice)) {
+      $form->error($::locale->text('It is not allowed that a summary account occurs in a drop-down menu!'));
+    }
   }
 
   $form->{link} = "";
@@ -160,7 +232,7 @@ sub save_account {
                     $form->{IC},            $form->{IC_sale},
                     $form->{IC_cogs},       $form->{IC_taxpart},
                     $form->{IC_income},     $form->{IC_expense},
-                    $form->{IC_taxservice}, $form->{CT_tax}
+                    $form->{IC_taxservice}
     ) {
     $form->{link} .= "${item}:" if ($item);
   }
@@ -175,75 +247,202 @@ sub save_account {
     $form->{id} = "";
   }
 
-  my @values;
+  $query = '
+    SELECT accno
+    FROM chart
+    WHERE accno = ?';
+
+  my @values = ($form->{accno});
+
+  if ( $form->{id} ) {
+    $query .= ' AND NOT id = ?';
+    push(@values, $form->{id});
+  }
+
+  my ($accno) = selectrow_query($form, $dbh, $query, @values);
+
+  if ($accno) {
+    $form->error($::locale->text('Account number not unique!'));
+  }
+
+
+  if (!$form->{id} || $form->{id} eq "") {
+    $query = qq|SELECT nextval('id')|;
+    ($form->{"id"}) = selectrow_query($form, $dbh, $query);
+    $query = qq|INSERT INTO chart (id, accno, link) VALUES (?, ?, ?)|;
+    do_query($form, $dbh, $query, $form->{"id"}, $form->{"accno"}, '');
+  }
+
+  @values = ();
+
+
+  if ($form->{id}) {
+
+    # if charttype is heading make sure certain values are empty
+    # specifically, if charttype is changed from an existing account, empty the
+    # fields unnecessary for headings, so that e.g. heading doesn't appear in
+    # drop-down menues due to still having a valid "link" entry
 
-  my ($tax_id, $taxkey) = split(/--/, $form->{tax});
-  my $startdate = $form->{startdate} ? $form->{startdate} : "1970-01-01";
+    if ( $form->{charttype} eq 'H' ) {
+      $form->{link} = '';
+      $form->{pos_bwa} = '';
+      $form->{pos_bilanz} = '';
+      $form->{pos_eur} = '';
+      $form->{new_chart_id} = '';
+      $form->{valid_from} = '';
+    };
 
-  if ($form->{id} && $form->{orphaned}) {
     $query = qq|UPDATE chart SET
-                accno = ?, description = ?, charttype = ?,
-		gifi_accno = ?, category = ?, link = ?,
-                taxkey_id = ?,
-                pos_ustva = ?, pos_bwa   = ?, pos_bilanz = ?,
-                pos_eur = ?, new_chart_id = ?, valid_from = ?
-		WHERE id = ?|;
-    @values = ($form->{accno}, $form->{description}, $form->{charttype},
-	       $form->{gifi_accno}, $form->{category}, $form->{link},
-	       conv_i($taxkey),
-	       conv_i($form->{pos_ustva}), conv_i($form->{pos_bwa}),
-	       conv_i($form->{pos_bilanz}), conv_i($form->{pos_eur}),
-	       conv_i($form->{new_chart_id}),
-	       conv_date($form->{valid_from}),
-	       $form->{id});
-
-  } elsif ($form->{id} && !$form->{new_chart_valid}) {
-    $query = qq|UPDATE chart SET new_chart_id = ?, valid_from = ?
-		WHERE id = ?|;
-    @values = (conv_i($form->{new_chart_id}), conv_date($form->{valid_from}),
-	       $form->{id});
-  } else {
-    $query = qq|INSERT INTO chart
-                (accno, description, charttype,
-                 gifi_accno, category, link,
-                 taxkey_id,
-                 pos_ustva, pos_bwa, pos_bilanz, pos_eur,
-                 new_chart_id, valid_from)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
-    @values = ($form->{accno}, $form->{description}, $form->{charttype},
-	       $form->{gifi_accno}, $form->{category}, $form->{link},
-	       conv_i($taxkey),
-	       conv_i($form->{pos_ustva}), conv_i($form->{pos_bwa}),
-	       conv_i($form->{pos_bilanz}), conv_i($form->{pos_eur}),
-	       conv_i($form->{new_chart_id}),
-	       conv_date($form->{valid_from}));
+                  accno = ?,
+                  description = ?,
+                  charttype = ?,
+                  category = ?,
+                  link = ?,
+                  pos_bwa   = ?,
+                  pos_bilanz = ?,
+                  pos_eur = ?,
+                  new_chart_id = ?,
+                  valid_from = ?,
+                  datevautomatik = ?
+                WHERE id = ?|;
+
+    @values = (
+                  $form->{accno},
+                  $form->{description},
+                  $form->{charttype},
+                  $form->{category},
+                  $form->{link},
+                  conv_i($form->{pos_bwa}),
+                  conv_i($form->{pos_bilanz}),
+                  conv_i($form->{pos_eur}),
+                  conv_i($form->{new_chart_id}),
+                  conv_date($form->{valid_from}),
+                  ($form->{datevautomatik} eq 'T') ? 'true':'false',
+                $form->{id},
+    );
+
 
   }
+
   do_query($form, $dbh, $query, @values);
 
-  #Save Taxes
-  if (!$form->{id}) {
-    $query =
-      qq|INSERT INTO taxkeys | .
-      qq|(chart_id, tax_id, taxkey_id, pos_ustva, startdate) | .
-      qq|VALUES ((SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?)|;
-    do_query($form, $dbh, $query,
-	     $form->{accno}, conv_i($tax_id), conv_i($taxkey),
-	     conv_i($form->{pos_ustva}), conv_date($startdate));
+  #Save Taxkeys
 
-  } else {
-    $query = qq|DELETE FROM taxkeys WHERE chart_id = ? AND tax_id = ?|;
-    do_query($form, $dbh, $query, $form->{id}, conv_i($tax_id));
+  my @taxkeys = ();
+
+  my $MAX_TRIES = 10; # Maximum count of taxkeys in form
+  my $tk_count;
+
+  READTAXKEYS:
+  for $tk_count (0 .. $MAX_TRIES) {
+
+    # Loop control
+
+    # Check if the account already exists, else cancel
+
+    print(STDERR "Keine Taxkeys weil ID =: $form->{id}\n");
+
+    last READTAXKEYS if ( $form->{'id'} == 0);
+
+    # check if there is a startdate
+    if ( $form->{"taxkey_startdate_$tk_count"} eq '' ) {
+      $tk_count++;
+      next READTAXKEYS;
+    }
+
+    # Add valid taxkeys into the array
+    push @taxkeys ,
+      {
+        id        => ($form->{"taxkey_id_$tk_count"} eq 'NEW') ? conv_i('') : conv_i($form->{"taxkey_id_$tk_count"}),
+        tax_id    => conv_i($form->{"taxkey_tax_$tk_count"}),
+        startdate => conv_date($form->{"taxkey_startdate_$tk_count"}),
+        chart_id  => conv_i($form->{"id"}),
+        pos_ustva => conv_i($form->{"taxkey_pos_ustva_$tk_count"}),
+        delete    => ( $form->{"taxkey_del_$tk_count"} eq 'delete' ) ? '1' : '',
+      };
+
+    $tk_count++;
+  }
+
+  TAXKEY:
+  for my $j (0 .. $#taxkeys){
+    if ( defined $taxkeys[$j]{'id'} ){
+      # delete Taxkey?
+
+      if ($taxkeys[$j]{'delete'}){
+        $query = qq{
+          DELETE FROM taxkeys WHERE id = ?
+        };
+
+        @values = ($taxkeys[$j]{'id'});
+
+        do_query($form, $dbh, $query, @values);
+
+        next TAXKEY;
+      }
+
+      # UPDATE Taxkey
+
+      $query = qq{
+        UPDATE taxkeys
+        SET taxkey_id = (SELECT taxkey FROM tax WHERE tax.id = ?),
+            chart_id  = ?,
+            tax_id    = ?,
+            pos_ustva = ?,
+            startdate = ?
+        WHERE id = ?
+      };
+      @values = (
+        $taxkeys[$j]{'tax_id'},
+        $taxkeys[$j]{'chart_id'},
+        $taxkeys[$j]{'tax_id'},
+        $taxkeys[$j]{'pos_ustva'},
+        $taxkeys[$j]{'startdate'},
+        $taxkeys[$j]{'id'},
+      );
+      do_query($form, $dbh, $query, @values);
+    }
+    else {
+      # INSERT Taxkey
+
+      $query = qq{
+        INSERT INTO taxkeys (
+          taxkey_id,
+          chart_id,
+          tax_id,
+          pos_ustva,
+          startdate
+        )
+        VALUES ((SELECT taxkey FROM tax WHERE tax.id = ?), ?, ?, ?, ?)
+      };
+      @values = (
+        $taxkeys[$j]{'tax_id'},
+        $taxkeys[$j]{'chart_id'},
+        $taxkeys[$j]{'tax_id'},
+        $taxkeys[$j]{'pos_ustva'},
+        $taxkeys[$j]{'startdate'},
+      );
+
+      do_query($form, $dbh, $query, @values);
+    }
 
-    $query =
-      qq|INSERT INTO taxkeys | .
-      qq|(chart_id, tax_id, taxkey_id, pos_ustva, startdate) | .
-      qq|VALUES (?, ?, ?, ?, ?)|;
-    do_query($form, $dbh, $query,
-	     $form->{id}, conv_i($tax_id), conv_i($taxkey),
-	     conv_i($form->{pos_ustva}), conv_date($startdate));
   }
 
+  # Update chart.taxkey_id to the latest from taxkeys for this chart.
+  $query = <<SQL;
+    UPDATE chart
+    SET taxkey_id = (
+      SELECT taxkey_id
+      FROM taxkeys
+      WHERE taxkeys.chart_id = chart.id
+      ORDER BY startdate DESC
+      LIMIT 1
+    )
+    WHERE id = ?
+SQL
+
+  do_query($form, $dbh, $query, $form->{id});
+
   # commit
   my $rc = $dbh->commit;
   $dbh->disconnect;
@@ -280,13 +479,18 @@ sub delete_account {
     do_query($form, $dbh, $query, $form->{id});
   }
 
-  foreach my $table (qw(partstax customertax vendortax tax)) {
-    $query = qq|DELETE FROM $table
-                WHERE chart_id = ?|;
-    do_query($form, $dbh, $query, $form->{id});
-  }
+  $query = qq|DELETE FROM tax
+              WHERE chart_id = ?|;
+  do_query($form, $dbh, $query, $form->{id});
+
+  # delete account taxkeys
+  $query = qq|DELETE FROM taxkeys
+              WHERE chart_id = ?|;
+  do_query($form, $dbh, $query, $form->{id});
 
   # delete chart of account record
+  # last step delete chart, because we have a constraint
+  # to taxkeys
   $query = qq|DELETE FROM chart
               WHERE id = ?|;
   do_query($form, $dbh, $query, $form->{id});
@@ -300,110 +504,6 @@ sub delete_account {
   return $rc;
 }
 
-sub departments {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  my $query = qq|SELECT d.id, d.description, d.role
-                 FROM department d
-		 ORDER BY 2|;
-
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{ALL} }, $ref;
-  }
-
-  $sth->finish;
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub get_department {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  my $query = qq|SELECT d.description, d.role
-                 FROM department d
-	         WHERE d.id = $form->{id}|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
-
-  map { $form->{$_} = $ref->{$_} } keys %$ref;
-
-  $sth->finish;
-
-  # see if it is in use
-  $query = qq|SELECT count(*) FROM dpt_trans d
-              WHERE d.department_id = $form->{id}|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  ($form->{orphaned}) = $sth->fetchrow_array;
-  $form->{orphaned} = !$form->{orphaned};
-  $sth->finish;
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub save_department {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  $form->{description} =~ s/\'/\'\'/g;
-
-  if ($form->{id}) {
-    $query = qq|UPDATE department SET
-		description = '$form->{description}',
-		role = '$form->{role}'
-		WHERE id = $form->{id}|;
-  } else {
-    $query = qq|INSERT INTO department
-                (description, role)
-                VALUES ('$form->{description}', '$form->{role}')|;
-  }
-  $dbh->do($query) || $form->dberror($query);
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub delete_department {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  $query = qq|DELETE FROM department
-	      WHERE id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
 sub lead {
   $main::lxdebug->enter_sub();
 
@@ -414,12 +514,12 @@ sub lead {
 
   my $query = qq|SELECT id, lead
                  FROM leads
-		 ORDER BY 2|;
+                 ORDER BY 2|;
 
-  $sth = $dbh->prepare($query);
+  my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
     push @{ $form->{ALL} }, $ref;
   }
 
@@ -438,13 +538,13 @@ sub get_lead {
   my $dbh = $form->dbconnect($myconfig);
 
   my $query =
-    qq|SELECT l.id, l.lead
-                 FROM leads l
-	         WHERE l.id = $form->{id}|;
+    qq|SELECT l.id, l.lead | .
+    qq|FROM leads l | .
+    qq|WHERE l.id = ?|;
   my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})");
 
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  my $ref = $sth->fetchrow_hashref("NAME_lc");
 
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
@@ -459,23 +559,24 @@ sub save_lead {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
+  my ($query);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  $form->{lead} =~ s/\'/\'\'/g;
-
+  my @values = ($form->{description});
   # id is the old record
   if ($form->{id}) {
     $query = qq|UPDATE leads SET
-		lead = '$form->{description}'
-		WHERE id = $form->{id}|;
+                lead = ?
+                WHERE id = ?|;
+    push(@values, $form->{id});
   } else {
     $query = qq|INSERT INTO leads
                 (lead)
-                VALUES ('$form->{description}')|;
+                VALUES (?)|;
   }
-  $dbh->do($query) || $form->dberror($query);
+  do_query($form, $dbh, $query, @values);
 
   $dbh->disconnect;
 
@@ -486,120 +587,20 @@ sub delete_lead {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
+  my ($query);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   $query = qq|DELETE FROM leads
-	      WHERE id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub business {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  my $query = qq|SELECT id, description, discount, customernumberinit, salesman
-                 FROM business
-		 ORDER BY 2|;
-
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{ALL} }, $ref;
-  }
-
-  $sth->finish;
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub get_business {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  my $query =
-    qq|SELECT b.description, b.discount, b.customernumberinit, b.salesman
-                 FROM business b
-	         WHERE b.id = $form->{id}|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
-
-  map { $form->{$_} = $ref->{$_} } keys %$ref;
-
-  $sth->finish;
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub save_business {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  $form->{description} =~ s/\'/\'\'/g;
-  $form->{discount} /= 100;
-  $form->{salesman} *= 1;
-
-  # id is the old record
-  if ($form->{id}) {
-    $query = qq|UPDATE business SET
-		description = '$form->{description}',
-		discount = $form->{discount},
-                customernumberinit = '$form->{customernumberinit}',
-                salesman = '$form->{salesman}'
-		WHERE id = $form->{id}|;
-  } else {
-    $query = qq|INSERT INTO business
-                (description, discount, customernumberinit, salesman)
-                VALUES ('$form->{description}', $form->{discount}, '$form->{customernumberinit}', '$form->{salesman}')|;
-  }
-  $dbh->do($query) || $form->dberror($query);
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub delete_business {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  $query = qq|DELETE FROM business
-	      WHERE id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+              WHERE id = ?|;
+  do_query($form, $dbh, $query, $form->{id});
 
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
 sub language {
   $main::lxdebug->enter_sub();
 
@@ -613,12 +614,12 @@ sub language {
     "  output_numberformat, output_dateformat, output_longdates " .
     "FROM language ORDER BY description";
 
-  $sth = $dbh->prepare($query);
+  my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
   my $ary = [];
 
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
     push(@{ $ary }, $ref);
   }
 
@@ -649,7 +650,7 @@ sub get_language {
   my $sth = $dbh->prepare($query);
   $sth->execute($form->{"id"}) || $form->dberror($query . " ($form->{id})");
 
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  my $ref = $sth->fetchrow_hashref("NAME_lc");
 
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
@@ -672,7 +673,7 @@ sub get_language_details {
     "SELECT template_code, " .
     "  output_numberformat, output_dateformat, output_longdates " .
     "FROM language WHERE id = ?";
-  my @res = $dbh->selectrow_array($query, undef, $id);
+  my @res = selectrow_query($form, $dbh, $query, $id);
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
@@ -709,8 +710,7 @@ sub save_language {
       "  output_numberformat, output_dateformat, output_longdates" .
       ") VALUES (?, ?, ?, ?, ?, ?)";
   }
-  $dbh->do($query, undef, @values) ||
-    $form->dberror($query . " (" . join(", ", @values) . ")");
+  do_query($form, $dbh, $query, @values);
 
   $dbh->disconnect;
 
@@ -721,12 +721,13 @@ sub delete_language {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
+  my $query;
 
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 
-  foreach my $table (qw(translation_payment_terms units_language)) {
-    my $query = qq|DELETE FROM $table WHERE language_id = ?|;
+  foreach my $table (qw(generic_translations units_language)) {
+    $query = qq|DELETE FROM $table WHERE language_id = ?|;
     do_query($form, $dbh, $query, $form->{"id"});
   }
 
@@ -739,746 +740,540 @@ sub delete_language {
   $main::lxdebug->leave_sub();
 }
 
-
-sub buchungsgruppe {
+sub prepare_template_filename {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
 
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  my ($filename, $display_filename);
 
-  my $query = qq|SELECT id, description,
-                 inventory_accno_id,
-                 (SELECT accno FROM chart WHERE id = inventory_accno_id) AS inventory_accno,
-                 income_accno_id_0,
-                 (SELECT accno FROM chart WHERE id = income_accno_id_0) AS income_accno_0,
-                 expense_accno_id_0,
-                 (SELECT accno FROM chart WHERE id = expense_accno_id_0) AS expense_accno_0,
-                 income_accno_id_1,
-                 (SELECT accno FROM chart WHERE id = income_accno_id_1) AS income_accno_1,
-                 expense_accno_id_1,
-                 (SELECT accno FROM chart WHERE id = expense_accno_id_1) AS expense_accno_1,
-                 income_accno_id_2,
-                 (SELECT accno FROM chart WHERE id = income_accno_id_2) AS income_accno_2,
-                 expense_accno_id_2,
-                 (select accno FROM chart WHERE id = expense_accno_id_2) AS expense_accno_2,
-                 income_accno_id_3,
-                 (SELECT accno FROM chart WHERE id = income_accno_id_3) AS income_accno_3,
-                 expense_accno_id_3,
-                 (SELECT accno FROM chart WHERE id = expense_accno_id_3) AS expense_accno_3
-                 FROM buchungsgruppen
-                 ORDER BY sortkey|;
+  if ($form->{type} eq "stylesheet") {
+    $filename = "css/$myconfig->{stylesheet}";
+    $display_filename = $myconfig->{stylesheet};
 
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  } else {
+    $filename = $form->{formname};
 
-  $form->{ALL} = [];
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{ALL} }, $ref;
-  }
+    if ($form->{language}) {
+      my ($id, $template_code) = split(/--/, $form->{language});
+      $filename .= "_${template_code}";
+    }
 
-  $sth->finish;
-  $dbh->disconnect;
+    if ($form->{printer}) {
+      my ($id, $template_code) = split(/--/, $form->{printer});
+      $filename .= "_${template_code}";
+    }
 
-  $main::lxdebug->leave_sub();
-}
-
-sub get_buchungsgruppe {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  if ($form->{id}) {
-    my $query =
-      qq|SELECT description, inventory_accno_id,
-         (SELECT accno FROM chart WHERE id = inventory_accno_id) AS inventory_accno,
-         income_accno_id_0,
-         (SELECT accno FROM chart WHERE id = income_accno_id_0) AS income_accno_0,
-         expense_accno_id_0,
-         (SELECT accno FROM chart WHERE id = expense_accno_id_0) AS expense_accno_0,
-         income_accno_id_1,
-         (SELECT accno FROM chart WHERE id = income_accno_id_1) AS income_accno_1,
-         expense_accno_id_1,
-         (SELECT accno FROM chart WHERE id = expense_accno_id_1) AS expense_accno_1,
-         income_accno_id_2,
-         (SELECT accno FROM chart WHERE id = income_accno_id_2) AS income_accno_2,
-         expense_accno_id_2,
-         (select accno FROM chart WHERE id = expense_accno_id_2) AS expense_accno_2,
-         income_accno_id_3,
-         (SELECT accno FROM chart WHERE id = income_accno_id_3) AS income_accno_3,
-         expense_accno_id_3,
-         (SELECT accno FROM chart WHERE id = expense_accno_id_3) AS expense_accno_3
-         FROM buchungsgruppen
-         WHERE id = ?|;
-    my $sth = $dbh->prepare($query);
-    $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})");
+    $filename .= "." . ($form->{format} eq "html" ? "html" : "tex");
+    if ($form->{"formname"} =~ m|\.\.| || $form->{"formname"} =~ m|^/|) {
+      $filename =~ s|.*/||;
+    }
+    $display_filename = $filename;
+    $filename = SL::DB::Default->get->templates . "/$filename";
+  }
 
-    my $ref = $sth->fetchrow_hashref(NAME_lc);
+  $main::lxdebug->leave_sub();
 
-    map { $form->{$_} = $ref->{$_} } keys %$ref;
+  return ($filename, $display_filename);
+}
 
-    $sth->finish;
 
-    my $query =
-      qq|SELECT count(id) = 0 AS orphaned
-         FROM parts
-         WHERE buchungsgruppen_id = ?|;
-    ($form->{orphaned}) = $dbh->selectrow_array($query, undef, $form->{id});
-    $form->dberror($query . " ($form->{id})") if ($dbh->err);
-  }
+sub load_template {
+  $main::lxdebug->enter_sub();
 
-  $query = "SELECT inventory_accno_id, income_accno_id, expense_accno_id ".
-    "FROM defaults";
-  ($form->{"std_inventory_accno_id"}, $form->{"std_income_accno_id"},
-   $form->{"std_expense_accno_id"}) = $dbh->selectrow_array($query);
+  my ($self, $filename) = @_;
 
-  my $module = "IC";
-  $query = qq|SELECT c.accno, c.description, c.link, c.id,
-              d.inventory_accno_id, d.income_accno_id, d.expense_accno_id
-              FROM chart c, defaults d
-              WHERE c.link LIKE '%$module%'
-              ORDER BY c.accno|;
+  my ($content, $lines) = ("", 0);
 
+  local *TEMPLATE;
 
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    foreach my $key (split(/:/, $ref->{link})) {
-      if (!$form->{"std_inventory_accno_id"} && ($key eq "IC")) {
-        $form->{"std_inventory_accno_id"} = $ref->{"id"};
-      }
-      if ($key =~ /$module/) {
-        if (   ($ref->{id} eq $ref->{inventory_accno_id})
-            || ($ref->{id} eq $ref->{income_accno_id})
-            || ($ref->{id} eq $ref->{expense_accno_id})) {
-          push @{ $form->{"${module}_links"}{$key} },
-            { accno       => $ref->{accno},
-              description => $ref->{description},
-              selected    => "selected",
-              id          => $ref->{id} };
-        } else {
-          push @{ $form->{"${module}_links"}{$key} },
-            { accno       => $ref->{accno},
-              description => $ref->{description},
-              selected    => "",
-              id          => $ref->{id} };
-        }
-      }
+  if (open(TEMPLATE, $filename)) {
+    while (<TEMPLATE>) {
+      $content .= $_;
+      $lines++;
     }
+    close(TEMPLATE);
   }
-  $sth->finish;
 
-
-  $dbh->disconnect;
+  $content = Encode::decode('utf-8-strict', $content);
 
   $main::lxdebug->leave_sub();
+
+  return ($content, $lines);
 }
 
-sub save_buchungsgruppe {
+sub save_template {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  my ($self, $filename, $content) = @_;
 
-  my @values = ($form->{description}, $form->{inventory_accno_id},
-                $form->{income_accno_id_0}, $form->{expense_accno_id_0},
-                $form->{income_accno_id_1}, $form->{expense_accno_id_1},
-                $form->{income_accno_id_2}, $form->{expense_accno_id_2},
-                $form->{income_accno_id_3}, $form->{expense_accno_id_3});
+  local *TEMPLATE;
 
-  my $query;
+  my $error = "";
 
-  # id is the old record
-  if ($form->{id}) {
-    $query = qq|UPDATE buchungsgruppen SET
-                description = ?, inventory_accno_id = ?,
-                income_accno_id_0 = ?, expense_accno_id_0 = ?,
-                income_accno_id_1 = ?, expense_accno_id_1 = ?,
-                income_accno_id_2 = ?, expense_accno_id_2 = ?,
-                income_accno_id_3 = ?, expense_accno_id_3 = ?
-                WHERE id = ?|;
-    push(@values, $form->{id});
+  if (open(TEMPLATE, ">", $filename)) {
+    $content = Encode::encode('utf-8-strict', $content);
+    $content =~ s/\r\n/\n/g;
+    print(TEMPLATE $content);
+    close(TEMPLATE);
   } else {
-    $query = qq|SELECT COALESCE(MAX(sortkey) + 1, 1) FROM buchungsgruppen|;
-    my ($sortkey) = $dbh->selectrow_array($query);
-    $form->dberror($query) if ($dbh->err);
-    push(@values, $sortkey);
-    $query = qq|INSERT INTO buchungsgruppen
-                (description, inventory_accno_id,
-                income_accno_id_0, expense_accno_id_0,
-                income_accno_id_1, expense_accno_id_1,
-                income_accno_id_2, expense_accno_id_2,
-                income_accno_id_3, expense_accno_id_3,
-                sortkey)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
+    $error = $!;
   }
-  do_query($form, $dbh, $query, @values);
-
-  $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
+
+  return $error;
 }
 
-sub delete_buchungsgruppe {
+sub save_preferences {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  my ($self, $form) = @_;
 
-  $query = qq|DELETE FROM buchungsgruppen WHERE id = ?|;
-  do_query($form, $dbh, $query, $form->{id});
+  my $employee = SL::DB::Manager::Employee->find_by(login => $::myconfig{login});
+  $employee->update_attributes(name => $form->{name});
 
-  $dbh->disconnect;
+  my $user = SL::DB::Manager::AuthUser->find_by(login => $::myconfig{login});
+  $user->update_attributes(
+    config_values => {
+      %{ $user->config_values },
+      map { ($_ => $form->{$_}) } SL::DB::AuthUser::CONFIG_VARS(),
+    });
 
   $main::lxdebug->leave_sub();
+
+  return 1;
 }
 
-sub swap_sortkeys {
+sub get_defaults {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form, $table) = @_;
+  my $self     = shift;
+  my %params   = @_;
 
-  # connect to database
-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my $myconfig = \%main::myconfig;
+  my $form     = $main::form;
 
-  my $query =
-    qq|SELECT
-       (SELECT sortkey FROM $table WHERE id = ?) AS sortkey1,
-       (SELECT sortkey FROM $table WHERE id = ?) AS sortkey2|;
-  my @values = ($form->{"id1"}, $form->{"id2"});
-  my @sortkeys = selectrow_query($form, $dbh, $query, @values);
-  $main::lxdebug->dump(0, "v", \@values);
-  $main::lxdebug->dump(0, "s", \@sortkeys);
-
-  $query = qq|UPDATE $table SET sortkey = ? WHERE id = ?|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute($sortkeys[1], $form->{"id1"}) ||
-    $form->dberror($query . " ($sortkeys[1], $form->{id1})");
-  $sth->execute($sortkeys[0], $form->{"id2"}) ||
-    $form->dberror($query . " ($sortkeys[0], $form->{id2})");
-  $sth->finish();
+  my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
 
-  $dbh->commit();
-  $dbh->disconnect;
+  my $defaults = selectfirst_hashref_query($form, $dbh, qq|SELECT * FROM defaults|) || {};
+
+  $defaults->{weightunit} ||= 'kg';
 
   $main::lxdebug->leave_sub();
+
+  return $defaults;
 }
 
-sub printer {
+sub closedto {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
 
-  # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  my $query = qq|SELECT id, printer_description, template_code, printer_command
-                 FROM printers
-		 ORDER BY 2|;
-
-  $sth = $dbh->prepare($query);
+  my $query = qq|SELECT closedto, max_future_booking_interval, revtrans FROM defaults|;
+  my $sth   = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
-  $form->{"ALL"} = [];
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{ALL} }, $ref;
-  }
+  ($form->{closedto}, $form->{max_future_booking_interval}, $form->{revtrans}) = $sth->fetchrow_array;
 
   $sth->finish;
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-sub get_printer {
+sub closebooks {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
 
-  # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  my $query =
-    qq|SELECT p.printer_description, p.template_code, p.printer_command
-                 FROM printers p
-	         WHERE p.id = $form->{id}|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  my ($query, @values);
 
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  # is currently NEVER trueish (no more hidden revtrans in $form)
+  # if ($form->{revtrans}) {
+  #   $query = qq|UPDATE defaults SET closedto = NULL, revtrans = '1'|;
+  # -> therefore you can only set this to false (which is already the default)
+  # and this flag is currently only checked in gl.pl. TOOD Can probably be removed
 
-  map { $form->{$_} = $ref->{$_} } keys %$ref;
+    $query = qq|UPDATE defaults SET closedto = ?, max_future_booking_interval = ?, revtrans = '0'|;
+    @values = (conv_date($form->{closedto}), conv_i($form->{max_future_booking_interval}));
 
-  $sth->finish;
+  # set close in defaults
+  do_query($form, $dbh, $query, @values);
 
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-sub save_printer {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+sub get_base_unit {
+  my ($self, $units, $unit_name, $factor) = @_;
 
-  $form->{printer_description} =~ s/\'/\'\'/g;
-  $form->{printer_command} =~ s/\'/\'\'/g;
-  $form->{template_code} =~ s/\'/\'\'/g;
+  $factor = 1 unless ($factor);
 
+  my $unit = $units->{$unit_name};
 
-  # id is the old record
-  if ($form->{id}) {
-    $query = qq|UPDATE printers SET
-		printer_description = '$form->{printer_description}',
-		template_code = '$form->{template_code}',
-		printer_command = '$form->{printer_command}'
-		WHERE id = $form->{id}|;
-  } else {
-    $query = qq|INSERT INTO printers
-                (printer_description, template_code, printer_command)
-                VALUES ('$form->{printer_description}', '$form->{template_code}', '$form->{printer_command}')|;
+  if (!defined($unit) || !$unit->{"base_unit"} ||
+      ($unit_name eq $unit->{"base_unit"})) {
+    return ($unit_name, $factor);
   }
-  $dbh->do($query) || $form->dberror($query);
-
-  $dbh->disconnect;
 
-  $main::lxdebug->leave_sub();
+  return AM->get_base_unit($units, $unit->{"base_unit"}, $factor * $unit->{"factor"});
 }
 
-sub delete_printer {
+sub retrieve_units {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  my ($self, $myconfig, $form, $prefix) = @_;
+  $prefix ||= '';
 
-  $query = qq|DELETE FROM printers
-	      WHERE id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  my $dbh = $form->get_standard_dbh;
 
-  $dbh->disconnect;
+  my $query = "SELECT *, base_unit AS original_base_unit FROM units";
 
-  $main::lxdebug->leave_sub();
-}
+  my $sth = prepare_execute_query($form, $dbh, $query);
 
-sub payment {
-  $main::lxdebug->enter_sub();
+  my $units = {};
+  while (my $ref = $sth->fetchrow_hashref()) {
+    $units->{$ref->{"name"}} = $ref;
+  }
+  $sth->finish();
 
-  my ($self, $myconfig, $form) = @_;
+  my $query_lang = "SELECT id, template_code FROM language ORDER BY description";
+  $sth = $dbh->prepare($query_lang);
+  $sth->execute() || $form->dberror($query_lang);
+  my @languages;
+  while (my $ref = $sth->fetchrow_hashref()) {
+    push(@languages, $ref);
+  }
+  $sth->finish();
 
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  $query_lang = "SELECT ul.localized, ul.localized_plural, l.id, l.template_code " .
+    "FROM units_language ul " .
+    "LEFT JOIN language l ON ul.language_id = l.id " .
+    "WHERE ul.unit = ?";
+  $sth = $dbh->prepare($query_lang);
 
-  my $query = qq|SELECT * FROM payment_terms ORDER BY sortkey|;
+  foreach my $unit (values(%{$units})) {
+    ($unit->{"${prefix}base_unit"}, $unit->{"${prefix}factor"}) = AM->get_base_unit($units, $unit->{"name"});
 
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+    $unit->{"LANGUAGES"} = {};
+    foreach my $lang (@languages) {
+      $unit->{"LANGUAGES"}->{$lang->{"template_code"}} = { "template_code" => $lang->{"template_code"} };
+    }
 
-  $form->{ALL} = [];
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{ALL} }, $ref;
+    $sth->execute($unit->{"name"}) || $form->dberror($query_lang . " (" . $unit->{"name"} . ")");
+    while (my $ref = $sth->fetchrow_hashref()) {
+      map({ $unit->{"LANGUAGES"}->{$ref->{"template_code"}}->{$_} = $ref->{$_} } keys(%{$ref}));
+    }
   }
-
   $sth->finish;
-  $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
+
+  return $units;
 }
 
-sub get_payment {
+sub retrieve_all_units {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form) = @_;
+  my $self = shift;
 
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  if (!$::request->{cache}{all_units}) {
+    $::request->{cache}{all_units} = $self->retrieve_units(\%main::myconfig, $main::form);
+  }
 
-  my $query = qq|SELECT * FROM payment_terms WHERE id = ?|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute($form->{"id"}) || $form->dberror($query . " ($form->{id})");
+  $main::lxdebug->leave_sub();
 
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
-  map { $form->{$_} = $ref->{$_} } keys %$ref;
-  $sth->finish();
+  return $::request->{cache}{all_units};
+}
 
-  $query =
-    qq|SELECT t.language_id, t.description_long, l.description AS language | .
-    qq|FROM translation_payment_terms t | .
-    qq|LEFT JOIN language l ON t.language_id = l.id | .
-    qq|WHERE t.payment_terms_id = ? | .
-    qq|UNION | .
-    qq|SELECT l.id AS language_id, NULL AS description_long, | .
-    qq|l.description AS language | .
-    qq|FROM language l|;
-  $sth = $dbh->prepare($query);
-  $sth->execute($form->{"id"}) || $form->dberror($query . " ($form->{id})");
 
-  my %mapping;
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    $mapping{ $ref->{"language_id"} } = $ref
-      unless (defined($mapping{ $ref->{"language_id"} }));
-  }
-  $sth->finish;
+sub translate_units {
+  $main::lxdebug->enter_sub();
 
-  $form->{"TRANSLATION"} = [sort({ $a->{"language"} cmp $b->{"language"} }
-                                 values(%mapping))];
+  my ($self, $form, $template_code, $unit, $amount) = @_;
 
-  $dbh->disconnect;
+  my $units = $self->retrieve_units(\%main::myconfig, $form);
+
+  my $h = $units->{$unit}->{"LANGUAGES"}->{$template_code};
+  my $new_unit = $unit;
+  if ($h) {
+    if (($amount != 1) && $h->{"localized_plural"}) {
+      $new_unit = $h->{"localized_plural"};
+    } elsif ($h->{"localized"}) {
+      $new_unit = $h->{"localized"};
+    }
+  }
 
   $main::lxdebug->leave_sub();
+
+  return $new_unit;
 }
 
-sub save_payment {
+sub units_in_use {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect_noauto($myconfig);
-
-  my $query;
+  my ($self, $myconfig, $form, $units) = @_;
 
-  if (!$form->{id}) {
-    $query = qq|SELECT nextval('id'), COALESCE(MAX(sortkey) + 1, 1) | .
-      qq|FROM payment_terms|;
-    my $sortkey;
-    ($form->{id}, $sortkey) = selectrow_query($form, $dbh, $query);
+  my $dbh = $form->dbconnect($myconfig);
 
-    $query = qq|INSERT INTO payment_terms (id, sortkey) VALUES (?, ?)|;
-    do_query($form, $dbh, $query, $form->{id}, $sortkey);
+  map({ $_->{"in_use"} = 0; } values(%{$units}));
 
-  } else {
-    $query =
-      qq|DELETE FROM translation_payment_terms | .
-      qq|WHERE payment_terms_id = ?|;
-    do_query($form, $dbh, $query, $form->{"id"});
+  foreach my $unit (values(%{$units})) {
+    my $base_unit = $unit->{"original_base_unit"};
+    while ($base_unit) {
+      $units->{$base_unit}->{"in_use"} = 1;
+      $units->{$base_unit}->{"DEPENDING_UNITS"} = [] unless ($units->{$base_unit}->{"DEPENDING_UNITS"});
+      push(@{$units->{$base_unit}->{"DEPENDING_UNITS"}}, $unit->{"name"});
+      $base_unit = $units->{$base_unit}->{"original_base_unit"};
+    }
   }
 
-  $query = qq|UPDATE payment_terms SET
-              description = ?, description_long = ?,
-              ranking = ?,
-              terms_netto = ?, terms_skonto = ?,
-              percent_skonto = ?
-              WHERE id = ?|;
-  my @values = ($form->{description}, $form->{description_long},
-                $form->{ranking} * 1,
-                $form->{terms_netto} * 1, $form->{terms_skonto} * 1,
-                $form->{percent_skonto} * 1,
-                $form->{id});
-  do_query($form, $dbh, $query, @values);
+  foreach my $unit (values(%{$units})) {
+    map({ $_ = $dbh->quote($_); } @{$unit->{"DEPENDING_UNITS"}});
 
-  $query = qq|SELECT id FROM language|;
-  my @language_ids;
-  my $sth = $dbh->prepare($query);
-  $sth->execute() || $form->dberror($query);
+    foreach my $table (qw(parts invoice orderitems)) {
+      my $query = "SELECT COUNT(*) FROM $table WHERE unit ";
 
-  while (my ($id) = $sth->fetchrow_array()) {
-    push(@language_ids, $id);
-  }
-  $sth->finish();
+      if (0 == scalar(@{$unit->{"DEPENDING_UNITS"}})) {
+        $query .= "= " . $dbh->quote($unit->{"name"});
+      } else {
+        $query .= "IN (" . $dbh->quote($unit->{"name"}) . "," .
+          join(",", map({ $dbh->quote($_) } @{$unit->{"DEPENDING_UNITS"}})) . ")";
+      }
 
-  $query =
-    qq|INSERT INTO translation_payment_terms | .
-    qq|(language_id, payment_terms_id, description_long) | .
-    qq|VALUES (?, ?, ?)|;
-  $sth = $dbh->prepare($query);
+      my ($count) = $dbh->selectrow_array($query);
+      $form->dberror($query) if ($dbh->err);
 
-  foreach my $language_id (@language_ids) {
-    do_statement($form, $sth, $query, $language_id, $form->{"id"},
-                 $form->{"description_long_${language_id}"});
+      if ($count) {
+        $unit->{"in_use"} = 1;
+        last;
+      }
+    }
   }
-  $sth->finish();
 
-  $dbh->commit();
-  $dbh->disconnect;
+  $dbh->disconnect();
 
   $main::lxdebug->leave_sub();
 }
 
-sub delete_payment {
+sub convertible_units {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form) = @_;
+  my $self        = shift;
+  my $units       = shift;
+  my $filter_unit = shift;
+  my $not_smaller = shift;
 
-  # connect to database
-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my $conv_units = [];
 
-  my $query =
-    qq|DELETE FROM translation_payment_terms WHERE payment_terms_id = ?|;
-  do_query($form, $dbh, $query, $form->{"id"});
+  $filter_unit = $units->{$filter_unit};
 
-  $query = qq|DELETE FROM payment_terms WHERE id = ?|;
-  do_query($form, $dbh, $query, $form->{"id"});
+  foreach my $name (sort { lc $a cmp lc $b } keys %{ $units }) {
+    my $unit = $units->{$name};
 
-  $dbh->commit();
-  $dbh->disconnect;
+    if (($unit->{base_unit} eq $filter_unit->{base_unit}) &&
+        (!$not_smaller || ($unit->{factor} >= $filter_unit->{factor}))) {
+      push @{$conv_units}, $unit;
+    }
+  }
+
+  my @sorted = sort { $b->{factor} <=> $a->{factor} } @{ $conv_units };
 
   $main::lxdebug->leave_sub();
+
+  return \@sorted;
 }
 
-sub sic {
-  $main::lxdebug->enter_sub();
+# if $a is translatable to $b, return the factor between them.
+# else return 1
+sub convert_unit {
+  $main::lxdebug->enter_sub(2);
+  my ($this, $a, $b, $all_units) = @_;
 
-  my ($self, $myconfig, $form) = @_;
+  if (!$all_units) {
+    $all_units = $this->retrieve_all_units;
+  }
 
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  $main::lxdebug->leave_sub(2) and return 0 unless $a && $b;
+  $main::lxdebug->leave_sub(2) and return 0 unless $all_units->{$a} && $all_units->{$b};
+  $main::lxdebug->leave_sub(2) and return 0 unless $all_units->{$a}{base_unit} eq $all_units->{$b}{base_unit};
+  $main::lxdebug->leave_sub(2) and return $all_units->{$a}{factor} / $all_units->{$b}{factor};
+}
+
+sub unit_select_data {
+  $main::lxdebug->enter_sub();
 
-  my $query = qq|SELECT code, sictype, description
-                 FROM sic
-		 ORDER BY code|;
+  my ($self, $units, $selected, $empty_entry, $convertible_into) = @_;
 
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  my $select = [];
 
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{ALL} }, $ref;
+  if ($empty_entry) {
+    push(@{$select}, { "name" => "", "base_unit" => "", "factor" => "", "selected" => "" });
   }
 
-  $sth->finish;
-  $dbh->disconnect;
+  foreach my $unit (sort({ $units->{$a}->{"sortkey"} <=> $units->{$b}->{"sortkey"} } keys(%{$units}))) {
+    if (!$convertible_into ||
+        ($units->{$convertible_into} &&
+         ($units->{$convertible_into}->{base_unit} eq $units->{$unit}->{base_unit}))) {
+      push @{$select}, { "name"      => $unit,
+                         "base_unit" => $units->{$unit}->{"base_unit"},
+                         "factor"    => $units->{$unit}->{"factor"},
+                         "selected"  => ($unit eq $selected) ? "selected" : "" };
+    }
+  }
 
   $main::lxdebug->leave_sub();
+
+  return $select;
 }
 
-sub get_sic {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  my $query = qq|SELECT s.code, s.sictype, s.description
-                 FROM sic s
-	         WHERE s.code = '$form->{code}'|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
-
-  map { $form->{$_} = $ref->{$_} } keys %$ref;
-
-  $sth->finish;
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub save_sic {
+sub unit_select_html {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  my ($self, $units, $name, $selected, $convertible_into) = @_;
 
-  $form->{code}        =~ s/\'/\'\'/g;
-  $form->{description} =~ s/\'/\'\'/g;
+  my $select = "<select name=${name}>";
 
-  # if there is an id
-  if ($form->{id}) {
-    $query = qq|UPDATE sic SET
-                code = '$form->{code}',
-		sictype = '$form->{sictype}',
-		description = '$form->{description}'
-		WHERE code = '$form->{id}'|;
-  } else {
-    $query = qq|INSERT INTO sic
-                (code, sictype, description)
-                VALUES ('$form->{code}', '$form->{sictype}', '$form->{description}')|;
+  foreach my $unit (sort({ $units->{$a}->{"sortkey"} <=> $units->{$b}->{"sortkey"} } keys(%{$units}))) {
+    if (!$convertible_into ||
+        ($units->{$convertible_into} &&
+         ($units->{$convertible_into}->{"base_unit"} eq $units->{$unit}->{"base_unit"}))) {
+      $select .= "<option" . (($unit eq $selected) ? " selected" : "") . ">${unit}</option>";
+    }
   }
-  $dbh->do($query) || $form->dberror($query);
-
-  $dbh->disconnect;
+  $select .= "</select>";
 
   $main::lxdebug->leave_sub();
+
+  return $select;
 }
 
-sub delete_sic {
+sub sum_with_unit {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form) = @_;
+  my $self  = shift;
 
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
+  my $units = $self->retrieve_all_units();
 
-  $query = qq|DELETE FROM sic
-	      WHERE code = '$form->{code}'|;
-  $dbh->do($query) || $form->dberror($query);
+  my $sum   = 0;
+  my $base_unit;
 
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub load_template {
-  $main::lxdebug->enter_sub();
+  while (2 <= scalar(@_)) {
+    my $qty  = shift(@_);
+    my $unit = $units->{shift(@_)};
 
-  my ($self, $form) = @_;
+    croak "No unit defined with name $unit" if (!defined $unit);
 
-  open(TEMPLATE, "$form->{file}") or $form->error("$form->{file} : $!");
+    if (!$base_unit) {
+      $base_unit = $unit->{base_unit};
+    } elsif ($base_unit ne $unit->{base_unit}) {
+      croak "Adding values with incompatible base units $base_unit/$unit->{base_unit}";
+    }
 
-  while (<TEMPLATE>) {
-    $form->{body} .= $_;
+    $sum += $qty * $unit->{factor};
   }
 
-  close(TEMPLATE);
-
   $main::lxdebug->leave_sub();
+
+  return $sum;
 }
 
-sub save_template {
+sub add_unit {
   $main::lxdebug->enter_sub();
 
-  my ($self, $form) = @_;
+  my ($self, $myconfig, $form, $name, $base_unit, $factor, $languages) = @_;
 
-  open(TEMPLATE, ">$form->{file}") or $form->error("$form->{file} : $!");
+  my $dbh = $form->dbconnect_noauto($myconfig);
 
-  # strip
-  $form->{body} =~ s/\r\n/\n/g;
-  print TEMPLATE $form->{body};
+  my $query = qq|SELECT COALESCE(MAX(sortkey), 0) + 1 FROM units|;
+  my ($sortkey) = selectrow_query($form, $dbh, $query);
 
-  close(TEMPLATE);
+  $query = "INSERT INTO units (name, base_unit, factor, sortkey) " .
+    "VALUES (?, ?, ?, ?)";
+  do_query($form, $dbh, $query, $name, $base_unit, $factor, $sortkey);
+
+  if ($languages) {
+    $query = "INSERT INTO units_language (unit, language_id, localized, localized_plural) VALUES (?, ?, ?, ?)";
+    my $sth = $dbh->prepare($query);
+    foreach my $lang (@{$languages}) {
+      my @values = ($name, $lang->{"id"}, $lang->{"localized"}, $lang->{"localized_plural"});
+      $sth->execute(@values) || $form->dberror($query . " (" . join(", ", @values) . ")");
+    }
+    $sth->finish();
+  }
+
+  $dbh->commit();
+  $dbh->disconnect();
 
   $main::lxdebug->leave_sub();
 }
 
-sub save_preferences {
+sub save_units {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form, $memberfile, $userspath, $webdav) = @_;
-
-  map { ($form->{$_}) = split(/--/, $form->{$_}) }
-    qw(inventory_accno income_accno expense_accno fxgain_accno fxloss_accno);
+  my ($self, $myconfig, $form, $units, $delete_units) = @_;
 
-  my @a;
-  $form->{curr} =~ s/ //g;
-  map { push(@a, uc pack "A3", $_) if $_ } split(/:/, $form->{curr});
-  $form->{curr} = join ':', @a;
-
-  # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 
-  # these defaults are database wide
-  # user specific variables are in myconfig
-  # save defaults
-  my $query = qq|UPDATE defaults SET
-                 inventory_accno_id =
-		     (SELECT c.id FROM chart c
-		                WHERE c.accno = '$form->{inventory_accno}'),
-                 income_accno_id =
-		     (SELECT c.id FROM chart c
-		                WHERE c.accno = '$form->{income_accno}'),
-	         expense_accno_id =
-		     (SELECT c.id FROM chart c
-		                WHERE c.accno = '$form->{expense_accno}'),
-	         fxgain_accno_id =
-		     (SELECT c.id FROM chart c
-		                WHERE c.accno = '$form->{fxgain_accno}'),
-	         fxloss_accno_id =
-		     (SELECT c.id FROM chart c
-		                WHERE c.accno = '$form->{fxloss_accno}'),
-	         invnumber = '$form->{invnumber}',
-                 cnnumber  = '$form->{cnnumber}',
-	         sonumber = '$form->{sonumber}',
-	         ponumber = '$form->{ponumber}',
-		 sqnumber = '$form->{sqnumber}',
-		 rfqnumber = '$form->{rfqnumber}',
-                 customernumber = '$form->{customernumber}',
-		 vendornumber = '$form->{vendornumber}',
-                 articlenumber = '$form->{articlenumber}',
-                 servicenumber = '$form->{servicenumber}',
-                 yearend = '$form->{yearend}',
-		 curr = '$form->{curr}',
-		 businessnumber = '$form->{businessnumber}'
-		|;
-  $dbh->do($query) || $form->dberror($query);
+  my ($base_unit, $unit, $sth, $query);
 
-  # update name
-  my $name = $form->{name};
-  $name =~ s/\'/\'\'/g;
-  $query = qq|UPDATE employee
-              SET name = '$name'
-	      WHERE login = '$form->{login}'|;
+  $query = "DELETE FROM units_language";
   $dbh->do($query) || $form->dberror($query);
 
-#   foreach my $item (split(/ /, $form->{taxaccounts})) {
-#     $query = qq|UPDATE tax
-# 		SET rate = | . ($form->{$item} / 100) . qq|,
-# 		taxnumber = '$form->{"taxnumber_$item"}'
-# 		WHERE chart_id = $item|;
-#     $dbh->do($query) || $form->dberror($query);
-#   }
-
-  my $rc = $dbh->commit;
-  $dbh->disconnect;
+  if ($delete_units && (0 != scalar(@{$delete_units}))) {
+    $query = "DELETE FROM units WHERE name IN (";
+    map({ $query .= "?," } @{$delete_units});
+    substr($query, -1, 1) = ")";
+    $dbh->do($query, undef, @{$delete_units}) ||
+      $form->dberror($query . " (" . join(", ", @{$delete_units}) . ")");
+  }
 
-  # save first currency in myconfig
-  $form->{currency} = substr($form->{curr}, 0, 3);
+  $query = "UPDATE units SET name = ?, base_unit = ?, factor = ? WHERE name = ?";
+  $sth = $dbh->prepare($query);
 
-  my $myconfig = new User "$memberfile", "$form->{login}";
+  my $query_lang = "INSERT INTO units_language (unit, language_id, localized, localized_plural) VALUES (?, ?, ?, ?)";
+  my $sth_lang = $dbh->prepare($query_lang);
 
-  foreach my $item (keys %$form) {
-    $myconfig->{$item} = $form->{$item};
+  foreach $unit (values(%{$units})) {
+    $unit->{"depth"} = 0;
+    my $base_unit = $unit;
+    while ($base_unit->{"base_unit"}) {
+      $unit->{"depth"}++;
+      $base_unit = $units->{$base_unit->{"base_unit"}};
+    }
   }
 
-  $myconfig->save_member($memberfile, $userspath);
-
-  if ($webdav) {
-    @webdavdirs =
-      qw(angebote bestellungen rechnungen anfragen lieferantenbestellungen einkaufsrechnungen);
-    foreach $directory (@webdavdirs) {
-      $file = "webdav/" . $directory . "/webdav-user";
-      if ($myconfig->{$directory}) {
-        open(HTACCESS, "$file") or die "cannot open webdav-user $!\n";
-        while (<HTACCESS>) {
-          ($login, $password) = split(/:/, $_);
-          if ($login ne $form->{login}) {
-            $newfile .= $_;
-          }
-        }
-        close(HTACCESS);
-        open(HTACCESS, "> $file") or die "cannot open webdav-user $!\n";
-        $newfile .= $myconfig->{login} . ":" . $myconfig->{password} . "\n";
-        print(HTACCESS $newfile);
-        close(HTACCESS);
-      } else {
-        $form->{$directory} = 0;
-        open(HTACCESS, "$file") or die "cannot open webdav-user $!\n";
-        while (<HTACCESS>) {
-          ($login, $password) = split(/:/, $_);
-          if ($login ne $form->{login}) {
-            $newfile .= $_;
-          }
-        }
-        close(HTACCESS);
-        open(HTACCESS, "> $file") or die "cannot open webdav-user $!\n";
-        print(HTACCESS $newfile);
-        close(HTACCESS);
+  foreach $unit (sort({ $a->{"depth"} <=> $b->{"depth"} } values(%{$units}))) {
+    if ($unit->{"LANGUAGES"}) {
+      foreach my $lang (@{$unit->{"LANGUAGES"}}) {
+        next unless ($lang->{"id"} && $lang->{"localized"});
+        my @values = ($unit->{"name"}, $lang->{"id"}, $lang->{"localized"}, $lang->{"localized_plural"});
+        $sth_lang->execute(@values) || $form->dberror($query_lang . " (" . join(", ", @values) . ")");
       }
     }
+
+    next if ($unit->{"unchanged_unit"});
+
+    my @values = ($unit->{"name"}, $unit->{"base_unit"}, $unit->{"factor"}, $unit->{"old_name"});
+    $sth->execute(@values) || $form->dberror($query . " (" . join(", ", @values) . ")");
   }
 
-  $main::lxdebug->leave_sub();
+  $sth->finish();
+  $sth_lang->finish();
+  $dbh->commit();
+  $dbh->disconnect();
 
-  return $rc;
+  $main::lxdebug->leave_sub();
 }
 
-sub defaultaccounts {
+sub taxes {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
@@ -1486,93 +1281,26 @@ sub defaultaccounts {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  # get defaults from defaults table
-  my $query = qq|SELECT * FROM defaults|;
-  my $sth   = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  $form->{defaults}             = $sth->fetchrow_hashref(NAME_lc);
-  $form->{defaults}{IC}         = $form->{defaults}{inventory_accno_id};
-  $form->{defaults}{IC_income}  = $form->{defaults}{income_accno_id};
-  $form->{defaults}{IC_expense} = $form->{defaults}{expense_accno_id};
-  $form->{defaults}{FX_gain}    = $form->{defaults}{fxgain_accno_id};
-  $form->{defaults}{FX_loss}    = $form->{defaults}{fxloss_accno_id};
-
-  $sth->finish;
+  my $query = qq|SELECT
+                   t.id,
+                   t.taxkey,
+                   t.taxdescription,
+                   round(t.rate * 100, 2) AS rate,
+                   (SELECT accno FROM chart WHERE id = chart_id) AS taxnumber,
+                   (SELECT description FROM chart WHERE id = chart_id) AS account_description,
+                   (SELECT accno FROM chart WHERE id = skonto_sales_chart_id) AS skonto_chart_accno,
+                   (SELECT description FROM chart WHERE id = skonto_sales_chart_id) AS skonto_chart_description,
+                   (SELECT accno FROM chart WHERE id = skonto_purchase_chart_id) AS skonto_chart_purchase_accno,
+                   (SELECT description FROM chart WHERE id = skonto_purchase_chart_id) AS skonto_chart_purchase_description
+                 FROM tax t
+                 ORDER BY taxkey, rate|;
 
-  $query = qq|SELECT c.id, c.accno, c.description, c.link
-              FROM chart c
-              WHERE c.link LIKE '%IC%'
-              ORDER BY c.accno|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $self->dberror($query);
-
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    foreach my $key (split(/:/, $ref->{link})) {
-      if ($key =~ /IC/) {
-        $nkey = $key;
-        if ($key =~ /cogs/) {
-          $nkey = "IC_expense";
-        }
-        if ($key =~ /sale/) {
-          $nkey = "IC_income";
-        }
-        %{ $form->{IC}{$nkey}{ $ref->{accno} } } = (
-                                             id          => $ref->{id},
-                                             description => $ref->{description}
-        );
-      }
-    }
-  }
-  $sth->finish;
-
-  $query = qq|SELECT c.id, c.accno, c.description
-              FROM chart c
-	      WHERE c.category = 'I'
-	      AND c.charttype = 'A'
-              ORDER BY c.accno|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $self->dberror($query);
-
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    %{ $form->{IC}{FX_gain}{ $ref->{accno} } } = (
-                                             id          => $ref->{id},
-                                             description => $ref->{description}
-    );
-  }
-  $sth->finish;
-
-  $query = qq|SELECT c.id, c.accno, c.description
-              FROM chart c
-	      WHERE c.category = 'E'
-	      AND c.charttype = 'A'
-              ORDER BY c.accno|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $self->dberror($query);
-
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    %{ $form->{IC}{FX_loss}{ $ref->{accno} } } = (
-                                             id          => $ref->{id},
-                                             description => $ref->{description}
-    );
-  }
-  $sth->finish;
-
-  # now get the tax rates and numbers
-  $query = qq|SELECT c.id, c.accno, c.description,
-              t.rate * 100 AS rate, t.taxnumber
-              FROM chart c, tax t
-	      WHERE c.id = t.chart_id|;
-
-  $sth = $dbh->prepare($query);
+  my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    $form->{taxrates}{ $ref->{accno} }{id}          = $ref->{id};
-    $form->{taxrates}{ $ref->{accno} }{description} = $ref->{description};
-    $form->{taxrates}{ $ref->{accno} }{taxnumber}   = $ref->{taxnumber}
-      if $ref->{taxnumber};
-    $form->{taxrates}{ $ref->{accno} }{rate} = $ref->{rate} if $ref->{rate};
+  $form->{TAX} = [];
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
+    push @{ $form->{TAX} }, $ref;
   }
 
   $sth->finish;
@@ -1581,614 +1309,411 @@ sub defaultaccounts {
   $main::lxdebug->leave_sub();
 }
 
-sub backup {
+sub get_tax_accounts {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form, $userspath) = @_;
-
-  my $mail;
-  my $err;
-  my $boundary = time;
-  my $tmpfile  =
-    "$userspath/$boundary.$myconfig->{dbname}-$form->{dbversion}.sql";
-  my $out = $form->{OUT};
-  $form->{OUT} = ">$tmpfile";
-
-  if ($form->{media} eq 'email') {
+  my ($self, $myconfig, $form) = @_;
 
-    use SL::Mailer;
-    $mail = new Mailer;
+  my $dbh = $form->dbconnect($myconfig);
 
-    $mail->{to}      = qq|"$myconfig->{name}" <$myconfig->{email}>|;
-    $mail->{from}    = qq|"$myconfig->{name}" <$myconfig->{email}>|;
-    $mail->{subject} =
-      "Lx-Office Backup / $myconfig->{dbname}-$form->{dbversion}.sql";
-    @{ $mail->{attachments} } = ($tmpfile);
-    $mail->{version} = $form->{version};
-    $mail->{fileid}  = "$boundary.";
+  # get Accounts from chart
+  my $query = qq{ SELECT
+                 id,
+                 accno || ' - ' || description AS taxaccount
+               FROM chart
+               WHERE link LIKE '%_tax%'
+               ORDER BY accno
+             };
 
-    $myconfig->{signature} =~ s/\\n/\r\n/g;
-    $mail->{message} = "--\n$myconfig->{signature}";
+  my $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
 
+  $form->{ACCOUNTS} = [];
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
+    push @{ $form->{ACCOUNTS} }, $ref;
   }
 
-  open(OUT, "$form->{OUT}") or $form->error("$form->{OUT} : $!");
-
-  # get sequences, functions and triggers
-  open(FH, "sql/lx-office.sql") or $form->error("sql/lx-office.sql : $!");
-
-  my @sequences = ();
-  my @functions = ();
-  my @triggers  = ();
-  my @indices   = ();
-  my %tablespecs;
-
-  my $query = "";
-  my @quote_chars;
-
-  while (<FH>) {
+  $form->{AR_PAID} = SL::DB::Manager::Chart->get_all(where => [ link => { like => '%AR_paid%' } ], sort_by => 'accno ASC');
+  $form->{AP_PAID} = SL::DB::Manager::Chart->get_all(where => [ link => { like => '%AP_paid%' } ], sort_by => 'accno ASC');
 
-    # Remove DOS and Unix style line endings.
-    s/[\r\n]//g;
+  $form->{skontochart_value_title_sub} = sub {
+    my $item = shift;
+    return [
+      $item->{id},
+      $item->{accno} .' '. $item->{description},
+    ];
+  };
 
-    # ignore comments or empty lines
-    next if /^(--.*|\s+)$/;
-
-    for (my $i = 0; $i < length($_); $i++) {
-      my $char = substr($_, $i, 1);
-
-      # Are we inside a string?
-      if (@quote_chars) {
-        if ($char eq $quote_chars[-1]) {
-          pop(@quote_chars);
-        }
-        $query .= $char;
-
-      } else {
-        if (($char eq "'") || ($char eq "\"")) {
-          push(@quote_chars, $char);
-
-        } elsif ($char eq ";") {
-
-          # Query is complete. Check for triggers and functions.
-          if ($query =~ /^create\s+function\s+\"?(\w+)\"?/i) {
-            push(@functions, $query);
-
-          } elsif ($query =~ /^create\s+trigger\s+\"?(\w+)\"?/i) {
-            push(@triggers, $query);
-
-          } elsif ($query =~ /^create\s+sequence\s+\"?(\w+)\"?/i) {
-            push(@sequences, $1);
-
-          } elsif ($query =~ /^create\s+table\s+\"?(\w+)\"?/i) {
-            $tablespecs{$1} = $query;
+  $sth->finish;
 
-          } elsif ($query =~ /^create\s+index\s+\"?(\w+)\"?/i) {
-            push(@indices, $query);
+  $dbh->disconnect;
 
-          }
+  $main::lxdebug->leave_sub();
+}
 
-          $query = "";
-          $char  = "";
-        }
+sub get_tax {
+  $main::lxdebug->enter_sub();
 
-        $query .= $char;
-      }
-    }
-  }
-  close(FH);
+  my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  # get all the tables
-  my @tables = $dbh->tables('', '', 'customer', '', { noprefix => 0 });
-
-  my $today = scalar localtime;
-
-  $myconfig->{dbhost} = 'localhost' unless $myconfig->{dbhost};
-
-  print OUT qq|-- Lx-Office Backup
--- Dataset: $myconfig->{dbname}
--- Version: $form->{dbversion}
--- Host: $myconfig->{dbhost}
--- Login: $form->{login}
--- User: $myconfig->{name}
--- Date: $today
---
--- set options
-$myconfig->{dboptions};
---
-|;
-
-  print OUT "-- DROP Sequences\n";
-  my $item;
-  foreach $item (@sequences) {
-    print OUT qq|DROP SEQUENCE $item;\n|;
-  }
+  my $query = qq|SELECT
+                   taxkey,
+                   taxdescription,
+                   round(rate * 100, 2) AS rate,
+                   chart_id,
+                   chart_categories,
+                   (id IN (SELECT tax_id
+                           FROM acc_trans)) AS tax_already_used,
+                   skonto_sales_chart_id,
+                   skonto_purchase_chart_id
+                 FROM tax
+                 WHERE id = ? |;
 
-  print OUT "-- DROP Triggers\n";
+  my $sth = $dbh->prepare($query);
+  $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})");
 
-  foreach $item (@triggers) {
-    if ($item =~ /^create\s+trigger\s+\"?(\w+)\"?\s+.*on\s+\"?(\w+)\"?\s+/i) {
-      print OUT qq|DROP TRIGGER "$1" ON "$2";\n|;
-    }
-  }
+  my $ref = $sth->fetchrow_hashref("NAME_lc");
 
-  print OUT "-- DROP Functions\n";
+  map { $form->{$_} = $ref->{$_} } keys %$ref;
 
-  foreach $item (@functions) {
-    if ($item =~ /^create\s+function\s+\"?(\w+)\"?/i) {
-      print OUT qq|DROP FUNCTION "$1" ();\n|;
-    }
-  }
+  $sth->finish;
 
-  foreach $table (@tables) {
-    if (!($table =~ /^sql_.*/)) {
-      my $query = qq|SELECT * FROM $table|;
+  # see if it is used by a taxkey
+  $query = qq|SELECT count(*) FROM taxkeys
+              WHERE tax_id = ? AND chart_id >0|;
 
-      my $sth = $dbh->prepare($query);
-      $sth->execute || $form->dberror($query);
+  ($form->{orphaned}) = selectrow_query($form, $dbh, $query, $form->{id});
 
-      $query = "INSERT INTO $table (";
-      map { $query .= qq|$sth->{NAME}->[$_],| }
-        (0 .. $sth->{NUM_OF_FIELDS} - 1);
-      chop $query;
+  $form->{orphaned} = !$form->{orphaned};
+  $sth->finish;
 
-      $query .= ") VALUES";
+  if (!$form->{orphaned} ) {
+    $query = qq|SELECT DISTINCT c.id, c.accno
+                FROM taxkeys tk
+                JOIN   tax t ON (t.id = tk.tax_id)
+                JOIN chart c ON (c.id = tk.chart_id)
+                WHERE tk.tax_id = ?|;
 
-      if ($tablespecs{$table}) {
-        print(OUT "--\n");
-        print(OUT "DROP TABLE $table;\n");
-        print(OUT $tablespecs{$table}, ";\n");
-      } else {
-        print(OUT "--\n");
-        print(OUT "DELETE FROM $table;\n");
-      }
-      while (my @arr = $sth->fetchrow_array) {
-
-        $fields = "(";
-        foreach my $item (@arr) {
-          if (defined $item) {
-            $item =~ s/\'/\'\'/g;
-            $fields .= qq|'$item',|;
-          } else {
-            $fields .= 'NULL,';
-          }
-        }
-
-        chop $fields;
-        $fields .= ")";
-
-        print OUT qq|$query $fields;\n|;
-      }
+    $sth = $dbh->prepare($query);
+    $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})");
 
-      $sth->finish;
+    $form->{TAXINUSE} = [];
+    while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
+      push @{ $form->{TAXINUSE} }, $ref;
     }
-  }
-
-  # create indices, sequences, functions and triggers
 
-  print(OUT "-- CREATE Indices\n");
-  map({ print(OUT "$_;\n"); } @indices);
-
-  print OUT "-- CREATE Sequences\n";
-  foreach $item (@sequences) {
-    $query = qq|SELECT last_value FROM $item|;
-    $sth   = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-    my ($id) = $sth->fetchrow_array;
     $sth->finish;
-
-    print OUT qq|--
-CREATE SEQUENCE $item START $id;
-|;
   }
 
-  print OUT "-- CREATE Functions\n";
-
-  # functions
-  map { print(OUT $_, ";\n"); } @functions;
-
-  print OUT "-- CREATE Triggers\n";
-
-  # triggers
-  map { print(OUT $_, ";\n"); } @triggers;
-
-  close(OUT);
-
   $dbh->disconnect;
 
-  # compress backup
-  my @args = ("gzip", "$tmpfile");
-  system(@args) == 0 or $form->error("$args[0] : $?");
-
-  $tmpfile .= ".gz";
-
-  if ($form->{media} eq 'email') {
-    @{ $mail->{attachments} } = ($tmpfile);
-    $err = $mail->send($out);
-  }
-
-  if ($form->{media} eq 'file') {
-
-    open(IN,  "$tmpfile") or $form->error("$tmpfile : $!");
-    open(OUT, ">-")       or $form->error("STDOUT : $!");
+  $main::lxdebug->leave_sub();
+}
 
-    print OUT qq|Content-Type: application/x-tar-gzip;
-Content-Disposition: attachment; filename="$myconfig->{dbname}-$form->{dbversion}.sql.gz"
+sub save_tax {
+  $main::lxdebug->enter_sub();
 
-|;
+  my ($self, $myconfig, $form) = @_;
+  my $query;
 
-    while (<IN>) {
-      print OUT $_;
-    }
+  # connect to database
+  my $dbh = $form->get_standard_dbh($myconfig);
+
+  $form->{rate} = $form->{rate} / 100;
+
+  my $chart_categories = '';
+  $chart_categories .= 'A' if $form->{asset};
+  $chart_categories .= 'L' if $form->{liability};
+  $chart_categories .= 'Q' if $form->{equity};
+  $chart_categories .= 'I' if $form->{revenue};
+  $chart_categories .= 'E' if $form->{expense};
+  $chart_categories .= 'C' if $form->{costs};
+
+  my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, conv_i($form->{chart_id}), conv_i($form->{chart_id}), conv_i($form->{skonto_sales_chart_id}), conv_i($form->{skonto_purchase_chart_id}), $chart_categories);
+  if ($form->{id} ne "") {
+    $query = qq|UPDATE tax SET
+                  taxkey                   = ?,
+                  taxdescription           = ?,
+                  rate                     = ?,
+                  chart_id                 = ?,
+                  taxnumber                = (SELECT accno FROM chart WHERE id = ? ),
+                  skonto_sales_chart_id    = ?,
+                  skonto_purchase_chart_id = ?,
+                  chart_categories         = ?
+                WHERE id = ?|;
 
-    close(IN);
-    close(OUT);
+  } else {
+    #ok
+    ($form->{id}) = selectfirst_array_query($form, $dbh, qq|SELECT nextval('id')|);
+    $query = qq|INSERT INTO tax (
+                  taxkey,
+                  taxdescription,
+                  rate,
+                  chart_id,
+                  taxnumber,
+                  skonto_sales_chart_id,
+                  skonto_purchase_chart_id,
+                  chart_categories,
+                  id
+                )
+                VALUES (?, ?, ?, ?, (SELECT accno FROM chart WHERE id = ?), ?, ?,  ?, ?)|;
+  }
+  push(@values, $form->{id});
+  do_query($form, $dbh, $query, @values);
 
+  foreach my $language_id (keys %{ $form->{translations} }) {
+    GenericTranslations->save('dbh'              => $dbh,
+                              'translation_type' => 'SL::DB::Tax/taxdescription',
+                              'translation_id'   => $form->{id},
+                              'language_id'      => $language_id,
+                              'translation'      => $form->{translations}->{$language_id});
   }
 
-  unlink "$tmpfile";
+  $dbh->commit();
 
   $main::lxdebug->leave_sub();
 }
 
-sub closedto {
+sub delete_tax {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
+  my $query;
 
-  my $dbh = $form->dbconnect($myconfig);
-
-  my $query = qq|SELECT closedto, revtrans FROM defaults|;
-  my $sth   = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  ($form->{closedto}, $form->{revtrans}) = $sth->fetchrow_array;
+  # connect to database
+  my $dbh = $form->get_standard_dbh($myconfig);
 
-  $sth->finish;
+  $query = qq|DELETE FROM tax
+              WHERE id = ?|;
+  do_query($form, $dbh, $query, $form->{id});
 
-  $dbh->disconnect;
+  $dbh->commit();
 
   $main::lxdebug->leave_sub();
 }
 
-sub closebooks {
+sub save_price_factor {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
 
-  my $dbh = $form->dbconnect($myconfig);
+  # connect to database
+  my $dbh = $form->get_standard_dbh($myconfig);
 
-  if ($form->{revtrans}) {
+  my $query;
+  my @values = ($form->{description}, conv_i($form->{factor}));
 
-    $query = qq|UPDATE defaults SET closedto = NULL,
-				    revtrans = '1'|;
-  } elsif ($form->{closedto}) {
+  if ($form->{id}) {
+    $query = qq|UPDATE price_factors SET description = ?, factor = ? WHERE id = ?|;
+    push @values, conv_i($form->{id});
 
-    $query = qq|UPDATE defaults SET closedto = '$form->{closedto}',
-				      revtrans = '0'|;
   } else {
-
-    $query = qq|UPDATE defaults SET closedto = NULL,
-				      revtrans = '0'|;
+    $query = qq|INSERT INTO price_factors (description, factor, sortkey) VALUES (?, ?, (SELECT COALESCE(MAX(sortkey), 0) + 1 FROM price_factors))|;
   }
 
-  # set close in defaults
-  $dbh->do($query) || $form->dberror($query);
+  do_query($form, $dbh, $query, @values);
 
-  $dbh->disconnect;
+  $dbh->commit();
 
   $main::lxdebug->leave_sub();
 }
 
-sub get_base_unit {
-  my ($self, $units, $unit_name, $factor) = @_;
+sub get_all_price_factors {
+  $main::lxdebug->enter_sub();
 
-  $factor = 1 unless ($factor);
+  my ($self, $myconfig, $form) = @_;
 
-  my $unit = $units->{$unit_name};
+  # connect to database
+  my $dbh = $form->get_standard_dbh($myconfig);
 
-  if (!defined($unit) || !$unit->{"base_unit"} ||
-      ($unit_name eq $unit->{"base_unit"})) {
-    return ($unit_name, $factor);
-  }
+  $form->{PRICE_FACTORS} = selectall_hashref_query($form, $dbh, qq|SELECT * FROM price_factors ORDER BY sortkey|);
 
-  return AM->get_base_unit($units, $unit->{"base_unit"}, $factor * $unit->{"factor"});
+  $main::lxdebug->leave_sub();
 }
 
-sub retrieve_units {
+sub get_price_factor {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form, $type, $prefix) = @_;
-
-  my $dbh = $form->dbconnect($myconfig);
-
-  my $query = "SELECT *, base_unit AS original_base_unit FROM units";
-  my @values;
-  if ($type) {
-    $query .= " WHERE (type = ?)";
-    @values = ($type);
-  }
-
-  my $sth = $dbh->prepare($query);
-  $sth->execute(@values) || $form->dberror($query . " (" . join(", ", @values) . ")");
-
-  my $units = {};
-  while (my $ref = $sth->fetchrow_hashref()) {
-    $units->{$ref->{"name"}} = $ref;
-  }
-  $sth->finish();
-
-  my $query_lang = "SELECT id, template_code FROM language ORDER BY description";
-  $sth = $dbh->prepare($query_lang);
-  $sth->execute() || $form->dberror($query_lang);
-  my @languages;
-  while ($ref = $sth->fetchrow_hashref()) {
-    push(@languages, $ref);
-  }
-  $sth->finish();
-
-  $query_lang = "SELECT ul.localized, ul.localized_plural, l.id, l.template_code " .
-    "FROM units_language ul " .
-    "LEFT JOIN language l ON ul.language_id = l.id " .
-    "WHERE ul.unit = ?";
-  $sth = $dbh->prepare($query_lang);
-
-  foreach my $unit (values(%{$units})) {
-    ($unit->{"${prefix}base_unit"}, $unit->{"${prefix}factor"}) = AM->get_base_unit($units, $unit->{"name"});
+  my ($self, $myconfig, $form) = @_;
 
-    $unit->{"LANGUAGES"} = {};
-    foreach my $lang (@languages) {
-      $unit->{"LANGUAGES"}->{$lang->{"template_code"}} = { "template_code" => $lang->{"template_code"} };
-    }
+  # connect to database
+  my $dbh = $form->get_standard_dbh($myconfig);
 
-    $sth->execute($unit->{"name"}) || $form->dberror($query_lang . " (" . $unit->{"name"} . ")");
-    while ($ref = $sth->fetchrow_hashref()) {
-      map({ $unit->{"LANGUAGES"}->{$ref->{"template_code"}}->{$_} = $ref->{$_} } keys(%{$ref}));
-    }
-  }
-  $sth->finish();
+  my $query = qq|SELECT description, factor,
+                   ((SELECT COUNT(*) FROM parts      WHERE price_factor_id = ?) +
+                    (SELECT COUNT(*) FROM invoice    WHERE price_factor_id = ?) +
+                    (SELECT COUNT(*) FROM orderitems WHERE price_factor_id = ?)) = 0 AS orphaned
+                 FROM price_factors WHERE id = ?|;
 
-  $dbh->disconnect();
+  ($form->{description}, $form->{factor}, $form->{orphaned}) = selectrow_query($form, $dbh, $query, (conv_i($form->{id})) x 4);
 
   $main::lxdebug->leave_sub();
-
-  return $units;
 }
 
-sub translate_units {
+sub delete_price_factor {
   $main::lxdebug->enter_sub();
 
-  my ($self, $form, $template_code, $unit, $amount) = @_;
+  my ($self, $myconfig, $form) = @_;
 
-  my $units = $self->retrieve_units(\%main::myconfig, $form);
+  # connect to database
+  my $dbh = $form->get_standard_dbh($myconfig);
 
-  my $h = $units->{$unit}->{"LANGUAGES"}->{$template_code};
-  my $new_unit = $unit;
-  if ($h) {
-    if (($amount != 1) && $h->{"localized_plural"}) {
-      $new_unit = $h->{"localized_plural"};
-    } elsif ($h->{"localized"}) {
-      $new_unit = $h->{"localized"};
-    }
-  }
+  do_query($form, $dbh, qq|DELETE FROM price_factors WHERE id = ?|, conv_i($form->{id}));
+  $dbh->commit();
 
   $main::lxdebug->leave_sub();
-
-  return $new_unit;
 }
 
-sub units_in_use {
+sub save_warehouse {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form, $units) = @_;
+  my ($self, $myconfig, $form) = @_;
 
-  my $dbh = $form->dbconnect($myconfig);
+  # connect to database
+  my $dbh = $form->get_standard_dbh($myconfig);
 
-  foreach my $unit (values(%{$units})) {
-    my $base_unit = $unit->{"original_base_unit"};
-    while ($base_unit) {
-      $units->{$base_unit}->{"DEPENDING_UNITS"} = [] unless ($units->{$base_unit}->{"DEPENDING_UNITS"});
-      push(@{$units->{$base_unit}->{"DEPENDING_UNITS"}}, $unit->{"name"});
-      $base_unit = $units->{$base_unit}->{"original_base_unit"};
-    }
-  }
+  my ($query, @values, $sth);
 
-  foreach my $unit (values(%{$units})) {
-    $unit->{"in_use"} = 0;
-    map({ $_ = $dbh->quote($_); } @{$unit->{"DEPENDING_UNITS"}});
+  if (!$form->{id}) {
+    $query        = qq|SELECT nextval('id')|;
+    ($form->{id}) = selectrow_query($form, $dbh, $query);
 
-    foreach my $table (qw(parts invoice orderitems)) {
-      my $query = "SELECT COUNT(*) FROM $table WHERE unit ";
+    $query        = qq|INSERT INTO warehouse (id, sortkey) VALUES (?, (SELECT COALESCE(MAX(sortkey), 0) + 1 FROM warehouse))|;
+    do_query($form, $dbh, $query, $form->{id});
+  }
 
-      if (0 == scalar(@{$unit->{"DEPENDING_UNITS"}})) {
-        $query .= "= " . $dbh->quote($unit->{"name"});
-      } else {
-        $query .= "IN (" . $dbh->quote($unit->{"name"}) . "," . join(",", @{$unit->{"DEPENDING_UNITS"}}) . ")";
-      }
+  do_query($form, $dbh, qq|UPDATE warehouse SET description = ?, invalid = ? WHERE id = ?|,
+           $form->{description}, $form->{invalid} ? 't' : 'f', conv_i($form->{id}));
 
-      my ($count) = $dbh->selectrow_array($query);
-      $form->dberror($query) if ($dbh->err);
+  if (0 < $form->{number_of_new_bins}) {
+    my ($num_existing_bins) = selectfirst_array_query($form, $dbh, qq|SELECT COUNT(*) FROM bin WHERE warehouse_id = ?|, $form->{id});
+    $query = qq|INSERT INTO bin (warehouse_id, description) VALUES (?, ?)|;
+    $sth   = prepare_query($form, $dbh, $query);
 
-      if ($count) {
-        $unit->{"in_use"} = 1;
-        last;
-      }
+    foreach my $i (1..$form->{number_of_new_bins}) {
+      do_statement($form, $sth, $query, conv_i($form->{id}), "$form->{prefix}" . ($i + $num_existing_bins));
     }
+
+    $sth->finish();
   }
 
-  $dbh->disconnect();
+  $dbh->commit();
 
   $main::lxdebug->leave_sub();
 }
 
-sub unit_select_data {
+sub save_bins {
   $main::lxdebug->enter_sub();
 
-  my ($self, $units, $selected, $empty_entry) = @_;
+  my ($self, $myconfig, $form) = @_;
 
-  my $select = [];
+  # connect to database
+  my $dbh = $form->get_standard_dbh($myconfig);
 
-  if ($empty_entry) {
-    push(@{$select}, { "name" => "", "base_unit" => "", "factor" => "", "selected" => "" });
-  }
+  my ($query, @values, $commit_necessary, $sth);
 
-  foreach my $unit (sort({ $a->{"sortkey"} <=> $b->{"sortkey"} } keys(%{$units}))) {
-    push(@{$select}, { "name" => $unit,
-                       "base_unit" => $units->{$unit}->{"base_unit"},
-                       "factor" => $units->{$unit}->{"factor"},
-                       "selected" => ($unit eq $selected) ? "selected" : "" });
-  }
+  @values = map { $form->{"id_${_}"} } grep { $form->{"delete_${_}"} } (1..$form->{rowcount});
 
-  $main::lxdebug->leave_sub();
+  if (@values) {
+    $query = qq|DELETE FROM bin WHERE id IN (| . join(', ', ('?') x scalar(@values)) . qq|)|;
+    do_query($form, $dbh, $query, @values);
 
-  return $select;
-}
+    $commit_necessary = 1;
+  }
 
-sub unit_select_html {
-  $main::lxdebug->enter_sub();
+  $query = qq|UPDATE bin SET description = ? WHERE id = ?|;
+  $sth   = prepare_query($form, $dbh, $query);
 
-  my ($self, $units, $name, $selected, $convertible_into) = @_;
+  foreach my $row (1..$form->{rowcount}) {
+    next if ($form->{"delete_${row}"});
 
-  my $select = "<select name=${name}>";
+    do_statement($form, $sth, $query, $form->{"description_${row}"}, conv_i($form->{"id_${row}"}));
 
-  foreach my $unit (sort({ $a->{"sortkey"} <=> $b->{"sortkey"} } keys(%{$units}))) {
-    if (!$convertible_into ||
-        ($units->{$convertible_into} &&
-         ($units->{$convertible_into}->{"base_unit"} eq $units->{$unit}->{"base_unit"}))) {
-      $select .= "<option" . (($unit eq $selected) ? " selected" : "") . ">${unit}</option>";
-    }
+    $commit_necessary = 1;
   }
-  $select .= "</select>";
 
-  $main::lxdebug->leave_sub();
+  $sth->finish();
 
-  return $select;
+  $dbh->commit() if ($commit_necessary);
+
+  $main::lxdebug->leave_sub();
 }
 
-sub add_unit {
+sub delete_warehouse {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form, $name, $base_unit, $factor, $type, $languages) = @_;
-
-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my ($self, $myconfig, $form) = @_;
 
-  my $query = qq|SELECT COALESCE(MAX(sortkey), 0) + 1 FROM units|;
-  my ($sortkey) = selectrow_query($form, $dbh, $query);
+  # connect to database
+  my $dbh = $form->get_standard_dbh($myconfig);
 
-  $query = "INSERT INTO units (name, base_unit, factor, type, sortkey) " .
-    "VALUES (?, ?, ?, ?, ?)";
-  do_query($form, $dbh, $query, $name, $base_unit, $factor, $type, $sortkey);
+  my $id      = conv_i($form->{id});
+  my $query   = qq|SELECT i.bin_id FROM inventory i WHERE i.bin_id IN (SELECT b.id FROM bin b WHERE b.warehouse_id = ?) LIMIT 1|;
+  my ($count) = selectrow_query($form, $dbh, $query, $id);
 
-  if ($languages) {
-    $query = "INSERT INTO units_language (unit, language_id, localized, localized_plural) VALUES (?, ?, ?, ?)";
-    my $sth = $dbh->prepare($query);
-    foreach my $lang (@{$languages}) {
-      my @values = ($name, $lang->{"id"}, $lang->{"localized"}, $lang->{"localized_plural"});
-      $sth->execute(@values) || $form->dberror($query . " (" . join(", ", @values) . ")");
-    }
-    $sth->finish();
+  if ($count) {
+    $main::lxdebug->leave_sub();
+    return 0;
   }
 
+  do_query($form, $dbh, qq|DELETE FROM bin       WHERE warehouse_id = ?|, conv_i($form->{id}));
+  do_query($form, $dbh, qq|DELETE FROM warehouse WHERE id           = ?|, conv_i($form->{id}));
+
   $dbh->commit();
-  $dbh->disconnect();
 
   $main::lxdebug->leave_sub();
+
+  return 1;
 }
 
-sub save_units {
+sub get_all_warehouses {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form, $type, $units, $delete_units) = @_;
-
-  my $dbh = $form->dbconnect_noauto($myconfig);
-
-  my ($base_unit, $unit, $sth, $query);
-
-  $query = "DELETE FROM units_language";
-  $dbh->do($query) || $form->dberror($query);
-
-  if ($delete_units && (0 != scalar(@{$delete_units}))) {
-    $query = "DELETE FROM units WHERE name IN (";
-    map({ $query .= "?," } @{$delete_units});
-    substr($query, -1, 1) = ")";
-    $dbh->do($query, undef, @{$delete_units}) ||
-      $form->dberror($query . " (" . join(", ", @{$delete_units}) . ")");
-  }
-
-  $query = "UPDATE units SET name = ?, base_unit = ?, factor = ? WHERE name = ?";
-  $sth = $dbh->prepare($query);
-
-  my $query_lang = "INSERT INTO units_language (unit, language_id, localized, localized_plural) VALUES (?, ?, ?, ?)";
-  my $sth_lang = $dbh->prepare($query_lang);
-
-  foreach $unit (values(%{$units})) {
-    $unit->{"depth"} = 0;
-    my $base_unit = $unit;
-    while ($base_unit->{"base_unit"}) {
-      $unit->{"depth"}++;
-      $base_unit = $units->{$base_unit->{"base_unit"}};
-    }
-  }
-
-  foreach $unit (sort({ $a->{"depth"} <=> $b->{"depth"} } values(%{$units}))) {
-    if ($unit->{"LANGUAGES"}) {
-      foreach my $lang (@{$unit->{"LANGUAGES"}}) {
-        next unless ($lang->{"id"} && $lang->{"localized"});
-        my @values = ($unit->{"name"}, $lang->{"id"}, $lang->{"localized"}, $lang->{"localized_plural"});
-        $sth_lang->execute(@values) || $form->dberror($query_lang . " (" . join(", ", @values) . ")");
-      }
-    }
+  my ($self, $myconfig, $form) = @_;
 
-    next if ($unit->{"unchanged_unit"});
+  # connect to database
+  my $dbh = $form->get_standard_dbh($myconfig);
 
-    my @values = ($unit->{"name"}, $unit->{"base_unit"}, $unit->{"factor"}, $unit->{"old_name"});
-    $sth->execute(@values) || $form->dberror($query . " (" . join(", ", @values) . ")");
-  }
+  my $query = qq|SELECT w.id, w.description, w.invalid,
+                   (SELECT COUNT(b.description) FROM bin b WHERE b.warehouse_id = w.id) AS number_of_bins
+                 FROM warehouse w
+                 ORDER BY w.sortkey|;
 
-  $sth->finish();
-  $sth_lang->finish();
-  $dbh->commit();
-  $dbh->disconnect();
+  $form->{WAREHOUSES} = selectall_hashref_query($form, $dbh, $query);
 
   $main::lxdebug->leave_sub();
 }
 
-sub swap_units {
+sub get_warehouse {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form, $dir, $name_1, $unit_type) = @_;
-
-  my $dbh = $form->dbconnect_noauto($myconfig);
-
-  my $query;
+  my ($self, $myconfig, $form) = @_;
 
-  $query = qq|SELECT sortkey FROM units WHERE name = ?|;
-  my ($sortkey_1) = selectrow_query($form, $dbh, $query, $name_1);
+  # connect to database
+  my $dbh = $form->get_standard_dbh($myconfig);
 
-  $query =
-    qq|SELECT sortkey FROM units | .
-    qq|WHERE sortkey | . ($dir eq "down" ? ">" : "<") . qq| ? AND type = ? | .
-    qq|ORDER BY sortkey | . ($dir eq "down" ? "ASC" : "DESC") . qq| LIMIT 1|;
-  my ($sortkey_2) = selectrow_query($form, $dbh, $query, $sortkey_1, $unit_type);
+  my $id    = conv_i($form->{id});
+  my $query = qq|SELECT w.description, w.invalid
+                 FROM warehouse w
+                 WHERE w.id = ?|;
 
-  if (defined($sortkey_1)) {
-    $query = qq|SELECT name FROM units WHERE sortkey = ${sortkey_2}|;
-    my ($name_2) = selectrow_query($form, $dbh, $query);
+  my $ref   = selectfirst_hashref_query($form, $dbh, $query, $id);
 
-    if (defined($name_2)) {
-      $query = qq|UPDATE units SET sortkey = ? WHERE name = ?|;
-      my $sth = $dbh->prepare($query);
+  map { $form->{$_} = $ref->{$_} } keys %{ $ref };
 
-      do_statement($form, $sth, $query, $sortkey_1, $name_2);
-      do_statement($form, $sth, $query, $sortkey_2, $name_1);
-    }
-  }
+  $query = <<SQL;
+    SELECT b.*,
+      (   EXISTS(SELECT i.bin_id FROM inventory i WHERE i.bin_id = b.id LIMIT 1)
+       OR EXISTS(SELECT p.bin_id FROM parts     p WHERE p.bin_id = b.id LIMIT 1))
+      AS in_use
+    FROM bin b
+    WHERE b.warehouse_id = ?
+SQL
 
-  $dbh->commit();
-  $dbh->disconnect();
+  $form->{BINS} = selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}));
 
   $main::lxdebug->leave_sub();
 }