Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend
This commit is contained in:
Taras Machyshyn
@@ -65,14 +65,17 @@
|
||||
"Marketing": "Marketing",
|
||||
"Publishing": "Publishing",
|
||||
"Real Estate": "Real Estate",
|
||||
"Retail": "Retail",
|
||||
"Service": "Service",
|
||||
"Support": "Support",
|
||||
"Sports": "Sports",
|
||||
"Software": "Software",
|
||||
"Technology": "Technology",
|
||||
"Telecommunications": "Telecommunications",
|
||||
"Television": "Television",
|
||||
"Transportation": "Transportation",
|
||||
"Venture Capital": "Venture Capital"
|
||||
"Venture Capital": "Venture Capital",
|
||||
"Wholesale": "Wholesale"
|
||||
}
|
||||
},
|
||||
"labels": {
|
||||
|
||||
@@ -28,7 +28,8 @@
|
||||
"accounts": "Accounts",
|
||||
"casesPrimary": "Cases (Primary)",
|
||||
"portalUser": "Portal User",
|
||||
"originalLead": "Original Lead"
|
||||
"originalLead": "Original Lead",
|
||||
"documents": "Documents"
|
||||
},
|
||||
"labels": {
|
||||
"Create Contact": "Create Contact"
|
||||
|
||||
@@ -19,7 +19,8 @@
|
||||
"accounts": "Accounts",
|
||||
"opportunities": "Opportunities",
|
||||
"folder": "Folder",
|
||||
"leads": "Leads"
|
||||
"leads": "Leads",
|
||||
"contacts": "Contacts"
|
||||
},
|
||||
"options": {
|
||||
"status": {
|
||||
|
||||
@@ -23,7 +23,8 @@
|
||||
"createdOpportunity": "Opportunity",
|
||||
"campaign": "Campaign",
|
||||
"targetLists": "Target Lists",
|
||||
"targetList": "Target List"
|
||||
"targetList": "Target List",
|
||||
"industry": "Industry"
|
||||
},
|
||||
"links": {
|
||||
"targetLists": "Target Lists",
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
[
|
||||
{"name":"name","width":30,"link":true},
|
||||
{"name":"number","width":12},
|
||||
{"name":"status", "width":11},
|
||||
{"name":"priority", "width":11},
|
||||
{"name":"account"},
|
||||
{"name":"assignedUser"}
|
||||
{"name":"name", "link": true},
|
||||
{"name":"number", "widthPx": 100},
|
||||
{"name":"status", "width": 11},
|
||||
{"name":"priority", "width": 11},
|
||||
{"name":"account", "width": 18},
|
||||
{"name":"assignedUser", "width": 14}
|
||||
]
|
||||
@@ -13,6 +13,7 @@
|
||||
"rows": [
|
||||
[{"name":"status"},{"name":"source"}],
|
||||
[{"name":"opportunityAmount"},{"name":"campaign"}],
|
||||
[false, {"name":"industry"}],
|
||||
[{"name":"description", "fullWidth": true}]
|
||||
]
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
"status",
|
||||
"source",
|
||||
"opportunityAmountConverted",
|
||||
"industry",
|
||||
"phoneNumber",
|
||||
"targetLists",
|
||||
"teams",
|
||||
|
||||
@@ -51,14 +51,17 @@
|
||||
"Marketing",
|
||||
"Publishing",
|
||||
"Real Estate",
|
||||
"Retail",
|
||||
"Service",
|
||||
"Sports",
|
||||
"Software",
|
||||
"Support",
|
||||
"Technology",
|
||||
"Telecommunications",
|
||||
"Television",
|
||||
"Transportation",
|
||||
"Venture Capital"
|
||||
"Venture Capital",
|
||||
"Wholesale"
|
||||
],
|
||||
"default": "",
|
||||
"isSorted": true
|
||||
|
||||
@@ -297,6 +297,12 @@
|
||||
"type": "hasOne",
|
||||
"entity": "Lead",
|
||||
"foreign": "createdContact"
|
||||
},
|
||||
"documents": {
|
||||
"type": "hasMany",
|
||||
"entity": "Document",
|
||||
"foreign": "contacts",
|
||||
"audited": true
|
||||
}
|
||||
},
|
||||
"collection": {
|
||||
|
||||
@@ -96,6 +96,11 @@
|
||||
"entity": "Lead",
|
||||
"foreign": "documents"
|
||||
},
|
||||
"contacts": {
|
||||
"type": "hasMany",
|
||||
"entity": "Contact",
|
||||
"foreign": "documents"
|
||||
},
|
||||
"createdBy": {
|
||||
"type": "belongsTo",
|
||||
"entity": "User"
|
||||
|
||||
@@ -39,6 +39,13 @@
|
||||
"options": ["", "Call", "Email", "Existing Customer", "Partner", "Public Relations", "Web Site", "Campaign", "Other"],
|
||||
"default": ""
|
||||
},
|
||||
"industry": {
|
||||
"type": "enum",
|
||||
"view": "crm:views/lead/fields/industry",
|
||||
"customizationOptionsDisabled": true,
|
||||
"default": "",
|
||||
"isSorted": true
|
||||
},
|
||||
"opportunityAmount": {
|
||||
"type": "currency",
|
||||
"audited": true
|
||||
|
||||
@@ -33,7 +33,8 @@
|
||||
"sentBy": "Sent by (User)",
|
||||
"folder": "Folder",
|
||||
"inboundEmails": "Group Accounts",
|
||||
"emailAccounts": "Personal Accounts"
|
||||
"emailAccounts": "Personal Accounts",
|
||||
"hasAttachment": "Has Attachment"
|
||||
},
|
||||
"links": {
|
||||
"replied": "Replied",
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
"sentBy",
|
||||
"users",
|
||||
"createdAt",
|
||||
"hasAttachment",
|
||||
"inboundEmails",
|
||||
"emailAccounts"
|
||||
]
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
/************************************************************************
|
||||
* This file is part of EspoCRM.
|
||||
*
|
||||
* EspoCRM - Open Source CRM application.
|
||||
* Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
|
||||
* Website: http://www.espocrm.com
|
||||
*
|
||||
* EspoCRM is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* EspoCRM is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
|
||||
*
|
||||
* The interactive user interfaces in modified source and object code versions
|
||||
* of this program must display Appropriate Legal Notices, as required under
|
||||
* Section 5 of the GNU General Public License version 3.
|
||||
*
|
||||
* In accordance with Section 7(b) of the GNU General Public License version 3,
|
||||
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
|
||||
************************************************************************/
|
||||
|
||||
Espo.define('crm:views/lead/fields/industry', 'views/fields/enum', function (Dep) {
|
||||
|
||||
return Dep.extend({
|
||||
|
||||
setup: function () {
|
||||
this.params.options = this.getMetadata().get('entityDefs.Account.fields.industry.options');
|
||||
this.params.translation = 'Account.options.industry';
|
||||
|
||||
Dep.prototype.setup.call(this);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
@@ -225,9 +225,13 @@ Espo.define('views/admin/layouts/grid', 'views/admin/layouts/base', function (De
|
||||
}
|
||||
}
|
||||
|
||||
if ($(this).data('full-width')) {
|
||||
$(ui.draggable).data('full-width', true).attr('data-full-width', true);
|
||||
}
|
||||
var fullWidth = $(this).data('fullWidth');
|
||||
|
||||
$(this).data('fullWidth', $(ui.draggable).data('fullWidth'));
|
||||
$(ui.draggable).data('fullWidth', fullWidth);
|
||||
|
||||
$(this).attr('data-full-width', $(ui.draggable).attr('data-full-width'));
|
||||
$(ui.draggable).attr('data-full-width', fullWidth);
|
||||
|
||||
ui.draggable.css({
|
||||
top: 0,
|
||||
|
||||
@@ -299,25 +299,34 @@ Espo.define('views/record/list', 'view', function (Dep) {
|
||||
}
|
||||
},
|
||||
|
||||
export: function () {
|
||||
var data = {};
|
||||
if (this.allResultIsChecked) {
|
||||
data.where = this.collection.getWhere();
|
||||
data.selectData = this.collection.data || {};
|
||||
data.byWhere = true;
|
||||
} else {
|
||||
data.ids = this.checkedList;
|
||||
export: function (data, url, fieldList) {
|
||||
if (!data) {
|
||||
data = {};
|
||||
if (this.allResultIsChecked) {
|
||||
data.where = this.collection.getWhere();
|
||||
data.selectData = this.collection.data || {};
|
||||
data.byWhere = true;
|
||||
} else {
|
||||
data.ids = this.checkedList;
|
||||
}
|
||||
}
|
||||
|
||||
this.createView('dialogExport', 'views/export/modals/export', {
|
||||
var url = url || this.scope + '/action/export';
|
||||
|
||||
var o = {
|
||||
scope: this.scope
|
||||
}, function (view) {
|
||||
};
|
||||
if (fieldList) {
|
||||
o.fieldList = fieldList;
|
||||
}
|
||||
|
||||
this.createView('dialogExport', 'views/export/modals/export', o, function (view) {
|
||||
view.render();
|
||||
this.listenToOnce(view, 'proceed', function (dialogData) {
|
||||
if (dialogData.useCustomFieldList) {
|
||||
data.attributeList = dialogData.attributeList;
|
||||
}
|
||||
this.ajaxPostRequest(this.scope + '/action/export', data).then(function (data) {
|
||||
this.ajaxPostRequest(url, data).then(function (data) {
|
||||
if ('id' in data) {
|
||||
window.location = this.getBasePath() + '?entryPoint=download&id=' + data.id;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user