Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --git a/SL/User.pm b/SL/User.pm
index 49ba339..5d58b5d 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -738,7 +738,7 @@ sub create_employee_entry {
     do_query($form, $dbh, $query, ($self->{login}, $myconfig->{name}, $myconfig->{tel}, "user"));
 
   } elsif ($update_existing) {
-    my $query = qq|UPDATE employee SET name = ?, workphone = ?, role = 'user' WHERE id = ?|;
+    my $query = qq|UPDATE employee SET name = ?, workphone = ?, role = 'user', deleted = 'f' WHERE id = ?|;
     do_query($form, $dbh, $query, $myconfig->{name}, $myconfig->{tel}, $id);
   }
 

diff --git a/sql/Pg-upgrade2/employee_deleted.sql b/sql/Pg-upgrade2/employee_deleted.sql
new file mode 100644 (file)
index 0000000..939580e
--- /dev/null
+++ b/sql/Pg-upgrade2/employee_deleted.sql
@@ -0,0 +1,5 @@
+-- @tag: employee_deleted
+-- @description: Benutzer löschbar machen
+-- @depends: release_2_6_3
+
+ALTER TABLE employee ADD COLUMN deleted BOOLEAN DEFAULT 'f';