Skip to content

Commit

Permalink
Merge branch 'pu/cw/fixSAles' into '2024.11'
Browse files Browse the repository at this point in the history
Pu/cw/fix s ales

See merge request tine20/tine20!5181
  • Loading branch information
corneliusweiss committed Mar 26, 2024
2 parents b798f14 + 7468765 commit 4a7aa69
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tine20/Felamimail/js/AccountEditDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ Tine.Felamimail.AccountEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {

const app = Tine.Tinebase.appMgr.get('Felamimail');
const description = document.createElement('div');
description.innerHTML = app.formatMessage('The recipients of this email distribution list are maintained in the list : {locationsHtml}', {
description.innerHTML = app.formatMessage('The recipients of this email distribution list are maintained in the list: {locationsHtml}', {
locationsHtml: listItem.outerHTML
});
description.style.padding = '5px';
Expand Down
4 changes: 2 additions & 2 deletions tine20/Felamimail/translations/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -2183,7 +2183,7 @@ msgstr "Abhängig vom Format"

msgid ""
"The recipients of this email distribution list are maintained in the "
"list : {locationsHtml}"
"list: {locationsHtml}"
msgstr ""
"Die Empfänger dieses Email-Verteilers werden in der Liste verwaltet : "
"Die Empfänger dieses Email-Verteilers werden in folgnder Liste verwaltet: "
"{locationsHtml}"
2 changes: 1 addition & 1 deletion tine20/Sales/js/Document/CreatePaperSlipAction.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Promise.all([Tine.Tinebase.appMgr.isInitialised('Sales'),

const mailRecord = new win.Tine.Felamimail.Model.Message(Object.assign(mailDefaults, {
subject: `${record.constructor.getRecordName()} ${record.get('document_number')}: ${record.get('document_title')}`,
body: body + win.Tine.Felamimail.getSignature(),
body: body,
to: [`${recipientData.name} < ${recipientData.email} >`],
attachments: [paperSlip]
}), 0);
Expand Down
2 changes: 1 addition & 1 deletion tine20/Tinebase/js/widgets/dialog/AttachmentsGridPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ Tine.widgets.dialog.AttachmentsGridPanel = Ext.extend(Tine.widgets.grid.FileUplo

if (rowRecord.data.type === 'folder') {
this.expandFolder(rowRecord);
} else if (!this.readOnly) {
} else {
const dblClickHandlers = [{
prio: 100,
fn: _.bind(this.action_preview.execute, this.action_preview)
Expand Down

0 comments on commit 4a7aa69

Please sign in to comment.