X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAM.pm;h=f455e65a243d1c499b8e5c4e880479a0625ec41e;hb=9a795b8553bd43a379646bc6244c618e570556e9;hp=81e463b0fcdd6c346fe4a8813d355560c405c7eb;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git

diff --git a/SL/AM.pm b/SL/AM.pm
index 81e463b0f..f455e65a2 100644
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -37,32 +37,41 @@
 
 package AM;
 
+use Data::Dumper;
+use SL::DBUtils;
+
 sub get_account {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
-  $form->{id} = "NULL" unless ($form->{id});
+
   # 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.gifi_accno,
-                 c.category, c.link, c.taxkey_id, c.pos_ustva, c.pos_bwa, c.pos_bilanz,c.pos_eur
-                 FROM chart c
-	         WHERE c.id = $form->{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);
-  
+
   foreach my $key (keys %$ref) {
     $form->{"$key"} = $ref->{"$key"};
   }
 
   $sth->finish;
 
-
   # get default accounts
   $query = qq|SELECT inventory_accno_id, income_accno_id, expense_accno_id
               FROM defaults|;
@@ -76,35 +85,59 @@ sub get_account {
   $sth->finish;
 
   # get taxkeys and description
-  $query = qq|SELECT taxkey, taxdescription 
-              FROM tax|;
+  $query = qq§SELECT id, taxkey,id||'--'||taxkey AS tax, taxdescription
+              FROM tax ORDER BY taxkey§;
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
-  $ref = $sth->fetchrow_hashref(NAME_lc);
+  $form->{TAXKEY} = [];
 
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $form->{TAXKEY} }, $ref;
   }
 
   $sth->finish;
+  if ($form->{id}) {
+    # get new accounts
+    $query = qq|SELECT id, accno,description
+                FROM chart WHERE link = ?|;
+    $sth = $dbh->prepare($query);
+    $sth->execute($form->{link}) || $form->dberror($query . " ($form->{link})");
 
+    $form->{NEWACCOUNT} = [];
+    while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+      push @{ $form->{NEWACCOUNT} }, $ref;
+    }
+
+    $sth->finish;
+  }
   # check if we have any transactions
   $query = qq|SELECT a.trans_id FROM acc_trans a
-              WHERE a.chart_id = $form->{id}|;
+              WHERE a.chart_id = ?|;
   $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})");
 
   ($form->{orphaned}) = $sth->fetchrow_array;
   $form->{orphaned} = !$form->{orphaned};
   $sth->finish;
 
+  # check if new account is active
+  $form->{new_chart_valid} = 0;
+  if ($form->{new_chart_id}) {
+    $query = qq|SELECT current_date-valid_from FROM chart
+                WHERE id = ?|;
+    my ($count) = selectrow_query($form, $dbh, $query, $form->{id});
+    if ($count >=0) {
+      $form->{new_chart_valid} = 1;
+    }
+    $sth->finish;
+  }
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
 sub save_account {
   $main::lxdebug->enter_sub();
 
@@ -115,111 +148,101 @@ sub save_account {
 
   # 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);
+    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);
   }
-  
+
   $form->{link} = "";
