Changeset 1646 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Timestamp:

01/21/16 02:15:58 (8 years ago)

Author:

nanardon

Message:

Fix Expiration computation between two employment

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql

Files:

• Employment.pm (modified) (1 diff)
• User.pm (modified) (1 diff)

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

@@ -101 +101 @@
                 my $firstday = $self->object->get_attributes('firstday');
 
-                my @fd = split('-', $firstday);
-                my @ld = split('-', $lastday);
+                my @fd = split('-', $firstday) or return;
+                my @ld = split('-', $lastday)  or return;
 
                 my ($Dy,$Dm,$Dd) = Date::Calc::N_Delta_YMD(@fd, @ld);

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

@@ -1426 +1426 @@
 
     if ($expireOn ne 'never') {
-        my $endemploy = $currentemployment
-            ? $self->_get_attributes("_$expireOn")
-            : (($self->base->config('unemployed_expire') ||'') eq 'no'
+        my $endemploy = $self->_get_attributes("_$expireOn") ||
+            (($self->base->config('unemployed_expire') ||'') eq 'no'
                 ? undef
                 : $self->_get_attributes('create'));