Changeset 1540 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Timestamp:

12/24/15 15:20:17 (9 years ago)

Author:

nanardon

Message:

minFirstDay and maxLastDay always return usefull data

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Employment.pm (modified) (3 diffs)

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

@@ -174 +174 @@
                     $dt->add(days => 1);
                     if ($first eq $dt->ymd('-')) {
-                        return;
+                        return $first;
                     } else {
                         return $dt->ymd('-');
                     }
                 } else {
-                    return 'NOLIMIT';
+                    return;
                 }
             },
@@ -199 +199 @@
                 my $last = $self->get_field('lastday') or do {
                     # This contract is last then...
-                    return 'NOLIMIT';
+                    return;
                 };
 
@@ -214 +214 @@
                     $dt->subtract(days => 1);
                     if ($last eq $dt->ymd('-')) {
-                        return;
+                        return $last;
                     } else {
                         return $dt->ymd('-');
                     }
                 } else {
-                    return 'NOLIMIT';
+                    return;
                 }
             },