Changeset 2155 for trunk/LATMOS-Accounts

Timestamp:

11/26/18 16:39:58 (6 years ago)

Author:

nanardon

Message:

Fix: don't use employment_delay when no eployment apply

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm

@@ -1689 +1689 @@
     if (my $expire = $self->_computeEndEmployment($self->base->config('employment_delay') || 0)) {
         $changes{ 'expire' } = $expire;
-    } elsif (my $expiren = $self->_computeEndEmployment($self->base->config('employment_delay') || 0, 1)) {
-        $changes{ 'expire' } = $expiren;
-    }
+    } elsif (my $prevEmployement = $self->_get_attributes('prevEmployement')) {
+        my $oprev = $self->base->get_object('employment', $prevEmployement);
+        $changes{ 'expire' } = $oprev->_get_attributes('lastday');
+    } elsif (($self->base->config('unemployed_expire') ||'') ne 'no') {
+        if (my $def = $self->base->{defattr}{'user.expire'}) {
+            $changes{ 'expire' } = $def;
+        }
+    }
+
 
     if (%changes) {