Changeset 2141

Timestamp:

06/13/18 16:01:03 (6 years ago)

Author:

nanardon

Message:

Revert "Compute departure always for next status"

This reverts commit b13c97ccaea94820e17f725f6179ed8a3f7b0910.

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (4 diffs)

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

@@ -256 +256 @@
                     my ($attr) = @_;
                     my $self = $attr->object;
-                    $self->_computeEndEmployment($self->base->config('employment_delay') || 0, 1);
+                    $self->_computeEndEmployment($self->base->config('employment_delay') || 0, 1, 1);
                 },
                 label => l('Start of employment'),
@@ -1803 +1803 @@
 
 sub _computeEndEmployment {
-    my ($self, $delay, $workday) = @_;
+    my ($self, $delay, $any, $workday) = @_;
 
     $delay ||= 0;
@@ -1846 +1846 @@
             }
             $end = $tend
+        } elsif ((!$res->{current}) && (!$any)) {
+            last;
         }
         $end = DateTime->from_epoch(epoch => str2time($res->{lastday}));
@@ -1852 +1854 @@
     }
     $list_empl->finish;
+
+    $end ||= $pend if($any);
 
     if ($end) {