diff --git a/README.md b/README.md index d5b780f346c..80f10648cc4 100755 --- a/README.md +++ b/README.md @@ -43,9 +43,9 @@ The following links offer various ways to view, contribute and collaborate to th + [SuiteCRM Extensions Directory - An extensions directory where community members can submit extensions built for SuiteCRM][suitecrm_ext] [suitecrm_demo]: https://suitecrm.com/demo -[suitecrm_forums]: https://suitecrm.com/forum/index +[suitecrm_forums]: https://suitecrm.com/suitecrm/forum/suite-forum [suitecrm_docs]: https://suitecrm.com/wiki -[suitecrm_partners]: https://suitecrm.com/community/partners +[suitecrm_partners]: https://suitecrm.com/about/about-us/partners [suitecrm_ext]: https://store.suitecrm.com/ ### Development Roadmap ### diff --git a/data/SugarBean.php b/data/SugarBean.php index 255b7422c89..a928aa54ef9 100755 --- a/data/SugarBean.php +++ b/data/SugarBean.php @@ -1919,7 +1919,15 @@ public function save($check_notify = false) foreach ($this->email_addresses_non_primary as $mail) { $this->emailAddress->addAddress($mail); } - $this->emailAddress->save($this->id, $this->module_dir); + $this->emailAddress->saveEmail( + $this->id, + $this->module_dir, + '', + '', + '', + '', + '', + $this->in_workflow); } if (isset($this->custom_fields)) { diff --git a/include/Dashlets/Dashlet.php b/include/Dashlets/Dashlet.php index 87ad91310ad..7a4228e25bd 100755 --- a/include/Dashlets/Dashlet.php +++ b/include/Dashlets/Dashlet.php @@ -242,7 +242,9 @@ public function getHeader($text = '') $template->assign('CONFIGURE_ICON', $this->setConfigureIcon()); $template->assign('REFRESH_ICON', $this->setRefreshIcon()); $template->assign('DELETE_ICON',$this->setDeleteIcon()); - $template->assign('DASHLET_MODULE',$this->seedBean->module_name); + if(!empty($this->seedBean->module_name)) { + $template->assign('DASHLET_MODULE', $this->seedBean->module_name); + } $template->assign('DASHLET_BUTTON_ARIA_EDIT', translate('LBL_DASHLET_EDIT', 'Home')); $template->assign('DASHLET_BUTTON_ARIA_REFRESH', translate('LBL_DASHLET_REFRESH', 'Home')); $template->assign('DASHLET_BUTTON_ARIA_DELETE', translate('LBL_DASHLET_DELETE', 'Home')); diff --git a/include/ListView/ListViewColumnsFilterDialog.tpl b/include/ListView/ListViewColumnsFilterDialog.tpl index 431b32556fc..092276ab275 100644 --- a/include/ListView/ListViewColumnsFilterDialog.tpl +++ b/include/ListView/ListViewColumnsFilterDialog.tpl @@ -187,6 +187,8 @@ displayColumns: cols.join('|'), query: 'true', use_stored_query: 'true', + update_stored_query: 'true', + update_stored_query_key: 'displayColumns', last_search_tab: listViewSearchIcon.getLatestSearchDialogType(), save_columns_order: 'true' }, function () { diff --git a/include/ListView/ListViewSmarty.php b/include/ListView/ListViewSmarty.php index d53f1a1971c..8a30229d50d 100755 --- a/include/ListView/ListViewSmarty.php +++ b/include/ListView/ListViewSmarty.php @@ -97,13 +97,13 @@ function process($file, $data, $htmlVar) { $totalWidth = 0; foreach($this->displayColumns as $name => $params) { - $totalWidth += $params['width']; + $totalWidth += trim($params['width'],'%'); } $adjustment = $totalWidth / 100; $contextMenuObjectsTypes = array(); foreach($this->displayColumns as $name => $params) { - $this->displayColumns[$name]['width'] = floor($this->displayColumns[$name]['width'] / $adjustment); + $this->displayColumns[$name]['width'] = floor(trim($this->displayColumns[$name]['width'],'%') / $adjustment); // figure out which contextMenu objectsTypes are required if(!empty($params['contextMenu']['objectType'])) $contextMenuObjectsTypes[$params['contextMenu']['objectType']] = true; diff --git a/include/MVC/View/views/view.list.php b/include/MVC/View/views/view.list.php index 406d7e735ce..73008a383f1 100755 --- a/include/MVC/View/views/view.list.php +++ b/include/MVC/View/views/view.list.php @@ -148,6 +148,13 @@ function listViewPrepare() if (!isset($_REQUEST['query'])) { $this->storeQuery->loadQuery($this->module); $this->storeQuery->populateRequest(); + } elseif (!empty($_REQUEST['update_stored_query'])) { + $updateKey = $_REQUEST['update_stored_query_key']; + $updateValue = $_REQUEST[$updateKey]; + $this->storeQuery->loadQuery($this->module); + $this->storeQuery->populateRequest(); + $_REQUEST[$updateKey] = $updateValue; + $this->storeQuery->saveFromRequest($this->module); } else { $this->storeQuery->saveFromRequest($this->module); } diff --git a/include/SubPanel/SubPanelTiles.js b/include/SubPanel/SubPanelTiles.js index 4a10b2e7ea1..af75fc290f6 100755 --- a/include/SubPanel/SubPanelTiles.js +++ b/include/SubPanel/SubPanelTiles.js @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/SubPanel/SubPanelTiles.php b/include/SubPanel/SubPanelTiles.php index c0ef993d916..62c77947e37 100755 --- a/include/SubPanel/SubPanelTiles.php +++ b/include/SubPanel/SubPanelTiles.php @@ -344,7 +344,7 @@ function display($showContainer = true, $forceTabless = false) $tabs_properties[$t]['show_icon_html'] = $show_icon_html; $tabs_properties[$t]['hide_icon_html'] = $hide_icon_html; - $max_min = " " + $max_min = " " . "" . $show_icon_html . ""; $max_min .= "" . "" . $hide_icon_html . ""; diff --git a/include/SugarEmailAddress/SugarEmailAddress.php b/include/SugarEmailAddress/SugarEmailAddress.php index a0b0d94c083..5e6d14db9b8 100755 --- a/include/SugarEmailAddress/SugarEmailAddress.php +++ b/include/SugarEmailAddress/SugarEmailAddress.php @@ -103,7 +103,7 @@ public function handleLegacySave($bean) || !isset($_REQUEST[$bean->module_dir . '_email_widget_id']) || !isset($_REQUEST['massupdate']) ) { - if (empty($this->addresses)) { + if (empty($this->addresses) || (!empty($bean->email1))) { $this->addresses = array(); $optOut = (isset($bean->email_opt_out) && $bean->email_opt_out == '1'); $invalid = (isset($bean->invalid_email) && $bean->invalid_email == '1'); diff --git a/include/SugarFields/Fields/Address/en_us.DetailView.tpl b/include/SugarFields/Fields/Address/en_us.DetailView.tpl index 6971e1b7e20..f480c74cdf5 100755 --- a/include/SugarFields/Fields/Address/en_us.DetailView.tpl +++ b/include/SugarFields/Fields/Address/en_us.DetailView.tpl @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/SugarFields/Fields/Address/en_us.EditView.tpl b/include/SugarFields/Fields/Address/en_us.EditView.tpl index f3ff08fa211..b0c9780a218 100755 --- a/include/SugarFields/Fields/Address/en_us.EditView.tpl +++ b/include/SugarFields/Fields/Address/en_us.EditView.tpl @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/SugarObjects/implements/assignable/language/en_us.lang.php b/include/SugarObjects/implements/assignable/language/en_us.lang.php index 5a38bbeb739..5441e0321d0 100755 --- a/include/SugarObjects/implements/assignable/language/en_us.lang.php +++ b/include/SugarObjects/implements/assignable/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/SugarObjects/implements/security_groups/language/en_us.lang.php b/include/SugarObjects/implements/security_groups/language/en_us.lang.php index 4bc20fa15a1..8b17ee4b3e6 100644 --- a/include/SugarObjects/implements/security_groups/language/en_us.lang.php +++ b/include/SugarObjects/implements/security_groups/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/SugarObjects/implements/team_security/language/en_us.lang.php b/include/SugarObjects/implements/team_security/language/en_us.lang.php index 08f42c5cf46..650db8f937a 100755 --- a/include/SugarObjects/implements/team_security/language/en_us.lang.php +++ b/include/SugarObjects/implements/team_security/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/SugarObjects/templates/basic/language/en_us.lang.php b/include/SugarObjects/templates/basic/language/en_us.lang.php index 433deef46ca..51e4266ce39 100755 --- a/include/SugarObjects/templates/basic/language/en_us.lang.php +++ b/include/SugarObjects/templates/basic/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/SugarObjects/templates/company/language/application/en_us.lang.php b/include/SugarObjects/templates/company/language/application/en_us.lang.php index aeef0129288..5b7880a5d8a 100755 --- a/include/SugarObjects/templates/company/language/application/en_us.lang.php +++ b/include/SugarObjects/templates/company/language/application/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/SugarObjects/templates/company/language/en_us.lang.php b/include/SugarObjects/templates/company/language/en_us.lang.php index 4028fbe2852..8cceffaa62a 100755 --- a/include/SugarObjects/templates/company/language/en_us.lang.php +++ b/include/SugarObjects/templates/company/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/SugarObjects/templates/file/language/application/en_us.lang.php b/include/SugarObjects/templates/file/language/application/en_us.lang.php index abe2224f409..5820140ecc3 100755 --- a/include/SugarObjects/templates/file/language/application/en_us.lang.php +++ b/include/SugarObjects/templates/file/language/application/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/SugarObjects/templates/file/language/en_us.lang.php b/include/SugarObjects/templates/file/language/en_us.lang.php index 9e3a16a9305..0c1c189e3b6 100755 --- a/include/SugarObjects/templates/file/language/en_us.lang.php +++ b/include/SugarObjects/templates/file/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/SugarObjects/templates/issue/language/application/en_us.lang.php b/include/SugarObjects/templates/issue/language/application/en_us.lang.php index b13f583a600..ac94d171db2 100755 --- a/include/SugarObjects/templates/issue/language/application/en_us.lang.php +++ b/include/SugarObjects/templates/issue/language/application/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/SugarObjects/templates/issue/language/en_us.lang.php b/include/SugarObjects/templates/issue/language/en_us.lang.php index e9d4c0ee70d..e347b26b480 100755 --- a/include/SugarObjects/templates/issue/language/en_us.lang.php +++ b/include/SugarObjects/templates/issue/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/SugarObjects/templates/person/language/en_us.lang.php b/include/SugarObjects/templates/person/language/en_us.lang.php index be9d0f1bef3..6d8ccc3ff35 100755 --- a/include/SugarObjects/templates/person/language/en_us.lang.php +++ b/include/SugarObjects/templates/person/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/SugarObjects/templates/sale/language/application/en_us.lang.php b/include/SugarObjects/templates/sale/language/application/en_us.lang.php index ec916f8a50e..2eacaa1033a 100755 --- a/include/SugarObjects/templates/sale/language/application/en_us.lang.php +++ b/include/SugarObjects/templates/sale/language/application/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/SugarObjects/templates/sale/language/en_us.lang.php b/include/SugarObjects/templates/sale/language/en_us.lang.php index 18a4a2f018c..c1932ff2ace 100755 --- a/include/SugarObjects/templates/sale/language/en_us.lang.php +++ b/include/SugarObjects/templates/sale/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/globalControlLinks.php b/include/globalControlLinks.php index 4083fdeb452..0ccbd3f3396 100755 --- a/include/globalControlLinks.php +++ b/include/globalControlLinks.php @@ -68,7 +68,7 @@ 'submenu' => '' ); $global_control_links['training'] = array( -'linkinfo' => array($app_strings['LBL_TRAINING'] => 'javascript:void(window.open(\'http://suitecrm.com/forum/index\'))'), +'linkinfo' => array($app_strings['LBL_TRAINING'] => 'javascript:void(window.open(\'https://suitecrm.com/suitecrm/forum/suite-forum\'))'), 'submenu' => '' ); diff --git a/include/language/en_us.lang.php b/include/language/en_us.lang.php index 9e200186c71..b5e54ee0864 100755 --- a/include/language/en_us.lang.php +++ b/include/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the @@ -3360,7 +3360,6 @@ $app_list_strings['aor_chart_types']['line'] = 'Line chart'; $app_list_strings['aor_chart_types']['pie'] = 'Pie chart'; $app_list_strings['aor_chart_types']['radar'] = 'Radar chart'; -$app_list_strings['aor_chart_types']['polar'] = 'Polar chart'; $app_list_strings['aor_chart_types']['stacked_bar'] = 'Stacked bar'; $app_list_strings['aor_chart_types']['grouped_bar'] = 'Grouped bar'; $app_list_strings['aor_scheduled_report_schedule_types']['monthly'] = 'Monthly'; diff --git a/include/language/en_us.notify_template.html b/include/language/en_us.notify_template.html index 24ea885340c..f0a125da7e3 100755 --- a/include/language/en_us.notify_template.html +++ b/include/language/en_us.notify_template.html @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. -* Copyright (C) 2011 - 2017 Salesagility Ltd. +* Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/include/language/getJSLanguage.php b/include/language/getJSLanguage.php index 9b4da853e07..129f71eb451 100644 --- a/include/language/getJSLanguage.php +++ b/include/language/getJSLanguage.php @@ -69,13 +69,13 @@ function getJSLanguage() return; } - if (empty($_REQUEST['module']) || $_REQUEST['module'] === 'app_strings') { + if (empty($_REQUEST['modulename']) || $_REQUEST['modulename'] === 'app_strings') { $file = sugar_cached('jsLanguage/').$lang.'.js'; if (!is_file($file)) { jsLanguage::createAppStringsCache($lang); } } else { - $module = clean_path($_REQUEST['module']); + $module = clean_path($_REQUEST['modulename']); $fullModuleList = array_merge($GLOBALS['moduleList'], $GLOBALS['modInvisList']); if (!isset($app_list_strings['moduleList'][$module]) && !in_array($module, $fullModuleList)) { echo 'Invalid module specified'; diff --git a/include/utils/sugar_file_utils.php b/include/utils/sugar_file_utils.php index 0fff976bb16..5b53f81b6c6 100755 --- a/include/utils/sugar_file_utils.php +++ b/include/utils/sugar_file_utils.php @@ -77,7 +77,7 @@ function sugar_mkdir($pathname, $mode = null, $recursive = false, $context = nul } if ($result) { - if (!sugar_chmod($pathname, $mode)) { + if (!sugar_chmod($pathname, $mode) && !is_writable($pathname)) { return false; } if (!empty($GLOBALS['sugar_config']['default_permissions']['user'])) { diff --git a/install/installCommon.js b/install/installCommon.js index a509dfd926d..9d4861cb41d 100755 --- a/install/installCommon.js +++ b/install/installCommon.js @@ -36,5 +36,5 @@ * display the words "Powered by SugarCRM" and "Supercharged by SuiteCRM". ********************************************************************************/ function showHelp(step) -{url='http://www.sugarcrm.com/forums/';name='helpWindowPopup';window.open(url,name);} +{url='https://suitecrm.com/suitecrm/forum/suite-forum';name='helpWindowPopup';window.open(url,name);} function setFocus(){focus=document.getElementById('button_next2');focus.focus();} \ No newline at end of file diff --git a/install/installSystemCheck.php b/install/installSystemCheck.php index 213d6c36126..85eb32f9de4 100755 --- a/install/installSystemCheck.php +++ b/install/installSystemCheck.php @@ -406,7 +406,7 @@ function runCheck($install_script = false, $mod_strings = array())
- +
diff --git a/install/install_utils.php b/install/install_utils.php index 3fb53786045..efae5e4b660 100755 --- a/install/install_utils.php +++ b/install/install_utils.php @@ -957,8 +957,8 @@ function handleHtaccess(){ Options +FollowSymLinks RewriteEngine On RewriteBase {$basePath} - RewriteRule ^cache/jsLanguage/(.._..).js$ index.php?entryPoint=jslang&module=app_strings&lang=$1 [L,QSA] - RewriteRule ^cache/jsLanguage/(\w*)/(.._..).js$ index.php?entryPoint=jslang&module=$1&lang=$2 [L,QSA] + RewriteRule ^cache/jsLanguage/(.._..).js$ index.php?entryPoint=jslang&modulename=app_strings&lang=$1 [L,QSA] + RewriteRule ^cache/jsLanguage/(\w*)/(.._..).js$ index.php?entryPoint=jslang&modulename=$1&lang=$2 [L,QSA] diff --git a/install/language/en_us.lang.php b/install/language/en_us.lang.php index 8be8b737f2f..908c3607d67 100755 --- a/install/language/en_us.lang.php +++ b/install/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the @@ -256,7 +256,7 @@ 'LBL_DISABLED_DESCRIPTION_2' => 'After this change has been made, you may click the "Start" button below to begin your installation. After the installation is complete, you will want to change the value for \'installer_locked\' to \'true\'.', 'LBL_DISABLED_DESCRIPTION' => 'The installer has already been run once. As a safety measure, it has been disabled from running a second time. If you are absolutely sure you want to run it again, please go to your config.php file and locate (or add) a variable called \'installer_locked\' and set it to \'false\'. The line should look like this:', 'LBL_DISABLED_HELP_1' => 'For installation help, please visit the SuiteCRM', - 'LBL_DISABLED_HELP_LNK' => 'http://www.suitecrm.com/forum/index', + 'LBL_DISABLED_HELP_LNK' => 'https://suitecrm.com/suitecrm/forum/suite-forum', 'LBL_DISABLED_HELP_2' => 'support forums', 'LBL_DISABLED_TITLE_2' => 'SuiteCRM Installation has been Disabled', 'LBL_DISABLED_TITLE' => 'SuiteCRM Installation Disabled', diff --git a/jssource/src_files/install/installCommon.js b/jssource/src_files/install/installCommon.js index 8fd9177b451..178a071bd83 100755 --- a/jssource/src_files/install/installCommon.js +++ b/jssource/src_files/install/installCommon.js @@ -40,7 +40,7 @@ function showHelp(step) { - url = 'http://www.sugarcrm.com/forums/'; + url = 'https://suitecrm.com/suitecrm/forum/suite-forum'; name = 'helpWindowPopup'; window.open(url,name); } diff --git a/jssource/src_files/modules/Calendar/Cal.js b/jssource/src_files/modules/Calendar/Cal.js index 3c023194cf4..df30684d674 100755 --- a/jssource/src_files/modules/Calendar/Cal.js +++ b/jssource/src_files/modules/Calendar/Cal.js @@ -1052,7 +1052,7 @@ $($.fullCalendar).ready(function () { + ''; var body = SUGAR.language.translate('app_strings', 'LBL_LOADING_PAGE'); - if ($('#cal_module').val() != "Home") { + if ($('#cal_module').val() != "Home" && typeof(event.id) !== 'undefined') { element.qtip({ content: { title: { diff --git a/modules/ACL/language/en_us.lang.php b/modules/ACL/language/en_us.lang.php index b7217d9676d..f4e400201ad 100755 --- a/modules/ACL/language/en_us.lang.php +++ b/modules/ACL/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/ACLActions/language/en_us.lang.php b/modules/ACLActions/language/en_us.lang.php index 9c9e99082ea..823efe6ffd3 100755 --- a/modules/ACLActions/language/en_us.lang.php +++ b/modules/ACLActions/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/ACLRoles/language/en_us.lang.php b/modules/ACLRoles/language/en_us.lang.php index 44bb25d4e4e..22319a798d3 100755 --- a/modules/ACLRoles/language/en_us.lang.php +++ b/modules/ACLRoles/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/AM_ProjectTemplates/language/en_us.lang.php b/modules/AM_ProjectTemplates/language/en_us.lang.php index d43f3161ac4..98a6128c7ea 100755 --- a/modules/AM_ProjectTemplates/language/en_us.lang.php +++ b/modules/AM_ProjectTemplates/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/AM_TaskTemplates/language/en_us.lang.php b/modules/AM_TaskTemplates/language/en_us.lang.php index f6df3626aaf..b2fd38f64f9 100644 --- a/modules/AM_TaskTemplates/language/en_us.lang.php +++ b/modules/AM_TaskTemplates/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/AOD_Index/language/en_us.lang.php b/modules/AOD_Index/language/en_us.lang.php index 13c22aff634..bbd08301e99 100644 --- a/modules/AOD_Index/language/en_us.lang.php +++ b/modules/AOD_Index/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/AOD_IndexEvent/language/en_us.lang.php b/modules/AOD_IndexEvent/language/en_us.lang.php index d97b63441f2..b69c8010d29 100644 --- a/modules/AOD_IndexEvent/language/en_us.lang.php +++ b/modules/AOD_IndexEvent/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/AOK_KnowledgeBase/language/en_us.lang.php b/modules/AOK_KnowledgeBase/language/en_us.lang.php index 7203738eae6..2ee79d5da6a 100644 --- a/modules/AOK_KnowledgeBase/language/en_us.lang.php +++ b/modules/AOK_KnowledgeBase/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/AOK_Knowledge_Base_Categories/language/en_us.lang.php b/modules/AOK_Knowledge_Base_Categories/language/en_us.lang.php index d1be3ee15ba..352ac2eac79 100644 --- a/modules/AOK_Knowledge_Base_Categories/language/en_us.lang.php +++ b/modules/AOK_Knowledge_Base_Categories/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/AOP_Case_Events/language/en_us.lang.php b/modules/AOP_Case_Events/language/en_us.lang.php index 9b18725fd5a..dceddf55d27 100755 --- a/modules/AOP_Case_Events/language/en_us.lang.php +++ b/modules/AOP_Case_Events/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2016 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/AOP_Case_Updates/language/en_us.lang.php b/modules/AOP_Case_Updates/language/en_us.lang.php index 2087910d8a5..373311f3627 100755 --- a/modules/AOP_Case_Updates/language/en_us.lang.php +++ b/modules/AOP_Case_Updates/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2016 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/AOR_Charts/AOR_Chart.php b/modules/AOR_Charts/AOR_Chart.php index a553e2178ee..28a88650b44 100755 --- a/modules/AOR_Charts/AOR_Chart.php +++ b/modules/AOR_Charts/AOR_Chart.php @@ -569,11 +569,6 @@ private function buildChartHTMLChartJS(array $reportData, array $fields){ $yName = str_replace(' ','_',$y->label) . $this->y_field; switch($this->type){ - case 'polar': - $chartFunction = 'PolarArea'; - $data = $this->getPolarChartData($reportData, $xName,$yName); - $config = $this->getPolarChartConfig(); - break; case 'radar': $chartFunction = 'Radar'; $data = $this->getRadarChartData($reportData, $xName,$yName); @@ -778,17 +773,10 @@ private function getRadarChartData($reportData, $xName,$yName){ return $this->getBarChartData($reportData, $xName,$yName); } - private function getPolarChartData($reportData, $xName,$yName){ - return $this->getPieChartData($reportData, $xName,$yName); - } - private function getRadarChartConfig(){ return array(); } - private function getPolarChartConfig(){ - return $this->getPieChartConfig(); - } private function getPieChartConfig(){ $config = array(); $config['legendTemplate'] = "
    -legend\"><% for (var i=0; i
  • \">     <%if(segments[i].label){%><%=segments[i].label%><%}%>
    • <%}%>
"; diff --git a/modules/AOR_Reports/AOR_Report.php b/modules/AOR_Reports/AOR_Report.php index 3d1743ec1f5..fd99e9c5cfc 100755 --- a/modules/AOR_Reports/AOR_Report.php +++ b/modules/AOR_Reports/AOR_Report.php @@ -107,7 +107,7 @@ function save($check_notify = false) // TODO: process of saveing the fields and conditions is too long so we will have to make some optimization on save_lines functions set_time_limit(3600); - if (empty($this->id)) { + if (empty($this->id) || (isset($_POST['duplicateSave']) && $_POST['duplicateSave'] == 'true')) { unset($_POST['aor_conditions_id']); unset($_POST['aor_fields_id']); } diff --git a/modules/AOR_Reports/Dashlets/AORReportsDashlet/AORReportsDashlet.php b/modules/AOR_Reports/Dashlets/AORReportsDashlet/AORReportsDashlet.php index 8748fd4cc6b..7712ab6a9e3 100644 --- a/modules/AOR_Reports/Dashlets/AORReportsDashlet/AORReportsDashlet.php +++ b/modules/AOR_Reports/Dashlets/AORReportsDashlet/AORReportsDashlet.php @@ -68,7 +68,7 @@ public function display() $dashletTemplate = get_custom_file_if_exists('modules/AOR_Reports/Dashlets/AORReportsDashlet/dashlet.tpl'); $dashletSmarty->assign('MOD', $mod_strings); $dashletSmarty->assign('dashlet_id', $this->id); - $dashletSmarty->assign('report_id', $this->report->id); + $dashletSmarty->assign('report_id', $this->report['id']); $dashletSmarty->assign('chartHTML', $this->getChartHTML()); $dashletSmarty->assign('onlyCharts', $this->onlyCharts); $dashletSmarty->assign('parameters', json_encode(array( diff --git a/modules/AOR_Reports/language/en_us.lang.php b/modules/AOR_Reports/language/en_us.lang.php index 182e16f51ba..420be409213 100755 --- a/modules/AOR_Reports/language/en_us.lang.php +++ b/modules/AOR_Reports/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2016 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/AOR_Scheduled_Reports/language/en_us.lang.php b/modules/AOR_Scheduled_Reports/language/en_us.lang.php index f8325fe2569..8568577173e 100644 --- a/modules/AOR_Scheduled_Reports/language/en_us.lang.php +++ b/modules/AOR_Scheduled_Reports/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/AOS_Contracts/AOS_Contracts.php b/modules/AOS_Contracts/AOS_Contracts.php index cfae25d3cb6..97fd0bddf17 100755 --- a/modules/AOS_Contracts/AOS_Contracts.php +++ b/modules/AOS_Contracts/AOS_Contracts.php @@ -73,8 +73,9 @@ function AOS_Contracts(){ self::__construct(); } - function save($check_notify = FALSE){ - if (empty($this->id)){ + function save($check_notify = false) + { + if (empty($this->id) || (isset($_POST['duplicateSave']) && $_POST['duplicateSave'] == 'true')) { unset($_POST['group_id']); unset($_POST['product_id']); unset($_POST['service_id']); diff --git a/modules/AOS_Invoices/AOS_Invoices.php b/modules/AOS_Invoices/AOS_Invoices.php index c3fd3a5a9d1..21a79801c80 100755 --- a/modules/AOS_Invoices/AOS_Invoices.php +++ b/modules/AOS_Invoices/AOS_Invoices.php @@ -49,13 +49,21 @@ function AOS_Invoices(){ } - function save($check_notify = FALSE){ + function save($check_notify = false) + { global $sugar_config; - if (empty($this->id) || $this->new_with_id){ - if(isset($_POST['group_id'])) unset($_POST['group_id']); - if(isset($_POST['product_id'])) unset($_POST['product_id']); - if(isset($_POST['service_id'])) unset($_POST['service_id']); + if (empty($this->id) || $this->new_with_id + || (isset($_POST['duplicateSave']) && $_POST['duplicateSave'] == 'true')) { + if (isset($_POST['group_id'])) { + unset($_POST['group_id']); + } + if (isset($_POST['product_id'])) { + unset($_POST['product_id']); + } + if (isset($_POST['service_id'])) { + unset($_POST['service_id']); + } if($sugar_config['dbconfig']['db_type'] == 'mssql'){ $this->number = $this->db->getOne("SELECT MAX(CAST(number as INT))+1 FROM aos_invoices"); diff --git a/modules/AOS_PDF_Templates/views/view.edit.php b/modules/AOS_PDF_Templates/views/view.edit.php index f750dc7cb4d..8ab0b6f16f0 100755 --- a/modules/AOS_PDF_Templates/views/view.edit.php +++ b/modules/AOS_PDF_Templates/views/view.edit.php @@ -278,7 +278,7 @@ function displayTMCE(){ convert_urls : false, plugin_insertdate_dateFormat : '{DATE '+df+'}', pagebreak_separator : "", - extended_valid_elements : "textblock", + extended_valid_elements : "textblock,barcode[*]", custom_elements: "textblock", }); @@ -302,7 +302,7 @@ function displayTMCE(){ convert_urls : false, remove_redundant_brs : true, plugin_insertdate_dateFormat : '{DATE '+df+'}', - extended_valid_elements : "textblock", + extended_valid_elements : "textblock,barcode[*]", custom_elements: "textblock", }); diff --git a/modules/AOS_Product_Categories/language/en_us.lang.php b/modules/AOS_Product_Categories/language/en_us.lang.php index 7a538cf01a0..29ad83fc4db 100755 --- a/modules/AOS_Product_Categories/language/en_us.lang.php +++ b/modules/AOS_Product_Categories/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/AOS_Quotes/AOS_Quotes.php b/modules/AOS_Quotes/AOS_Quotes.php index 484ba358ac7..8ace74e657b 100755 --- a/modules/AOS_Quotes/AOS_Quotes.php +++ b/modules/AOS_Quotes/AOS_Quotes.php @@ -44,13 +44,21 @@ function AOS_Quotes(){ } - function save($check_notify = FALSE){ + function save($check_notify = false) + { global $sugar_config; - if (empty($this->id) || $this->new_with_id){ - if(isset($_POST['group_id'])) unset($_POST['group_id']); - if(isset($_POST['product_id'])) unset($_POST['product_id']); - if(isset($_POST['service_id'])) unset($_POST['service_id']); + if (empty($this->id) || $this->new_with_id + || (isset($_POST['duplicateSave']) && $_POST['duplicateSave'] == 'true')) { + if (isset($_POST['group_id'])) { + unset($_POST['group_id']); + } + if (isset($_POST['product_id'])) { + unset($_POST['product_id']); + } + if (isset($_POST['service_id'])) { + unset($_POST['service_id']); + } if($sugar_config['dbconfig']['db_type'] == 'mssql'){ $this->number = $this->db->getOne("SELECT MAX(CAST(number as INT))+1 FROM aos_quotes"); diff --git a/modules/AOW_Actions/language/en_us.lang.php b/modules/AOW_Actions/language/en_us.lang.php index 8d8018b6280..d4fd1cbadd3 100755 --- a/modules/AOW_Actions/language/en_us.lang.php +++ b/modules/AOW_Actions/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/AOW_WorkFlow/AOW_WorkFlow.php b/modules/AOW_WorkFlow/AOW_WorkFlow.php index 8723748375a..8e75e4206ab 100755 --- a/modules/AOW_WorkFlow/AOW_WorkFlow.php +++ b/modules/AOW_WorkFlow/AOW_WorkFlow.php @@ -126,8 +126,9 @@ public function bean_implements($interface) return false; } - function save($check_notify = FALSE){ - if (empty($this->id)){ + function save($check_notify = false) + { + if (empty($this->id) || (isset($_POST['duplicateSave']) && $_POST['duplicateSave'] == 'true')) { unset($_POST['aow_conditions_id']); unset($_POST['aow_actions_id']); } diff --git a/modules/Accounts/Dashlets/MyAccountsDashlet/MyAccountsDashlet.php b/modules/Accounts/Dashlets/MyAccountsDashlet/MyAccountsDashlet.php index b67f8c7fbd3..5193e38ddc3 100755 --- a/modules/Accounts/Dashlets/MyAccountsDashlet/MyAccountsDashlet.php +++ b/modules/Accounts/Dashlets/MyAccountsDashlet/MyAccountsDashlet.php @@ -83,7 +83,7 @@ function MyAccountsDashlet($id, $def = null){ * @param array $lvsParams */ - function process($lvsParams = array()) { + function process($lvsParams = array(), $id = null) { if (isset($this->displayColumns) && array_search('email1', $this->displayColumns) !== false) { $lvsParams['custom_select'] = ', email_address as email1'; $lvsParams['custom_from'] = ' LEFT JOIN email_addr_bean_rel eabr ON eabr.deleted = 0 AND bean_module = \'Accounts\'' diff --git a/modules/Accounts/language/en_us.lang.php b/modules/Accounts/language/en_us.lang.php index fa320695105..6040c694b38 100755 --- a/modules/Accounts/language/en_us.lang.php +++ b/modules/Accounts/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Activities/language/en_us.lang.php b/modules/Activities/language/en_us.lang.php index 6c0f158159c..5ec41bf606e 100755 --- a/modules/Activities/language/en_us.lang.php +++ b/modules/Activities/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Administration/PasswordManager.php b/modules/Administration/PasswordManager.php index cd4a51d1d59..b514f46d867 100755 --- a/modules/Administration/PasswordManager.php +++ b/modules/Administration/PasswordManager.php @@ -156,14 +156,6 @@ function clearPasswordSettings() { $sugar_smarty->assign('saml_enabled_checked', false); -//echo "sugar_config[authenticationClass]: " . $sugar_config['authenticationClass']; -//if (array_key_exists('authenticationClass', $sugar_config) && $sugar_config['authenticationClass'] == 'SAMLAuthenticate') { -// $sugar_smarty->assign('saml_enabled_checked', true); -//} else { -// $sugar_smarty->assign('saml_enabled_checked', false); -//} - - if(!function_exists('mcrypt_cbc')){ $sugar_smarty->assign("LDAP_ENC_KEY_READONLY", 'readonly'); $sugar_smarty->assign("LDAP_ENC_KEY_DESC", $config_strings['LDAP_ENC_KEY_NO_FUNC_DESC']); diff --git a/modules/Administration/PasswordManager.tpl b/modules/Administration/PasswordManager.tpl index b93714826e4..5496fcb2ef7 100755 --- a/modules/Administration/PasswordManager.tpl +++ b/modules/Administration/PasswordManager.tpl @@ -432,7 +432,9 @@ - {if !empty($config.authenticationClass) && $config.authenticationClass == 'SAMLAuthenticate'} + {if !empty($config.authenticationClass) + && ($config.authenticationClass == 'SAMLAuthenticate' + || $config.authenticationClass == 'SAML2Authenticate')} {assign var='saml_enabled_checked' value='CHECKED'} {assign var='saml_display' value='inline'} {else} diff --git a/modules/Administration/UpgradeAccess.php b/modules/Administration/UpgradeAccess.php index db6c88d31a7..15e541fbbe8 100755 --- a/modules/Administration/UpgradeAccess.php +++ b/modules/Administration/UpgradeAccess.php @@ -63,8 +63,8 @@ Options +FollowSymLinks RewriteEngine On RewriteBase {$basePath} - RewriteRule ^cache/jsLanguage/(.._..).js$ index.php?entryPoint=jslang&module=app_strings&lang=$1 [L,QSA] - RewriteRule ^cache/jsLanguage/(\w*)/(.._..).js$ index.php?entryPoint=jslang&module=$1&lang=$2 [L,QSA] + RewriteRule ^cache/jsLanguage/(.._..).js$ index.php?entryPoint=jslang&modulename=app_strings&lang=$1 [L,QSA] + RewriteRule ^cache/jsLanguage/(\w*)/(.._..).js$ index.php?entryPoint=jslang&modulename=$1&lang=$2 [L,QSA] # END SUGARCRM RESTRICTIONS EOQ; diff --git a/modules/Administration/language/en_us.lang.php b/modules/Administration/language/en_us.lang.php index 5b830b7aaad..a2fe2cafa58 100755 --- a/modules/Administration/language/en_us.lang.php +++ b/modules/Administration/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Alerts/language/en_us.lang.php b/modules/Alerts/language/en_us.lang.php index d1a813cbeb8..a4b84ee4bf8 100644 --- a/modules/Alerts/language/en_us.lang.php +++ b/modules/Alerts/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Audit/language/en_us.lang.php b/modules/Audit/language/en_us.lang.php index 10a04512b5f..974c142e98e 100755 --- a/modules/Audit/language/en_us.lang.php +++ b/modules/Audit/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Bugs/language/en_us.lang.php b/modules/Bugs/language/en_us.lang.php index 636a6f3c931..097aab90758 100755 --- a/modules/Bugs/language/en_us.lang.php +++ b/modules/Bugs/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Calendar/Cal.js b/modules/Calendar/Cal.js index 9236d1085ce..0ea776a792f 100755 --- a/modules/Calendar/Cal.js +++ b/modules/Calendar/Cal.js @@ -158,5 +158,5 @@ CAL.dialog_create(date_start,date_end,user_id);}},eventClick:function(calEvent,j var url="index.php?module=Calendar&action=Reschedule&sugar_body_only=true";$.ajax({method:"POST",url:url,data:data})},navLinks:true,navLinkDayClick:function(weekStart,jsEvent){if(global_edit==true){if($(jsEvent.currentTarget).hasClass('fc-day-number')){var dateStr=$(jsEvent.currentTarget).closest('.fc-day-top').attr('data-date');var dateMoment=new moment(dateStr);var url='index.php?module=Calendar&action=index&view=agendaDay&year='+dateMoment.format('YYYY')+'&month='+dateMoment.format('MM')+'&day='+dateMoment.format('DD')+'&hour=0';window.location.href=url;return false;} var dayHeader=$(jsEvent.currentTarget).closest('.fc-day-header');var momentObj=moment($(dayHeader).attr('data-date'));var url='index.php?module=Calendar&action=index&view=agendaDay&year='+momentObj.format('YYYY')+'&month='+momentObj.format('MM')+'&day='+momentObj.format('DD')+'&hour=0';window.location.href=url;return false;}},eventResize:function(event,delta,revertFunc){var url="index.php?module=Calendar&action=Resize&sugar_body_only=true";var hours=Math.floor(event.end.diff(event.start,'minutes')/ 60);var minutes=event.end.diff(event.start,'minutes')%60;var data={"current_module":event.module,"record":event.record,"duration_hours":hours,"duration_minutes":minutes};$.ajax({method:"POST",url:url,data:data})},events:all_events,eventRender:function(event,element){var url='index.php?to_pdf=1&module=Home&action=AdditionalDetailsRetrieve&bean='+event.module+'&id='+event.id;var title='
'+event.title+'
' +'
' -+'
';var body=SUGAR.language.translate('app_strings','LBL_LOADING_PAGE');if($('#cal_module').val()!="Home"){element.qtip({content:{title:{text:title,button:true,},text:body,},events:{render:function(event,api){$.ajax(url).done(function(data){SUGAR.util.globalEval(data);var divCaption="#qtip-"+api.id+"-title";var divBody="#qtip-"+api.id+"-content";if(data.caption!=""){$(divCaption).html(result.caption);} ++'';var body=SUGAR.language.translate('app_strings','LBL_LOADING_PAGE');if($('#cal_module').val()!="Home"&&typeof(event.id)!=='undefined'){element.qtip({content:{title:{text:title,button:true,},text:body,},events:{render:function(event,api){$.ajax(url).done(function(data){SUGAR.util.globalEval(data);var divCaption="#qtip-"+api.id+"-title";var divBody="#qtip-"+api.id+"-content";if(data.caption!=""){$(divCaption).html(result.caption);} api.set('content.text',result.body);}).fail(function(){$(divBody).html(SUGAR.language.translate('app_strings','LBL_EMAIL_ERROR_GENERAL_TITLE'));}).always(function(){});}},position:{my:'bottom left',at:'top left'},show:{solo:true},hide:{event:false},style:{width:224,padding:5,color:'black',textAlign:'left',border:{width:1,radius:3},tip:'bottomLeft',classes:{tooltip:'ui-widget',tip:'ui-widget',title:'ui-widget-header',content:'ui-widget-content'}}});}},}).ready(function(){$(window).resize();});if($('#calendar_title_'+user_id).length==0){var calendar=$("#calendar"+user_id+" > .fc-view-container");var calendarTitle="
";$(calendarTitle).prependTo(calendar);$.ajax({url:"index.php?module=Calendar&action=getUser&record="+user_id,}).done(function(data){data=jQuery.parseJSON(data);$("#calendar_title_"+user_id).html(data.full_name);});}}}); \ No newline at end of file diff --git a/modules/Calendar/Dashlets/CalendarDashlet/CalendarDashlet.en_us.lang.php b/modules/Calendar/Dashlets/CalendarDashlet/CalendarDashlet.en_us.lang.php index 407f1fb0b7f..6ea68060be9 100755 --- a/modules/Calendar/Dashlets/CalendarDashlet/CalendarDashlet.en_us.lang.php +++ b/modules/Calendar/Dashlets/CalendarDashlet/CalendarDashlet.en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Calendar/language/en_us.lang.php b/modules/Calendar/language/en_us.lang.php index 630803befd5..e52791a2e16 100755 --- a/modules/Calendar/language/en_us.lang.php +++ b/modules/Calendar/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Calls/Dashlets/MyCallsDashlet/MyCallsDashlet.php b/modules/Calls/Dashlets/MyCallsDashlet/MyCallsDashlet.php index cd761f504b7..f7c9fdffd79 100755 --- a/modules/Calls/Dashlets/MyCallsDashlet/MyCallsDashlet.php +++ b/modules/Calls/Dashlets/MyCallsDashlet/MyCallsDashlet.php @@ -83,7 +83,7 @@ function MyCallsDashlet($id, $def = null){ self::__construct($id, $def); } - function process($lvsParams = array()) { + function process($lvsParams = array(), $id = null) { global $current_language, $app_list_strings, $current_user; $mod_strings = return_module_language($current_language, 'Calls'); diff --git a/modules/Calls_Reschedule/language/en_us.lang.php b/modules/Calls_Reschedule/language/en_us.lang.php index ac54e983d84..43dd362a015 100755 --- a/modules/Calls_Reschedule/language/en_us.lang.php +++ b/modules/Calls_Reschedule/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/CampaignLog/language/en_us.lang.php b/modules/CampaignLog/language/en_us.lang.php index 6f7ac46228f..eda83573226 100755 --- a/modules/CampaignLog/language/en_us.lang.php +++ b/modules/CampaignLog/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/CampaignTrackers/language/en_us.lang.php b/modules/CampaignTrackers/language/en_us.lang.php index a2874085872..bbb204c9401 100755 --- a/modules/CampaignTrackers/language/en_us.lang.php +++ b/modules/CampaignTrackers/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Campaigns/TrackDetailView.tpl b/modules/Campaigns/TrackDetailView.tpl index a163c02841f..c9d4246f23d 100755 --- a/modules/Campaigns/TrackDetailView.tpl +++ b/modules/Campaigns/TrackDetailView.tpl @@ -83,14 +83,8 @@ {$MOD.LBL_CAMPAIGN_STATUS} {$STATUS} - {$MOD.LBL_TEAM} {$TEAM_NAME} - - -   -   - {$MOD.LBL_CAMPAIGN_START_DATE} {$START_DATE} diff --git a/modules/Campaigns/language/en_us.lang.php b/modules/Campaigns/language/en_us.lang.php index 261f3347fe4..4ab808a8bc5 100755 --- a/modules/Campaigns/language/en_us.lang.php +++ b/modules/Campaigns/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Campaigns/metadata/detailviewdefs.php b/modules/Campaigns/metadata/detailviewdefs.php index 2434ea495b5..f594d4bcdb4 100755 --- a/modules/Campaigns/metadata/detailviewdefs.php +++ b/modules/Campaigns/metadata/detailviewdefs.php @@ -55,10 +55,10 @@ 'customCode' => '', ), 1 => array( - 'customCode' => '{if $bean->aclAccess("edit")}{/if}' + 'customCode' => '{if $bean->aclAccess("edit")}{/if}' ), 2 => array( - 'customCode' => '{if $bean->aclAccess("delete")}{/if} ' + 'customCode' => '{if $bean->aclAccess("delete")}{/if} ' ), 3 => array ( diff --git a/modules/Cases/Case.php b/modules/Cases/Case.php index 6763970ad7a..b31c4d8d1bf 100755 --- a/modules/Cases/Case.php +++ b/modules/Cases/Case.php @@ -345,7 +345,8 @@ public function build_generic_where_clause($the_query_string) public function set_notification_body($xtpl, $case) { global $app_list_strings; - + + $xtpl->assign('CASE_NUMBER', $case->case_number); $xtpl->assign('CASE_SUBJECT', $case->name); $xtpl->assign( 'CASE_PRIORITY', diff --git a/modules/Cases/language/en_us.lang.php b/modules/Cases/language/en_us.lang.php index 8b75a985b39..d8e50dfd467 100755 --- a/modules/Cases/language/en_us.lang.php +++ b/modules/Cases/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Charts/Dashlets/CampaignROIChartDashlet/CampaignROIChartDashlet.en_us.lang.php b/modules/Charts/Dashlets/CampaignROIChartDashlet/CampaignROIChartDashlet.en_us.lang.php index 01776c8c6dd..d2446f8ca4b 100755 --- a/modules/Charts/Dashlets/CampaignROIChartDashlet/CampaignROIChartDashlet.en_us.lang.php +++ b/modules/Charts/Dashlets/CampaignROIChartDashlet/CampaignROIChartDashlet.en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.en_us.lang.php b/modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.en_us.lang.php index f100793bb32..0411ad05812 100755 --- a/modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.en_us.lang.php +++ b/modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.en_us.lang.php b/modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.en_us.lang.php index 362b175814f..0b5f5a5e106 100755 --- a/modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.en_us.lang.php +++ b/modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.en_us.lang.php b/modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.en_us.lang.php index 706c911c4ea..4c74683e3d8 100755 --- a/modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.en_us.lang.php +++ b/modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.en_us.lang.php b/modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.en_us.lang.php index 8aade35ba95..e296f6b5cca 100755 --- a/modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.en_us.lang.php +++ b/modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.en_us.lang.php b/modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.en_us.lang.php index fa9e46399a4..d7bc114280e 100755 --- a/modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.en_us.lang.php +++ b/modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Charts/language/en_us.lang.php b/modules/Charts/language/en_us.lang.php index 317f3ca2597..5a018cd1c21 100755 --- a/modules/Charts/language/en_us.lang.php +++ b/modules/Charts/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Configurator/language/en_us.lang.php b/modules/Configurator/language/en_us.lang.php index 4f0a0bca263..63093b2175f 100755 --- a/modules/Configurator/language/en_us.lang.php +++ b/modules/Configurator/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Connectors/connectors/sources/ext/rest/insideview/language/en_us.lang.php b/modules/Connectors/connectors/sources/ext/rest/insideview/language/en_us.lang.php index 51b826e6fae..5f558190053 100755 --- a/modules/Connectors/connectors/sources/ext/rest/insideview/language/en_us.lang.php +++ b/modules/Connectors/connectors/sources/ext/rest/insideview/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Connectors/language/en_us.lang.php b/modules/Connectors/language/en_us.lang.php index a6f940d4758..1f8d054a4f1 100755 --- a/modules/Connectors/language/en_us.lang.php +++ b/modules/Connectors/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM Community Edition is a customer relationship management program developed by * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Contacts/Contact.php b/modules/Contacts/Contact.php index 2b326c4049e..99ec95643cd 100755 --- a/modules/Contacts/Contact.php +++ b/modules/Contacts/Contact.php @@ -422,10 +422,12 @@ function fill_in_additional_detail_fields() { // Set campaign name if there is a campaign id if( !empty($this->campaign_id)){ - $camp = new Campaign(); - $where = "campaigns.id='{$this->campaign_id}'"; - $campaign_list = $camp->get_full_list("campaigns.name", $where, true); - $this->campaign_name = $campaign_list[0]->name; + $camp = new Campaign(); + $where = "campaigns.id='{$this->campaign_id}'"; + $campaign_list = $camp->get_full_list("campaigns.name", $where, true); + if (!empty($campaign_list) && !empty($campaign_list[0]->name)) { + $this->campaign_name = $campaign_list[0]->name; + } } } diff --git a/modules/Contacts/language/en_us.lang.php b/modules/Contacts/language/en_us.lang.php index eb1adfb3281..e21750fc9cf 100755 --- a/modules/Contacts/language/en_us.lang.php +++ b/modules/Contacts/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Currencies/language/en_us.lang.php b/modules/Currencies/language/en_us.lang.php index c283c16b19e..0d6d4326a50 100755 --- a/modules/Currencies/language/en_us.lang.php +++ b/modules/Currencies/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Delegates/language/en_us.lang.php b/modules/Delegates/language/en_us.lang.php index a387385eb7d..6dc558f7ece 100755 --- a/modules/Delegates/language/en_us.lang.php +++ b/modules/Delegates/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/DocumentRevisions/language/en_us.lang.php b/modules/DocumentRevisions/language/en_us.lang.php index 8b2428fc7d6..f7b54c4ca4e 100755 --- a/modules/DocumentRevisions/language/en_us.lang.php +++ b/modules/DocumentRevisions/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Documents/language/en_us.lang.php b/modules/Documents/language/en_us.lang.php index 0e8ab6cfd58..04ef440a4a7 100755 --- a/modules/Documents/language/en_us.lang.php +++ b/modules/Documents/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/DynamicFields/language/en_us.lang.php b/modules/DynamicFields/language/en_us.lang.php index b19891f26bf..9763154b989 100755 --- a/modules/DynamicFields/language/en_us.lang.php +++ b/modules/DynamicFields/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/EAPM/language/en_us.lang.php b/modules/EAPM/language/en_us.lang.php index b3f697587aa..80aeca93286 100755 --- a/modules/EAPM/language/en_us.lang.php +++ b/modules/EAPM/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/EmailAddresses/language/en_us.lang.php b/modules/EmailAddresses/language/en_us.lang.php index aa584785eb7..6016bc8c6ff 100755 --- a/modules/EmailAddresses/language/en_us.lang.php +++ b/modules/EmailAddresses/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/EmailMan/language/en_us.lang.php b/modules/EmailMan/language/en_us.lang.php index 9b530480305..f930d9f00f4 100755 --- a/modules/EmailMan/language/en_us.lang.php +++ b/modules/EmailMan/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/EmailMarketing/language/en_us.lang.php b/modules/EmailMarketing/language/en_us.lang.php index a4254cda15c..b39edb2f89e 100755 --- a/modules/EmailMarketing/language/en_us.lang.php +++ b/modules/EmailMarketing/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/EmailTemplates/language/en_us.lang.php b/modules/EmailTemplates/language/en_us.lang.php index f9613ab6112..77cb51a29c0 100755 --- a/modules/EmailTemplates/language/en_us.lang.php +++ b/modules/EmailTemplates/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Emails/javascript/ajax.js b/modules/Emails/javascript/ajax.js index 58c204b5af8..c09e1adc8a3 100755 --- a/modules/Emails/javascript/ajax.js +++ b/modules/Emails/javascript/ajax.js @@ -688,20 +688,13 @@ AjaxObject.detailView = { shadow : true }); - SED.quickCreateDialog.renderEvent.subscribe(function() { - var viewH = YAHOO.util.Dom.getViewportHeight(); - var contH = 0; - for (var i in this.body.childNodes) { - if (this.body.childNodes[i].clientHeight) { - contH += this.body.childNodes[i].clientHeight; - } else if (this.body.childNodes[i].offsetHeight) { - contH += this.body.childNodes[i].offsetHeight; - } // if - } - this.body.style.width = "800px"; - this.body.style.height = (viewH - 75 > contH ? (contH + 10) : (viewH - 75)) + "px"; - this.body.style.overflow = "auto"; - }, SED.quickCreateDialog); + SED.quickCreateDialog.renderEvent.subscribe(function () { + var viewH = YAHOO.util.Dom.getViewportHeight(); + var contH = 500; + this.body.style.width = "800px"; + this.body.style.height = (viewH - 75 > contH ? (contH + 10) : (viewH - 75)) + "px"; + this.body.style.overflow = "auto"; + }, SED.quickCreateDialog); SED.quickCreateDialog.hideEvent.subscribe(function(){ var qsFields = YAHOO.util.Dom.getElementsByClassName('.sqsEnabled', null, this.body); diff --git a/modules/Emails/language/en_us.lang.php b/modules/Emails/language/en_us.lang.php index 633166b4703..a96901d8b4c 100755 --- a/modules/Emails/language/en_us.lang.php +++ b/modules/Emails/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Employees/language/en_us.lang.php b/modules/Employees/language/en_us.lang.php index a8b5a3e53d2..5ee5d4f460b 100755 --- a/modules/Employees/language/en_us.lang.php +++ b/modules/Employees/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/FP_Event_Locations/language/en_us.lang.php b/modules/FP_Event_Locations/language/en_us.lang.php index 3c8343a3a2a..e5b8d0acb93 100755 --- a/modules/FP_Event_Locations/language/en_us.lang.php +++ b/modules/FP_Event_Locations/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/FP_events/language/en_us.lang.php b/modules/FP_events/language/en_us.lang.php index 931ebedb32b..cde99a8b293 100755 --- a/modules/FP_events/language/en_us.lang.php +++ b/modules/FP_events/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Favorites/language/en_us.lang.php b/modules/Favorites/language/en_us.lang.php index 91c1a125af6..054561e11ac 100755 --- a/modules/Favorites/language/en_us.lang.php +++ b/modules/Favorites/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2016 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Groups/language/en_us.lang.php b/modules/Groups/language/en_us.lang.php index f46558d1e30..358f5784e67 100755 --- a/modules/Groups/language/en_us.lang.php +++ b/modules/Groups/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Help/index.php b/modules/Help/index.php index 947061394d3..72e120376ce 100755 --- a/modules/Help/index.php +++ b/modules/Help/index.php @@ -48,4 +48,4 @@ ?> Sorry! The module has not yet been implemented.

-Stay tuned for an upcoming release of SugarCRM! \ No newline at end of file +Stay tuned for an upcoming release of SuiteCRM! \ No newline at end of file diff --git a/modules/Help/language/en_us.lang.php b/modules/Help/language/en_us.lang.php index b8cffc20a1e..df85e35e809 100755 --- a/modules/Help/language/en_us.lang.php +++ b/modules/Help/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/History/language/en_us.lang.php b/modules/History/language/en_us.lang.php index daca8ae7566..267604f83e7 100755 --- a/modules/History/language/en_us.lang.php +++ b/modules/History/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Home/About.php b/modules/Home/About.php index e1a7dfd801f..8788ced39c1 100755 --- a/modules/Home/About.php +++ b/modules/Home/About.php @@ -116,7 +116,7 @@

diff --git a/modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.en_us.lang.php b/modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.en_us.lang.php index f39a521a9a4..550fc7ce30d 100755 --- a/modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.en_us.lang.php +++ b/modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Home/Dashlets/InvadersDashlet/InvadersDashlet.en_us.lang.php b/modules/Home/Dashlets/InvadersDashlet/InvadersDashlet.en_us.lang.php index a18cbecd79a..ed206c6de01 100755 --- a/modules/Home/Dashlets/InvadersDashlet/InvadersDashlet.en_us.lang.php +++ b/modules/Home/Dashlets/InvadersDashlet/InvadersDashlet.en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Home/Dashlets/JotPadDashlet/JotPadDashlet.en_us.lang.php b/modules/Home/Dashlets/JotPadDashlet/JotPadDashlet.en_us.lang.php index 50da550ee45..235b9857aef 100755 --- a/modules/Home/Dashlets/JotPadDashlet/JotPadDashlet.en_us.lang.php +++ b/modules/Home/Dashlets/JotPadDashlet/JotPadDashlet.en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Home/language/en_us.lang.php b/modules/Home/language/en_us.lang.php index fee65277439..07b394e7478 100755 --- a/modules/Home/language/en_us.lang.php +++ b/modules/Home/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Import/Importer.php b/modules/Import/Importer.php index 3bf99215bfd..8743b33346e 100755 --- a/modules/Import/Importer.php +++ b/modules/Import/Importer.php @@ -436,32 +436,30 @@ protected function importRow($row) protected function sanitizeFieldValueByType($rowValue, $fieldDef, $defaultRowValue, $focus, $fieldTranslated) { + $fieldtype = $fieldDef['type']; global $mod_strings, $app_list_strings; - switch ($fieldDef['type']) + switch ($fieldtype) { case 'enum': + case 'dynamicenum': case 'multienum': - if ( isset($fieldDef['type']) && $fieldDef['type'] == "multienum" ) - $returnValue = $this->ifs->multienum($rowValue,$fieldDef); - else - $returnValue = $this->ifs->enum($rowValue,$fieldDef); + $returnValue = $this->ifs->$fieldtype($rowValue, $fieldDef); + // try the default value on fail - if ( !$returnValue && !empty($defaultRowValue) ) - { - if ( isset($fieldDef['type']) && $fieldDef['type'] == "multienum" ) - $returnValue = $this->ifs->multienum($defaultRowValue,$fieldDef); - else - $returnValue = $this->ifs->enum($defaultRowValue,$fieldDef); + if (!$returnValue && !empty($defaultRowValue)) { + $returnValue = $this->ifs->$fieldtype($defaultRowValue, $fieldDef); } - if ( $returnValue === FALSE ) - { - $this->importSource->writeError($mod_strings['LBL_ERROR_NOT_IN_ENUM'] . implode(",",$app_list_strings[$fieldDef['options']]), $fieldTranslated,$rowValue); - return FALSE; + + if ($returnValue === false) { + $this->importSource->writeError( + $mod_strings['LBL_ERROR_NOT_IN_ENUM'] . implode(",", $app_list_strings[$fieldDef['options']]), + $fieldTranslated, + $rowValue + ); + return false; } - else - return $returnValue; + return $returnValue; - break; case 'relate': case 'parent': $returnValue = $this->ifs->relate($rowValue, $fieldDef, $focus, empty($defaultRowValue)); @@ -482,14 +480,13 @@ protected function sanitizeFieldValueByType($rowValue, $fieldDef, $defaultRowVal return $rowValue; break; default: - $fieldtype = $fieldDef['type']; $returnValue = $this->ifs->$fieldtype($rowValue, $fieldDef, $focus); // try the default value on fail if ( !$returnValue && !empty($defaultRowValue) ) $returnValue = $this->ifs->$fieldtype($defaultRowValue,$fieldDef, $focus); if ( !$returnValue ) { - $this->importSource->writeError($mod_strings['LBL_ERROR_INVALID_'.strtoupper($fieldDef['type'])],$fieldTranslated,$rowValue,$focus); + $this->importSource->writeError($mod_strings['LBL_ERROR_INVALID_'.strtoupper($fieldtype)],$fieldTranslated,$rowValue,$focus); return FALSE; } return $returnValue; diff --git a/modules/Import/language/en_us.lang.php b/modules/Import/language/en_us.lang.php index c66f7a27edd..59328346674 100755 --- a/modules/Import/language/en_us.lang.php +++ b/modules/Import/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Import/views/ImportView.php b/modules/Import/views/ImportView.php index c954476b45c..8b588916b3e 100755 --- a/modules/Import/views/ImportView.php +++ b/modules/Import/views/ImportView.php @@ -63,6 +63,15 @@ public function __construct($bean = null, $view_object_map = array()) } + public function preDisplay() { + if (!is_file('cache/jsLanguage/Import/' . $GLOBALS['current_language'] . '.js')) { + require_once ('include/language/jsLanguage.php'); + jsLanguage::createModuleStringsCache('Import', $GLOBALS['current_language']); + } + echo ''; + parent::preDisplay(); + } + /** * @see SugarView::getMenu() */ diff --git a/modules/InboundEmail/language/en_us.lang.php b/modules/InboundEmail/language/en_us.lang.php index 392ecd602da..216901113c6 100755 --- a/modules/InboundEmail/language/en_us.lang.php +++ b/modules/InboundEmail/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/LabelEditor/language/en_us.lang.php b/modules/LabelEditor/language/en_us.lang.php index e2df26ec33b..0d68deb24f4 100755 --- a/modules/LabelEditor/language/en_us.lang.php +++ b/modules/LabelEditor/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Leads/language/en_us.lang.php b/modules/Leads/language/en_us.lang.php index f374fd0b3c4..94bfff8f327 100755 --- a/modules/Leads/language/en_us.lang.php +++ b/modules/Leads/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/MailMerge/language/en_us.lang.php b/modules/MailMerge/language/en_us.lang.php index e38f652ab0e..32043984e01 100755 --- a/modules/MailMerge/language/en_us.lang.php +++ b/modules/MailMerge/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Meetings/Dashlets/MyMeetingsDashlet/MyMeetingsDashlet.php b/modules/Meetings/Dashlets/MyMeetingsDashlet/MyMeetingsDashlet.php index f3dfb3a820f..5615468bc79 100755 --- a/modules/Meetings/Dashlets/MyMeetingsDashlet/MyMeetingsDashlet.php +++ b/modules/Meetings/Dashlets/MyMeetingsDashlet/MyMeetingsDashlet.php @@ -88,7 +88,7 @@ function MyMeetingsDashlet($id, $def = null){ self::__construct($id, $def); } - function process($lvsParams = array()) { + function process($lvsParams = array(), $id = null) { global $current_language, $app_list_strings, $current_user; $mod_strings = return_module_language($current_language, 'Meetings'); diff --git a/modules/Meetings/language/en_us.lang.php b/modules/Meetings/language/en_us.lang.php index 7c497dbe3ae..23521bb53e3 100755 --- a/modules/Meetings/language/en_us.lang.php +++ b/modules/Meetings/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/MergeRecords/language/en_us.lang.php b/modules/MergeRecords/language/en_us.lang.php index ba8e034cc9b..ca8b6e24e90 100755 --- a/modules/MergeRecords/language/en_us.lang.php +++ b/modules/MergeRecords/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/MySettings/language/en_us.lang.php b/modules/MySettings/language/en_us.lang.php index d6d132c4723..b48800cfbaf 100755 --- a/modules/MySettings/language/en_us.lang.php +++ b/modules/MySettings/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Notes/language/en_us.lang.php b/modules/Notes/language/en_us.lang.php index e41653f016b..0358836c0c5 100755 --- a/modules/Notes/language/en_us.lang.php +++ b/modules/Notes/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/OAuthKeys/language/en_us.lang.php b/modules/OAuthKeys/language/en_us.lang.php index 76a8619749d..42e28bd372b 100755 --- a/modules/OAuthKeys/language/en_us.lang.php +++ b/modules/OAuthKeys/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/OAuthTokens/language/en_us.lang.php b/modules/OAuthTokens/language/en_us.lang.php index 350c2b367a1..f3eb5d26036 100755 --- a/modules/OAuthTokens/language/en_us.lang.php +++ b/modules/OAuthTokens/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Opportunities/Dashlets/MyOpportunitiesDashlet/MyOpportunitiesDashlet.php b/modules/Opportunities/Dashlets/MyOpportunitiesDashlet/MyOpportunitiesDashlet.php index a0e457add32..911386889f7 100755 --- a/modules/Opportunities/Dashlets/MyOpportunitiesDashlet/MyOpportunitiesDashlet.php +++ b/modules/Opportunities/Dashlets/MyOpportunitiesDashlet/MyOpportunitiesDashlet.php @@ -78,7 +78,7 @@ function MyOpportunitiesDashlet($id, $def = null){ //4.5.0g fix for upgrade issue where user_preferences table still refer to column as 'amount' //Bug fix for dashlet issue with amount_us and amount fields. - function process($lvsParams = array()) { + function process($lvsParams = array(), $id = null) { // if(!empty($this->displayColumns)) { // if(array_search('amount', $this->displayColumns)) { // $this->displayColumns[array_search('amount', $this->displayColumns)] = 'amount_usdollar'; diff --git a/modules/Opportunities/language/en_us.lang.php b/modules/Opportunities/language/en_us.lang.php index b16e804c340..debb7036dd3 100755 --- a/modules/Opportunities/language/en_us.lang.php +++ b/modules/Opportunities/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/OptimisticLock/language/en_us.lang.php b/modules/OptimisticLock/language/en_us.lang.php index 106e719304a..58429006cc3 100755 --- a/modules/OptimisticLock/language/en_us.lang.php +++ b/modules/OptimisticLock/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/OutboundEmailAccounts/language/en_us.lang.php b/modules/OutboundEmailAccounts/language/en_us.lang.php index dd6a76ab559..f2427d9e519 100644 --- a/modules/OutboundEmailAccounts/language/en_us.lang.php +++ b/modules/OutboundEmailAccounts/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Project/language/en_us.lang.php b/modules/Project/language/en_us.lang.php index 7cf96d32945..86e792546c1 100755 --- a/modules/Project/language/en_us.lang.php +++ b/modules/Project/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/ProjectTask/language/en_us.lang.php b/modules/ProjectTask/language/en_us.lang.php index 71a878653b9..c8b3f7c2ad1 100755 --- a/modules/ProjectTask/language/en_us.lang.php +++ b/modules/ProjectTask/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/ProspectLists/language/en_us.lang.php b/modules/ProspectLists/language/en_us.lang.php index be653f9c093..728d858a2e8 100755 --- a/modules/ProspectLists/language/en_us.lang.php +++ b/modules/ProspectLists/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Prospects/language/en_us.lang.php b/modules/Prospects/language/en_us.lang.php index 89d48c8c4d7..34c7aebcb56 100755 --- a/modules/Prospects/language/en_us.lang.php +++ b/modules/Prospects/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2016 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Relationships/language/en_us.lang.php b/modules/Relationships/language/en_us.lang.php index f2159a48f5c..5a3be3e2099 100755 --- a/modules/Relationships/language/en_us.lang.php +++ b/modules/Relationships/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Releases/language/en_us.lang.php b/modules/Releases/language/en_us.lang.php index 5068dcd9df6..39c5c73b934 100755 --- a/modules/Releases/language/en_us.lang.php +++ b/modules/Releases/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/ResourceCalendar/language/en_us.lang.php b/modules/ResourceCalendar/language/en_us.lang.php index e2d8dfc52ef..fcd8f9422d6 100644 --- a/modules/ResourceCalendar/language/en_us.lang.php +++ b/modules/ResourceCalendar/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Roles/language/en_us.lang.php b/modules/Roles/language/en_us.lang.php index 7ad67a8f39e..fb2d5324577 100755 --- a/modules/Roles/language/en_us.lang.php +++ b/modules/Roles/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/SavedSearch/language/en_us.lang.php b/modules/SavedSearch/language/en_us.lang.php index 26efb73c66c..ee286a61412 100755 --- a/modules/SavedSearch/language/en_us.lang.php +++ b/modules/SavedSearch/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Schedulers/language/en_us.lang.php b/modules/Schedulers/language/en_us.lang.php index 2b2d239103c..022acd4eb87 100755 --- a/modules/Schedulers/language/en_us.lang.php +++ b/modules/Schedulers/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2017 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/SchedulersJobs/language/en_us.lang.php b/modules/SchedulersJobs/language/en_us.lang.php index ef520261241..af7cc456b88 100755 --- a/modules/SchedulersJobs/language/en_us.lang.php +++ b/modules/SchedulersJobs/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/SecurityGroups/SecurityGroup.php b/modules/SecurityGroups/SecurityGroup.php index 17b4f506565..eda020329c7 100755 --- a/modules/SecurityGroups/SecurityGroup.php +++ b/modules/SecurityGroups/SecurityGroup.php @@ -607,15 +607,18 @@ public function getSecurityModules() continue; } - //$security_modules[$row['rhs_module']] = $row['rhs_module']; - $security_modules[$row['rhs_module']] = $app_list_strings['moduleList'][$row['rhs_module']];//rost fix + if (isset($app_list_strings['moduleList'][$row['rhs_module']])) { + $security_modules[$row['rhs_module']] = $app_list_strings['moduleList'][$row['rhs_module']];//rost fix + } + } else { if (in_array($row['lhs_module'], $module_blacklist)) { continue; } - //$security_modules[$row['lhs_module']] = $row['lhs_module']; - $security_modules[$row['lhs_module']] = $app_list_strings['moduleList'][$row['lhs_module']];//rost fix + if (isset($app_list_strings['moduleList'][$row['lhs_module']])) { + $security_modules[$row['lhs_module']] = $app_list_strings['moduleList'][$row['lhs_module']]; + } } } diff --git a/modules/Spots/Dashlets/SpotsDashlet/SpotsDashlet.en_us.lang.php b/modules/Spots/Dashlets/SpotsDashlet/SpotsDashlet.en_us.lang.php index 3a370908396..53d19d35645 100755 --- a/modules/Spots/Dashlets/SpotsDashlet/SpotsDashlet.en_us.lang.php +++ b/modules/Spots/Dashlets/SpotsDashlet/SpotsDashlet.en_us.lang.php @@ -3,7 +3,7 @@ * SugarCRM Community Edition is a customer relationship management program developed by * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Spots/language/en_us.lang.php b/modules/Spots/language/en_us.lang.php index 96edf7ac303..0ada5f3f18d 100755 --- a/modules/Spots/language/en_us.lang.php +++ b/modules/Spots/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2016 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Studio/language/en_us.Portal.html b/modules/Studio/language/en_us.Portal.html index 449c809d3ed..44bf0e76906 100755 --- a/modules/Studio/language/en_us.Portal.html +++ b/modules/Studio/language/en_us.Portal.html @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Studio/language/en_us.lang.php b/modules/Studio/language/en_us.lang.php index d038992e891..6dae0cbca9b 100755 --- a/modules/Studio/language/en_us.lang.php +++ b/modules/Studio/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/SugarFeed/Dashlets/SugarFeedDashlet/SugarFeedDashlet.php b/modules/SugarFeed/Dashlets/SugarFeedDashlet/SugarFeedDashlet.php index a14a041a656..c3bb8320b50 100644 --- a/modules/SugarFeed/Dashlets/SugarFeedDashlet/SugarFeedDashlet.php +++ b/modules/SugarFeed/Dashlets/SugarFeedDashlet/SugarFeedDashlet.php @@ -137,7 +137,7 @@ function SugarFeedDashlet($id, $def = null){ self::__construct($id, $def); } - function process($lvsParams = array()) { + function process($lvsParams = array(), $id = null) { global $current_user; $currentSearchFields = array(); diff --git a/modules/Tasks/language/en_us.lang.php b/modules/Tasks/language/en_us.lang.php index fbaed83092d..9d7387282b3 100755 --- a/modules/Tasks/language/en_us.lang.php +++ b/modules/Tasks/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/TemplateSectionLine/language/en_us.lang.php b/modules/TemplateSectionLine/language/en_us.lang.php index 4be1a1e5b24..7526ac232f0 100644 --- a/modules/TemplateSectionLine/language/en_us.lang.php +++ b/modules/TemplateSectionLine/language/en_us.lang.php @@ -4,7 +4,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Trackers/language/en_us.lang.php b/modules/Trackers/language/en_us.lang.php index 3b1bfed7974..945e4c576a7 100755 --- a/modules/Trackers/language/en_us.lang.php +++ b/modules/Trackers/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd. - * Copyright (C) 2011 - 2014 Salesagility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Users/language/en_us.lang.php b/modules/Users/language/en_us.lang.php index 7d74d83f85b..5f0510f4303 100755 --- a/modules/Users/language/en_us.lang.php +++ b/modules/Users/language/en_us.lang.php @@ -5,7 +5,7 @@ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd. - * Copyright (C) 2011 - 2017 SalesAgility Ltd. + * Copyright (C) 2011 - 2018 SalesAgility Ltd. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License version 3 as published by the diff --git a/modules/Users/tpls/wizard.tpl b/modules/Users/tpls/wizard.tpl index 549f7bb270a..34b9e9caab6 100755 --- a/modules/Users/tpls/wizard.tpl +++ b/modules/Users/tpls/wizard.tpl @@ -353,14 +353,14 @@
{$MOD.LBL_WIZARD_FINISH9}
{$MOD.LBL_WIZARD_FINISH10}
- {$MOD.LBL_WIZARD_FINISH11}
{$MOD.LBL_WIZARD_FINISH12} + {$MOD.LBL_WIZARD_FINISH11}
{$MOD.LBL_WIZARD_FINISH12}
{else} - {$MOD.LBL_WIZARD_FINISH11}
{$MOD.LBL_WIZARD_FINISH12} + {$MOD.LBL_WIZARD_FINISH11}
{$MOD.LBL_WIZARD_FINISH12}
{$MOD.LBL_WIZARD_FINISH14}
{$MOD.LBL_WIZARD_FINISH15}
- {$MOD.LBL_WIZARD_FINISH18}
{$MOD.LBL_WIZARD_FINISH19} + {$MOD.LBL_WIZARD_FINISH18}
{$MOD.LBL_WIZARD_FINISH19}
{/if} diff --git a/modules/jjwg_Areas/views/view.area_detail_map.php b/modules/jjwg_Areas/views/view.area_detail_map.php index 9b467010d0c..05adebbee16 100755 --- a/modules/jjwg_Areas/views/view.area_detail_map.php +++ b/modules/jjwg_Areas/views/view.area_detail_map.php @@ -60,7 +60,7 @@ function display() { } - + + + +