diff --git a/application/Espo/Jobs/Cleanup.php b/application/Espo/Jobs/Cleanup.php index 7ec39969cc..0d9a4ecb34 100644 --- a/application/Espo/Jobs/Cleanup.php +++ b/application/Espo/Jobs/Cleanup.php @@ -76,7 +76,10 @@ class Cleanup extends \Espo\Core\Jobs\Base $pdo = $this->getEntityManager()->getPDO(); $query = "DELETE FROM `job` WHERE DATE(modified_at) < ".$pdo->quote($this->getCleanupJobFromDate())." AND status <> 'Pending'"; + $sth = $pdo->prepare($query); + $sth->execute(); + $query = "DELETE FROM `job` WHERE DATE(modified_at) < ".$pdo->quote($this->getCleanupJobFromDate())." AND status = 'Pending' AND deleted = 1"; $sth = $pdo->prepare($query); $sth->execute(); } diff --git a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Admin.json b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Admin.json index 448bd5da9a..5b04d79d0c 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Admin.json +++ b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Admin.json @@ -1,5 +1,6 @@ { "layouts": { + "detailConvert": "Converti Lead", "listForAccount": "Elenco (per Account)", "listForContact": "Lista (per contatto)" } diff --git a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Call.json b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Call.json index 9d996fe1df..f81316ad77 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Call.json +++ b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Call.json @@ -10,7 +10,6 @@ "description": "Descrizione", "users": "Utenti", "contacts": "Contatti", - "leads": "Comando", "reminders": "Promemoria", "acceptanceStatus": "Stato accettazione" }, diff --git a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Campaign.json b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Campaign.json index 228f7df7b5..0bd301d1b6 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Campaign.json +++ b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Campaign.json @@ -27,7 +27,6 @@ "excludingTargetLists": "Esclusioni da liste di destinazione", "accounts": "Account", "contacts": "Contatti", - "leads": "Comando", "opportunities": "Opportunita'", "massEmails": "Email Massiva", "contactsTemplate": "Modello contatti", diff --git a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Contact.json b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Contact.json index 3505af5bdc..93c5963f79 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Contact.json +++ b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Contact.json @@ -1,7 +1,6 @@ { "fields": { "name": "Nome", - "title": "Titolo", "accountRole": "Titolo", "accounts": "Account", "phoneNumber": "Telefono", diff --git a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Document.json b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Document.json index dfb41c260a..76e1619594 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Document.json +++ b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Document.json @@ -16,7 +16,6 @@ "accounts": "Account", "opportunities": "Opportunita'", "folder": "Cartella", - "leads": "Comando", "contacts": "Contatti" }, "options": { diff --git a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Email.json b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Email.json index d2ca057802..b3bcbaa56f 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Email.json +++ b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Email.json @@ -1,6 +1,6 @@ { "labels": { - "Create Lead": "Crea Guida", + "Create Lead": "Crea Lead", "Create Contact": "Crea Contatto", "Create Task": "Crea Compito", "Create Case": "Crea Caso", diff --git a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Global.json b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Global.json index 3fc7d02094..459ea5ce22 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Global.json +++ b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Global.json @@ -3,7 +3,6 @@ "parent": "Genitore", "contacts": "Contatti", "opportunities": "Opportunita'", - "leads": "Comando", "meetings": "Riunioni", "calls": "Chiamate", "tasks": "Compiti", @@ -16,7 +15,6 @@ }, "scopeNames": { "Contact": "Contatti", - "Lead": "Guida", "Opportunity": "Opportunità", "Meeting": "Riunione", "Calendar": "Calendario", @@ -34,7 +32,6 @@ "scopeNamesPlural": { "Account": "Account", "Contact": "Contatti", - "Lead": "Comando", "Opportunity": "Opportunita'", "Meeting": "Riunioni", "Calendar": "Calendario", @@ -51,7 +48,7 @@ "KnowledgeBaseCategory": "Conoscenza di Base Categorie" }, "dashlets": { - "Leads": "Le mie Guide", + "Leads": "I miei Lead", "Opportunities": "Le mie Opportunità", "Tasks": "I miei Compiti", "Cases": "I miei Casi", diff --git a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Lead.json b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Lead.json index 82b07f571d..b62649dac0 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Lead.json +++ b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Lead.json @@ -1,7 +1,7 @@ { "labels": { "Converted To": "Convertito in", - "Create Lead": "Crea Guida", + "Create Lead": "Crea Lead", "Convert": "Convertire", "convert": "convertire" }, diff --git a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Opportunity.json b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Opportunity.json index dac8f9241a..c893c63df2 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Opportunity.json +++ b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Opportunity.json @@ -3,6 +3,7 @@ "name": "Nome", "amount": "Importo", "probability": "Probabilità, %", + "leadSource": "Sorgente Lead", "doNotCall": "Non chiamare", "closeDate": "Data di chiusura", "contacts": "Contatti", diff --git a/application/Espo/Resources/i18n/it_IT/Admin.json b/application/Espo/Resources/i18n/it_IT/Admin.json index 5962e921ac..c1109cd06c 100644 --- a/application/Espo/Resources/i18n/it_IT/Admin.json +++ b/application/Espo/Resources/i18n/it_IT/Admin.json @@ -56,7 +56,14 @@ "Label Manager": "Gestione etichetta", "Auth Log": "Auth log", "Lead Capture": "Cattura Lead", - "Attachments": "Allegati" + "Attachments": "Allegati", + "API Users": "API Utenti", + "PHP Settings": "Impostazioni PHP", + "Database Settings": "Impostazioni Database", + "Permissions": "Permessi", + "Success": "Successo", + "Fail": "Fallito", + "is recommended": "E' raccomandato" }, "layouts": { "list": "Elenco", diff --git a/application/Espo/Resources/i18n/it_IT/ApiUser.json b/application/Espo/Resources/i18n/it_IT/ApiUser.json new file mode 100644 index 0000000000..9e26dfeeb6 --- /dev/null +++ b/application/Espo/Resources/i18n/it_IT/ApiUser.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/application/Espo/Resources/i18n/it_IT/Email.json b/application/Espo/Resources/i18n/it_IT/Email.json index 6ceb591994..7e2f7f0260 100644 --- a/application/Espo/Resources/i18n/it_IT/Email.json +++ b/application/Espo/Resources/i18n/it_IT/Email.json @@ -108,7 +108,7 @@ "archived": "Archiviato", "drafts": "Bozze", "trash": "Cestino", - "important": "Importantw" + "important": "Importante" }, "massActions": { "markAsRead": "Contrassegna come Letto", diff --git a/application/Espo/Resources/i18n/it_IT/Global.json b/application/Espo/Resources/i18n/it_IT/Global.json index f152ace368..a655818535 100644 --- a/application/Espo/Resources/i18n/it_IT/Global.json +++ b/application/Espo/Resources/i18n/it_IT/Global.json @@ -137,9 +137,9 @@ "Actions": "Azioni", "Delete": "Cancellare", "Update": "Aggiorna", - "Save": "Salvare", + "Save": "Salva", "Edit": "Modificare", - "Cancel": "Annullare", + "Cancel": "Annulla", "Apply": "Applicare", "Unlink": "Scollegare", "Mass Update": "Aggiornamento Massivo", diff --git a/application/Espo/Services/App.php b/application/Espo/Services/App.php index d644be5750..c44433683b 100644 --- a/application/Espo/Services/App.php +++ b/application/Espo/Services/App.php @@ -131,11 +131,11 @@ class App extends \Espo\Core\Services\Base $emailAddressList = []; foreach ($user->get('emailAddresses') as $emailAddress) { if ($emailAddress->get('invalid')) continue; - if ($user->get('emailAddrses') === $emailAddress->get('name')) continue; + if ($user->get('emailAddress') === $emailAddress->get('name')) continue; $emailAddressList[] = $emailAddress->get('name'); } - if ($user->get('emailAddrses')) { - array_unshift($emailAddressList, $user->get('emailAddrses')); + if ($user->get('emailAddress')) { + array_unshift($emailAddressList, $user->get('emailAddress')); } $entityManager = $this->getEntityManager(); diff --git a/client/modules/crm/src/views/calendar/calendar.js b/client/modules/crm/src/views/calendar/calendar.js index 488901efaa..6af33e1602 100644 --- a/client/modules/crm/src/views/calendar/calendar.js +++ b/client/modules/crm/src/views/calendar/calendar.js @@ -457,7 +457,7 @@ Espo.define('crm:views/calendar/calendar', ['view', 'lib!full-calendar'], functi }, getCalculatedHeight: function () { - if (this.$container && this.$container.size()) { + if (this.$container && this.$container.length) { return this.$container.height(); } var height = $(window).height(); @@ -727,7 +727,7 @@ Espo.define('crm:views/calendar/calendar', ['view', 'lib!full-calendar'], functi setTimeout(function () { $calendar.fullCalendar(options); this.updateDate(); - if (this.$container && this.$container.size()) { + if (this.$container && this.$container.length) { this.adjustSize(); } }.bind(this), 150); diff --git a/client/modules/crm/src/views/dashlets/abstract/chart.js b/client/modules/crm/src/views/dashlets/abstract/chart.js index 44fdda2c29..9b9368b18d 100644 --- a/client/modules/crm/src/views/dashlets/abstract/chart.js +++ b/client/modules/crm/src/views/dashlets/abstract/chart.js @@ -184,7 +184,7 @@ Espo.define('crm:views/dashlets/abstract/chart', ['views/dashlets/abstract/base' var width = Math.floor((containerWidth - dashletChartLegendBoxWidth * number) / number); - var columnNumber = this.$legendContainer.find('> table tr:first-child > td').size() / 2; + var columnNumber = this.$legendContainer.find('> table tr:first-child > td').length / 2; var tableWidth = (width + dashletChartLegendBoxWidth) * columnNumber; @@ -215,7 +215,7 @@ Espo.define('crm:views/dashlets/abstract/chart', ['views/dashlets/abstract/base' this.adjustContainer(); setTimeout(function () { - if (!this.$container.size() || !this.$container.is(":visible")) return; + if (!this.$container.length || !this.$container.is(":visible")) return; this.draw(); }.bind(this), 1); }); diff --git a/client/modules/crm/src/views/document/fields/file.js b/client/modules/crm/src/views/document/fields/file.js index 562a1abbe2..d1cb7dca24 100644 --- a/client/modules/crm/src/views/document/fields/file.js +++ b/client/modules/crm/src/views/document/fields/file.js @@ -40,7 +40,7 @@ Espo.define('crm:views/document/fields/file', 'views/fields/file', function (Dep return false; } - return ''; + return ''; } else { return Dep.prototype.getValueForDisplay.call(this); } diff --git a/client/res/templates/attachment/fields/name/detail.tpl b/client/res/templates/attachment/fields/name/detail.tpl index 9adbd239a7..454f6eebaf 100644 --- a/client/res/templates/attachment/fields/name/detail.tpl +++ b/client/res/templates/attachment/fields/name/detail.tpl @@ -1,2 +1,2 @@ - {{{value}}} + {{{value}}} diff --git a/client/res/templates/email/fields/has-attachment/detail.tpl b/client/res/templates/email/fields/has-attachment/detail.tpl index f3e8dcb41e..c58671141a 100644 --- a/client/res/templates/email/fields/has-attachment/detail.tpl +++ b/client/res/templates/email/fields/has-attachment/detail.tpl @@ -1 +1 @@ -{{#if value}}{{/if}} \ No newline at end of file +{{#if value}}{{/if}} \ No newline at end of file diff --git a/client/res/templates/email/fields/subject/list-link.tpl b/client/res/templates/email/fields/subject/list-link.tpl index 717661c145..b9ebc0a95b 100644 --- a/client/res/templates/email/fields/subject/list-link.tpl +++ b/client/res/templates/email/fields/subject/list-link.tpl @@ -1,6 +1,6 @@ {{#if hasAttachment}} - + {{/if}} {{#unless isRead}}{{/unless}} diff --git a/client/res/templates/fields/attachments-multiple/edit.tpl b/client/res/templates/fields/attachments-multiple/edit.tpl index 31fd7766ae..4ce1fc49d2 100644 --- a/client/res/templates/fields/attachments-multiple/edit.tpl +++ b/client/res/templates/fields/attachments-multiple/edit.tpl @@ -3,7 +3,7 @@ {{#unless uploadFromFileSystemDisabled}}
diff --git a/client/res/templates/fields/file/edit.tpl b/client/res/templates/fields/file/edit.tpl index 4e99c6ea71..7b604c0126 100644 --- a/client/res/templates/fields/file/edit.tpl +++ b/client/res/templates/fields/file/edit.tpl @@ -2,7 +2,7 @@
diff --git a/client/res/templates/record/list.tpl b/client/res/templates/record/list.tpl index 9b185bf0c6..c8645ffaff 100644 --- a/client/res/templates/record/list.tpl +++ b/client/res/templates/record/list.tpl @@ -8,14 +8,41 @@
{{/if}} - {{#if checkboxes}} - {{#if massActionList}} + {{#if displayActionsButtonGroup}}
- -
+ + - {{/if}} {{/if}} {{#if displayTotalCount}} @@ -37,10 +86,6 @@ {{translate 'Total'}}: {{collection.total}} {{/if}} - - {{#each buttonList}} - {{button name scope=../../scope label=label style=style}} - {{/each}} {{/if}} diff --git a/client/res/templates/record/search.tpl b/client/res/templates/record/search.tpl index 787d943358..dc525facce 100644 --- a/client/res/templates/record/search.tpl +++ b/client/res/templates/record/search.tpl @@ -40,10 +40,11 @@ -