/SL/AM.pm - Annotieren - projekt kivitendo - wissen

| Zweig: | Markierung: | Revision:

kivitendo/SL/AM.pm @ af853490

-            d319704a
+#=====================================================================
 # LX-Office ERP
 # Copyright (C) 2004
 # Based on SQL-Ledger Version 2.1.9
 # Web http://www.lx-office.org
+#
 #=====================================================================
 # SQL-Ledger Accounting
 # Copyright (C) 2001
+#
 #  Author: Dieter Simader
 #   Email: dsimader@sql-ledger.org
 #     Web: http://www.sql-ledger.org
+#
 #  Contributors:
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #======================================================================
+#
 # Administration module
 #    Chart of Accounts
 #    template routines
 #    preferences
+#
 #======================================================================
 package AM;
-e4131e
+use Data::Dumper;
-            d319704a
+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);
-            e0e6a9bb
+  my $query = qq?SELECT c.accno, c.description, c.charttype, c.gifi_accno,
                  c.category,c.link, tk.taxkey_id, tk.pos_ustva, tk.tax_id,tk.tax_id||'--'||tk.taxkey_id AS tax, tk.startdate, c.pos_bilanz, c.pos_eur, c.new_chart_id, c.valid_from, c.pos_bwa
                 FROM chart c LEFT JOIN taxkeys tk
                 ON (c.id=tk.chart_id AND tk.id = (SELECT id from taxkeys where taxkeys.chart_id =c.id AND startdate<=current_date ORDER BY startdate desc LIMIT 1))
                 WHERE c.id = $form->{id}?;
-            d319704a
+            Moritz Bunkus
   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|;
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
   $ref = $sth->fetchrow_hashref(NAME_lc);
   map { $form->{$_} = $ref->{$_} } keys %ref;
   $sth->finish;
   # get taxkeys and description
-            e0e6a9bb
+  $query = qq?SELECT id, taxkey,id||'--'||taxkey AS tax, taxdescription
-            bc6ceee1
+              FROM tax ORDER BY taxkey?;
-            d319704a
+  $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
-            bc6ceee1
+            Philip Reetz
   $form->{TAXKEY} = [];
-            d319704a
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $form->{TAXKEY} }, $ref;
+  }
   $sth->finish;
-e4131e
+  if ($form->{id}) {
-            d319704a
+            Moritz Bunkus
-e4131e
+    $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;
+  }
-            d319704a
+  # check if we have any transactions
   $query = qq|SELECT a.trans_id FROM acc_trans a
               WHERE a.chart_id = $form->{id}|;
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
   ($form->{orphaned}) = $sth->fetchrow_array;
   $form->{orphaned} = !$form->{orphaned};
   $sth->finish;
-e4131e
+  # 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;
+  }
-            d319704a
+  $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
 sub save_account {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database, turn off AutoCommit
   my $dbh = $form->dbconnect_noauto($myconfig);
   # 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);
+  }
   $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);
+  }
   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->{$_}); }
-e4131e
+      qw(pos_ustva pos_bwa pos_bilanz pos_eur new_chart_id));
-            e0e6a9bb
+  my($tax_id, $taxkey) = split /--/, $form->{tax};
-e4131e
+  $form->{valid_from} = ($form->{valid_from}) ? "'$form->{valid_from}'" : "NULL";
-            e0e6a9bb
+  my $startdate = ($form->{startdate}) ? "'$form->{startdate}'" : "'1970-01-01'";
-e4131e
+  if ($form->{id} && $form->{orphaned}) {
-            d319704a
+    $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}',
-            e0e6a9bb
+                taxkey_id = $taxkey,
-            d319704a
+                pos_ustva = $form->{pos_ustva},
                 pos_bwa   = $form->{pos_bwa},
                 pos_bilanz = $form->{pos_bilanz},
-e4131e
+                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}
-            d319704a
+		WHERE id = $form->{id}|;
   } else {
-            0576299f
+    $query = qq|INSERT INTO chart
-e4131e
+                (accno, description, charttype, gifi_accno, category, link, taxkey_id, pos_ustva, pos_bwa, pos_bilanz,pos_eur, new_chart_id, valid_from)
-            d319704a
+                VALUES ('$form->{accno}', '$form->{description}',
 		'$form->{charttype}', '$form->{gifi_accno}',
-            e0e6a9bb
+		'$form->{category}', '$form->{link}', $taxkey, $form->{pos_ustva}, $form->{pos_bwa}, $form->{pos_bilanz}, $form->{pos_eur}, $form->{new_chart_id}, $form->{valid_from})|;
-            d319704a
+            Moritz Bunkus
   $dbh->do($query) || $form->dberror($query);
-            e0e6a9bb
+  #Save Taxes
   if (!$form->{id}) {
     $query = qq|INSERT INTO taxkeys (chart_id,tax_id,taxkey_id, pos_ustva, startdate) VALUES ((SELECT id FROM chart where accno='$form->{accno}'), $tax_id, $taxkey,$form->{pos_ustva}, $startdate)|;
     $dbh->do($query) || $form->dberror($query);
-            d319704a
+  } else {
-            e0e6a9bb
+    $query = qq|DELETE FROM taxkeys WHERE chart_id=$form->{id} AND tax_id=$tax_id|;
     $dbh->do($query) || $form->dberror($query);
     $query = qq|INSERT INTO taxkeys (chart_id,tax_id,taxkey_id, pos_ustva, startdate) VALUES ($form->{id}, $tax_id, $taxkey,$form->{pos_ustva}, $startdate)|;
     $dbh->do($query) || $form->dberror($query);
-            d319704a
+            Moritz Bunkus
-            e0e6a9bb
+#   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 ($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);
 #     }
 #   } else {
+#
 #     # remove tax
 #     if ($form->{id}) {
 #       $query = qq|DELETE FROM tax
 # 		  WHERE chart_id = $form->{id}|;
 #       $dbh->do($query) || $form->dberror($query);
 #     }
 #   }
-            d319704a
+  # commit
   my $rc = $dbh->commit;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
   return $rc;
+}
 sub delete_account {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database, turn off AutoCommit
   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);
   if ($sth->fetchrow_array) {
     $sth->finish;
     $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
-            0576299f
+              SET inventory_accno_id =
-            d319704a
+	                 (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);
-e4131e
+  $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}|;
     $dbh->do($query) || $form->dberror($query);
+  }
   # commit and redirect
   my $rc = $dbh->commit;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
   return $rc;
