Changeset 1623


Ignore:
Timestamp:
01/10/16 20:15:54 (9 years ago)
Author:
nanardon
Message:

Fix start / end Employment computation

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N/fr.po

    r1621 r1623  
    1616"Content-Transfer-Encoding: 8bit\n" 
    1717 
    18 #: root/html/users/employment.tt:133 
     18#: root/html/users/employment.tt:134 
    1919msgid "Arrival" 
    2020msgstr "Arrivée" 
    … …  
    3232msgstr "Créer" 
    3333 
    34 #: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:81 
     34#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:92 
     35#: root/html/users/employment.tt:132 
    3536msgid "Created" 
    3637msgstr "Créé" 
    3738 
    38 #: root/html/users/employment.tt:115 
     39#: root/html/users/employment.tt:114 
    3940msgid "Current status" 
    4041msgstr "Statut actuel" 
    4142 
    42 #: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:86 
     43#: root/html/users/employment.tt:149 
     44msgid "Duration" 
     45msgstr "Durée" 
     46 
     47#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:97 
    4348msgid "Expire" 
    4449msgstr "Expiration" 
    4550 
    46 #: root/html/users/employment.tt:95 
     51#: root/html/users/employment.tt:91 
    4752msgid "From" 
    4853msgstr "Du" 
    … …  
    5257msgstr "Gestion informatique" 
    5358 
    54 #: root/html/users/employment.tt:135 
     59#: root/html/users/employment.tt:136 
    5560msgid "Leave" 
    5661msgstr "Départ" 
    … …  
    6065msgstr "Se déconnecter" 
    6166 
    62 #: root/html/users/employment.tt:38 
     67#: root/html/users/employment.tt:31 
    6368msgid "New employment" 
    6469msgstr "Nouveau statut" 
    6570 
    66 #: root/html/users/employment.tt:98 
     71#: root/html/users/employment.tt:94 
    6772msgid "Since" 
    6873msgstr "A partir du" 
    … …  
    7277msgstr "Statistiques" 
    7378 
    74 #: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:77 
     79#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:88 
    7580msgid "Today" 
    7681msgstr "Aujourd'hui" 
    … …  
    8489msgstr "Voir" 
    8590 
    86 #: root/html/users/employment.tt:36 root/html/users/employment.tt:96 
     91#: root/html/users/employment.tt:29 root/html/users/employment.tt:92 
    8792msgid "to" 
    8893msgstr "à" 

  • trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N/messages.pot

    r1621 r1623  
    1616"Content-Transfer-Encoding: 8bit\n" 
    1717 
    18 #: root/html/users/employment.tt:133 
     18#: root/html/users/employment.tt:134 
    1919msgid "Arrival" 
    2020msgstr "" 
    … …  
    3232msgstr "" 
    3333 
    34 #: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:81 
     34#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:92 root/html/users/employment.tt:132 
    3535msgid "Created" 
    3636msgstr "" 
    3737 
    38 #: root/html/users/employment.tt:115 
     38#: root/html/users/employment.tt:114 
    3939msgid "Current status" 
    4040msgstr "" 
    4141 
    42 #: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:86 
     42#: root/html/users/employment.tt:149 
     43msgid "Duration" 
     44msgstr "" 
     45 
     46#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:97 
    4347msgid "Expire" 
    4448msgstr "" 
    4549 
    46 #: root/html/users/employment.tt:95 
     50#: root/html/users/employment.tt:91 
    4751msgid "From" 
    4852msgstr "" 
    … …  
    5256msgstr "" 
    5357 
    54 #: root/html/users/employment.tt:135 
     58#: root/html/users/employment.tt:136 
    5559msgid "Leave" 
    5660msgstr "" 
    … …  
    6064msgstr "" 
    6165 
    62 #: root/html/users/employment.tt:38 
     66#: root/html/users/employment.tt:31 
    6367msgid "New employment" 
    6468msgstr "" 
    6569 
    66 #: root/html/users/employment.tt:98 
     70#: root/html/users/employment.tt:94 
    6771msgid "Since" 
    6872msgstr "" 
    … …  
    7276msgstr "" 
    7377 
    74 #: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:77 
     78#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:88 
    7579msgid "Today" 
    7680msgstr "" 
    … …  
    8488msgstr "" 
    8589 
    86 #: root/html/users/employment.tt:36 root/html/users/employment.tt:96 
     90#: root/html/users/employment.tt:29 root/html/users/employment.tt:92 
    8791msgid "to" 
    8892msgstr "" 

  • trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

    r1613 r1623  
    2323            sn givenName description 
    2424            comment 
     25            managerContact 
    2526            uid uidNumber gidNumber gecos homeDirectory loginShell 
    2627            mail initials nickname 
    … …  
    6162        attrs => [ qw( 
    6263            sn givenName 
    63             endEmployment 
    6464            expire 
    65             manager 
    6665        ) ] 
    6766    }, 
    … …  
    122121            lastday 
    123122            endcircuit 
     123            lengthText 
     124            description 
    124125            company 
    125126            contratType 

  • trunk/LATMOS-Accounts-Web/root/html/users/employment.tt

    r1622 r1623  
    133133        <td>[% user.get_attributes('create') | html  %]</td></tr> 
    134134    <tr><th>[% l('Arrival') %]</th> 
    135         <td>[% user.get_attributes('startFirstEmployment') | html  %]</td></tr> 
     135        <td>[% user.get_attributes('startEmployment') | html  %]</td></tr> 
     136    <tr><th>[% l('Leave') %]</th> 
     137        <td>[% user.get_attributes('endEmployment') | html  %]</td></tr> 
    136138    <tr> 
    137139        <th> 
    … …  
    145147        <td>[% user.get_attributes('expire') | html  %]</td> 
    146148    </tr> 
    147     <tr><th>[% l('Leave') %]</th> 
    148         <td>[% user.get_attributes('endLastEmployment') | html  %]</td></tr> 
     149    <tr><th>[% l('Duration') %]</th> 
     150        <td>[% user.get_attributes('employmentLengthText') | html  %]</td></tr> 
    149151    </table> 
    150152 

  • trunk/LATMOS-Accounts/Makefile.PL

    r1604 r1623  
    3636        'XML::XPath' => undef, 
    3737        'Crypt::SmbHash' => undef, 
     38        'Date::Calc' => undef, 
    3839    }, # e.g., Module::Name => 1.1 
    3940    ($] >= 5.005 ?     ## Add these new keywords supported since 5.005 

  • trunk/LATMOS-Accounts/latmos-accounts.spec.in

    r1604 r1623  
    3838BuildRequires: perl-Locale-Maketext-Lexicon  
    3939BuildRequires: perl(Crypt::SmbHash) 
     40BuildRequires: perl(Date::Calc) 
    4041 
    4142Requires: perl(Mail::Sendmail) 

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

    r1621 r1623  
    1010use Date::Parse; 
    1111use DateTime; 
     12use Date::Calc; 
    1213 
    1314our $VERSION = (q$Rev: 594 $ =~ /^Rev: (\d+) /)[0]; 
    … …  
    7172            monitored => 1, 
    7273            label => l('Contract end'), 
     74        }, 
     75        length => { 
     76            ro => 1, 
     77            managed => 1, 
     78            get => sub { 
     79                my ($self) = @_; 
     80                my $lastday = $self->object->get_attributes('lastday') || DateTime->now->ymd('-'); 
     81                my $firstday = $self->object->get_attributes('firstday'); 
     82 
     83                my @fd = split('-', $firstday); 
     84                my @ld = split('-', $lastday); 
     85 
     86                return Date::Calc::Delta_Days(@fd, @ld) +1; 
     87            }, 
     88            label => l('Length'), 
     89        }, 
     90        lengthText => { 
     91            ro => 1, 
     92            managed => 1, 
     93            get => sub { 
     94                my ($self) = @_; 
     95                my $lastday = $self->object->get_attributes('lastday')|| DateTime->now->ymd('-'); 
     96                { 
     97                    my $dtlast = DateTime->from_epoch(epoch => str2time($lastday)); 
     98                    $dtlast->add(days => 1); 
     99                    $lastday = $dtlast->ymd('-'); 
     100                } 
     101                my $firstday = $self->object->get_attributes('firstday'); 
     102 
     103                my @fd = split('-', $firstday); 
     104                my @ld = split('-', $lastday); 
     105 
     106                my ($Dy,$Dm,$Dd) = Date::Calc::N_Delta_YMD(@fd, @ld); 
     107                return join(', ', 
     108                    ($Dy ? l('%d years', $Dy)  : ()), 
     109                    ($Dm ? l('%d months', $Dm) : ()), 
     110                    ($Dd ? l('%d days', $Dd)   : ()), 
     111                ); 
     112            }, 
     113            label => l('Length'), 
    73114        }, 
    74115        'state' => { 
    … …  
    315356        my $endemploy = $currentemployment 
    316357            ? $user->_get_attributes("_$expireOn") 
    317             : ($self->base->config('unemployed_expire') eq 'no' 
     358            : (($self->base->config('unemployed_expire') ||'') eq 'no' 
    318359                ? undef 
    319360                : $user->_get_attributes('create')); 

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

    r1620 r1623  
    1414use base qw(LATMOS::Accounts::Bases::Sql::objects); 
    1515use LATMOS::Accounts::I18N; 
     16use Date::Calc; 
    1617 
    1718our $VERSION = (q$Rev$ =~ /^Rev: (\d+) /)[0]; 
    … …  
    407408                ro => 1, 
    408409                label => l('Start of any employment'), 
     410            }, 
     411            employmentLength => { 
     412                ro => 1, 
     413                managed => 1, 
     414                get => sub { 
     415                    my ($self) = @_; 
     416                    my $lastday = $self->object->get_attributes('endEmployment') || DateTime->now->ymd('-'); 
     417                    my $firstday = $self->object->get_attributes('startEmployment') or return; 
     418 
     419                    my @fd = split('-', DateTime->from_epoch(epoch => str2time($firstday))->ymd('-')); 
     420                    my @ld = split('-', DateTime->from_epoch(epoch => str2time($lastday))->ymd('-')); 
     421 
     422                    return Date::Calc::Delta_Days(@fd, @ld) +1; 
     423                }, 
     424                label => l('Work duration'), 
     425            }, 
     426            employmentLengthText => { 
     427                ro => 1, 
     428                managed => 1, 
     429                get => sub { 
     430                    my ($self) = @_; 
     431                    my $firstday = $self->object->get_attributes('startEmployment') or return; 
     432                    my $lastday = $self->object->get_attributes('endEmployment')|| DateTime->now->ymd('-'); 
     433                    { 
     434                        my $dtlast = DateTime->from_epoch(epoch => str2time($lastday)); 
     435                        $dtlast->add(days => 1); 
     436                        $lastday = $dtlast->ymd('-'); 
     437                    } 
     438 
     439                    my @fd = split('-', DateTime->from_epoch(epoch => str2time($firstday))->ymd('-')); 
     440                    my @ld = split('-', DateTime->from_epoch(epoch => str2time($lastday))->ymd('-')); 
     441 
     442                    my ($Dy,$Dm,$Dd) = Date::Calc::N_Delta_YMD(@fd, @ld); 
     443                    return join(', ', 
     444                        ($Dy ? l('%d years', $Dy)  : ()), 
     445                        ($Dm ? l('%d months', $Dm) : ()), 
     446                        ($Dd ? l('%d days', $Dd)   : ()), 
     447                    ); 
     448                }, 
     449                label => l('Work duration'), 
    409450            }, 
    410451            cn        => { 
    … …  
    12961337    my ($self, $delay) = @_; 
    12971338 
     1339    $delay ||= 0; 
     1340 
    12981341    my $list_empl = $self->base->db->prepare_cached(q{ 
    12991342        SELECT *, (lastday is null or lastday >= now()) as "current" FROM employment WHERE "user" = ? 
     1343        and firstday < now() 
    13001344        order by firstday desc 
    13011345        }); 
    … …  
    13051349        if ($start) { 
    13061350            my $prevend = DateTime->from_epoch(epoch => str2time($res->{lastday})); 
     1351            $prevend->set_time_zone( DateTime::TimeZone->new( name => 'local' ) ); 
    13071352            my $tstart = $start->clone; 
    1308             if ($delay) { 
    1309                 $tstart->subtract(days => $delay); 
    1310             } 
     1353            $tstart->subtract(days => $delay + 1); 
    13111354            if ($tstart->ymd gt $prevend->ymd) { 
    13121355                last; 
    … …  
    13221365    $list_empl->finish; 
    13231366 
    1324     if (!$start) { 
    1325         my $listold = $self->base->db->prepare_cached(q{ 
    1326             SELECT min(firstday) as firstday FROM employment WHERE "user" = ? and 
    1327             lastday IS NOT NULL and lastday <= now() - '1 days'::interval 
    1328             }); 
    1329         $listold->execute($self->id); 
    1330         my $res = $listold->fetchrow_hashref; 
    1331         if ($res && $res->{firstday}) { 
    1332             $start = DateTime->from_epoch(epoch => str2time($res->{firstday})); 
    1333             $start->set_time_zone( DateTime::TimeZone->new( name => 'local' ) ); 
    1334         } 
    1335         $listold->finish; 
    1336     } 
    13371367    return $start ? $start->iso8601 : undef 
    13381368} 
    … …  
    13401370sub _computeEndEmployment { 
    13411371    my ($self, $delay) = @_; 
     1372 
     1373    $delay ||= 0; 
    13421374 
    13431375    my $list_empl = $self->base->db->prepare_cached(q{ 
    … …  
    13561388        if ($end) { 
    13571389            my $nextstart = DateTime->from_epoch(epoch => str2time($res->{firstday})); 
     1390            $nextstart->set_time_zone( DateTime::TimeZone->new( name => 'local' ) ); 
    13581391            my $tend = $end->clone; 
    1359             if ($delay) { 
    1360                 $tend->add(days => $delay); 
    1361             } 
     1392            $tend->add(days => $delay + 1); 
    13621393            if ($tend->ymd lt $nextstart->ymd) { 
    13631394                last; 
    … …  
    13741405    $list_empl->finish; 
    13751406 
    1376     if (!$end) { 
    1377         my $listold = $self->base->db->prepare_cached(q{ 
    1378             SELECT max(lastday) as lastday FROM employment WHERE "user" = ? and 
    1379             lastday IS NOT NULL and lastday <= now() - '1 days'::interval 
    1380             }); 
    1381         $listold->execute($self->id); 
    1382         my $res = $listold->fetchrow_hashref; 
    1383         if ($res && $res->{lastday}) { 
    1384             $end = DateTime->from_epoch(epoch => str2time($res->{lastday})); 
    1385             $end->set_time_zone( DateTime::TimeZone->new( name => 'local' ) ); 
    1386             $end->add(hours => 23, minutes => 59, seconds => 59); 
    1387         } 
    1388         $listold->finish; 
    1389     } 
    13901407    return $end ? $end->iso8601 : undef 
    13911408} 

  • trunk/LATMOS-Accounts/po/fr.po

    r1621 r1623  
    1111"Content-Transfer-Encoding: 8bit\n" 
    1212 
    13 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1057 
     13#. ($Dd) 
     14#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:110 
     15#: lib/LATMOS/Accounts/Bases/Sql/User.pm:446 
     16msgid "%d days" 
     17msgstr "%d jours" 
     18 
     19#. ($Dm) 
     20#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:109 
     21#: lib/LATMOS/Accounts/Bases/Sql/User.pm:445 
     22msgid "%d months" 
     23msgstr "%d mois" 
     24 
     25#. ($Dy) 
     26#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:108 
     27#: lib/LATMOS/Accounts/Bases/Sql/User.pm:444 
     28msgid "%d years" 
     29msgstr "%d années" 
     30 
     31#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1098 
    1432msgid "Active" 
    1533msgstr "Actif" 
    1634 
    1735#: lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:101 
    18 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:571 
     36#: lib/LATMOS/Accounts/Bases/Sql/User.pm:612 
    1937msgid "Aliases" 
    2038msgstr "Alias" 
    … …  
    4361 
    4462#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:174 
    45 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:695 
     63#: lib/LATMOS/Accounts/Bases/Sql/User.pm:736 
    4664msgid "City" 
    4765msgstr "Ville" 
    … …  
    5169#: lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:220 
    5270#: lib/LATMOS/Accounts/Bases/Sql/Service.pm:70 
    53 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1136 
     71#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1177 
    5472msgid "Comment" 
    5573msgstr "Commentaire" 
    5674 
    5775#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:307 
    58 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:121 
    59 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1133 
    60 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:765 
     76#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:162 
     77#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1174 
     78#: lib/LATMOS/Accounts/Bases/Sql/User.pm:806 
    6179msgid "Company" 
    6280msgstr "Société" 
    6381 
    64 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:72 
     82#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:73 
    6583msgid "Contract end" 
    6684msgstr "Fin du contrat" 
    6785 
    68 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:66 
     86#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:67 
    6987msgid "Contract start" 
    7088msgstr "Début du contrat" 
    … …  
    82100msgstr "Créé par" 
    83101 
    84 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:118 
    85 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:645 
    86 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:770 
     102#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:159 
     103#: lib/LATMOS/Accounts/Bases/Sql/User.pm:686 
     104#: lib/LATMOS/Accounts/Bases/Sql/User.pm:811 
    87105msgid "Department" 
    88106msgstr "Départment" 
    89107 
    90 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1048 
     108#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1089 
    91109msgid "Departments" 
    92110msgstr "Départements" 
    … …  
    97115 
    98116#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:324 
    99 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:60 
     117#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:61 
    100118#: lib/LATMOS/Accounts/Bases/Sql/Group.pm:145 
    101119#: lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:223 
    102120#: lib/LATMOS/Accounts/Bases/Sql/Service.pm:73 
    103 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1130 
     121#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1171 
    104122msgid "Description" 
    105123msgstr "Description" 
    106124 
    107 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:110 
     125#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:151 
    108126msgid "Direct manager" 
    109127msgstr "Responsable direct" 
    110128 
    111129#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:82 
    112 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1109 
     130#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1150 
    113131msgid "Email" 
    114132msgstr "Email" 
    … …  
    122140msgstr "Fin" 
    123141 
    124 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:310 
    125 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:315 
     142#: lib/LATMOS/Accounts/Bases/Sql/User.pm:311 
     143#: lib/LATMOS/Accounts/Bases/Sql/User.pm:316 
    126144msgid "End of any employment" 
    127145msgstr "Fin de tout emplois" 
    128146 
    129 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:226 
    130 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:231 
     147#: lib/LATMOS/Accounts/Bases/Sql/User.pm:227 
     148#: lib/LATMOS/Accounts/Bases/Sql/User.pm:232 
    131149msgid "End of employment" 
    132150msgstr "Fin d'emploi" 
    133151 
    134 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:214 
     152#: lib/LATMOS/Accounts/Bases/Sql/User.pm:215 
    135153msgid "End of entrance" 
    136154msgstr "Fin de circuit" 
    137155 
    138 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:126 
     156#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:167 
    139157msgid "End of entrance circuit" 
    140158msgstr "Fin de circuit d'entrée" 
    … …  
    145163msgstr "Expiration" 
    146164 
    147 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:208 
     165#: lib/LATMOS/Accounts/Bases/Sql/User.pm:209 
    148166msgid "Expire on" 
    149167msgstr "Expire le" 
    150168 
    151 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1053 
     169#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1094 
    152170msgid "Expired" 
    153171msgstr "Expiration" 
    154172 
    155173#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:285 
    156 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:760 
    157 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:983 
     174#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1024 
     175#: lib/LATMOS/Accounts/Bases/Sql/User.pm:801 
    158176msgid "Fax number" 
    159177msgstr "Fax" 
    … …  
    164182 
    165183#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:94 
    166 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1126 
     184#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1167 
    167185msgid "First name" 
    168186msgstr "Prénom" 
    169187 
    170188#: lib/LATMOS/Accounts/Bases/Sql/Aliases.pm:69 
    171 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:517 
     189#: lib/LATMOS/Accounts/Bases/Sql/User.pm:558 
    172190msgid "Forward" 
    173191msgstr "Renvois" 
    174192 
    175 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:824 
     193#: lib/LATMOS/Accounts/Bases/Sql/User.pm:865 
    176194msgid "GECOS" 
    177195msgstr "GECOS" 
    178196 
    179197#: lib/LATMOS/Accounts/Bases/Sql/Group.pm:35 
    180 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:170 
     198#: lib/LATMOS/Accounts/Bases/Sql/User.pm:171 
    181199msgid "GID" 
    182200msgstr "GID" 
    183201 
    184 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1122 
     202#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1163 
    185203msgid "HAL id" 
    186204msgstr "Identifiant HAL" 
    … …  
    194212msgstr "Caché" 
    195213 
    196 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1119 
     214#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1160 
    197215msgid "Home directory" 
    198216msgstr "Home" 
    199217 
    200 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:130 
    201 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1199 
     218#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:171 
     219#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1240 
    202220msgid "Hosted" 
    203221msgstr "Hébergé" 
    204222 
    205 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1115 
     223#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1156 
    206224msgid "Initials" 
    207225msgstr "Initiales" 
    … …  
    227245msgstr "Nom" 
    228246 
    229 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:202 
     247#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:113 
     248#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:88 
     249msgid "Length" 
     250msgstr "Durée" 
     251 
     252#: lib/LATMOS/Accounts/Bases/Sql/User.pm:203 
    230253msgid "Locked" 
    231254msgstr "Vérouillé" 
    232255 
    233 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:801 
     256#: lib/LATMOS/Accounts/Bases/Sql/User.pm:842 
    234257msgid "Login" 
    235258msgstr "Login" 
    … …  
    241264#: lib/LATMOS/Accounts/Bases/Sql/Group.pm:108 
    242265#: lib/LATMOS/Accounts/Bases/Sql/Service.pm:67 
    243 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1000 
     266#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1041 
    244267msgid "Manager" 
    245268msgstr "Responsable" 
    246269 
    247 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:249 
     270#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:290 
    248271msgid "Maximal last day" 
    249272msgstr "Dernier jour possible" 
    … …  
    258281msgstr "Nb de membres" 
    259282 
    260 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:476 
     283#: lib/LATMOS/Accounts/Bases/Sql/User.pm:517 
    261284msgid "Member of" 
    262285msgstr "Membre de" 
    263286 
    264 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:208 
     287#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:249 
    265288msgid "Minimal first day" 
    266289msgstr "Premier jour possible" 
    … …  
    271294 
    272295#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:130 
    273 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1095 
    274 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:839 
     296#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1136 
     297#: lib/LATMOS/Accounts/Bases/Sql/User.pm:880 
    275298#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:92 
    276299msgid "Name" 
    277300msgstr "Nom" 
    278301 
    279 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1092 
     302#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1133 
    280303msgid "Native first name" 
    281304msgstr "Prénom" 
    282305 
    283 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1089 
     306#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1130 
    284307msgid "Native name" 
    285308msgstr "Nom" 
    … …  
    289312msgstr "NetZones" 
    290313 
    291 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:170 
     314#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:211 
    292315msgid "Next" 
    293316msgstr "Suivant" 
    294317 
    295 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1105 
     318#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1146 
    296319msgid "Nickname" 
    297320msgstr "Surnom" 
    … …  
    306329 
    307330#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:318 
    308 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:796 
     331#: lib/LATMOS/Accounts/Bases/Sql/User.pm:837 
    309332msgid "Office" 
    310333msgstr "Bureau" 
    … …  
    322345msgstr "Parents" 
    323346 
    324 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1141 
     347#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1182 
    325348msgid "Password set" 
    326349msgstr "Mot de passe mis" 
    … …  
    335358 
    336359#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:315 
    337 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:783 
     360#: lib/LATMOS/Accounts/Bases/Sql/User.pm:824 
    338361msgid "Phone number" 
    339362msgstr "Téléphone" 
    340363 
    341364#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:241 
    342 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:735 
     365#: lib/LATMOS/Accounts/Bases/Sql/User.pm:776 
    343366msgid "Post office box" 
    344367msgstr "Boite postale" 
    345368 
    346 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:979 
     369#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1020 
    347370msgid "Postal Address" 
    348371msgstr "Adresse postale" 
    … …  
    353376 
    354377#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:196 
    355 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:708 
     378#: lib/LATMOS/Accounts/Bases/Sql/User.pm:749 
    356379msgid "Postal code" 
    357380msgstr "Code postal" 
    358381 
    359 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:150 
     382#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:191 
    360383msgid "Previous" 
    361384msgstr "Précédent" 
    … …  
    369392msgstr "Voir aussi" 
    370393 
    371 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:637 
     394#: lib/LATMOS/Accounts/Bases/Sql/User.pm:678 
    372395msgid "Responsible" 
    373396msgstr "Responsable" 
    … …  
    393416msgstr "Service" 
    394417 
    395 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:174 
     418#: lib/LATMOS/Accounts/Bases/Sql/User.pm:175 
    396419msgid "Shell" 
    397420msgstr "Shell" 
    398421 
    399422#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:58 
    400 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:670 
     423#: lib/LATMOS/Accounts/Bases/Sql/User.pm:711 
    401424msgid "Site" 
    402425msgstr "Site" 
    … …  
    406429msgstr "Début" 
    407430 
    408 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:403 
    409 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:408 
     431#: lib/LATMOS/Accounts/Bases/Sql/User.pm:404 
     432#: lib/LATMOS/Accounts/Bases/Sql/User.pm:409 
    410433msgid "Start of any employment" 
    411434msgstr "Debut de tout emplois" 
    412435 
    413 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:327 
    414 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:332 
     436#: lib/LATMOS/Accounts/Bases/Sql/User.pm:328 
     437#: lib/LATMOS/Accounts/Bases/Sql/User.pm:333 
    415438msgid "Start of employment" 
    416439msgstr "Debut d'emploi" 
    417440 
    418 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:91 
     441#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:132 
    419442msgid "State" 
    420443msgstr "État" 
    … …  
    422445#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:219 
    423446#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:263 
    424 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:722 
     447#: lib/LATMOS/Accounts/Bases/Sql/User.pm:763 
    425448msgid "Street" 
    426449msgstr "Rue" 
    … …  
    430453msgstr "Structure" 
    431454 
    432 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:99 
    433 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:653 
     455#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:140 
     456#: lib/LATMOS/Accounts/Bases/Sql/User.pm:694 
    434457msgid "Type of contract" 
    435458msgstr "Type de contrat" 
    436459 
    437 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:131 
     460#: lib/LATMOS/Accounts/Bases/Sql/User.pm:132 
    438461msgid "UID" 
    439462msgstr "UID" 
    … …  
    441464#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:54 
    442465#: lib/LATMOS/Accounts/Bases/Sql/Aliases.pm:143 
    443 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:57 
     466#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:58 
    444467#: lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:117 
    445468msgid "User" 
    … …  
    450473msgstr "Utilisateurs exclus" 
    451474 
    452 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1085 
     475#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1126 
    453476msgid "Web Page" 
    454477msgstr "Page Web" 
    455478 
     479#: lib/LATMOS/Accounts/Bases/Sql/User.pm:424 
     480#: lib/LATMOS/Accounts/Bases/Sql/User.pm:449 
     481msgid "Work duration" 
     482msgstr "Durée de présence" 
     483 
    456484#~ msgid "Contact" 
    457485#~ msgstr "Contact" 

  • trunk/LATMOS-Accounts/po/messages.pot

    r1621 r1623  
    1616"Content-Transfer-Encoding: 8bit\n" 
    1717 
    18 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1057 
     18#. ($Dd) 
     19#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:110 lib/LATMOS/Accounts/Bases/Sql/User.pm:446 
     20msgid "%d days" 
     21msgstr "" 
     22 
     23#. ($Dm) 
     24#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:109 lib/LATMOS/Accounts/Bases/Sql/User.pm:445 
     25msgid "%d months" 
     26msgstr "" 
     27 
     28#. ($Dy) 
     29#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:108 lib/LATMOS/Accounts/Bases/Sql/User.pm:444 
     30msgid "%d years" 
     31msgstr "" 
     32 
     33#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1098 
    1934msgid "Active" 
    2035msgstr "" 
    2136 
    22 #: lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:101 lib/LATMOS/Accounts/Bases/Sql/User.pm:571 
     37#: lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:101 lib/LATMOS/Accounts/Bases/Sql/User.pm:612 
    2338msgid "Aliases" 
    2439msgstr "" 
    … …  
    4257msgstr "" 
    4358 
    44 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:174 lib/LATMOS/Accounts/Bases/Sql/User.pm:695 
     59#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:174 lib/LATMOS/Accounts/Bases/Sql/User.pm:736 
    4560msgid "City" 
    4661msgstr "" 
    4762 
    48 #: lib/LATMOS/Accounts/Bases/Sql/Aliases.pm:151 lib/LATMOS/Accounts/Bases/Sql/Group.pm:148 lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:220 lib/LATMOS/Accounts/Bases/Sql/Service.pm:70 lib/LATMOS/Accounts/Bases/Sql/User.pm:1136 
     63#: lib/LATMOS/Accounts/Bases/Sql/Aliases.pm:151 lib/LATMOS/Accounts/Bases/Sql/Group.pm:148 lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:220 lib/LATMOS/Accounts/Bases/Sql/Service.pm:70 lib/LATMOS/Accounts/Bases/Sql/User.pm:1177 
    4964msgid "Comment" 
    5065msgstr "" 
    5166 
    52 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:307 lib/LATMOS/Accounts/Bases/Sql/Employment.pm:121 lib/LATMOS/Accounts/Bases/Sql/User.pm:1133 lib/LATMOS/Accounts/Bases/Sql/User.pm:765 
     67#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:307 lib/LATMOS/Accounts/Bases/Sql/Employment.pm:162 lib/LATMOS/Accounts/Bases/Sql/User.pm:1174 lib/LATMOS/Accounts/Bases/Sql/User.pm:806 
    5368msgid "Company" 
    5469msgstr "" 
    5570 
    56 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:72 
     71#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:73 
    5772msgid "Contract end" 
    5873msgstr "" 
    5974 
    60 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:66 
     75#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:67 
    6176msgid "Contract start" 
    6277msgstr "" 
    … …  
    7489msgstr "" 
    7590 
    76 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:118 lib/LATMOS/Accounts/Bases/Sql/User.pm:645 lib/LATMOS/Accounts/Bases/Sql/User.pm:770 
     91#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:159 lib/LATMOS/Accounts/Bases/Sql/User.pm:686 lib/LATMOS/Accounts/Bases/Sql/User.pm:811 
    7792msgid "Department" 
    7893msgstr "" 
    7994 
    80 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1048 
     95#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1089 
    8196msgid "Departments" 
    8297msgstr "" 
    … …  
    86101msgstr "" 
    87102 
    88 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:324 lib/LATMOS/Accounts/Bases/Sql/Employment.pm:60 lib/LATMOS/Accounts/Bases/Sql/Group.pm:145 lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:223 lib/LATMOS/Accounts/Bases/Sql/Service.pm:73 lib/LATMOS/Accounts/Bases/Sql/User.pm:1130 
     103#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:324 lib/LATMOS/Accounts/Bases/Sql/Employment.pm:61 lib/LATMOS/Accounts/Bases/Sql/Group.pm:145 lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:223 lib/LATMOS/Accounts/Bases/Sql/Service.pm:73 lib/LATMOS/Accounts/Bases/Sql/User.pm:1171 
    89104msgid "Description" 
    90105msgstr "" 
    91106 
    92 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:110 
     107#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:151 
    93108msgid "Direct manager" 
    94109msgstr "" 
    95110 
    96 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:82 lib/LATMOS/Accounts/Bases/Sql/User.pm:1109 
     111#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:82 lib/LATMOS/Accounts/Bases/Sql/User.pm:1150 
    97112msgid "Email" 
    98113msgstr "" 
    … …  
    106121msgstr "" 
    107122 
    108 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:310 lib/LATMOS/Accounts/Bases/Sql/User.pm:315 
     123#: lib/LATMOS/Accounts/Bases/Sql/User.pm:311 lib/LATMOS/Accounts/Bases/Sql/User.pm:316 
    109124msgid "End of any employment" 
    110125msgstr "" 
    111126 
    112 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:226 lib/LATMOS/Accounts/Bases/Sql/User.pm:231 
     127#: lib/LATMOS/Accounts/Bases/Sql/User.pm:227 lib/LATMOS/Accounts/Bases/Sql/User.pm:232 
    113128msgid "End of employment" 
    114129msgstr "" 
    115130 
    116 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:214 
     131#: lib/LATMOS/Accounts/Bases/Sql/User.pm:215 
    117132msgid "End of entrance" 
    118133msgstr "" 
    119134 
    120 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:126 
     135#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:167 
    121136msgid "End of entrance circuit" 
    122137msgstr "" 
    … …  
    126141msgstr "" 
    127142 
    128 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:208 
     143#: lib/LATMOS/Accounts/Bases/Sql/User.pm:209 
    129144msgid "Expire on" 
    130145msgstr "" 
    131146 
    132 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1053 
     147#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1094 
    133148msgid "Expired" 
    134149msgstr "" 
    135150 
    136 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:285 lib/LATMOS/Accounts/Bases/Sql/User.pm:760 lib/LATMOS/Accounts/Bases/Sql/User.pm:983 
     151#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:285 lib/LATMOS/Accounts/Bases/Sql/User.pm:1024 lib/LATMOS/Accounts/Bases/Sql/User.pm:801 
    137152msgid "Fax number" 
    138153msgstr "" 
    … …  
    142157msgstr "" 
    143158 
    144 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:94 lib/LATMOS/Accounts/Bases/Sql/User.pm:1126 
     159#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:94 lib/LATMOS/Accounts/Bases/Sql/User.pm:1167 
    145160msgid "First name" 
    146161msgstr "" 
    147162 
    148 #: lib/LATMOS/Accounts/Bases/Sql/Aliases.pm:69 lib/LATMOS/Accounts/Bases/Sql/User.pm:517 
     163#: lib/LATMOS/Accounts/Bases/Sql/Aliases.pm:69 lib/LATMOS/Accounts/Bases/Sql/User.pm:558 
    149164msgid "Forward" 
    150165msgstr "" 
    151166 
    152 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:824 
     167#: lib/LATMOS/Accounts/Bases/Sql/User.pm:865 
    153168msgid "GECOS" 
    154169msgstr "" 
    155170 
    156 #: lib/LATMOS/Accounts/Bases/Sql/Group.pm:35 lib/LATMOS/Accounts/Bases/Sql/User.pm:170 
     171#: lib/LATMOS/Accounts/Bases/Sql/Group.pm:35 lib/LATMOS/Accounts/Bases/Sql/User.pm:171 
    157172msgid "GID" 
    158173msgstr "" 
    159174 
    160 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1122 
     175#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1163 
    161176msgid "HAL id" 
    162177msgstr "" 
    … …  
    170185msgstr "" 
    171186 
    172 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1119 
     187#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1160 
    173188msgid "Home directory" 
    174189msgstr "" 
    175190 
    176 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:130 lib/LATMOS/Accounts/Bases/Sql/User.pm:1199 
     191#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:171 lib/LATMOS/Accounts/Bases/Sql/User.pm:1240 
    177192msgid "Hosted" 
    178193msgstr "" 
    179194 
    180 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1115 
     195#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1156 
    181196msgid "Initials" 
    182197msgstr "" 
    … …  
    202217msgstr "" 
    203218 
    204 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:202 
     219#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:113 lib/LATMOS/Accounts/Bases/Sql/Employment.pm:88 
     220msgid "Length" 
     221msgstr "" 
     222 
     223#: lib/LATMOS/Accounts/Bases/Sql/User.pm:203 
    205224msgid "Locked" 
    206225msgstr "" 
    207226 
    208 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:801 
     227#: lib/LATMOS/Accounts/Bases/Sql/User.pm:842 
    209228msgid "Login" 
    210229msgstr "" 
    … …  
    214233msgstr "" 
    215234 
    216 #: lib/LATMOS/Accounts/Bases/Sql/Group.pm:108 lib/LATMOS/Accounts/Bases/Sql/Service.pm:67 lib/LATMOS/Accounts/Bases/Sql/User.pm:1000 
     235#: lib/LATMOS/Accounts/Bases/Sql/Group.pm:108 lib/LATMOS/Accounts/Bases/Sql/Service.pm:67 lib/LATMOS/Accounts/Bases/Sql/User.pm:1041 
    217236msgid "Manager" 
    218237msgstr "" 
    219238 
    220 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:249 
     239#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:290 
    221240msgid "Maximal last day" 
    222241msgstr "" 
    … …  
    230249msgstr "" 
    231250 
    232 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:476 
     251#: lib/LATMOS/Accounts/Bases/Sql/User.pm:517 
    233252msgid "Member of" 
    234253msgstr "" 
    235254 
    236 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:208 
     255#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:249 
    237256msgid "Minimal first day" 
    238257msgstr "" 
    … …  
    242261msgstr "" 
    243262 
    244 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:130 lib/LATMOS/Accounts/Bases/Sql/User.pm:1095 lib/LATMOS/Accounts/Bases/Sql/User.pm:839 lib/LATMOS/Accounts/Bases/Sql/objects.pm:92 
     263#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:130 lib/LATMOS/Accounts/Bases/Sql/User.pm:1136 lib/LATMOS/Accounts/Bases/Sql/User.pm:880 lib/LATMOS/Accounts/Bases/Sql/objects.pm:92 
    245264msgid "Name" 
    246265msgstr "" 
    247266 
    248 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1092 
     267#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1133 
    249268msgid "Native first name" 
    250269msgstr "" 
    251270 
    252 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1089 
     271#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1130 
    253272msgid "Native name" 
    254273msgstr "" 
    … …  
    258277msgstr "" 
    259278 
    260 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:170 
     279#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:211 
    261280msgid "Next" 
    262281msgstr "" 
    263282 
    264 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1105 
     283#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1146 
    265284msgid "Nickname" 
    266285msgstr "" 
    … …  
    274293msgstr "" 
    275294 
    276 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:318 lib/LATMOS/Accounts/Bases/Sql/User.pm:796 
     295#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:318 lib/LATMOS/Accounts/Bases/Sql/User.pm:837 
    277296msgid "Office" 
    278297msgstr "" 
    … …  
    290309msgstr "" 
    291310 
    292 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1141 
     311#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1182 
    293312msgid "Password set" 
    294313msgstr "" 
    … …  
    299318msgstr "" 
    300319 
    301 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:315 lib/LATMOS/Accounts/Bases/Sql/User.pm:783 
     320#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:315 lib/LATMOS/Accounts/Bases/Sql/User.pm:824 
    302321msgid "Phone number" 
    303322msgstr "" 
    304323 
    305 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:241 lib/LATMOS/Accounts/Bases/Sql/User.pm:735 
     324#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:241 lib/LATMOS/Accounts/Bases/Sql/User.pm:776 
    306325msgid "Post office box" 
    307326msgstr "" 
    308327 
    309 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:979 
     328#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1020 
    310329msgid "Postal Address" 
    311330msgstr "" 
    … …  
    315334msgstr "" 
    316335 
    317 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:196 lib/LATMOS/Accounts/Bases/Sql/User.pm:708 
     336#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:196 lib/LATMOS/Accounts/Bases/Sql/User.pm:749 
    318337msgid "Postal code" 
    319338msgstr "" 
    320339 
    321 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:150 
     340#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:191 
    322341msgid "Previous" 
    323342msgstr "" 
    … …  
    331350msgstr "" 
    332351 
    333 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:637 
     352#: lib/LATMOS/Accounts/Bases/Sql/User.pm:678 
    334353msgid "Responsible" 
    335354msgstr "" 
    … …  
    355374msgstr "" 
    356375 
    357 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:174 
     376#: lib/LATMOS/Accounts/Bases/Sql/User.pm:175 
    358377msgid "Shell" 
    359378msgstr "" 
    360379 
    361 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:58 lib/LATMOS/Accounts/Bases/Sql/User.pm:670 
     380#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:58 lib/LATMOS/Accounts/Bases/Sql/User.pm:711 
    362381msgid "Site" 
    363382msgstr "" 
    … …  
    367386msgstr "" 
    368387 
    369 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:403 lib/LATMOS/Accounts/Bases/Sql/User.pm:408 
     388#: lib/LATMOS/Accounts/Bases/Sql/User.pm:404 lib/LATMOS/Accounts/Bases/Sql/User.pm:409 
    370389msgid "Start of any employment" 
    371390msgstr "" 
    372391 
    373 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:327 lib/LATMOS/Accounts/Bases/Sql/User.pm:332 
     392#: lib/LATMOS/Accounts/Bases/Sql/User.pm:328 lib/LATMOS/Accounts/Bases/Sql/User.pm:333 
    374393msgid "Start of employment" 
    375394msgstr "" 
    376395 
    377 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:91 
     396#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:132 
    378397msgid "State" 
    379398msgstr "" 
    380399 
    381 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:219 lib/LATMOS/Accounts/Bases/Sql/Address.pm:263 lib/LATMOS/Accounts/Bases/Sql/User.pm:722 
     400#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:219 lib/LATMOS/Accounts/Bases/Sql/Address.pm:263 lib/LATMOS/Accounts/Bases/Sql/User.pm:763 
    382401msgid "Street" 
    383402msgstr "" 
    … …  
    387406msgstr "" 
    388407 
    389 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:99 lib/LATMOS/Accounts/Bases/Sql/User.pm:653 
     408#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:140 lib/LATMOS/Accounts/Bases/Sql/User.pm:694 
    390409msgid "Type of contract" 
    391410msgstr "" 
    392411 
    393 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:131 
     412#: lib/LATMOS/Accounts/Bases/Sql/User.pm:132 
    394413msgid "UID" 
    395414msgstr "" 
    396415 
    397 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:54 lib/LATMOS/Accounts/Bases/Sql/Aliases.pm:143 lib/LATMOS/Accounts/Bases/Sql/Employment.pm:57 lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:117 
     416#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:54 lib/LATMOS/Accounts/Bases/Sql/Aliases.pm:143 lib/LATMOS/Accounts/Bases/Sql/Employment.pm:58 lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:117 
    398417msgid "User" 
    399418msgstr "" 
    … …  
    403422msgstr "" 
    404423 
    405 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1085 
     424#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1126 
    406425msgid "Web Page" 
    407426msgstr "" 
     427 
     428#: lib/LATMOS/Accounts/Bases/Sql/User.pm:424 lib/LATMOS/Accounts/Bases/Sql/User.pm:449 
     429msgid "Work duration" 
     430msgstr "" 
Note: See TracChangeset for help on using the changeset viewer.