-  foreach my $item ($form->{AR},
-		    $form->{AR_amount},
-                    $form->{AR_tax},
-                    $form->{AR_paid},
-                    $form->{AP},
-		    $form->{AP_amount},
-		    $form->{AP_tax},
-		    $form->{AP_paid},
-		    $form->{IC},
-		    $form->{IC_sale},
-		    $form->{IC_cogs},
-		    $form->{IC_taxpart},
-		    $form->{IC_income},
-		    $form->{IC_expense},
-		    $form->{IC_taxservice},
-		    $form->{CT_tax}
-		    ) {
-     $form->{link} .= "${item}:" if ($item);
+  foreach my $item ($form->{AR},            $form->{AR_amount},
+                    $form->{AR_tax},        $form->{AR_paid},
+                    $form->{AP},            $form->{AP_amount},
+                    $form->{AP_tax},        $form->{AP_paid},
+                    $form->{IC},            $form->{IC_sale},
+                    $form->{IC_cogs},       $form->{IC_taxpart},
+                    $form->{IC_income},     $form->{IC_expense},
+                    $form->{IC_taxservice}, $form->{CT_tax}
+    ) {
+    $form->{link} .= "${item}:" if ($item);
   }
   chop $form->{link};
 
-  # if we have an id then replace the old record
-  $form->{description} =~ s/\'/\'\'/g;
-
   # strip blanks from accno
   map { $form->{$_} =~ s/ //g; } qw(accno);
-  
+
   my ($query, $sth);
-  
-  if ($form->{id}eq "NULL") {
-    $form->{id}="";
-    }
-  
-  map({ $form->{$_} = "NULL" unless ($form->{$_}); } qw(pos_ustva pos_bwa pos_bilanz pos_eur));  
 
-  if ($form->{id}) {
-    $query = qq|UPDATE chart SET
-                accno = '$form->{accno}',
-		description = '$form->{description}',
-		charttype = '$form->{charttype}',
-		gifi_accno = '$form->{gifi_accno}',
-		category = '$form->{category}',
-		link = '$form->{link}',
-                taxkey_id = $form->{taxkey_id},
-                pos_ustva = $form->{pos_ustva},
-                pos_bwa   = $form->{pos_bwa},
-                pos_bilanz = $form->{pos_bilanz},
-                pos_eur = $form->{pos_eur}
-		WHERE id = $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)
-                VALUES ('$form->{accno}', '$form->{description}',
-		'$form->{charttype}', '$form->{gifi_accno}',
-		'$form->{category}', '$form->{link}', $form->{taxkey_id}, $form->{pos_ustva}, $form->{pos_bwa}, $form->{pos_bilanz}, $form->{pos_eur})|;
+  if ($form->{id} eq "NULL") {
+    $form->{id} = "";
   }
-  $dbh->do($query) || $form->dberror($query);
-  
-
-  if ($form->{IC_taxpart} || $form->{IC_taxservice} || $form->{CT_tax}) {
-
-    my $chart_id = $form->{id};
-    
-    unless ($form->{id}) {
-      # get id from chart
-      $query = qq|SELECT c.id
-                  FROM chart c
-		  WHERE c.accno = '$form->{accno}'|;
-      $sth = $dbh->prepare($query);
-      $sth->execute || $form->dberror($query);
 
-      ($chart_id) = $sth->fetchrow_array;
-      $sth->finish;
-    }
-    
-    # add account if it doesn't exist in tax
-    $query = qq|SELECT t.chart_id
-                FROM tax t
-		WHERE t.chart_id = $chart_id|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
+  my @values;
 
-    my ($tax_id) = $sth->fetchrow_array;
-    $sth->finish;
-    
-    # add tax if it doesn't exist
-    unless ($tax_id) {
-      $query = qq|INSERT INTO tax (chart_id, rate)
-                  VALUES ($chart_id, 0)|;
-      $dbh->do($query) || $form->dberror($query);
-    }
+  my ($tax_id, $taxkey) = split(/--/, $form->{tax});
+  my $startdate = $form->{startdate} ? $form->{startdate} : "1970-01-01";
+
+  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 {
-    # remove tax
-    if ($form->{id}) {
-      $query = qq|DELETE FROM tax
-		  WHERE chart_id = $form->{id}|;
-      $dbh->do($query) || $form->dberror($query);
-    }
+    $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}));
+
   }
+  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));
 
+  } else {
+    $query = qq|DELETE FROM taxkeys WHERE chart_id = ? AND tax_id = ?|;
+    do_query($form, $dbh, $query, $form->{id}, conv_i($tax_id));
+
+    $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));
+  }
 
   # commit
   my $rc = $dbh->commit;
@@ -230,8 +253,6 @@ sub save_account {
   return $rc;
 }
 
