X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FPE.pm;h=57b61842ec4e0aa026682a0b59db51a5527b883c;hb=a4b22a8f008d6431597fa80de26bcb0fa10e8d7b;hp=57c9c67afa6c731a077739571ec29276d68cc463;hpb=58b14f96d6a7aab3bad2ffac3f8930793cf15a09;p=kivitendo-erp.git

diff --git a/SL/PE.pm b/SL/PE.pm
index 57c9c67af..57b61842e 100644
--- a/SL/PE.pm
+++ b/SL/PE.pm
@@ -37,6 +37,8 @@ package PE;
 
 use Data::Dumper;
 
+use SL::DBUtils;
+
 sub projects {
   $main::lxdebug->enter_sub();
 
@@ -47,7 +49,7 @@ sub projects {
 
   my $sortorder = ($form->{sort}) ? $form->{sort} : "projectnumber";
 
-  my $query = qq|SELECT p.id, p.projectnumber, p.description
+  my $query = qq|SELECT p.id, p.projectnumber, p.description, p.active
                  FROM project p
 		 WHERE 1 = 1|;
 
@@ -70,6 +72,11 @@ sub projects {
 		               FROM project p, orderitems o
 			       WHERE p.id = o.project_id)";
   }
+  if ($form->{active} eq "active") {
+    $query .= " AND p.active";
+  } elsif ($form->{active} eq "inactive") {
+    $query .= " AND NOT p.active";
+  }
 
   $query .= qq|
 		 ORDER BY $sortorder|;
@@ -136,19 +143,19 @@ sub save_project {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  map { $form->{$_} =~ s/\'/\'\'/g } (projectnumber, description);
+  my @values = ($form->{projectnumber}, $form->{description});
 
   if ($form->{id}) {
-    $query = qq|UPDATE project SET
-                projectnumber = '$form->{projectnumber}',
-		description = '$form->{description}'
-		WHERE id = $form->{id}|;
+    $query =
+      qq|UPDATE project SET projectnumber = ?, description = ?, active = ? | .
+      qq|WHERE id = ?|;
+    push(@values, $form->{active} ? 't' : 'f', $form->{id});
   } else {
-    $query = qq|INSERT INTO project
-                (projectnumber, description)
-                VALUES ('$form->{projectnumber}', '$form->{description}')|;
+    $query =
+      qq|INSERT INTO project (projectnumber, description, active) | .
+      qq|VALUES (?, ?, 't')|;
   }
-  $dbh->do($query) || $form->dberror($query);
+  do_query($form, $dbh, $query, @values);
 
   $dbh->disconnect;
 
@@ -218,8 +225,7 @@ sub save_partsgroup {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  map { $form->{$_} =~ s/\'/\'\'/g } (partsgroup);
-
+  map { $form->{$_} =~ s/\'/\'\'/g } qw(partsgroup);
   $form->{discount} /= 100;
 
   if ($form->{id}) {
@@ -360,7 +366,7 @@ sub save_pricegroup {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  map { $form->{$_} =~ s/\'/\'\'/g } (pricegroup);
+  map { $form->{$_} =~ s/\'/\'\'/g } qw(pricegroup);
 
   $form->{discount} /= 100;