Merge branch develop

.gitignore

@@ -54,5 +54,7 @@ Session.vim
 # Windows
 Thumbs.db
 Desktop.ini
+.DS_Store
+.DS_Store?
 # Disytel
 lang_cmp.php

README.md

@@ -1,4 +1,4 @@
-##SuiteCRM 7.0.2
+##SuiteCRM 7.1.0
 
 ### What's in this repository ###
 
@@ -26,10 +26,7 @@ The following links offer various ways to view, contribute and collaborate to th
 ### Development Roadmap ###
 
 #### Advanced OpenWorkflow ####
-+ Work with related modules(SalesAgility) 
-+ New modified only(SalesAgility) 
 + Approvals(Unassigned)*
-+ Field change triggers(Unassigned)*
 
 #### Advanced OpenReports ####
 + Charts(SalesAgility) 
@@ -43,7 +40,6 @@ The following links offer various ways to view, contribute and collaborate to th
 + Integration with WordPress & Drupal(Unassigned)*
 
 #### Advanced OpenDiscovery ####
-+ Zend only(SalesAgility) 
 + Solr integration(Unassigned)*
 
 (*) Unassigned - Available for collaborators to be assigned to this requirement and develop it for future releases.

custom/Extension/application/Ext/Extensions/aow_workflow.php

@@ -22,4 +22,4 @@
  * @author SalesAgility <[email protected]>
  */
 
-$extensions["aowactions"] =  array("section" => "aow_actions",	  "extdir" => "Actions", "file" => 'actions.ext.php', "module" => "AOW_Actions");
+$extensions["aow"] =  array("section" => "aow_actions",	  "extdir" => "Actions", "file" => 'actions.ext.php', "module" => "AOW_Actions");

custom/Extension/application/Ext/Include/AdvancedOpenDiscovery.php

@@ -0,0 +1,14 @@
+<?php 
+ //WARNING: The contents of this file are auto-generated
+$beanList['AOD_IndexEvent'] = 'AOD_IndexEvent';
+$beanFiles['AOD_IndexEvent'] = 'modules/AOD_IndexEvent/AOD_IndexEvent.php';
+$modules_exempt_from_availability_check['AOD_IndexEvent'] = 'AOD_IndexEvent';
+$report_include_modules['AOD_IndexEvent'] = 'AOD_IndexEvent';
+$modInvisList[] = 'AOD_IndexEvent';
+$beanList['AOD_Index'] = 'AOD_Index';
+$beanFiles['AOD_Index'] = 'modules/AOD_Index/AOD_Index.php';
+$modules_exempt_from_availability_check['AOD_Index'] = 'AOD_Index';
+$report_include_modules['AOD_Index'] = 'AOD_Index';
+$modInvisList[] = 'AOD_Index';
+
+?>

custom/Extension/application/Ext/Language/en_us.AdvancedOpenDiscovery.php

@@ -0,0 +1,39 @@
+<?php
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
+ * 
+ * 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
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address [email protected].
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+$app_list_strings['moduleList']['AOD_IndexEvent'] = 'Index Event';
+$app_list_strings['moduleList']['AOD_Index'] = 'Index';

custom/Extension/application/Ext/Language/en_us.AdvancedOpenPortal.php

@@ -45,10 +45,8 @@
       'Closed_Rejected' => 'Rejected',
       'Closed_Duplicate' => 'Duplicate',
   );
-
-$app_list_strings['aop_distribution_method'] =
+$app_list_strings['contact_portal_user_type_dom'] =
     array (
-        'singleUser' => 'Single User',
-        'roundRobin' => 'Round Robin',
-        'leastBusy' => 'Least Busy',
+        'Single' => 'Single user',
+        'Account' => 'Account user',
     );

custom/Extension/application/Ext/Language/en_us.AdvancedOpenWorkflow.php

@@ -3,7 +3,7 @@
  * Advanced OpenWorkflow, Automating SugarCRM.
  * @package Advanced OpenWorkflow for SugarCRM
  * @copyright SalesAgility Ltd http://www.salesagility.com
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -50,8 +50,10 @@
 $app_list_strings['aow_condition_operator_list']['OR'] = 'OR';
 $app_list_strings['aow_condition_type_list']['Value'] = 'Value';
 $app_list_strings['aow_condition_type_list']['Field'] = 'Field';
