Merge pull request #11363 from aspangaro/10.0_other

Translate rights
Dolibarr · Jun 20, 2019 · 554724a · 554724a
2 parents 980239e + f91c40a
commit 554724a
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 12 deletions.
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
@@ -21,7 +21,7 @@
 
 /**
  *	\file       htdocs/core/class/html.formaccounting.class.php
- *  \ingroup    Advanced accountancy
+ *  \ingroup    Accountancy (Double entries)
  *	\brief      File of class with all html predefined components
  */
 require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';

diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
@@ -20,7 +20,7 @@
 
 /**
  * 	\file		htdocs/core/lib/accounting.lib.php
- * 	\ingroup	Advanced accountancy
+ * 	\ingroup	Accountancy (Double entries)
  * 	\brief		Library of accountancy functions
  */
 

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,38 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Delete leave requests
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Admin leave requests (setup and update balance)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls