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

diff --git a/SL/AM.pm b/SL/AM.pm
index 81e463b0f..a2e201f61 100644
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -37,32 +37,34 @@
 
 package AM;
 
+use Data::Dumper;
+
 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, c.link, c.taxkey_id, c.pos_ustva, c.pos_bwa, c.pos_bilanz,c.pos_eur
+                 c.category, c.link, c.taxkey_id, c.pos_ustva, c.pos_bwa, c.pos_bilanz,c.pos_eur, c.new_chart_id, c.valid_from
                  FROM chart c
 	         WHERE c.id = $form->{id}|;
-  
+
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
   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,7 +78,7 @@ sub get_account {
   $sth->finish;
 
   # get taxkeys and description
-  $query = qq|SELECT taxkey, taxdescription 
+  $query = qq|SELECT taxkey, taxdescription
               FROM tax|;
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
@@ -88,7 +90,23 @@ sub get_account {
   }
 
   $sth->finish;
+  if ($form->{id}) {
 
+    $where = " WHERE link='$form->{link}'";
+    
+  
+    # get new accounts
+    $query = qq|SELECT id, accno,description
+                FROM chart $where|;
+    $sth = $dbh->prepare($query);
+    $sth->execute || $form->dberror($query);
+  
+    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}|;
@@ -99,12 +117,26 @@ sub get_account {
   $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 = $form->{id}|;
+    $sth = $dbh->prepare($query);
+    $sth->execute || $form->dberror($query);
+
+    my ($count) = $sth->fetchrow_array;
+    if ($count >=0) {
+      $form->{new_chart_valid} = 1;
+    }
+    $sth->finish;
+  }
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
 sub save_account {
   $main::lxdebug->enter_sub();
 
@@ -115,28 +147,21 @@ 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};
 
@@ -145,16 +170,19 @@ sub save_account {
 
   # 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}) {
+  if ($form->{id} eq "NULL") {
+    $form->{id} = "";
+  }
+
+  map({ $form->{$_} = "NULL" unless ($form->{$_}); }
+      qw(pos_ustva pos_bwa pos_bilanz pos_eur new_chart_id));
+
+  $form->{valid_from} = ($form->{valid_from}) ? "'$form->{valid_from}'" : "NULL";
+
+  if ($form->{id} && $form->{orphaned}) {
     $query = qq|UPDATE chart SET
                 accno = '$form->{accno}',
 		description = '$form->{description}',
@@ -166,24 +194,31 @@ sub save_account {
                 pos_ustva = $form->{pos_ustva},
                 pos_bwa   = $form->{pos_bwa},
                 pos_bilanz = $form->{pos_bilanz},
-                pos_eur = $form->{pos_eur}
+                pos_eur = $form->{pos_eur},
+                new_chart_id = $form->{new_chart_id},
+                valid_from = $form->{valid_from}
+		WHERE id = $form->{id}|;
+  } elsif ($form->{id} && !$form->{new_chart_valid}) {
+     $query = qq|UPDATE chart SET
+                new_chart_id = $form->{new_chart_id},
+                valid_from = $form->{valid_from}
 		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)
+
+    $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 ('$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})|;
+		'$form->{category}', '$form->{link}', $form->{taxkey_id}, $form->{pos_ustva}, $form->{pos_bwa}, $form->{pos_bilanz}, $form->{pos_eur}, $form->{new_chart_id}, $form->{valid_from})|;
   }
   $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
@@ -194,7 +229,7 @@ sub save_account {
       ($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
@@ -204,7 +239,7 @@ sub save_account {
 
     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)
@@ -212,6 +247,7 @@ sub save_account {
       $dbh->do($query) || $form->dberror($query);
     }
   } else {
+
     # remove tax
     if ($form->{id}) {
       $query = qq|DELETE FROM tax
@@ -220,7 +256,6 @@ sub save_account {
     }
   }
 
-
   # commit
   my $rc = $dbh->commit;
   $dbh->disconnect;
@@ -230,8 +265,6 @@ sub save_account {
   return $rc;
 }
 
-
-
 sub delete_account {
   $main::lxdebug->enter_sub();
 
@@ -253,7 +286,6 @@ sub delete_account {
   }
   $sth->finish;
 
-
   # delete chart of account record
   $query = qq|DELETE FROM chart
               WHERE id = $form->{id}|;
@@ -261,23 +293,23 @@ sub delete_account {
 
   # set inventory_accno_id, income_accno_id, expense_accno_id to defaults
   $query = qq|UPDATE parts
-              SET inventory_accno_id = 
+              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 $table (qw(partstax customertax vendortax tax)) {
     $query = qq|DELETE FROM $table
 		WHERE chart_id = $form->{id}|;
@@ -293,12 +325,11 @@ sub delete_account {
   return $rc;
 }
 
-
 sub gifi_accounts {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
@@ -315,12 +346,10 @@ sub gifi_accounts {
 
   $sth->finish;
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
-
-
 sub get_gifi {
   $main::lxdebug->enter_sub();
 
@@ -328,7 +357,7 @@ sub get_gifi {
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
+
   my $query = qq|SELECT g.accno, g.description
                  FROM gifi g
 	         WHERE g.accno = '$form->{accno}'|;
@@ -336,7 +365,7 @@ sub get_gifi {
   $sth->execute || $form->dberror($query);
 
   my $ref = $sth->fetchrow_hashref(NAME_lc);
-  
+
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
   $sth->finish;
@@ -358,15 +387,14 @@ sub get_gifi {
   $main::lxdebug->leave_sub();
 }
 
-
 sub save_gifi {
   $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!
@@ -376,42 +404,40 @@ sub save_gifi {
 		description = '$form->{description}'
 		WHERE accno = '$form->{id}'|;
   } else {
-    $query = qq|INSERT INTO gifi 
+    $query = qq|INSERT INTO gifi
                 (accno, description)
                 VALUES ('$form->{accno}', '$form->{description}')|;
   }
   $dbh->do($query) || $form->dberror($query);
-  
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
 sub delete_gifi {
   $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}'|;
   $dbh->do($query) || $form->dberror($query);
-  
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
 sub warehouses {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
@@ -428,12 +454,10 @@ sub warehouses {
 
   $sth->finish;
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
-
-
 sub get_warehouse {
   $main::lxdebug->enter_sub();
 
@@ -441,7 +465,7 @@ sub get_warehouse {
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
+
   my $query = qq|SELECT w.description
                  FROM warehouse w
 	         WHERE w.id = $form->{id}|;
@@ -449,7 +473,7 @@ sub get_warehouse {
   $sth->execute || $form->dberror($query);
 
   my $ref = $sth->fetchrow_hashref(NAME_lc);
-  
+
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
   $sth->finish;
@@ -469,15 +493,14 @@ sub get_warehouse {
   $main::lxdebug->leave_sub();
 }
 
-
 sub save_warehouse {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
+
   $form->{description} =~ s/\'/\'\'/g;
 
   if ($form->{id}) {
@@ -490,37 +513,34 @@ sub save_warehouse {
                 VALUES ('$form->{description}')|;
   }
   $dbh->do($query) || $form->dberror($query);
-  
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
 sub delete_warehouse {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
+
   $query = qq|DELETE FROM warehouse
 	      WHERE id = $form->{id}|;
   $dbh->do($query) || $form->dberror($query);
-  
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
-
 sub departments {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
@@ -537,12 +557,10 @@ sub departments {
 
   $sth->finish;
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
-
-
 sub get_department {
   $main::lxdebug->enter_sub();
 
@@ -550,7 +568,7 @@ sub get_department {
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
+
   my $query = qq|SELECT d.description, d.role
                  FROM department d
 	         WHERE d.id = $form->{id}|;
@@ -558,7 +576,7 @@ sub get_department {
   $sth->execute || $form->dberror($query);
 
   my $ref = $sth->fetchrow_hashref(NAME_lc);
-  
+
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
   $sth->finish;
@@ -578,15 +596,14 @@ sub get_department {
   $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}) {
@@ -595,46 +612,44 @@ sub save_department {
 		role = '$form->{role}'
 		WHERE id = $form->{id}|;
   } else {
-    $query = qq|INSERT INTO department 
+    $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 business {
+sub lead {
   $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
+  my $query = qq|SELECT id, lead
+                 FROM leads
 		 ORDER BY 2|;
 
   $sth = $dbh->prepare($query);
@@ -646,28 +661,27 @@ sub business {
 
   $sth->finish;
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
-
-
-sub get_business {
+sub get_lead {
   $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 $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;
@@ -677,69 +691,61 @@ sub get_business {
   $main::lxdebug->leave_sub();
 }
 
-
-sub save_business {
+sub save_lead {
   $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;
-  
+
+  $form->{lead} =~ s/\'/\'\'/g;
+
   # 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}'
+    $query = qq|UPDATE leads SET
+		lead = '$form->{description}'
 		WHERE id = $form->{id}|;
   } else {
-    $query = qq|INSERT INTO business 
-                (description, discount, customernumberinit, salesman)
-                VALUES ('$form->{description}', $form->{discount}, '$form->{customernumberinit}', '$form->{salesman}')|;
+    $query = qq|INSERT INTO leads
+                (lead)
+                VALUES ('$form->{description}')|;
   }
   $dbh->do($query) || $form->dberror($query);
-  
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
-sub delete_business {
+sub delete_lead {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
-  $query = qq|DELETE FROM business
+
+  $query = qq|DELETE FROM leads
 	      WHERE id = $form->{id}|;
   $dbh->do($query) || $form->dberror($query);
-  
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
-
-sub sic {
+sub business {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  my $query = qq|SELECT code, sictype, description
-                 FROM sic
-		 ORDER BY code|;
+  my $query = qq|SELECT id, description, discount, customernumberinit, salesman
+                 FROM business
+		 ORDER BY 2|;
 
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
@@ -750,28 +756,27 @@ sub sic {
 
   $sth->finish;
   $dbh->disconnect;
-  
+
   $main::lxdebug->leave_sub();
 }
 
-
-
-sub get_sic {
+sub get_business {
   $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 $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;
@@ -781,61 +786,721 @@ sub get_sic {
   $main::lxdebug->leave_sub();
 }
 
-
-sub save_sic {
+sub save_business {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  
+
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-  
-  $form->{code} =~ s/\'/\'\'/g;
+
   $form->{description} =~ s/\'/\'\'/g;
-  
-  # if there is an id
+  $form->{discount} /= 100;
+  $form->{salesman} *= 1;
+
+  # id is the old record
   if ($form->{id}) {
-    $query = qq|UPDATE sic SET
-                code = '$form->{code}',
-		sictype = '$form->{sictype}',
-		description = '$form->{description}'
-		WHERE code = '$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 sic 
-                (code, sictype, description)
-                VALUES ('$form->{code}', '$form->{sictype}', '$form->{description}')|;
+    $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_sic {
+sub delete_business {
   $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}'|;
+
+  $query = qq|DELETE FROM business
+	      WHERE id = $form->{id}|;
   $dbh->do($query) || $form->dberror($query);
-  
+
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
 }
 
 
-sub load_template {
+sub language {
   $main::lxdebug->enter_sub();
 
-  my ($self, $form) = @_;
-  
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  my $query = qq|SELECT id, description, template_code, article_code
+                 FROM language
+		 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_language {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  my $query =
+    qq|SELECT l.description, l.template_code, l.article_code
+                 FROM language 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;
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub save_language {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  $form->{description} =~ s/\'/\'\'/g;
+  $form->{article_code} =~ s/\'/\'\'/g;
+  $form->{template_code} =~ s/\'/\'\'/g;
+
+
+  # id is the old record
+  if ($form->{id}) {
+    $query = qq|UPDATE language SET
+		description = '$form->{description}',
+		template_code = '$form->{template_code}',
+		article_code = '$form->{article_code}'
+		WHERE id = $form->{id}|;
+  } else {
+    $query = qq|INSERT INTO language
+                (description, template_code, article_code)
+                VALUES ('$form->{description}', '$form->{template_code}', '$form->{article_code}')|;
+  }
+  $dbh->do($query) || $form->dberror($query);
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub delete_language {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  $query = qq|DELETE FROM language
+	      WHERE id = $form->{id}|;
+  $dbh->do($query) || $form->dberror($query);
+
+  $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 id|;
+
+  $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_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 = $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;
+  
+    my $query =
+      qq|SELECT count(id) as anzahl
+                  FROM parts
+                  WHERE buchungsgruppen_id = $form->{id}|;
+    my $sth = $dbh->prepare($query);
+    $sth->execute || $form->dberror($query);
+  
+    my $ref = $sth->fetchrow_hashref(NAME_lc);
+    if (!$ref->{anzahl}) {
+      $form->{orphaned} = 1;
+    }
+    $sth->finish;
+
+  }
+  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 ($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);
+
+  $form->{description} =~ s/\'/\'\'/g;
+
+
+  # id is the old record
+  if ($form->{id}) {
+    $query = qq|UPDATE buchungsgruppen SET
+		description = '$form->{description}',
+		inventory_accno_id = '$form->{inventory_accno_id}',
+		income_accno_id_0 = '$form->{income_accno_id_0}',
+		expense_accno_id_0 = '$form->{expense_accno_id_0}',
+		income_accno_id_1 = '$form->{income_accno_id_1}',
+		expense_accno_id_1 = '$form->{expense_accno_id_1}',
+        	income_accno_id_2 = '$form->{income_accno_id_2}',
+		expense_accno_id_2 = '$form->{expense_accno_id_2}',
+                income_accno_id_3 = '$form->{income_accno_id_3}',
+		expense_accno_id_3 = '$form->{expense_accno_id_3}'
+		WHERE id = $form->{id}|;
+  } else {
+    $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)
+                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}')|;
+  }
+  $dbh->do($query) || $form->dberror($query);
+
+  $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 buchungsgruppe
+	      WHERE id = $form->{id}|;
+  $dbh->do($query) || $form->dberror($query);
+
+  $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);
+
+  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 adr {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  my $query = qq|SELECT id, adr_description, adr_code
+                 FROM adr
+		 ORDER BY adr_code|;
+
+  $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_adr {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  my $query =
+    qq|SELECT a.adr_description, a.adr_code
+                 FROM adr a
+	         WHERE a.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_adr {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  $form->{adr_description} =~ s/\'/\'\'/g;
+  $form->{adr_code} =~ s/\'/\'\'/g;
+
+
+  # id is the old record
+  if ($form->{id}) {
+    $query = qq|UPDATE adr SET
+		adr_description = '$form->{adr_description}',
+		adr_code = '$form->{adr_code}'
+		WHERE id = $form->{id}|;
+  } else {
+    $query = qq|INSERT INTO adr
+                (adr_description, adr_code)
+                VALUES ('$form->{adr_description}', '$form->{adr_code}')|;
+  }
+  $dbh->do($query) || $form->dberror($query);
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub delete_adr {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  $query = qq|DELETE FROM adr
+	      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 id|;
+
+  $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {   
+    $ref->{percent_skonto} = $form->format_amount($myconfig,($ref->{percent_skonto} * 100));
+    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 = $form->{id}|;
+  my $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  $ref->{percent_skonto} = $form->format_amount($myconfig,($ref->{percent_skonto} * 100));
+
+  map { $form->{$_} = $ref->{$_} } keys %$ref;
+
+  $sth->finish;
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub save_payment {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  $form->{description} =~ s/\'/\'\'/g;
+  $form->{description_long} =~ s/\'/\'\'/g;
+  $percentskonto = $form->parse_amount($myconfig, $form->{percent_skonto}) /100;
+  $form->{ranking} *= 1;
+  $form->{terms_netto} *= 1;
+  $form->{terms_skonto} *= 1;
+  $form->{percent_skonto} *= 1;
+
+
+
+  # id is the old record
+  if ($form->{id}) {
+    $query = qq|UPDATE payment_terms SET
+		description = '$form->{description}',
+                ranking = $form->{ranking},
+		description_long = '$form->{description_long}',
+		terms_netto = $form->{terms_netto},
+                terms_skonto = $form->{terms_skonto},
+                percent_skonto = $percentskonto
+		WHERE id = $form->{id}|;
+  } else {
+    $query = qq|INSERT INTO payment_terms
+                (description, ranking, description_long, terms_netto, terms_skonto, percent_skonto)
+                VALUES ('$form->{description}', $form->{ranking}, '$form->{description_long}', $form->{terms_netto}, $form->{terms_skonto}, $percentskonto)|;
+  }
+  $dbh->do($query) || $form->dberror($query);
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub delete_payment {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  $query = qq|DELETE FROM payment_terms
+	      WHERE id = $form->{id}|;
+  $dbh->do($query) || $form->dberror($query);
+
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
+sub sic {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  my $query = qq|SELECT code, sictype, description
+                 FROM sic
+		 ORDER BY code|;
+
+  $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_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 {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # connect to database
+  my $dbh = $form->dbconnect($myconfig);
+
+  $form->{code}        =~ s/\'/\'\'/g;
+  $form->{description} =~ s/\'/\'\'/g;
+
+  # 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}')|;
+  }
+  $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 +1512,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 +1528,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};
   $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 +1564,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}',
@@ -923,10 +1587,10 @@ 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|,
+		SET rate = | . ($form->{$item} / 100) . qq|,
 		taxnumber = '$form->{"taxnumber_$item"}'
 		WHERE chart_id = $item|;
     $dbh->do($query) || $form->dberror($query);
@@ -936,80 +1600,77 @@ sub save_preferences {
   $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 +1682,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 +1707,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 +1723,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 +1740,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 +1791,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 +1821,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 +1841,7 @@ sub backup {
           }
 
           $query = "";
-          $char = "";
+          $char  = "";
         }
 
         $query .= $char;
@@ -1182,17 +1850,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 +1880,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 +1903,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 +1939,6 @@ $myconfig->{dboptions};
     }
   }
 
-
   # create indices, sequences, functions and triggers
 
   print(OUT "-- CREATE Indices\n");
@@ -1280,11 +1947,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 +1963,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 +1998,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 +2014,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,16 +2034,16 @@ 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}',
 				      revtrans = '0'|;
     } else {
-      
+
       $query = qq|UPDATE defaults SET closedto = NULL,
 				      revtrans = '0'|;
     }
@@ -1388,12 +2051,203 @@ sub closebooks {
 
   # 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();
+
+  foreach my $unit (keys(%{$units})) {
+    ($units->{$unit}->{"${prefix}base_unit"}, $units->{$unit}->{"${prefix}factor"}) = AM->get_base_unit($units, $unit);
+  }
+
+  $dbh->disconnect();
+
+  $main::lxdebug->leave_sub();
+
+  return $units;
+}
+
+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({ lc($a) cmp lc($b) } 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({ lc($a) cmp lc($b) } 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) = @_;
+
+  my $dbh = $form->dbconnect($myconfig);
+
+  my $query = "INSERT INTO units (name, base_unit, factor, type) VALUES (?, ?, ?, ?)";
+  $dbh->do($query, undef, $name, $base_unit, $factor, $type) || $form->dberror($query . " ($name, $base_unit, $factor, $type)");
+  $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);
 
+  if ($delete_units && (0 != scalar(@{$delete_units}))) {
+    $query = "DELETE FROM units WHERE name = ?";
+    $sth = $dbh->prepare($query);
+    map({ $sth->execute($_) || $form->dberror($query . " ($_)"); } @{$delete_units});
+    $sth->finish();
+  }
+
+  $query = "UPDATE units SET name = ?, base_unit = ?, factor = ? WHERE name = ?";
+  $sth = $dbh->prepare($query);
+
+  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}))) {
+    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();
+  $dbh->commit();
+  $dbh->disconnect();
+
+  $main::lxdebug->leave_sub();
+}
+
+1;