Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
This commit is contained in:
commit
36873b9fe7
2 changed files with 15 additions and 15 deletions
|
|
@ -862,14 +862,14 @@ class Notify
|
|||
// content will be sent.
|
||||
$mailTemplateLabel = isset($conf->global->{$notifcode.'_TEMPLATE'}) ? $conf->global->{$notifcode.'_TEMPLATE'} : '';
|
||||
$emailTemplate = null;
|
||||
// Set output language
|
||||
$outputlangs = $langs;
|
||||
if (!empty($mailTemplateLabel)) {
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
|
||||
$formmail = new FormMail($this->db);
|
||||
$emailTemplate = $formmail->getEMailTemplate($this->db, $object_type.'_send', $user, $outputlangs, 0, 1, $labeltouse);
|
||||
}
|
||||
if (!empty($mailTemplateLabel) && is_object($emailTemplate) && $emailTemplate->id > 0) {
|
||||
// Set output language
|
||||
$outputlangs = $langs;
|
||||
if ($obj->default_lang && $obj->default_lang != $langs->defaultlang) {
|
||||
$outputlangs = new Translate('', $conf);
|
||||
$outputlangs->setDefaultLang($obj->default_lang);
|
||||
|
|
|
|||
|
|
@ -873,13 +873,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
|
||||
|
|
@ -900,12 +900,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
|
||||
|
|
@ -977,7 +977,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
|
||||
|
|
@ -1011,9 +1011,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
|
||||
|
|
@ -1038,7 +1038,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
|
||||
|
|
|
|||
Loading…
Reference in a new issue