-
-
 sub delete_account {
   $main::lxdebug->enter_sub();
 
@@ -241,49 +262,35 @@ sub delete_account {
   my $dbh = $form->dbconnect_noauto($myconfig);
 
   my $query = qq|SELECT count(*) FROM acc_trans a
-                 WHERE a.chart_id = $form->{id}|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+                 WHERE a.chart_id = ?|;
+  my ($count) = selectrow_query($form, $dbh, $query, $form->{id});
 
-  if ($sth->fetchrow_array) {
-    $sth->finish;
+  if ($count) {
     $dbh->disconnect;
     $main::lxdebug->leave_sub();
     return;
   }
-  $sth->finish;
-
-
-  # delete chart of account record
-  $query = qq|DELETE FROM chart
-              WHERE id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
 
   # set inventory_accno_id, income_accno_id, expense_accno_id to defaults
-  $query = qq|UPDATE parts
-              SET inventory_accno_id = 
-	                 (SELECT inventory_accno_id FROM defaults)
-	      WHERE inventory_accno_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
-  
-  $query = qq|UPDATE parts
-              SET income_accno_id =
-	                 (SELECT income_accno_id FROM defaults)
-	      WHERE income_accno_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
-  
-  $query = qq|UPDATE parts
-              SET expense_accno_id =
-	                 (SELECT expense_accno_id FROM defaults)
-	      WHERE expense_accno_id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
-  
+  foreach my $type (qw(inventory income expense)) {
+    $query =
+      qq|UPDATE parts | .
+      qq|SET ${type}_accno_id = (SELECT ${type}_accno_id FROM defaults) | .
+      qq|WHERE ${type}_accno_id = ?|;
+    do_query($form, $dbh, $query, $form->{id});
+  }
+
   foreach my $table (qw(partstax customertax vendortax tax)) {
     $query = qq|DELETE FROM $table
-		WHERE chart_id = $form->{id}|;
-    $dbh->do($query) || $form->dberror($query);
+                WHERE chart_id = ?|;
+    do_query($form, $dbh, $query, $form->{id});
   }
 
+  # delete chart of account record
+  $query = qq|DELETE FROM chart
+              WHERE id = ?|;
+  do_query($form, $dbh, $query, $form->{id});
+
   # commit and redirect
   my $rc = $dbh->commit;
   $dbh->disconnect;
@@ -293,18 +300,17 @@ sub delete_account {
   return $rc;
 }
 
-
-sub gifi_accounts {
+sub warehouses {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  my $query = qq|SELECT accno, description
-                 FROM gifi
-		 ORDER BY accno|;
+  my $query = qq|SELECT id, description
+                 FROM warehouse
+		 ORDER BY 2|;
 
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
@@ -315,108 +321,98 @@ sub gifi_accounts {
 
   $sth->finish;
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
-
-
-sub get_gifi {
+sub get_warehouse {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
-  my $query = qq|SELECT g.accno, g.description
-                 FROM gifi g
-	         WHERE g.accno = '$form->{accno}'|;
+
+  my $query = qq|SELECT w.description
+                 FROM warehouse w
+	         WHERE w.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;
 
-  # check for transactions
-  $query = qq|SELECT count(*) FROM acc_trans a, chart c, gifi g
-              WHERE c.gifi_accno = g.accno
-	      AND a.chart_id = c.id
-	      AND g.accno = '$form->{accno}'|;
+  # see if it is in use
+  $query = qq|SELECT count(*) FROM inventory i
+              WHERE i.warehouse_id = $form->{id}|;
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
   ($form->{orphaned}) = $sth->fetchrow_array;
-  $sth->finish;
   $form->{orphaned} = !$form->{orphaned};
+  $sth->finish;
 
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
-sub save_gifi {
+sub save_warehouse {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
+
   $form->{description} =~ s/\'/\'\'/g;
 
-  # id is the old account number!
   if ($form->{id}) {
-    $query = qq|UPDATE gifi SET
-                accno = '$form->{accno}',
+    $query = qq|UPDATE warehouse SET
 		description = '$form->{description}'
-		WHERE accno = '$form->{id}'|;
+		WHERE id = $form->{id}|;
   } else {
-    $query = qq|INSERT INTO gifi 
-                (accno, description)
-                VALUES ('$form->{accno}', '$form->{description}')|;
+    $query = qq|INSERT INTO warehouse
+                (description)
+                VALUES ('$form->{description}')|;
   }
   $dbh->do($query) || $form->dberror($query);
-  
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
-sub delete_gifi {
+sub delete_warehouse {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
-  # id is the old account number!
-  $query = qq|DELETE FROM gifi
-	      WHERE accno = '$form->{id}'|;
+
+  $query = qq|DELETE FROM warehouse
+	      WHERE id = $form->{id}|;
   $dbh->do($query) || $form->dberror($query);
-  
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
-sub warehouses {
+sub departments {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  my $query = qq|SELECT id, description
-                 FROM warehouse
+  my $query = qq|SELECT d.id, d.description, d.role
+                 FROM department d
 		 ORDER BY 2|;
 
   $sth = $dbh->prepare($query);
@@ -428,35 +424,33 @@ sub warehouses {
 
   $sth->finish;
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
-
-
-sub get_warehouse {
+sub get_department {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
-  my $query = qq|SELECT w.description
-                 FROM warehouse w
-	         WHERE w.id = $form->{id}|;
+
+  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 inventory i
-              WHERE i.warehouse_id = $form->{id}|;
+  $query = qq|SELECT count(*) FROM dpt_trans d
+              WHERE d.department_id = $form->{id}|;
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
@@ -469,63 +463,60 @@ sub get_warehouse {
   $main::lxdebug->leave_sub();
 }
 
-
-sub save_warehouse {
+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 warehouse SET
-		description = '$form->{description}'
+    $query = qq|UPDATE department SET
+		description = '$form->{description}',
+		role = '$form->{role}'
 		WHERE id = $form->{id}|;
   } else {
-    $query = qq|INSERT INTO warehouse
-                (description)
-                VALUES ('$form->{description}')|;
+    $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_warehouse {
+sub delete_department {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
-  $query = qq|DELETE FROM warehouse
+
+  $query = qq|DELETE FROM department
 	      WHERE id = $form->{id}|;
   $dbh->do($query) || $form->dberror($query);
-  
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
-
-sub departments {
+sub lead {
   $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
+  my $query = qq|SELECT id, lead
+                 FROM leads
 		 ORDER BY 2|;
 
   $sth = $dbh->prepare($query);
@@ -537,40 +528,29 @@ sub departments {
 
   $sth->finish;
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
-
-
-sub get_department {
+sub get_lead {
   $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 $query =
+    qq|SELECT l.id, l.lead
+                 FROM leads l
+	         WHERE l.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);
+  map { $form->{$_} = $ref->{$_} } keys %$ref;
 
-  ($form->{orphaned}) = $sth->fetchrow_array;
-  $form->{orphaned} = !$form->{orphaned};
   $sth->finish;
 
   $dbh->disconnect;
@@ -578,58 +558,55 @@ sub get_department {
   $main::lxdebug->leave_sub();
 }
 
-
-sub save_department {
+sub save_lead {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
-  $form->{description} =~ s/\'/\'\'/g;
 
+  $form->{lead} =~ s/\'/\'\'/g;
+
+  # id is the old record
   if ($form->{id}) {
-    $query = qq|UPDATE department SET
-		description = '$form->{description}',
-		role = '$form->{role}'
+    $query = qq|UPDATE leads SET
+		lead = '$form->{description}'
 		WHERE id = $form->{id}|;
   } else {
-    $query = qq|INSERT INTO department 
-                (description, role)
-                VALUES ('$form->{description}', '$form->{role}')|;
+    $query = qq|INSERT INTO leads
+                (lead)
+                VALUES ('$form->{description}')|;
   }
   $dbh->do($query) || $form->dberror($query);
-  
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
-sub delete_department {
+sub delete_lead {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
-  $query = qq|DELETE FROM department
+
+  $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);
 
@@ -646,12 +623,10 @@ sub business {
 
   $sth->finish;
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
-
-
 sub get_business {
   $main::lxdebug->enter_sub();
 
@@ -659,15 +634,16 @@ sub get_business {
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
-  my $query = qq|SELECT b.description, b.discount, b.customernumberinit, b.salesman
+
+  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;
@@ -677,19 +653,18 @@ sub get_business {
   $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
@@ -699,41 +674,668 @@ sub save_business {
                 salesman = '$form->{salesman}'
 		WHERE id = $form->{id}|;
   } else {
-    $query = qq|INSERT INTO business 
+    $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->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);
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+
+sub language {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form, $return_list) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  my $query =
+    "SELECT id, description, template_code, article_code, " .
+    "  output_numberformat, output_dateformat, output_longdates " .
+    "FROM language ORDER BY description";
+
+  $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  my $ary = [];
+
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push(@{ $ary }, $ref);
+  }
+
+  $sth->finish;
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+
+  if ($return_list) {
+    return @{$ary};
+  } else {
+    $form->{ALL} = $ary;
+  }
+}
+
+sub get_language {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  my $query =
+    "SELECT description, template_code, article_code, " .
+    "  output_numberformat, output_dateformat, output_longdates " .
+    "FROM language WHERE id = ?";
+  my $sth = $dbh->prepare($query);
+  $sth->execute($form->{"id"}) || $form->dberror($query . " ($form->{id})");
+
+  my $ref = $sth->fetchrow_hashref(NAME_lc);
+
+  map { $form->{$_} = $ref->{$_} } keys %$ref;
+
+  $sth->finish;
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub get_language_details {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form, $id) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  my $query =
+    "SELECT template_code, " .
+    "  output_numberformat, output_dateformat, output_longdates " .
+    "FROM language WHERE id = ?";
+  my @res = $dbh->selectrow_array($query, undef, $id);
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+
+  return @res;
+}
+
+sub save_language {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+  my (@values, $query);
+
+  map({ push(@values, $form->{$_}); }
+      qw(description template_code article_code
+         output_numberformat output_dateformat output_longdates));
+
+  # id is the old record
+  if ($form->{id}) {
+    $query =
+      "UPDATE language SET " .
+      "  description = ?, template_code = ?, article_code = ?, " .
+      "  output_numberformat = ?, output_dateformat = ?, " .
+      "  output_longdates = ? " .
+      "WHERE id = ?";
+    push(@values, $form->{id});
+  } else {
+    $query =
+      "INSERT INTO language (" .
+      "  description, template_code, article_code, " .
+      "  output_numberformat, output_dateformat, output_longdates" .
+      ") VALUES (?, ?, ?, ?, ?, ?)";
+  }
+  $dbh->do($query, undef, @values) ||
+    $form->dberror($query . " (" . join(", ", @values) . ")");
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub delete_language {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # 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 = ?|;
+    do_query($form, $dbh, $query, $form->{"id"});
+  }
+
+  $query = "DELETE FROM language WHERE id = ?";
+  do_query($form, $dbh, $query, $form->{"id"});
+
+  $dbh->commit();
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+
+sub buchungsgruppe {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  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|;
+
+  $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  $form->{ALL} = [];
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push @{ $form->{ALL} }, $ref;
+  }
+
+  $sth->finish;
+  $dbh->disconnect;
+
+  $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})");
+
+    my $ref = $sth->fetchrow_hashref(NAME_lc);
+
+    map { $form->{$_} = $ref->{$_} } keys %$ref;
+
+    $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);
+  }
+
+  $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 $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 $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} };
+        }
+      }
+    }
+  }
+  $sth->finish;
+
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub save_buchungsgruppe {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  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});
+
+  my $query;
+
+  # 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});
+  } 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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
+  }
+  do_query($form, $dbh, $query, @values);
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub delete_buchungsgruppe {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  $query = qq|DELETE FROM buchungsgruppen WHERE id = ?|;
+  do_query($form, $dbh, $query, $form->{id});
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub swap_sortkeys {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form, $table) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect_noauto($myconfig);
+
+  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();
+
+  $dbh->commit();
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub printer {
+  $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);
+  $sth->execute || $form->dberror($query);
+
+  $form->{"ALL"} = [];
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push @{ $form->{ALL} }, $ref;
+  }
+
+  $sth->finish;
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub get_printer {
+  $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 $ref = $sth->fetchrow_hashref(NAME_lc);
+
+  map { $form->{$_} = $ref->{$_} } keys %$ref;
+
+  $sth->finish;
+
+  $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);
+
+  $form->{printer_description} =~ s/\'/\'\'/g;
+  $form->{printer_command} =~ s/\'/\'\'/g;
+  $form->{template_code} =~ s/\'/\'\'/g;
+
+
+  # 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}')|;
+  }
+  $dbh->do($query) || $form->dberror($query);
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub delete_printer {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  $query = qq|DELETE FROM printers
+	      WHERE id = $form->{id}|;
+  $dbh->do($query) || $form->dberror($query);
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub payment {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  my $query = qq|SELECT * FROM payment_terms ORDER BY sortkey|;
+
+  $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  $form->{ALL} = [];
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push @{ $form->{ALL} }, $ref;
+  }
+
+  $sth->finish;
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub get_payment {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  my $query = qq|SELECT * FROM payment_terms WHERE id = ?|;
+  my $sth = $dbh->prepare($query);
+  $sth->execute($form->{"id"}) || $form->dberror($query . " ($form->{id})");
+
+  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  map { $form->{$_} = $ref->{$_} } keys %$ref;
+  $sth->finish();
+
+  $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;
+
+  $form->{"TRANSLATION"} = [sort({ $a->{"language"} cmp $b->{"language"} }
+                                 values(%mapping))];
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub save_payment {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect_noauto($myconfig);
+
+  my $query;
+
+  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);
+
+    $query = qq|INSERT INTO payment_terms (id, sortkey) VALUES (?, ?)|;
+    do_query($form, $dbh, $query, $form->{id}, $sortkey);
+
+  } else {
+    $query =
+      qq|DELETE FROM translation_payment_terms | .
+      qq|WHERE payment_terms_id = ?|;
+    do_query($form, $dbh, $query, $form->{"id"});
+  }
+
+  $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);
+
+  $query = qq|SELECT id FROM language|;
+  my @language_ids;
+  my $sth = $dbh->prepare($query);
+  $sth->execute() || $form->dberror($query);
+
+  while (my ($id) = $sth->fetchrow_array()) {
+    push(@language_ids, $id);
+  }
+  $sth->finish();
+
+  $query =
+    qq|INSERT INTO translation_payment_terms | .
+    qq|(language_id, payment_terms_id, description_long) | .
+    qq|VALUES (?, ?, ?)|;
+  $sth = $dbh->prepare($query);
+
+  foreach my $language_id (@language_ids) {
+    do_statement($form, $sth, $query, $language_id, $form->{"id"},
+                 $form->{"description_long_${language_id}"});
+  }
+  $sth->finish();
+
+  $dbh->commit();
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
-sub delete_business {
+sub delete_payment {
   $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);
-  
+  my $dbh = $form->dbconnect_noauto($myconfig);
+
+  my $query =
+    qq|DELETE FROM translation_payment_terms WHERE payment_terms_id = ?|;
+  do_query($form, $dbh, $query, $form->{"id"});
+
+  $query = qq|DELETE FROM payment_terms WHERE id = ?|;
+  do_query($form, $dbh, $query, $form->{"id"});
+
+  $dbh->commit();
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
 sub sic {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
@@ -750,12 +1352,10 @@ sub sic {
 
   $sth->finish;
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
-
-
 sub get_sic {
   $main::lxdebug->enter_sub();
 
@@ -763,7 +1363,7 @@ sub get_sic {
 
   # 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}'|;
@@ -771,7 +1371,7 @@ sub get_sic {
   $sth->execute || $form->dberror($query);
 
   my $ref = $sth->fetchrow_hashref(NAME_lc);
-  
+
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
   $sth->finish;
@@ -781,18 +1381,17 @@ sub get_sic {
   $main::lxdebug->leave_sub();
 }
 
-
 sub save_sic {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
-  $form->{code} =~ s/\'/\'\'/g;
+
+  $form->{code}        =~ s/\'/\'\'/g;
   $form->{description} =~ s/\'/\'\'/g;
-  
+
   # if there is an id
   if ($form->{id}) {
     $query = qq|UPDATE sic SET
@@ -801,41 +1400,39 @@ sub save_sic {
 		description = '$form->{description}'
 		WHERE code = '$form->{id}'|;
   } else {
-    $query = qq|INSERT INTO sic 
+    $query = qq|INSERT INTO sic
                 (code, sictype, description)
                 VALUES ('$form->{code}', '$form->{sictype}', '$form->{description}')|;
   }
   $dbh->do($query) || $form->dberror($query);
-  
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
 sub delete_sic {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
+
   $query = qq|DELETE FROM sic
 	      WHERE code = '$form->{code}'|;
   $dbh->do($query) || $form->dberror($query);
-  
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
 sub load_template {
   $main::lxdebug->enter_sub();
 
   my ($self, $form) = @_;
-  
+
   open(TEMPLATE, "$form->{file}") or $form->error("$form->{file} : $!");
 
   while (<TEMPLATE>) {
@@ -847,15 +1444,14 @@ sub load_template {
   $main::lxdebug->leave_sub();
 }
 
-
 sub save_template {
   $main::lxdebug->enter_sub();
 
   my ($self, $form) = @_;
-  
+
   open(TEMPLATE, ">$form->{file}") or $form->error("$form->{file} : $!");
-  
-  # strip 
+
+  # strip
   $form->{body} =~ s/\r\n/\n/g;
   print TEMPLATE $form->{body};
 
@@ -864,28 +1460,27 @@ sub save_template {
   $main::lxdebug->leave_sub();
 }
 
-
-
 sub save_preferences {
   $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);
-  
+  map { ($form->{$_}) = split(/--/, $form->{$_}) }
+    qw(inventory_accno income_accno expense_accno fxgain_accno fxloss_accno);
+
   my @a;
   $form->{curr} =~ s/ //g;
-  map { push(@a, uc pack "A3", $_) if $_ } split /:/, $form->{curr};
+  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 = 
+                 inventory_accno_id =
 		     (SELECT c.id FROM chart c
 		                WHERE c.accno = '$form->{inventory_accno}'),
                  income_accno_id =
@@ -901,6 +1496,7 @@ sub save_preferences {
 		     (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}',
@@ -911,7 +1507,6 @@ sub save_preferences {
                  servicenumber = '$form->{servicenumber}',
                  yearend = '$form->{yearend}',
 		 curr = '$form->{curr}',
-		 weightunit = '$form->{weightunit}',
 		 businessnumber = '$form->{businessnumber}'
 		|;
   $dbh->do($query) || $form->dberror($query);
@@ -923,93 +1518,90 @@ sub save_preferences {
               SET name = '$name'
 	      WHERE login = '$form->{login}'|;
   $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);
-  }
+
+#   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;
 
   # save first currency in myconfig
-  $form->{currency} = substr($form->{curr},0,3);
-  
+  $form->{currency} = substr($form->{curr}, 0, 3);
+
   my $myconfig = new User "$memberfile", "$form->{login}";
-  
+
   foreach my $item (keys %$form) {
     $myconfig->{$item} = $form->{$item};
   }
 
   $myconfig->save_member($memberfile, $userspath);
-  
+
   if ($webdav) {
-    @webdavdirs = qw(angebote bestellungen rechnungen anfragen lieferantenbestellungen einkaufsrechnungen);
+    @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);
-		}
+      $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);
       }
-  }    
+    }
+  }
 
   $main::lxdebug->leave_sub();
 
   return $rc;
 }
 
-
 sub defaultaccounts {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
+
   # get defaults from defaults table
   my $query = qq|SELECT * FROM defaults|;
-  my $sth = $dbh->prepare($query);
+  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}             = $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;
+  $form->{defaults}{FX_gain}    = $form->{defaults}{fxgain_accno_id};
+  $form->{defaults}{FX_loss}    = $form->{defaults}{fxloss_accno_id};
 
+  $sth->finish;
 
   $query = qq|SELECT c.id, c.accno, c.description, c.link
               FROM chart c
@@ -1021,21 +1613,22 @@ sub defaultaccounts {
   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} );
+        $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'
@@ -1045,8 +1638,10 @@ sub defaultaccounts {
   $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} );
+    %{ $form->{IC}{FX_gain}{ $ref->{accno} } } = (
+                                             id          => $ref->{id},
+                                             description => $ref->{description}
+    );
   }
   $sth->finish;
 
@@ -1059,12 +1654,13 @@ sub defaultaccounts {
   $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} );
+    %{ $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
@@ -1075,48 +1671,49 @@ sub defaultaccounts {
   $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->{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};
   }
 
   $sth->finish;
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
-
 sub backup {
   $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 $tmpfile  =
+    "$userspath/$boundary.$myconfig->{dbname}-$form->{dbversion}.sql";
   my $out = $form->{OUT};
   $form->{OUT} = ">$tmpfile";
-  
+
   if ($form->{media} eq 'email') {
-   
+
     use SL::Mailer;
     $mail = new Mailer;
 
-    $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->{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.";
+    $mail->{fileid}  = "$boundary.";
 
     $myconfig->{signature} =~ s/\\n/\r\n/g;
     $mail->{message} = "--\n$myconfig->{signature}";
-    
-  }
 
+  }
 
   open(OUT, "$form->{OUT}") or $form->error("$form->{OUT} : $!");
 
@@ -1125,14 +1722,15 @@ sub backup {
 
   my @sequences = ();
   my @functions = ();
-  my @triggers = ();
-  my @indices = ();
+  my @triggers  = ();
+  my @indices   = ();
   my %tablespecs;
- 
+
   my $query = "";
   my @quote_chars;
 
   while (<FH>) {
+
     # Remove DOS and Unix style line endings.
     s/[\r\n]//g;
 
@@ -1154,6 +1752,7 @@ sub backup {
           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);
@@ -1173,7 +1772,7 @@ sub backup {
           }
 
           $query = "";
-          $char = "";
+          $char  = "";
         }
 
         $query .= $char;
@@ -1182,17 +1781,16 @@ sub backup {
   }
   close(FH);
 
-
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # get all the tables
-  my @tables = $dbh->tables( '', '', 'customer', '', {noprefix => 0});
+  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}
@@ -1213,21 +1811,21 @@ $myconfig->{dboptions};
   }
 
   print OUT "-- DROP Triggers\n";
-  
+
   foreach $item (@triggers) {
-  	if ($item =~ /^create\s+trigger\s+\"?(\w+)\"?\s+.*on\s+\"?(\w+)\"?\s+/i) {
+    if ($item =~ /^create\s+trigger\s+\"?(\w+)\"?\s+.*on\s+\"?(\w+)\"?\s+/i) {
       print OUT qq|DROP TRIGGER "$1" ON "$2";\n|;
     }
   }
-  
+
   print OUT "-- DROP Functions\n";
-  
+
   foreach $item (@functions) {
     if ($item =~ /^create\s+function\s+\"?(\w+)\"?/i) {
       print OUT qq|DROP FUNCTION "$1" ();\n|;
     }
   }
-  
+
   foreach $table (@tables) {
     if (!($table =~ /^sql_.*/)) {
       my $query = qq|SELECT * FROM $table|;
@@ -1236,7 +1834,8 @@ $myconfig->{dboptions};
       $sth->execute || $form->dberror($query);
 
       $query = "INSERT INTO $table (";
-      map { $query .= qq|$sth->{NAME}->[$_],| } (0 .. $sth->{NUM_OF_FIELDS} - 1);
+      map { $query .= qq|$sth->{NAME}->[$_],| }
+        (0 .. $sth->{NUM_OF_FIELDS} - 1);
       chop $query;
 
       $query .= ") VALUES";
@@ -1271,7 +1870,6 @@ $myconfig->{dboptions};
     }
   }
 
-
   # create indices, sequences, functions and triggers
 
   print(OUT "-- CREATE Indices\n");
@@ -1280,11 +1878,11 @@ $myconfig->{dboptions};
   print OUT "-- CREATE Sequences\n";
   foreach $item (@sequences) {
     $query = qq|SELECT last_value FROM $item|;
-    $sth = $dbh->prepare($query);
+    $sth   = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
     my ($id) = $sth->fetchrow_array;
     $sth->finish;
-  
+
     print OUT qq|--
 CREATE SEQUENCE $item START $id;
 |;
@@ -1296,32 +1894,30 @@ CREATE SEQUENCE $item START $id;
   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 : $!");
-   
+
+    open(IN,  "$tmpfile") or $form->error("$tmpfile : $!");
+    open(OUT, ">-")       or $form->error("STDOUT : $!");
+
     print OUT qq|Content-Type: application/x-tar-gzip;
 Content-Disposition: attachment; filename="$myconfig->{dbname}-$form->{dbversion}.sql.gz"
 
@@ -1333,15 +1929,14 @@ Content-Disposition: attachment; filename="$myconfig->{dbname}-$form->{dbversion
 
     close(IN);
     close(OUT);
-    
+
   }
 
   unlink "$tmpfile";
-   
+
   $main::lxdebug->leave_sub();
 }
 
-
 sub closedto {
   $main::lxdebug->enter_sub();
 
@@ -1350,19 +1945,18 @@ sub closedto {
   my $dbh = $form->dbconnect($myconfig);
 
   my $query = qq|SELECT closedto, revtrans FROM defaults|;
-  my $sth = $dbh->prepare($query);
+  my $sth   = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
   ($form->{closedto}, $form->{revtrans}) = $sth->fetchrow_array;
-  
+
   $sth->finish;
-  
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
- 
 sub closebooks {
   $main::lxdebug->enter_sub();
 
@@ -1371,29 +1965,335 @@ sub closebooks {
   my $dbh = $form->dbconnect($myconfig);
 
   if ($form->{revtrans}) {
-   
+
     $query = qq|UPDATE defaults SET closedto = NULL,
 				    revtrans = '1'|;
-  } else {
-    if ($form->{closedto}) {
-    
-      $query = qq|UPDATE defaults SET closedto = '$form->{closedto}',
+  } elsif ($form->{closedto}) {
+
+    $query = qq|UPDATE defaults SET closedto = '$form->{closedto}',
 				      revtrans = '0'|;
-    } else {
-      
-      $query = qq|UPDATE defaults SET closedto = NULL,
+  } else {
+
+    $query = qq|UPDATE defaults SET closedto = NULL,
 				      revtrans = '0'|;
-    }
   }
 
   # set close in defaults
   $dbh->do($query) || $form->dberror($query);
-  
+
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
+sub get_base_unit {
+  my ($self, $units, $unit_name, $factor) = @_;
 
-1;
+  $factor = 1 unless ($factor);
+
+  my $unit = $units->{$unit_name};
+
+  if (!defined($unit) || !$unit->{"base_unit"} ||
+      ($unit_name eq $unit->{"base_unit"})) {
+    return ($unit_name, $factor);
+  }
+
+  return AM->get_base_unit($units, $unit->{"base_unit"}, $factor * $unit->{"factor"});
+}
+
+sub retrieve_units {
+  $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"});
+
+    $unit->{"LANGUAGES"} = {};
+    foreach my $lang (@languages) {
+      $unit->{"LANGUAGES"}->{$lang->{"template_code"}} = { "template_code" => $lang->{"template_code"} };
+    }
+
+    $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();
+
+  $dbh->disconnect();
+
+  $main::lxdebug->leave_sub();
+
+  return $units;
+}
+
+sub translate_units {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $form, $template_code, $unit, $amount) = @_;
+
+  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 units_in_use {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form, $units) = @_;
+
+  my $dbh = $form->dbconnect($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"};
+    }
+  }
+
+  foreach my $unit (values(%{$units})) {
+    $unit->{"in_use"} = 0;
+    map({ $_ = $dbh->quote($_); } @{$unit->{"DEPENDING_UNITS"}});
+
+    foreach my $table (qw(parts invoice orderitems)) {
+      my $query = "SELECT COUNT(*) FROM $table WHERE unit ";
+
+      if (0 == scalar(@{$unit->{"DEPENDING_UNITS"}})) {
+        $query .= "= " . $dbh->quote($unit->{"name"});
+      } else {
+        $query .= "IN (" . $dbh->quote($unit->{"name"}) . "," . join(",", @{$unit->{"DEPENDING_UNITS"}}) . ")";
+      }
+
+      my ($count) = $dbh->selectrow_array($query);
+      $form->dberror($query) if ($dbh->err);
+
+      if ($count) {
+        $unit->{"in_use"} = 1;
+        last;
+      }
+    }
+  }
+
+  $dbh->disconnect();
+
+  $main::lxdebug->leave_sub();
+}
+
+sub unit_select_data {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $units, $selected, $empty_entry) = @_;
+
+  my $select = [];
+
+  if ($empty_entry) {
+    push(@{$select}, { "name" => "", "base_unit" => "", "factor" => "", "selected" => "" });
+  }
+
+  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" : "" });
+  }
+
+  $main::lxdebug->leave_sub();
+
+  return $select;
+}
+
+sub unit_select_html {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $units, $name, $selected, $convertible_into) = @_;
+
+  my $select = "<select name=${name}>";
+
+  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>";
+    }
+  }
+  $select .= "</select>";
+
+  $main::lxdebug->leave_sub();
+
+  return $select;
+}
+
+sub add_unit {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form, $name, $base_unit, $factor, $type, $languages) = @_;
+
+  my $dbh = $form->dbconnect_noauto($myconfig);
+
+  my $query = qq|SELECT COALESCE(MAX(sortkey), 0) + 1 FROM units|;
+  my ($sortkey) = selectrow_query($form, $dbh, $query);
+
+  $query = "INSERT INTO units (name, base_unit, factor, type, sortkey) " .
+    "VALUES (?, ?, ?, ?, ?)";
+  do_query($form, $dbh, $query, $name, $base_unit, $factor, $type, $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_units {
+  $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) . ")");
+      }
+    }
+
+    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) . ")");
+  }
+
+  $sth->finish();
+  $sth_lang->finish();
+  $dbh->commit();
+  $dbh->disconnect();
+
+  $main::lxdebug->leave_sub();
+}
+
+sub swap_units {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form, $dir, $name_1, $unit_type) = @_;
+
+  my $dbh = $form->dbconnect_noauto($myconfig);
+
+  my $query;
+
+  $query = qq|SELECT sortkey FROM units WHERE name = ?|;
+  my ($sortkey_1) = selectrow_query($form, $dbh, $query, $name_1);
+
+  $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);
+
+  if (defined($sortkey_1)) {
+    $query = qq|SELECT name FROM units WHERE sortkey = ${sortkey_2}|;
+    my ($name_2) = selectrow_query($form, $dbh, $query);
+
+    if (defined($name_2)) {
+      $query = qq|UPDATE units SET sortkey = ? WHERE name = ?|;
+      my $sth = $dbh->prepare($query);
+
+      do_statement($form, $sth, $query, $sortkey_1, $name_2);
+      do_statement($form, $sth, $query, $sortkey_2, $name_1);
+    }
+  }
+
+  $dbh->commit();
+  $dbh->disconnect();
+
+  $main::lxdebug->leave_sub();
+}
+
+1;