diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 972712edeea..6638a4c1a04 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -885,7 +885,6 @@ LineNb=Line no. IncotermLabel=Incoterms TabLetteringCustomer=Customer lettering TabLetteringSupplier=Vendor lettering -# Week day Monday=Monday Tuesday=Tuesday Wednesday=Wednesday @@ -965,3 +964,4 @@ SelectAThirdPartyFirst=Select a third party first... YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode Inventory=Inventory AnalyticCode=Analytic code +TMenuMRP=MRP \ No newline at end of file diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index 862d137a510..53ac720d862 100644 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -109,3 +109,4 @@ UserLogoff=User logout UserLogged=User logged DateEmployment=Employment Start Date DateEmploymentEnd=Employment End Date +CantDisableYourself=You can disable your own user record \ No newline at end of file diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 3b2afd05305..46fc74626bb 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -388,12 +388,12 @@ if (empty($reshook)) { $object->dateemployment = $dateemployment; $dateemploymentend = dol_mktime(0, 0, 0, GETPOST('dateemploymentendmonth', 'int'), GETPOST('dateemploymentendday', 'int'), GETPOST('dateemploymentendyear', 'int')); $object->dateemploymentend = $dateemploymentend; - + if (! empty($conf->stock->enabled)) { $object->fk_warehouse = GETPOST('fk_warehouse', 'int'); } - + if (! empty($conf->multicompany->enabled)) { if (! empty($_POST["superadmin"])) @@ -1553,7 +1553,7 @@ else print ''.$langs->trans("PostOrFunction").''; print ''.$object->job.''; print ''."\n"; - + // Default warehouse if (! empty($conf->stock->enabled)) { @@ -1828,18 +1828,25 @@ else } } - // Activer + // Enable user 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))) { print '
'.$langs->trans("Reactivate").'
'; } - // Desactiver + // Disable user 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))) { print '
'.$langs->trans("DisableUser").'
'; } + else + { + if ($user->id == $id) + { + print '
'.$langs->trans("DisableUser").'
'; + } + } // Delete 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))) @@ -2582,7 +2589,7 @@ else print $object->job; } print ''; - + // Default warehouse if (! empty($conf->stock->enabled)) {