+$app_list_strings['aow_condition_type_list']['Any_Change'] = 'Any Change';
+$app_list_strings['aow_condition_type_list']['SecurityGroup'] = 'In SecurityGroup';
 $app_list_strings['aow_condition_type_list']['Date'] = 'Date';
-$app_list_strings['aow_condition_type_list']['Multi'] = 'Multiple';
+$app_list_strings['aow_condition_type_list']['Multi'] = 'One of';
 $app_list_strings['aow_action_type_list']['Value'] = 'Value';
 $app_list_strings['aow_action_type_list']['Field'] = 'Field';
 $app_list_strings['aow_action_type_list']['Date'] = 'Date';
@@ -79,5 +81,10 @@
 $app_list_strings['aow_email_type_list']['Record Email'] = 'Record Email';
 $app_list_strings['aow_email_type_list']['Specify User'] = 'User';
 $app_list_strings['aow_email_type_list']['Related Field'] = 'Related Field';
+$app_list_strings['aow_run_on_list']['All_Records'] = 'All Records';
+$app_list_strings['aow_run_on_list']['New_Records'] = 'New Records';
+$app_list_strings['aow_run_on_list']['Modified_Records'] = 'Modified Records';
+
+
 
 

custom/Extension/application/Ext/Language/en_us.Reschedule.php

@@ -23,19 +23,9 @@
  * @author Salesagility Ltd <[email protected]>
  */
 
-$app_list_strings['call_reschedule_dom'][''] = '';
-$app_list_strings['call_reschedule_dom']['Out of Office'] = 'Out of Office';
-$app_list_strings['call_reschedule_dom']['In a Meeting'] = 'In a Meeting';
-
-$app_strings['LBL_RESCHEDULE_LABEL'] = 'Reschedule';
-$app_strings['LBL_RESCHEDULE_TITLE'] = 'Please enter the reschedule information';
-$app_strings['LBL_RESCHEDULE_DATE'] = 'Date:';
-$app_strings['LBL_RESCHEDULE_REASON'] = 'Reason:';
-$app_strings['LBL_RESCHEDULE_ERROR1'] = 'Please select a valid date';
-$app_strings['LBL_RESCHEDULE_ERROR2'] = 'Please select a reason';
-
-$app_strings['LBL_RESCHEDULE_PANEL'] = 'Reschedule';
-$app_strings['LBL_RESCHEDULE_HISTORY'] = 'Call attempt history';
-$app_strings['LBL_RESCHEDULE_COUNT'] = 'Call Attempts';
+$mod_strings = array (
+    'TWITTER_USER_C' => 'Twitter User',
+    'FACEBOOK_USER_C' => 'Facebook User',
+);
 
 

custom/Extension/application/Ext/Language/en_us.Social.php

@@ -0,0 +1,30 @@
+<?php 
+/**
+ * Extensions to SugarCRM
+ * @package Reschedule for SugarCRM
+ * @subpackage Products
+ * @copyright SalesAgility Ltd http://www.salesagility.com
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with this program; if not, see http://www.gnu.org/licenses
+ * or write to the Free Software Foundation,Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301  USA
+ *
+ * @author Salesagility Ltd <[email protected]>
+ */
+
+$mod_strings = array (
+    'TWITTER_USER_C' => 'Twitter User',
+    'FACEBOOK_USER_C' => 'Facebook User',
+);
+

custom/Extension/application/Ext/Language/en_us.social_fields.php

@@ -0,0 +1,10 @@
+<?php
+/**
+ * Social Feed Language Strings.
+ */
+
+$app_strings['FACEBOOK_USER_C'] = 'Facebook';
+$app_strings['TWITTER_USER_C'] = 'Twitter';
+$app_strings['LBL_FACEBOOK_USER_C'] = 'Facebook User';
+$app_strings['LBL_TWITTER_USER_C'] = 'Twitter User';
+$app_strings['LBL_PANEL_SOCIAL_FEED'] = 'Social Feed Details';

