Changeset 1724

Timestamp:

02/25/16 11:11:51 (8 years ago)

Author:

nanardon

Message:

Fix: don't truncate last employement if new one is before

File:

• trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Users/Employment.pm (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Users/Employment.pm

@@ -75 +75 @@
         if ($empl) {
             my $obj = $c->model('Accounts')->db->get_object('employment', $empl);
+            # We try to truncate last employment if need
+            # if new employment if after only
             if (my $lastday = $obj->get_attributes('lastday')) {
-                if ($lastday ge $lastd->ymd('-')) {
+                my $firstday = $obj->get_attributes('firstday');
+                if ($lastd->ymd('-') ge $firstday &&
+                    $lastday         ge $lastd->ymd('-')) {
                     $obj->set_c_fields(lastday => $lastd->ymd('-'));
                 }