Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur
2019-06-27 20:13:51 +02:00

View File

@@ -819,9 +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
Permission650=Read Bills of Materials
Permission651=Create/Update Bills of Materials
Permission652=Delete Bills of Materials
Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
@@ -911,7 +911,7 @@ Permission50414=Delete operations in ledger
Permission50415=Delete all operations by year and journal in ledger
Permission50418=Export operations of the ledger
Permission50420=Report and export reports (turnover, balance, journals, ledger)
Permission50430=Define and close a fiscal year
Permission50430=Define and close a fiscal period
Permission50440=Manage chart of accounts, setup of accountancy
Permission51001=Read assets
Permission51002=Create/Update assets
@@ -1924,4 +1924,4 @@ UrlForIFTTT=URL endpoint for IFTTT
YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
EndPointFor=End point for %s : %s
DeleteEmailCollector=Delete email collector
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?