lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix language

Browse Source
This commit is contained in:
Laurent Destailleur 2019-02-27 13:48:13 +01:00
parent 727c4b787b
commit c4e96e9f74
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/main.lang
View File

@ -885,7 +885,6 @@ LineNb=Line no.
IncotermLabel=Incoterms IncotermLabel=Incoterms
TabLetteringCustomer=Customer lettering TabLetteringCustomer=Customer lettering
TabLetteringSupplier=Vendor lettering TabLetteringSupplier=Vendor lettering
# Week day
Monday=Monday Monday=Monday
Tuesday=Tuesday Tuesday=Tuesday
Wednesday=Wednesday Wednesday=Wednesday
@ -965,3 +964,4 @@ SelectAThirdPartyFirst=Select a third party first...
YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
Inventory=Inventory Inventory=Inventory
AnalyticCode=Analytic code AnalyticCode=Analytic code
TMenuMRP=MRP

1
htdocs/langs/en_US/users.lang
View File

@ -109,3 +109,4 @@ UserLogoff=User logout
UserLogged=User logged UserLogged=User logged
DateEmployment=Employment Start Date DateEmployment=Employment Start Date
DateEmploymentEnd=Employment End Date DateEmploymentEnd=Employment End Date
CantDisableYourself=You can disable your own user record

19
htdocs/user/card.php
View File

@ -388,12 +388,12 @@ if (empty($reshook)) {
$object->dateemployment = $dateemployment; $object->dateemployment = $dateemployment;
$dateemploymentend = dol_mktime(0, 0, 0, GETPOST('dateemploymentendmonth', 'int'), GETPOST('dateemploymentendday', 'int'), GETPOST('dateemploymentendyear', 'int')); $dateemploymentend = dol_mktime(0, 0, 0, GETPOST('dateemploymentendmonth', 'int'), GETPOST('dateemploymentendday', 'int'), GETPOST('dateemploymentendyear', 'int'));
$object->dateemploymentend = $dateemploymentend; $object->dateemploymentend = $dateemploymentend;
if (! empty($conf->stock->enabled)) if (! empty($conf->stock->enabled))
{ {
$object->fk_warehouse = GETPOST('fk_warehouse', 'int'); $object->fk_warehouse = GETPOST('fk_warehouse', 'int');
} }
if (! empty($conf->multicompany->enabled)) if (! empty($conf->multicompany->enabled))
{ {
if (! empty($_POST["superadmin"])) if (! empty($_POST["superadmin"]))
@ -1553,7 +1553,7 @@ else
print '<tr><td>'.$langs->trans("PostOrFunction").'</td>'; print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
print '<td>'.$object->job.'</td>'; print '<td>'.$object->job.'</td>';
print '</tr>'."\n"; print '</tr>'."\n";
// Default warehouse // Default warehouse
if (! empty($conf->stock->enabled)) if (! empty($conf->stock->enabled))
{ {
@ -1828,18 +1828,25 @@ else
} }
} }
// Activer // Enable user
if ($user->id <> $id && $candisableuser && $object->statut == 0 && if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
{ {
print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a></div>'; print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a></div>';
} }
// Desactiver // Disable user
if ($user->id <> $id && $candisableuser && $object->statut == 1 && if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
{ {
print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a></div>'; print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a></div>';
} }
else
{
if ($user->id == $id)
{
print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("CantDisableYourself").'">'.$langs->trans("DisableUser").'</a></div>';
}
}
// Delete // Delete
if ($user->id <> $id && $candisableuser && if ($user->id <> $id && $candisableuser &&
((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
@ -2582,7 +2589,7 @@ else
print $object->job; print $object->job;
} }
print '</td></tr>'; print '</td></tr>';
// Default warehouse // Default warehouse
if (! empty($conf->stock->enabled)) if (! empty($conf->stock->enabled))
{ {