custom/Extension/application/Ext/Language/en_us.sps.php

@@ -0,0 +1,9 @@
+<?php
+/**
+ * en_us.sps.php
+ * @author SalesAgility <[email protected]>
+ * Date: 27/01/14
+ */
+
+
+$app_strings['LBL_SUBPANEL_FILTER_LABEL'] = 'Filter';

custom/Extension/application/Ext/Language/en_us.suitecrm.php

@@ -18,7 +18,7 @@
  * or write to the Free Software Foundation,Inc., 51 Franklin Street,
  * Fifth Floor, Boston, MA 02110-1301  USA
  *
- * @author Salesagility Ltd <support@salesagility.com>
+ * @author Salesagility Ltd <info@salesagility.com>
  */
 
 $app_strings['LBL_QUICK_ACCOUNT'] = 'Create Account';
@@ -27,4 +27,19 @@
 $app_strings['LBL_QUICK_LEAD'] = 'Create Lead';
 $app_strings['LBL_QUICK_DOCUMENT'] = 'Create Document';
 $app_strings['LBL_QUICK_CALL'] = 'Log Call';
-$app_strings['LBL_QUICK_TASK'] = 'Create Task';
+$app_strings['LBL_QUICK_TASK'] = 'Create Task';
+$app_strings['LBL_COLLECTION_TYPE'] = 'Type';
+
+$app_strings['LBL_ADD_TAB'] = 'Add Tab';
+$app_strings['LBL_SUITE_DASHBOARD'] = 'Suite Dashboard';
+$app_strings['LBL_ENTER_DASHBOARD_NAME'] = 'Enter Dashboard Name:';
+$app_strings['LBL_NUMBER_OF_COLUMNS'] = 'Number of Columns:';
+$app_strings['LBL_DELETE_DASHBOARD1'] = 'Are you sure you want to delete the';
+$app_strings['LBL_DELETE_DASHBOARD2'] = 'dashboard?';
+$app_strings['LBL_ADD_DASHBOARD_PAGE'] = 'Add a Dashboard Page';
+$app_strings['LBL_DELETE_DASHBOARD_PAGE'] = 'Remove Current Dashboard Page';
+$app_strings['LBL_RENAME_DASHBOARD_PAGE'] = 'Rename Dashboard Page';
+
+$app_strings['LBL_DISCOVER_SUITECRM'] = 'Discover SuiteCRM';
+
+$app_list_strings['collection_temp_list'] = array ( 'Tasks' => 'Tasks', 'Meetings' => 'Meetings', 'Calls' => 'Calls', 'Notes' => 'Notes', 'Emails' => 'Emails' );

custom/Extension/application/Ext/Language/ru_ru.AdvancedOpenDiscovery.php

@@ -0,0 +1,39 @@
+<?php
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
+ * 
+ * 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
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address [email protected].
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+$app_list_strings['moduleList']['AOD_IndexEvent'] = 'Index Event';
+$app_list_strings['moduleList']['AOD_Index'] = 'Индекс';

custom/Extension/application/Ext/Language/ru_ru.AdvancedOpenPortal.php

@@ -46,9 +46,8 @@
       'Closed_Duplicate' => 'Продублированное',
   );
 
-  $app_list_strings['aop_distribution_method'] =
+  $app_list_strings['contact_portal_user_type_dom'] =
     array (
-        'singleUser' => 'Указанный пользователь',
-        'roundRobin' => 'В цикле',
-        'leastBusy' => 'Наименее занятой',
+        'Single' => 'Указанный пользователь',
+        'Account' => 'Учётная запись пользователя',
     ); 

custom/Extension/application/Ext/Language/ru_ru.AdvancedOpenReports.php

@@ -25,8 +25,8 @@
 
 $app_list_strings['moduleList']['AOR_Reports'] = 'Отчёты';
 $app_list_strings['moduleList']['AOR_Conditions'] = 'Условия отчёта';
