Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0

htdocs/langs/en_US/admin.lang

@@ -887,13 +887,13 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
-Permission430=Use Debug Bar
+Permission431=Use Debug Bar
 Permission511=Read salaries and payments (yours and subordinates)
 Permission512=Create/modify salaries and payments
 Permission514=Delete salaries and payments
 Permission517=Read salaries and payments everybody
 Permission519=Export salaries
-Permission520=Read Loans
+Permission521=Read Loans
 Permission522=Create/modify loans
 Permission524=Delete loans
 Permission525=Access loan calculator
@@ -914,12 +914,12 @@ Permission609=Delete stickers
 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
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission651=Read Bills of Materials
+Permission652=Create/Update Bills of Materials
+Permission653=Delete Bills of Materials
+Permission661=Read Manufacturing Order (MO)
+Permission662=Create/Update Manufacturing Order (MO)
+Permission663=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -991,7 +991,7 @@ Permission2515=Setup documents directories
 Permission2610=Generate/modify users API key
 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
+Permission3201=Read archived events and fingerprints
 Permission3301=Generate new modules
 Permission4001=Read skill/job/position
 Permission4002=Create/modify skill/job/position
@@ -1028,9 +1028,9 @@ Permission50152=Edit sales lines
 Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
+Permission50331=Read objects of Zapier
+Permission50332=Create/Update objects of Zapier
+Permission50333=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -1055,7 +1055,7 @@ Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 Permission64001=Allow direct printing
-Permission67000=Allow printing of receipts
+Permission67001=Allow printing of receipts
 Permission68001=Read intracomm report
 Permission68002=Create/modify intracomm report
 Permission68004=Delete intracomm report

htdocs/langs/en_US/errors.lang

@@ -322,6 +322,7 @@ ErrorFixThisHere=<a href="%s">Fix this here</a>
 ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Error: The URL of you current instance (%s) does not match the URL defined into your OAuth2 login setup (%s). Doing OAuth2 login in such a configuration is not allowed.
 ErrorMenuExistValue=A Menu already exist with this Title or URL
 ErrorSVGFilesNotAllowedAsLinksWithout=SVG files are not allowed as external links without the option %s 
+ErrorGeneratingBarcode=Error while generating the barcode (probably invalid code shape)
 ErrorTypeMenu=Impossible to add another menu for the same module on the navbar, not handle yet 
 ErrorObjectNotFound = The object <b>%s</b> is not found, please check your url
 ErrorCountryCodeMustBe2Char=Country code must be a 2 character string