+}
 sub gifi_accounts {
   $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|;
   $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_gifi {
   $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 $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}'|;
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
   ($form->{orphaned}) = $sth->fetchrow_array;
   $sth->finish;
   $form->{orphaned} = !$form->{orphaned};
   $dbh->disconnect;
   $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!
   if ($form->{id}) {
     $query = qq|UPDATE gifi SET
                 accno = '$form->{accno}',
 		description = '$form->{description}'
 		WHERE accno = '$form->{id}'|;
   } else {
     $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);
   my $query = qq|SELECT id, description
                  FROM warehouse
 		 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_warehouse {
   $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 $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}|;
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
   ($form->{orphaned}) = $sth->fetchrow_array;
   $form->{orphaned} = !$form->{orphaned};
   $sth->finish;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
 sub save_warehouse {
   $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}'
 		WHERE id = $form->{id}|;
   } else {
     $query = qq|INSERT INTO warehouse
                 (description)
                 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);
   my $query = qq|SELECT d.id, d.description, d.role
                  FROM department d
 		 ORDER BY 2|;
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $form->{ALL} }, $ref;
+  }
   $sth->finish;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
 sub get_department {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   my $query = qq|SELECT d.description, d.role
                  FROM department d
 	         WHERE d.id = $form->{id}|;
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
   my $ref = $sth->fetchrow_hashref(NAME_lc);
   map { $form->{$_} = $ref->{$_} } keys %$ref;
   $sth->finish;
   # see if it is in use
   $query = qq|SELECT count(*) FROM dpt_trans d
               WHERE d.department_id = $form->{id}|;
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
   ($form->{orphaned}) = $sth->fetchrow_array;
   $form->{orphaned} = !$form->{orphaned};
   $sth->finish;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
 sub save_department {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   $form->{description} =~ s/\'/\'\'/g;
   if ($form->{id}) {
     $query = qq|UPDATE department SET
 		description = '$form->{description}',
 		role = '$form->{role}'
 		WHERE id = $form->{id}|;
   } else {
     $query = qq|INSERT INTO department
                 (description, role)
                 VALUES ('$form->{description}', '$form->{role}')|;
+  }
   $dbh->do($query) || $form->dberror($query);
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
 sub delete_department {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   $query = qq|DELETE FROM department
 	      WHERE id = $form->{id}|;
   $dbh->do($query) || $form->dberror($query);
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
-ad
+sub lead {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   my $query = qq|SELECT id, lead
                  FROM leads
 		 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_lead {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   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;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
 sub save_lead {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   $form->{lead} =~ s/\'/\'\'/g;
   # id is the old record
   if ($form->{id}) {
     $query = qq|UPDATE leads SET
 		lead = '$form->{description}'
 		WHERE id = $form->{id}|;
   } else {
     $query = qq|INSERT INTO leads
                 (lead)
                 VALUES ('$form->{description}')|;
+  }
   $dbh->do($query) || $form->dberror($query);
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
 sub delete_lead {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   $query = qq|DELETE FROM leads
 	      WHERE id = $form->{id}|;
   $dbh->do($query) || $form->dberror($query);
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
-e4131e
+sub business {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   my $query = qq|SELECT id, description, discount, customernumberinit, salesman
                  FROM business
 		 ORDER BY 2|;
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     push @{ $form->{ALL} }, $ref;
+  }
   $sth->finish;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
 sub get_business {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   my $query =
     qq|SELECT b.description, b.discount, b.customernumberinit, b.salesman
                  FROM business b
 	         WHERE b.id = $form->{id}|;
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
   my $ref = $sth->fetchrow_hashref(NAME_lc);
   map { $form->{$_} = $ref->{$_} } keys %$ref;
   $sth->finish;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
 sub save_business {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   $form->{description} =~ s/\'/\'\'/g;
   $form->{discount} /= 100;
   $form->{salesman} *= 1;
   # id is the old record
   if ($form->{id}) {
     $query = qq|UPDATE business SET
 		description = '$form->{description}',
 		discount = $form->{discount},
                 customernumberinit = '$form->{customernumberinit}',
                 salesman = '$form->{salesman}'
 		WHERE id = $form->{id}|;
   } else {
     $query = qq|INSERT INTO business
                 (description, discount, customernumberinit, salesman)
                 VALUES ('$form->{description}', $form->{discount}, '$form->{customernumberinit}', '$form->{salesman}')|;
+  }
   $dbh->do($query) || $form->dberror($query);
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
 sub delete_business {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   $query = qq|DELETE FROM business
 	      WHERE id = $form->{id}|;
   $dbh->do($query) || $form->dberror($query);
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
 sub language {
   $main::lxdebug->enter_sub();
-            af853490
+  my ($self, $myconfig, $form, $return_list) = @_;
-e4131e
+            Moritz Bunkus
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-e8c
+  my $query =
     "SELECT id, description, template_code, article_code, " .
     "  output_numberformat, output_dateformat, output_longdates " .
     "FROM language ORDER BY description";
-e4131e
+            Moritz Bunkus
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
-            af853490
+  my $ary = [];
-e4131e
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-            af853490
+    push(@{ $ary }, $ref);
-e4131e
+            Moritz Bunkus
   $sth->finish;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
-            af853490
+            Moritz Bunkus
   if ($return_list) {
     return @{$ary};
   } else {
     $form->{ALL} = $ary;
+  }
-e4131e
+            Moritz Bunkus
 sub get_language {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   my $query =
-e8c
+    "SELECT description, template_code, article_code, " .
     "  output_numberformat, output_dateformat, output_longdates " .
     "FROM language WHERE id = ?";
-e4131e
+  my $sth = $dbh->prepare($query);
-e8c
+  $sth->execute($form->{"id"}) || $form->dberror($query . " ($form->{id})");
-e4131e
+            Moritz Bunkus
   my $ref = $sth->fetchrow_hashref(NAME_lc);
   map { $form->{$_} = $ref->{$_} } keys %$ref;
   $sth->finish;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
-e8c
+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;
+}
-e4131e
+sub save_language {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-e8c
+  my (@values, $query);
-e4131e
+            Moritz Bunkus
-e8c
+  map({ push(@values, $form->{$_}); }
       qw(description template_code article_code
          output_numberformat output_dateformat output_longdates));
-e4131e
+            Moritz Bunkus
   # id is the old record
   if ($form->{id}) {
-e8c
+    $query =
       "UPDATE language SET " .
       "  description = ?, template_code = ?, article_code = ?, " .
       "  output_numberformat = ?, output_dateformat = ?, " .
       "  output_longdates = ? " .
       "WHERE id = ?";
     push(@values, $form->{id});
-e4131e
+  } else {
-e8c
+    $query =
       "INSERT INTO language (" .
       "  description, template_code, article_code, " .
       "  output_numberformat, output_dateformat, output_longdates" .
       ") VALUES (?, ?, ?, ?, ?, ?)";
-e4131e
+            Moritz Bunkus
-e8c
+  $dbh->do($query, undef, @values) ||
     $form->dberror($query . " (" . join(", ", @values) . ")");
-e4131e
+            Moritz Bunkus
   $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);
-e8c
+  my $query = "DELETE FROM language WHERE id = ?";
   $dbh->do($query, undef, $form->{"id"}) ||
     $form->dberror($query . " ($form->{id})");
-            d319704a
+            Moritz Bunkus
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
-e4131e
+            Moritz Bunkus
 sub buchungsgruppe {
-            d319704a
+  $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-e4131e
+  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|;
-            d319704a
+            Moritz Bunkus
   $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();
+}
-e4131e
+sub get_buchungsgruppe {
-            d319704a
+  $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-e4131e
+  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;
-            d319704a
+            Moritz Bunkus
-e4131e
+            Moritz Bunkus
-beff66b
+            Moritz Bunkus
   $query = "SELECT inventory_accno_id FROM defaults";
   ($form->{"std_inventory_accno_id"}) = $dbh->selectrow_array($query);
-e4131e
+  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|;
-            d319704a
+            Moritz Bunkus
-e4131e
+  my $sth = $dbh->prepare($query);
-            d319704a
+  $sth->execute || $form->dberror($query);
-e4131e
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-            b65d3ea9
+    foreach my $key (split(/:/, $ref->{link})) {
-beff66b
+      if (!$form->{"std_inventory_accno_id"} && ($key eq "IC")) {
         $form->{"std_inventory_accno_id"} = $ref->{"id"};
+      }
-e4131e
+      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} };
-            a36907a0
+        } else {
-e4131e
+          push @{ $form->{"${module}_links"}{$key} },
             { accno       => $ref->{accno},
               description => $ref->{description},
               selected    => "",
               id          => $ref->{id} };
+        }
+      }
+    }
+  }
-            d319704a
+  $sth->finish;
-e4131e
+            Moritz Bunkus
-            d319704a
+            Moritz Bunkus
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
-e4131e
+sub save_buchungsgruppe {
-            d319704a
+  $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   $form->{description} =~ s/\'/\'\'/g;
-e4131e
+            Moritz Bunkus
   # id is the old record
-            d319704a
+  if ($form->{id}) {
-e4131e
+    $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}|;
-            d319704a
+  } else {
-e4131e
+    $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}')|;
-            d319704a
+            Moritz Bunkus
   $dbh->do($query) || $form->dberror($query);
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
-e4131e
+sub delete_buchungsgruppe {
-            d319704a
+  $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-            12136988
+  $query = qq|DELETE FROM buchungsgruppen
-e4131e
+	      WHERE id = $form->{id}|;
-            d319704a
+  $dbh->do($query) || $form->dberror($query);
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
-e4131e
+sub printer {
-            d319704a
+  $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-e4131e
+  my $query = qq|SELECT id, printer_description, template_code, printer_command
                  FROM printers
-            d319704a
+		 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();
+}
-e4131e
+sub get_printer {
-            d319704a
+  $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-e4131e
+  my $query =
     qq|SELECT p.printer_description, p.template_code, p.printer_command
                  FROM printers p
 	         WHERE p.id = $form->{id}|;
-            d319704a
+  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();
+}
-e4131e
+sub save_printer {
-            d319704a
+  $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-e4131e
+  $form->{printer_description} =~ s/\'/\'\'/g;
   $form->{printer_command} =~ s/\'/\'\'/g;
   $form->{template_code} =~ s/\'/\'\'/g;
-            d319704a
+            Moritz Bunkus
-e4131e
+  # id is the old record
-            d319704a
+  if ($form->{id}) {
-e4131e
+    $query = qq|UPDATE printers SET
 		printer_description = '$form->{printer_description}',
 		template_code = '$form->{template_code}',
 		printer_command = '$form->{printer_command}'
-            d319704a
+		WHERE id = $form->{id}|;
   } else {
-e4131e
+    $query = qq|INSERT INTO printers
                 (printer_description, template_code, printer_command)
                 VALUES ('$form->{printer_description}', '$form->{template_code}', '$form->{printer_command}')|;
-            d319704a
+            Moritz Bunkus
   $dbh->do($query) || $form->dberror($query);
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
-e4131e
+sub delete_printer {
-            d319704a
+  $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-e4131e
+  $query = qq|DELETE FROM printers
-            d319704a
+	      WHERE id = $form->{id}|;
   $dbh->do($query) || $form->dberror($query);
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
-e4131e
+sub payment {
-            d319704a
+  $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-e4131e
+  my $query = qq|SELECT *
                  FROM payment_terms
 		 ORDER BY id|;
-            d319704a
+            Moritz Bunkus
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
-e4131e
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     $ref->{percent_skonto} = $form->format_amount($myconfig,($ref->{percent_skonto} * 100));
-            d319704a
+    push @{ $form->{ALL} }, $ref;
+  }
   $sth->finish;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
-e4131e
+sub get_payment {
-            d319704a
+  $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   my $query =
-e4131e
+    qq|SELECT *
                  FROM payment_terms
 	         WHERE id = $form->{id}|;
-            d319704a
+  my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
   my $ref = $sth->fetchrow_hashref(NAME_lc);
-e4131e
+  $ref->{percent_skonto} = $form->format_amount($myconfig,($ref->{percent_skonto} * 100));
-            d319704a
+            Moritz Bunkus
   map { $form->{$_} = $ref->{$_} } keys %$ref;
   $sth->finish;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
-e4131e
+sub save_payment {
-            d319704a
+  $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   $form->{description} =~ s/\'/\'\'/g;
-e4131e
+  $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;
-            d319704a
+            Moritz Bunkus
   # id is the old record
   if ($form->{id}) {
-e4131e
+    $query = qq|UPDATE payment_terms SET
-            d319704a
+		description = '$form->{description}',
-e4131e
+                ranking = $form->{ranking},
 		description_long = '$form->{description_long}',
 		terms_netto = $form->{terms_netto},
                 terms_skonto = $form->{terms_skonto},
                 percent_skonto = $percentskonto
-            d319704a
+		WHERE id = $form->{id}|;
   } else {
-e4131e
+    $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)|;
-            d319704a
+            Moritz Bunkus
   $dbh->do($query) || $form->dberror($query);
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
-e4131e
+sub delete_payment {
-            d319704a
+  $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
-e4131e
+  $query = qq|DELETE FROM payment_terms
-            d319704a
+	      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 {
-            0576299f
+    $query = qq|INSERT INTO sic
-            d319704a
+                (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>) {
     $form->{body} .= $_;
+  }
   close(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
   $form->{body} =~ s/\r\n/\n/g;
   print TEMPLATE $form->{body};
   close(TEMPLATE);
   $main::lxdebug->leave_sub();
+}
 sub save_preferences {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form, $memberfile, $userspath, $webdav) = @_;
-            b65d3ea9
+  map { ($form->{$_}) = split(/--/, $form->{$_}) }
-            d319704a
+    qw(inventory_accno income_accno expense_accno fxgain_accno fxloss_accno);
   my @a;
   $form->{curr} =~ s/ //g;
-            b65d3ea9
+  map { push(@a, uc pack "A3", $_) if $_ } split(/:/, $form->{curr});
-            d319704a
+  $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
-            0576299f
+                 inventory_accno_id =
-            d319704a
+		     (SELECT c.id FROM chart c
 		                WHERE c.accno = '$form->{inventory_accno}'),
                  income_accno_id =
 		     (SELECT c.id FROM chart c
 		                WHERE c.accno = '$form->{income_accno}'),
 	         expense_accno_id =
 		     (SELECT c.id FROM chart c
 		                WHERE c.accno = '$form->{expense_accno}'),
 	         fxgain_accno_id =
 		     (SELECT c.id FROM chart c
 		                WHERE c.accno = '$form->{fxgain_accno}'),
 	         fxloss_accno_id =
 		     (SELECT c.id FROM chart c
 		                WHERE c.accno = '$form->{fxloss_accno}'),
 	         invnumber = '$form->{invnumber}',
-e4131e
+                 cnnumber  = '$form->{cnnumber}',
-            d319704a
+	         sonumber = '$form->{sonumber}',
 	         ponumber = '$form->{ponumber}',
 		 sqnumber = '$form->{sqnumber}',
 		 rfqnumber = '$form->{rfqnumber}',
                  customernumber = '$form->{customernumber}',
 		 vendornumber = '$form->{vendornumber}',
                  articlenumber = '$form->{articlenumber}',
                  servicenumber = '$form->{servicenumber}',
                  yearend = '$form->{yearend}',
 		 curr = '$form->{curr}',
 		 weightunit = '$form->{weightunit}',
 		 businessnumber = '$form->{businessnumber}'
 		|;
   $dbh->do($query) || $form->dberror($query);
   # update name
   my $name = $form->{name};
   $name =~ s/\'/\'\'/g;
   $query = qq|UPDATE employee
               SET name = '$name'
 	      WHERE login = '$form->{login}'|;
   $dbh->do($query) || $form->dberror($query);
-            d05861af
+#   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);
 #   }
-            d319704a
+            Moritz Bunkus
   my $rc = $dbh->commit;
   $dbh->disconnect;
   # save first currency in myconfig
   $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);
     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);
+      }
+    }
+  }
   $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);
   $sth->execute || $form->dberror($query);
   $form->{defaults}             = $sth->fetchrow_hashref(NAME_lc);
   $form->{defaults}{IC}         = $form->{defaults}{inventory_accno_id};
   $form->{defaults}{IC_income}  = $form->{defaults}{income_accno_id};
   $form->{defaults}{IC_expense} = $form->{defaults}{expense_accno_id};
   $form->{defaults}{FX_gain}    = $form->{defaults}{fxgain_accno_id};
   $form->{defaults}{FX_loss}    = $form->{defaults}{fxloss_accno_id};
   $sth->finish;
   $query = qq|SELECT c.id, c.accno, c.description, c.link
               FROM chart c
               WHERE c.link LIKE '%IC%'
               ORDER BY c.accno|;
   $sth = $dbh->prepare($query);
   $sth->execute || $self->dberror($query);
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     foreach my $key (split(/:/, $ref->{link})) {
       if ($key =~ /IC/) {
         $nkey = $key;
         if ($key =~ /cogs/) {
           $nkey = "IC_expense";
+        }
         if ($key =~ /sale/) {
           $nkey = "IC_income";
+        }
         %{ $form->{IC}{$nkey}{ $ref->{accno} } } = (
                                              id          => $ref->{id},
                                              description => $ref->{description}
         );
+      }
+    }
+  }
   $sth->finish;
   $query = qq|SELECT c.id, c.accno, c.description
               FROM chart c
 	      WHERE c.category = 'I'
 	      AND c.charttype = 'A'
               ORDER BY c.accno|;
   $sth = $dbh->prepare($query);
   $sth->execute || $self->dberror($query);
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     %{ $form->{IC}{FX_gain}{ $ref->{accno} } } = (
                                              id          => $ref->{id},
                                              description => $ref->{description}
     );
+  }
   $sth->finish;
   $query = qq|SELECT c.id, c.accno, c.description
               FROM chart c
 	      WHERE c.category = 'E'
 	      AND c.charttype = 'A'
               ORDER BY c.accno|;
   $sth = $dbh->prepare($query);
   $sth->execute || $self->dberror($query);
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     %{ $form->{IC}{FX_loss}{ $ref->{accno} } } = (
                                              id          => $ref->{id},
                                              description => $ref->{description}
     );
+  }
   $sth->finish;
   # now get the tax rates and numbers
   $query = qq|SELECT c.id, c.accno, c.description,
               t.rate * 100 AS rate, t.taxnumber
               FROM chart c, tax t
 	      WHERE c.id = t.chart_id|;
   $sth = $dbh->prepare($query);
   $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};
+  }
   $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 $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->{attachments} } = ($tmpfile);
     $mail->{version} = $form->{version};
     $mail->{fileid}  = "$boundary.";
     $myconfig->{signature} =~ s/\\n/\r\n/g;
     $mail->{message} = "--\n$myconfig->{signature}";
+  }
   open(OUT, "$form->{OUT}") or $form->error("$form->{OUT} : $!");
   # get sequences, functions and triggers
   open(FH, "sql/lx-office.sql") or $form->error("sql/lx-office.sql : $!");
   my @sequences = ();
   my @functions = ();
   my @triggers  = ();
   my @indices   = ();
   my %tablespecs;
   my $query = "";
   my @quote_chars;
   while (<FH>) {
     # Remove DOS and Unix style line endings.
     s/[\r\n]//g;
     # ignore comments or empty lines
     next if /^(--.*|\s+)$/;
     for (my $i = 0; $i < length($_); $i++) {
       my $char = substr($_, $i, 1);
       # Are we inside a string?
       if (@quote_chars) {
         if ($char eq $quote_chars[-1]) {
           pop(@quote_chars);
+        }
         $query .= $char;
       } else {
         if (($char eq "'") || ($char eq "\"")) {
           push(@quote_chars, $char);
         } elsif ($char eq ";") {
           # Query is complete. Check for triggers and functions.
           if ($query =~ /^create\s+function\s+\"?(\w+)\"?/i) {
             push(@functions, $query);
           } elsif ($query =~ /^create\s+trigger\s+\"?(\w+)\"?/i) {
             push(@triggers, $query);
           } elsif ($query =~ /^create\s+sequence\s+\"?(\w+)\"?/i) {
             push(@sequences, $1);
           } elsif ($query =~ /^create\s+table\s+\"?(\w+)\"?/i) {
             $tablespecs{$1} = $query;
           } elsif ($query =~ /^create\s+index\s+\"?(\w+)\"?/i) {
             push(@indices, $query);
+          }
           $query = "";
           $char  = "";
+        }
         $query .= $char;
+      }
+    }
+  }
   close(FH);
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   # get all the tables
   my @tables = $dbh->tables('', '', 'customer', '', { noprefix => 0 });
   my $today = scalar localtime;
   $myconfig->{dbhost} = 'localhost' unless $myconfig->{dbhost};
   print OUT qq|-- Lx-Office Backup
 -- Dataset: $myconfig->{dbname}
 -- Version: $form->{dbversion}
 -- Host: $myconfig->{dbhost}
 -- Login: $form->{login}
 -- User: $myconfig->{name}
 -- Date: $today
 --
 -- set options
 $myconfig->{dboptions};
 --
 |;
   print OUT "-- DROP Sequences\n";
   my $item;
   foreach $item (@sequences) {
     print OUT qq|DROP SEQUENCE $item;\n|;
+  }
   print OUT "-- DROP Triggers\n";
   foreach $item (@triggers) {
     if ($item =~ /^create\s+trigger\s+\"?(\w+)\"?\s+.*on\s+\"?(\w+)\"?\s+/i) {
       print OUT qq|DROP TRIGGER "$1" ON "$2";\n|;
+    }
+  }
   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|;
       my $sth = $dbh->prepare($query);
       $sth->execute || $form->dberror($query);
       $query = "INSERT INTO $table (";
       map { $query .= qq|$sth->{NAME}->[$_],| }
         (0 .. $sth->{NUM_OF_FIELDS} - 1);
       chop $query;
       $query .= ") VALUES";
       if ($tablespecs{$table}) {
         print(OUT "--\n");
         print(OUT "DROP TABLE $table;\n");
         print(OUT $tablespecs{$table}, ";\n");
       } else {
         print(OUT "--\n");
         print(OUT "DELETE FROM $table;\n");
+      }
       while (my @arr = $sth->fetchrow_array) {
         $fields = "(";
         foreach my $item (@arr) {
           if (defined $item) {
             $item =~ s/\'/\'\'/g;
             $fields .= qq|'$item',|;
           } else {
             $fields .= 'NULL,';
+          }
+        }
         chop $fields;
         $fields .= ")";
         print OUT qq|$query $fields;\n|;
+      }
       $sth->finish;
+    }
+  }
   # create indices, sequences, functions and triggers
   print(OUT "-- CREATE Indices\n");
   map({ print(OUT "$_;\n"); } @indices);
   print OUT "-- CREATE Sequences\n";
   foreach $item (@sequences) {
     $query = qq|SELECT last_value FROM $item|;
     $sth   = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
     my ($id) = $sth->fetchrow_array;
     $sth->finish;
     print OUT qq|--
 CREATE SEQUENCE $item START $id;
 |;
+  }
   print OUT "-- CREATE Functions\n";
   # functions
   map { print(OUT $_, ";\n"); } @functions;
   print OUT "-- CREATE Triggers\n";
   # triggers
   map { print(OUT $_, ";\n"); } @triggers;
   close(OUT);
   $dbh->disconnect;
   # compress backup
   my @args = ("gzip", "$tmpfile");
   system(@args) == 0 or $form->error("$args[0] : $?");
   $tmpfile .= ".gz";
   if ($form->{media} eq 'email') {
     @{ $mail->{attachments} } = ($tmpfile);
     $err = $mail->send($out);
+  }
   if ($form->{media} eq 'file') {
     open(IN,  "$tmpfile") or $form->error("$tmpfile : $!");
     open(OUT, ">-")       or $form->error("STDOUT : $!");
     print OUT qq|Content-Type: application/x-tar-gzip;
 Content-Disposition: attachment; filename="$myconfig->{dbname}-$form->{dbversion}.sql.gz"
 |;
     while (<IN>) {
       print OUT $_;
+    }
     close(IN);
     close(OUT);
+  }
   unlink "$tmpfile";
   $main::lxdebug->leave_sub();
+}
 sub closedto {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   my $dbh = $form->dbconnect($myconfig);
   my $query = qq|SELECT closedto, revtrans FROM defaults|;
   my $sth   = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
   ($form->{closedto}, $form->{revtrans}) = $sth->fetchrow_array;
   $sth->finish;
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
 sub closebooks {
   $main::lxdebug->enter_sub();
   my ($self, $myconfig, $form) = @_;
   my $dbh = $form->dbconnect($myconfig);
   if ($form->{revtrans}) {
     $query = qq|UPDATE defaults SET closedto = NULL,
 				    revtrans = '1'|;
-            a36907a0
+  } elsif ($form->{closedto}) {
-            d319704a
+            Moritz Bunkus
-            a36907a0
+    $query = qq|UPDATE defaults SET closedto = '$form->{closedto}',
-            d319704a
+				      revtrans = '0'|;
-            a36907a0
+  } else {
-            d319704a
+            Moritz Bunkus
-            a36907a0
+    $query = qq|UPDATE defaults SET closedto = NULL,
-            d319704a
+				      revtrans = '0'|;
+  }
   # set close in defaults
   $dbh->do($query) || $form->dberror($query);
   $dbh->disconnect;
   $main::lxdebug->leave_sub();
+}
-e4131e
+sub get_base_unit {
   my ($self, $units, $unit_name, $factor) = @_;
   $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();
-            af853490
+  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}));
+    }
-e4131e
+            Moritz Bunkus
-            af853490
+  $sth->finish();
-e4131e
+            Moritz Bunkus
   $dbh->disconnect();
   $main::lxdebug->leave_sub();
   return $units;
