Changeset 1833 for trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller

Timestamp:

08/29/16 12:28:12 (8 years ago)

Author:

nanardon

Message:

Dont truncate current employment with pasted date

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

@@ -77 +77 @@
             # We try to truncate last employment if need
             # if new employment if after only
-            if (my $lastday = $obj->get_attributes('lastday')) {
-                my $firstday = $obj->get_attributes('firstday');
-                if ($lastd->ymd('-') ge $firstday &&
-                    $lastday         ge $lastd->ymd('-')) {
+
+            if ($obj->get_attributes('firstday') lt $lastd->ymd('-')) {
+                if (my $lastday = $obj->get_attributes('lastday')) {
+                    my $firstday = $obj->get_attributes('firstday');
+                    if ($lastd->ymd('-') ge $firstday &&
+                        $lastday         ge $lastd->ymd('-')) {
+                        $obj->set_c_fields(lastday => $lastd->ymd('-'));
+                    }
+                } elsif (!$obj->get_attributes('lastday')) {
                     $obj->set_c_fields(lastday => $lastd->ymd('-'));
                 }
-            } elsif (!$obj->get_attributes('lastday')) {
-                $obj->set_c_fields(lastday => $lastd->ymd('-'));
             }
         }