diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php index 860181935e1..e424325734e 100644 --- a/htdocs/core/modules/modReception.class.php +++ b/htdocs/core/modules/modReception.class.php @@ -113,21 +113,21 @@ class modReception extends DolibarrModules $r++; $this->rights[$r][0] = $this->numero.$r; - $this->rights[$r][1] = 'Lire les receptions'; + $this->rights[$r][1] = 'Read receptions'; $this->rights[$r][2] = 'r'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'lire'; $r++; $this->rights[$r][0] = $this->numero.$r; - $this->rights[$r][1] = 'Creer modifier les receptions'; + $this->rights[$r][1] = 'Create receptions'; $this->rights[$r][2] = 'w'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'creer'; $r++; $this->rights[$r][0] = $this->numero.$r; - $this->rights[$r][1] = 'Valider les receptions'; + $this->rights[$r][1] = 'Validate receptions'; $this->rights[$r][2] = 'd'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'reception_advance'; @@ -135,7 +135,7 @@ class modReception extends DolibarrModules $r++; $this->rights[$r][0] = $this->numero.$r; // id de la permission - $this->rights[$r][1] = 'Envoyer les receptions aux clients'; // libelle de la permission + $this->rights[$r][1] = 'Send receptions to customers'; // libelle de la permission $this->rights[$r][2] = 'd'; // type de la permission (deprecated) $this->rights[$r][3] = 0; // La permission est-elle une permission par default $this->rights[$r][4] = 'reception_advance'; @@ -143,7 +143,7 @@ class modReception extends DolibarrModules $r++; $this->rights[$r][0] = $this->numero.$r; - $this->rights[$r][1] = 'Exporter les receptions'; + $this->rights[$r][1] = 'Export receptions'; $this->rights[$r][2] = 'r'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'reception'; @@ -151,7 +151,7 @@ class modReception extends DolibarrModules $r++; $this->rights[$r][0] = $this->numero.$r; - $this->rights[$r][1] = 'Supprimer les receptions'; + $this->rights[$r][1] = 'Delete receptions'; $this->rights[$r][2] = 'd'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'supprimer'; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 0d8c100d28e..a862b32c2b3 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1068,12 +1068,12 @@ Permission67001=Allow printing of receipts Permission68001=Read intracomm report Permission68002=Create/modify intracomm report Permission68004=Delete intracomm report -Permission941601=Read receipts -Permission941602=Create and modify receipts -Permission941603=Validate receipts -Permission941604=Send receipts by email -Permission941605=Export receipts -Permission941606=Delete receipts +Permission941601=Read receptions +Permission941602=Create and modify receptions +Permission941603=Validate receptions +Permission941604=Send receptions by email +Permission941605=Export receptions +Permission941606=Delete receptions DictionaryCompanyType=Third-party types DictionaryCompanyJuridicalType=Third-party legal entities DictionaryProspectLevel=Prospect potential level for companies diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 06403b9451e..5adf651734b 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -535,6 +535,7 @@ ToLocation=to at=at and=and or=or +otherwise=otherwise Other=Other Others=Others OtherInformations=Other information diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index 1fceafab74e..683ac263362 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -508,12 +508,12 @@ if (empty($reshook)) { if ($result < 0) { setEventMessages($object->error, $object->errors, 'errors'); } - } elseif ($action == 'settracking_number' || $action == 'settracking_url' + } elseif (($action == 'settracking_number' || $action == 'settracking_url' || $action == 'settrueWeight' || $action == 'settrueWidth' || $action == 'settrueHeight' || $action == 'settrueDepth' - || $action == 'setshipping_method_id') { + || $action == 'setshipping_method_id') && $permissiontoadd) { // Action update $error = 0; @@ -588,7 +588,7 @@ if (empty($reshook)) { } else { setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors'); } - } elseif ($action == 'classifybilled') { + } elseif ($action == 'classifybilled' && $permissiontoadd) { $result = $object->setBilled(); if ($result >= 0) { header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); @@ -1516,7 +1516,7 @@ if ($action == 'create') { print $langs->trans('DateDeliveryPlanned'); print ''; - if ($action != 'editdate_livraison') { + if ($action != 'editdate_livraison' && $permissiontoadd) { print '