diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 6eb9ba5014c..73b4c479b2e 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -361,7 +361,7 @@ if ($action == 'validate' && $permissiontovalidate) { if ($tmpproposal->valid($user) > 0) { setEventMessage($langs->trans('hasBeenValidated', $tmpproposal->ref), 'mesgs'); } else { - setEventMessage($langs->trans('CantBeValidated'), 'errors'); + setEventMessage($tmpproposal->error, $tmpproposal->errors, 'errors'); $error++; } } else { @@ -398,7 +398,7 @@ if ($action == "sign" && $permissiontoclose) { $error++; } } else { - setEventMessage($tmpproposal->ref." ".$langs->trans('CantBeSign'), 'errors'); + setEventMessage($langs->trans('MustBeValidatedToBeSigned', $tmpproposal->ref), 'errors'); $error++; } } else { diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index c819bd1dc55..fcbd00fe945 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -318,7 +318,7 @@ if ($action == 'validate' && $permissiontoadd) { if ($objecttmp->valid($user, $idwarehouse)) { setEventMessage($langs->trans('hasBeenValidated', $objecttmp->ref), 'mesgs'); } else { - setEventMessage($langs->trans('CantBeValidated'), 'errors'); + setEventMessage($objecttmp->error, $objecttmp->errors, 'errors'); $error++; } } else { diff --git a/htdocs/core/modules/modVariants.class.php b/htdocs/core/modules/modVariants.class.php index ad71d2ca300..e1364fd845e 100644 --- a/htdocs/core/modules/modVariants.class.php +++ b/htdocs/core/modules/modVariants.class.php @@ -112,15 +112,15 @@ class modVariants extends DolibarrModules $r = 0; $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) - $this->rights[$r][1] = 'Read objects of ProductAttribute'; // Permission label + $this->rights[$r][1] = 'Read attributes of variants'; // Permission label $this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1) $r++; $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) - $this->rights[$r][1] = 'Create/Update objects of ProductAttribute'; // Permission label + $this->rights[$r][1] = 'Create/Update attributes of variants'; // Permission label $this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1) $r++; $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used) - $this->rights[$r][1] = 'Delete objects of ProductAttribute'; // Permission label + $this->rights[$r][1] = 'Delete attributes of variants'; // Permission label $this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1) $r++; } diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 794893e2133..d4073f80b7c 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -883,9 +883,9 @@ Permission564=Record Debits/Rejections of credit transfer Permission601=Read stickers Permission602=Create/modify stickers Permission609=Delete stickers -Permission611=Read objects of ProductAttribute -Permission612=Create/Update objects of ProductAttribute -Permission613=Delete objects of ProductAttribute +Permission611=Read attributes of variants +Permission612=Create/Update attributes of variants +Permission613=Delete attributes of variants Permission650=Read Bills of Materials Permission651=Create/Update Bills of Materials Permission652=Delete Bills of Materials diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index fb30758aba9..a4261f8e62c 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -106,7 +106,6 @@ GenerateBill=Generate invoice ClassifyShipped=Classify delivered PassedInShippedStatus=classified delivered YouCantShipThis=I can't classify this. Please check user permissions -MustBeValidatedBefore=must be Validated or In process in order to be classified as shipped DraftOrders=Draft orders DraftSuppliersOrders=Draft purchase orders OnProcessOrders=In process orders diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index cc63f8e7c68..1e0ed42d3e3 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -190,6 +190,7 @@ PlannedWorkload=Planned workload PlannedWorkloadShort=Workload ProjectReferers=Related items ProjectMustBeValidatedFirst=Project must be validated first +MustBeValidatedToBeSigned=%s must be validated first to be set to Signed. FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time InputPerDay=Input per day InputPerWeek=Input per week diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index 4c95b3b1851..ed25b5501dc 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -93,11 +93,8 @@ ConfirmMassNoSignature=Bulk Not signed confirmation ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ? IsNotADraft=is not a draft PassedInOpenStatus=has been validated -CantBeSign=cannot be signed Sign=Sign Signed=signed -CantBeSign=cannot be signed -CantBeValidated=cannot be validated ConfirmMassValidation=Bulk Validate confirmation ConfirmMassSignature=Bulk Signature confirmation ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?