-$app_list_strings['moduleList']['AOR_Charts'] = 'Диаграммы отчета';
-$app_list_strings['moduleList']['AOR_Fields'] = 'Поля отчета';
+$app_list_strings['moduleList']['AOR_Charts'] = 'Диаграммы отчёта';
+$app_list_strings['moduleList']['AOR_Fields'] = 'Поля отчёта';
 
 $app_list_strings['aor_operator_list']['Equal_To'] = '=';
 $app_list_strings['aor_operator_list']['Not_Equal_To'] = '!=';

custom/Extension/application/Ext/Language/ru_ru.AdvancedOpenWorkflow.php

@@ -56,6 +56,8 @@
 
 $app_list_strings['aow_condition_type_list']['Value'] = 'Значение';
 $app_list_strings['aow_condition_type_list']['Field'] = 'Поле';
+$app_list_strings['aow_condition_type_list']['Any_Change'] = 'Изменение';
+$app_list_strings['aow_condition_type_list']['SecurityGroup'] = 'Состоит в Группе пользователей';
 $app_list_strings['aow_condition_type_list']['Date'] = 'Дата';
 $app_list_strings['aow_condition_type_list']['Multi'] = 'Мультивыбор';
 
@@ -93,4 +95,8 @@
 $app_list_strings['aow_email_type_list']['Specify User'] = 'Пользователя';
 $app_list_strings['aow_email_type_list']['Related Field'] = 'Связанного модуля';
 
+$app_list_strings['aow_run_on_list']['All_Records'] = 'Всех записей';
+$app_list_strings['aow_run_on_list']['New_Records'] = 'Создаваемых записей';
+$app_list_strings['aow_run_on_list']['Modified_Records'] = 'Изменяемых записей';
+
 

custom/Extension/application/Ext/Language/ru_ru.Reschedule.php

@@ -23,6 +23,11 @@
  * @author Salesagility Ltd <[email protected]>
  */
 
+ $mod_strings = array (
+    'TWITTER_USER_C' => 'Учётная запись в Twitter',
+    'FACEBOOK_USER_C' => 'Учётная запись в Facebook',
+ );
+
 $app_list_strings['call_reschedule_dom'][''] = '';
 $app_list_strings['call_reschedule_dom']['Out of Office'] = 'Сотрудник отсутствует';
 $app_list_strings['call_reschedule_dom']['In a Meeting'] = 'Сотрудник занят';

custom/Extension/application/Ext/Language/ru_ru.SecurityGroups.php

@@ -0,0 +1,7 @@
+<?php
+
+$app_list_strings["moduleList"]["SecurityGroups"] = 'Группы пользователей';
+$app_strings['LBL_LOGIN_AS'] = "Login as ";
+$app_strings['LBL_LOGOUT_AS'] = "Logout as ";
+
+?>

custom/Extension/application/Ext/Language/ru_ru.Social.php

@@ -0,0 +1,30 @@
+<?php 
+/**
+ * Extensions to SugarCRM
+ * @package Reschedule for SugarCRM
+ * @subpackage Products
+ * @copyright SalesAgility Ltd http://www.salesagility.com
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with this program; if not, see http://www.gnu.org/licenses
+ * or write to the Free Software Foundation,Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301  USA
+ *
+ * @author Salesagility Ltd <[email protected]>
+ */
+
+$mod_strings = array (
+    'TWITTER_USER_C' => 'Учётная запись в Twitter',
+    'FACEBOOK_USER_C' => 'Учётная запись в Facebook',
+);
+

custom/Extension/application/Ext/Language/ru_ru.social_fields.php

@@ -0,0 +1,10 @@
+<?php
+/**
+ * Social Feed Language Strings.
+ */
+
+$app_strings['FACEBOOK_USER_C'] = 'Facebook';
+$app_strings['TWITTER_USER_C'] = 'Twitter';
+$app_strings['LBL_FACEBOOK_USER_C'] = 'Учётная запись в Facebook';
+$app_strings['LBL_TWITTER_USER_C'] = 'Учётная запись в Twitter';
+$app_strings['LBL_PANEL_SOCIAL_FEED'] = 'Подробности';