diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php index 3ca1a082580..aebc570ab36 100644 --- a/htdocs/core/modules/modBanque.class.php +++ b/htdocs/core/modules/modBanque.class.php @@ -86,49 +86,49 @@ class modBanque extends DolibarrModules $r++; $this->rights[$r][0] = 111; // id de la permission - $this->rights[$r][1] = 'Lire les comptes bancaires'; // libelle de la permission + $this->rights[$r][1] = 'Read bank account and transactions'; $this->rights[$r][2] = 'r'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'lire'; $r++; $this->rights[$r][0] = 112; // id de la permission - $this->rights[$r][1] = 'Creer/modifier montant/supprimer ecriture bancaire'; // libelle de la permission + $this->rights[$r][1] = 'Creer/modifier montant/supprimer ecriture bancaire'; $this->rights[$r][2] = 'w'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'modifier'; $r++; $this->rights[$r][0] = 113; // id de la permission - $this->rights[$r][1] = 'Configurer les comptes bancaires (creer, gerer categories)'; // libelle de la permission + $this->rights[$r][1] = 'Configurer les comptes bancaires (creer, gerer categories)'; $this->rights[$r][2] = 'a'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'configurer'; $r++; $this->rights[$r][0] = 114; // id de la permission - $this->rights[$r][1] = 'Rapprocher les ecritures bancaires'; // libelle de la permission + $this->rights[$r][1] = 'Rapprocher les ecritures bancaires'; $this->rights[$r][2] = 'w'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'consolidate'; $r++; $this->rights[$r][0] = 115; // id de la permission - $this->rights[$r][1] = 'Exporter transactions et releves'; // libelle de la permission + $this->rights[$r][1] = 'Exporter transactions et releves'; $this->rights[$r][2] = 'r'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'export'; $r++; $this->rights[$r][0] = 116; // id de la permission - $this->rights[$r][1] = 'Virements entre comptes'; // libelle de la permission + $this->rights[$r][1] = 'Virements entre comptes'; $this->rights[$r][2] = 'w'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'transfer'; $r++; $this->rights[$r][0] = 117; // id de la permission - $this->rights[$r][1] = 'Gerer les envois de cheques'; // libelle de la permission + $this->rights[$r][1] = 'Gerer les envois de cheques'; $this->rights[$r][2] = 'w'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'cheque'; diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php index 1f6f1e92f05..348b44aaa1d 100644 --- a/htdocs/core/modules/modStripe.class.php +++ b/htdocs/core/modules/modStripe.class.php @@ -102,7 +102,7 @@ class modStripe extends DolibarrModules 'langs'=>'stripe', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. 'position'=>500, 'enabled'=>'$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. - 'perms'=>'$user->rights->banque->consolidate', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules + 'perms'=>'$user->rights->banque->modifier', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules 'target'=>'', 'user'=>2 ); // 0=Menu for internal users, 1=external users, 2=both @@ -117,8 +117,8 @@ class modStripe extends DolibarrModules 'url' => '', 'langs' => 'stripe', 'position' => 100, - 'enabled' => '$conf->global->MAIN_FEATURES_LEVEL >= 1', - 'perms' => '$user->rights->banque->configurer', + 'enabled' => '$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1', + 'perms' => '$user->rights->banque->lire', 'target' => '', 'user' => 0 ); @@ -131,8 +131,8 @@ class modStripe extends DolibarrModules 'url' => '/stripe/charge.php', 'langs' => 'stripe', 'position' => 102, - 'enabled' => '$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2', - 'perms' => '$user->rights->banque->configurer', + 'enabled' => '$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1', + 'perms' => '$user->rights->banque->lire', 'target' => '', 'user' => 0 ); @@ -145,8 +145,8 @@ class modStripe extends DolibarrModules 'url' => '/stripe/transaction.php', 'langs' => 'stripe', 'position' => 102, - 'enabled' => '$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2', - 'perms' => '$user->rights->banque->configurer', + 'enabled' => '$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1', + 'perms' => '$user->rights->banque->lire', 'target' => '', 'user' => 0 ); diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 5e8e9ff62da..a3cc816f7fa 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -951,3 +951,4 @@ Deletedraft=Delete draft ConfirmMassDraftDeletion=Draft mass delete confirmation FileSharedViaALink=File shared via a link SelectAThirdPartyFirst=Select a third party first... +YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang index 724a3bbd813..c088debc518 100644 --- a/htdocs/langs/en_US/paypal.lang +++ b/htdocs/langs/en_US/paypal.lang @@ -14,7 +14,6 @@ PaypalModeOnlyPaypal=PayPal only ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page ThisIsTransactionId=This is id of transaction: %s PAYPAL_ADD_PAYMENT_URL=Add the url of PayPal payment when you send a document by mail -YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode NewOnlinePaymentReceived=New online payment received NewOnlinePaymentFailed=New online payment tried but failed ONLINE_PAYMENT_SENDEMAIL=EMail to warn after a payment (success or not)