+}
-            af853490
+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};
   $main::lxdebug->dump(0, "klaus", $h);
   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;
+}
-e4131e
+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();
-            af853490
+  my ($self, $myconfig, $form, $name, $base_unit, $factor, $type, $languages) = @_;
-e4131e
+            Moritz Bunkus
-            af853490
+  my $dbh = $form->dbconnect_noauto($myconfig);
-e4131e
+            Moritz Bunkus
   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)");
-            af853490
+            Moritz Bunkus
   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();
-e4131e
+  $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);
-            af853490
+  $query = "DELETE FROM units_language";
   $dbh->do($query) || $form->dberror($query);
-e4131e
+  if ($delete_units && (0 != scalar(@{$delete_units}))) {
-            af853490
+    $query = "DELETE FROM units WHERE name = (";
     map({ $query .= "?," } @{$delete_units});
     substr($query, -1, 1) = ")";
     $dbh->do($query, undef, @{$delete_units}) || $form->dberror($query . " ($_)");
-e4131e
+            Moritz Bunkus
   $query = "UPDATE units SET name = ?, base_unit = ?, factor = ? WHERE name = ?";
   $sth = $dbh->prepare($query);
-            af853490
+  my $query_lang = "INSERT INTO units_language (unit, language_id, localized, localized_plural) VALUES (?, ?, ?, ?)";
   my $sth_lang = $dbh->prepare($query_lang);
-e4131e
+  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}))) {
-            af853490
+    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) . ")");
+      }
+    }
-e4131e
+    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();
-            af853490
+  $sth_lang->finish();
-e4131e
+  $dbh->commit();
   $dbh->disconnect();
   $main::lxdebug->leave_sub();
+}
-            d319704a
+;

Projekt

Allgemein

Profil

projekt kivitendo