Loeblich, Doku wollte ich schon immer haben.

[kivitendo-erp.git] / SL / AM.pm

diff --git a/SL/AM.pm b/SL/AM.pm
index be5d8a4..8696cba 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -180,7 +180,7 @@ sub save_account {
   my ($tax_id, $taxkey) = split(/--/, $form->{tax});
   my $startdate = $form->{startdate} ? $form->{startdate} : "1970-01-01";
 
-  if ($form->{id} && $form->{orphaned}) {
+  if ($form->{id}) {
     $query = qq|UPDATE chart SET
                 accno = ?, description = ?, charttype = ?,
                 gifi_accno = ?, category = ?, link = ?,
@@ -506,7 +506,7 @@ sub business {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  my $query = qq|SELECT id, description, discount, customernumberinit, salesman
+  my $query = qq|SELECT id, description, discount, customernumberinit
                  FROM business
                  ORDER BY 2|;
 
@@ -533,7 +533,7 @@ sub get_business {
   my $dbh = $form->dbconnect($myconfig);
 
   my $query =
-    qq|SELECT b.description, b.discount, b.customernumberinit, b.salesman
+    qq|SELECT b.description, b.discount, b.customernumberinit
        FROM business b
        WHERE b.id = ?|;
   my $sth = $dbh->prepare($query);
@@ -559,20 +559,19 @@ sub save_business {
   my $dbh = $form->dbconnect($myconfig);
 
   my @values = ($form->{description}, $form->{discount},
-                $form->{customernumberinit}, $form->{salesman} ? 't' : 'f');
+                $form->{customernumberinit});
   # id is the old record
   if ($form->{id}) {
     $query = qq|UPDATE business SET
                 description = ?,
                 discount = ?,
-                customernumberinit = ?,
-                salesman = ?
+                customernumberinit = ?
                 WHERE id = ?|;
     push(@values, $form->{id});
   } else {
     $query = qq|INSERT INTO business
-                (description, discount, customernumberinit, salesman)
-                VALUES (?, ?, ?, ?)|;
+                (description, discount, customernumberinit)
+                VALUES (?, ?, ?)|;
   }
   do_query($form, $dbh, $query, @values);
 
@@ -825,14 +824,13 @@ sub get_buchungsgruppe {
       qq|SELECT count(id) = 0 AS orphaned
          FROM parts
          WHERE buchungsgruppen_id = ?|;
-    ($form->{orphaned}) = selectrow_arra($query, undef, $form->{id});
-    $form->dberror($query . " ($form->{id})") if ($dbh->err);
+    ($form->{orphaned}) = selectrow_query($form, $dbh, $query, $form->{id});
   }
 
   $query = "SELECT inventory_accno_id, income_accno_id, expense_accno_id ".
     "FROM defaults";
   ($form->{"std_inventory_accno_id"}, $form->{"std_income_accno_id"},
-   $form->{"std_expense_accno_id"}) = $dbh->selectrow_array($query);
+   $form->{"std_expense_accno_id"}) = selectrow_query($form, $dbh, $query);
 
   my $module = "IC";
   $query = qq|SELECT c.accno, c.description, c.link, c.id,