adamjakab / SuiteCRM

custom/modules/unified_search_modules_display.php

Indentation +102 added lines, -102 removed lines

@@ -1,140 +1,140 @@
 <?php
 // created: 2014-01-29 09:59:23
 $unified_search_modules_display = array (
-  'AOP_Case_Events' => 
-  array (
+    'AOP_Case_Events' => 
+    array (
     'visible' => false,
-  ),
-  'AOP_Case_Updates' => 
-  array (
+    ),
+    'AOP_Case_Updates' => 
+    array (
     'visible' => false,
-  ),
-  'AOR_Reports' => 
-  array (
+    ),
+    'AOR_Reports' => 
+    array (
     'visible' => false,
-  ),
-  'AOS_Contracts' => 
-  array (
+    ),
+    'AOS_Contracts' => 
+    array (
     'visible' => false,
-  ),
-  'AOS_Invoices' => 
-  array (
+    ),
+    'AOS_Invoices' => 
+    array (
     'visible' => false,
-  ),
-  'AOS_PDF_Templates' => 
-  array (
+    ),
+    'AOS_PDF_Templates' => 
+    array (
     'visible' => false,
-  ),
-  'AOS_Product_Categories' => 
-  array (
+    ),
+    'AOS_Product_Categories' => 
+    array (
     'visible' => false,
-  ),
-  'AOS_Products' => 
-  array (
+    ),
+    'AOS_Products' => 
+    array (
     'visible' => false,
-  ),
-  'AOS_Quotes' => 
-  array (
+    ),
+    'AOS_Quotes' => 
+    array (
     'visible' => false,
-  ),
-  'AOW_Processed' => 
-  array (
+    ),
+    'AOW_Processed' => 
+    array (
     'visible' => false,
-  ),
-  'AOW_WorkFlow' => 
-  array (
+    ),
+    'AOW_WorkFlow' => 
+    array (
     'visible' => false,
-  ),
-  'Accounts' => 
-  array (
+    ),
+    'Accounts' => 
+    array (
     'visible' => true,
-  ),
-  'Bugs' => 
-  array (
+    ),
+    'Bugs' => 
+    array (
     'visible' => false,
-  ),
-  'Calls' => 
-  array (
+    ),
+    'Calls' => 
+    array (
     'visible' => true,
-  ),
-  'Calls_Reschedule' => 
-  array (
+    ),
+    'Calls_Reschedule' => 
+    array (
     'visible' => false,
-  ),
-  'Campaigns' => 
-  array (
+    ),
+    'Campaigns' => 
+    array (
     'visible' => false,
-  ),
-  'Cases' => 
-  array (
+    ),
+    'Cases' => 
+    array (
     'visible' => true,
-  ),
-  'Contacts' => 
-  array (
+    ),
+    'Contacts' => 
+    array (
     'visible' => true,
-  ),
-  'Documents' => 
-  array (
+    ),
+    'Documents' => 
+    array (
     'visible' => true,
-  ),
-  'FP_Event_Locations' => 
-  array (
+    ),
+    'FP_Event_Locations' => 
+    array (
     'visible' => false,
-  ),
-  'FP_events' => 
-  array (
+    ),
+    'FP_events' => 
+    array (
     'visible' => false,
-  ),
-  'Leads' => 
-  array (
+    ),
+    'Leads' => 
+    array (
     'visible' => true,
-  ),
-  'Meetings' => 
-  array (
+    ),
+    'Meetings' => 
+    array (
     'visible' => true,
-  ),
-  'Notes' => 
-  array (
+    ),
+    'Notes' => 
+    array (
     'visible' => true,
-  ),
-  'Opportunities' => 
-  array (
+    ),
+    'Opportunities' => 
+    array (
     'visible' => true,
-  ),
-  'Project' => 
-  array (
+    ),
+    'Project' => 
+    array (
     'visible' => false,
-  ),
-  'ProjectTask' => 
-  array (
+    ),
+    'ProjectTask' => 
+    array (
     'visible' => false,
-  ),
-  'ProspectLists' => 
-  array (
+    ),
+    'ProspectLists' => 
+    array (
     'visible' => false,
-  ),
-  'Prospects' => 
-  array (
+    ),
+    'Prospects' => 
+    array (
     'visible' => false,
-  ),
-  'Tasks' => 
-  array (
+    ),
+    'Tasks' => 
+    array (
     'visible' => false,
-  ),
-  'jjwg_Address_Cache' => 
-  array (
+    ),
+    'jjwg_Address_Cache' => 
+    array (
     'visible' => false,
-  ),
-  'jjwg_Areas' => 
-  array (
+    ),
+    'jjwg_Areas' => 
+    array (
     'visible' => false,
-  ),
-  'jjwg_Maps' => 
-  array (
+    ),
+    'jjwg_Maps' => 
+    array (
     'visible' => false,
-  ),
-  'jjwg_Markers' => 
-  array (
+    ),
+    'jjwg_Markers' => 
+    array (
     'visible' => false,
-  ),
+    ),
 );
\ No newline at end of file

include/SugarFields/Fields/Datetimecombo/SugarFieldDatetimecombo.php

Indentation +37 added lines, -37 removed lines

@@ -44,19 +44,19 @@ 
     function getEditViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
         // Create Smarty variables for the Calendar picker widget
         if(!isset($displayParams['showMinutesDropdown'])) {
-           $displayParams['showMinutesDropdown'] = false;
+            $displayParams['showMinutesDropdown'] = false;
         }
 
         if(!isset($displayParams['showHoursDropdown'])) {
-           $displayParams['showHoursDropdown'] = false;
+            $displayParams['showHoursDropdown'] = false;
         }
 
         if(!isset($displayParams['showNoneCheckbox'])) {
-           $displayParams['showNoneCheckbox'] = false;
+            $displayParams['showNoneCheckbox'] = false;
         }
 
         if(!isset($displayParams['showFormats'])) {
-           $displayParams['showFormats'] = false;
+            $displayParams['showFormats'] = false;
         }
 
         global $timedate;
@@ -75,44 +75,44 @@ 
 	
     function getSearchViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
 
-    	 if($this->isRangeSearchView($vardef)) {
-           $displayParams['showMinutesDropdown'] = false;
-           $displayParams['showHoursDropdown'] = false;
-           $displayParams['showNoneCheckbox'] = false;
-           $displayParams['showFormats'] = false;
-	       global $timedate, $current_language;
-	       $displayParams['dateFormat'] = $timedate->get_cal_date_format();
-	       $displayParams['timeFormat'] = $timedate->get_user_time_format();
-
-           $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
-           $id = isset($displayParams['idName']) ? $displayParams['idName'] : $vardef['name'];
-           $this->ss->assign('original_id', "{$id}");
-           $this->ss->assign('id_range', "range_{$id}");
-           $this->ss->assign('id_range_start', "start_range_{$id}");
-           $this->ss->assign('id_range_end', "end_range_{$id}");
-           $this->ss->assign('id_range_choice', "{$id}_range_choice");
-           if(file_exists('custom/include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl'))
-           {
-              return $this->fetch('custom/include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl');
-           }
-           return $this->fetch('include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl');
+            if($this->isRangeSearchView($vardef)) {
+            $displayParams['showMinutesDropdown'] = false;
+            $displayParams['showHoursDropdown'] = false;
+            $displayParams['showNoneCheckbox'] = false;
+            $displayParams['showFormats'] = false;
+            global $timedate, $current_language;
+            $displayParams['dateFormat'] = $timedate->get_cal_date_format();
+            $displayParams['timeFormat'] = $timedate->get_user_time_format();
+
+            $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
+            $id = isset($displayParams['idName']) ? $displayParams['idName'] : $vardef['name'];
+            $this->ss->assign('original_id', "{$id}");
+            $this->ss->assign('id_range', "range_{$id}");
+            $this->ss->assign('id_range_start', "start_range_{$id}");
+            $this->ss->assign('id_range_end', "end_range_{$id}");
+            $this->ss->assign('id_range_choice', "{$id}_range_choice");
+            if(file_exists('custom/include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl'))
+            {
+                return $this->fetch('custom/include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl');
+            }
+            return $this->fetch('include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl');
         }
 
-    	// Create Smarty variables for the Calendar picker widget
+        // Create Smarty variables for the Calendar picker widget
         if(!isset($displayParams['showMinutesDropdown'])) {
-           $displayParams['showMinutesDropdown'] = false;
+            $displayParams['showMinutesDropdown'] = false;
         }
 
         if(!isset($displayParams['showHoursDropdown'])) {
-           $displayParams['showHoursDropdown'] = false;
+            $displayParams['showHoursDropdown'] = false;
         }
 
         if(!isset($displayParams['showNoneCheckbox'])) {
-           $displayParams['showNoneCheckbox'] = false;
+            $displayParams['showNoneCheckbox'] = false;
         }
 
         if(!isset($displayParams['showFormats'])) {
-           $displayParams['showFormats'] = false;
+            $displayParams['showFormats'] = false;
         }
 
         global $timedate;
@@ -124,7 +124,7 @@ 
     }
 
 
-	public function getEmailTemplateValue($inputField, $vardef, $context = null, $tabindex = 0){
+    public function getEmailTemplateValue($inputField, $vardef, $context = null, $tabindex = 0){
         // This does not return a smarty section, instead it returns a direct value
         if(isset($context['notify_user'])) {
             $user = $context['notify_user'];
@@ -143,14 +143,14 @@ 
 
         if(strpos($params[$prefix.$field], ' ') > 0) {
             if ($timedate->check_matching_format($params[$prefix.$field], TimeDate::DB_DATETIME_FORMAT)) {
-	            $bean->$field = $params[$prefix.$field];
+                $bean->$field = $params[$prefix.$field];
             } else {
                 $bean->$field = $timedate->to_db($params[$prefix.$field]);
             }
         } else {
-        	$GLOBALS['log']->error('Field ' . $prefix.$field . ' expecting datetime format, but got value: ' . $params[$prefix.$field]);
-	        //Default to assume date format value
-        	if ($timedate->check_matching_format($params[$prefix.$field], TimeDate::DB_DATE_FORMAT)) {
+            $GLOBALS['log']->error('Field ' . $prefix.$field . ' expecting datetime format, but got value: ' . $params[$prefix.$field]);
+            //Default to assume date format value
+            if ($timedate->check_matching_format($params[$prefix.$field], TimeDate::DB_DATE_FORMAT)) {
                 $bean->$field = $params[$prefix.$field];
             } else {
                 $bean->$field = $timedate->to_db_date($params[$prefix.$field]);
@@ -175,10 +175,10 @@ 
         if ( !$timedate->check_matching_format($value, $format) ) {
             $parts = $timedate->split_date_time($value);
             if(empty($parts[0])) {
-               $datepart = $timedate->getNow()->format($settings->dateformat);
+                $datepart = $timedate->getNow()->format($settings->dateformat);
             }
             else {
-               $datepart = $parts[0];
+                $datepart = $parts[0];
             }
             if(empty($parts[1])) {
                 $timepart = $timedate->fromTimestamp(0)->format($settings->timeformat);

include/SugarFields/Fields/Assigned_user_name/SugarFieldAssigned_user_name.php

Indentation +9 added lines, -9 removed lines

@@ -41,14 +41,14 @@
 
 class SugarFieldAssigned_user_name extends SugarFieldBase {
 
-	function getSearchViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
-    	$vardef['options'] = get_user_array(false);
-		if(!empty($vardef['function']['returns']) && $vardef['function']['returns']== 'html'){
-    	   $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
-           return $this->fetch($this->findTemplate('EditViewFunction'));
-    	}else{
-    	   $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
-           return $this->fetch($this->findTemplate('SearchView'));
-    	}
+    function getSearchViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
+        $vardef['options'] = get_user_array(false);
+        if(!empty($vardef['function']['returns']) && $vardef['function']['returns']== 'html'){
+            $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
+            return $this->fetch($this->findTemplate('EditViewFunction'));
+        }else{
+            $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
+            return $this->fetch($this->findTemplate('SearchView'));
+        }
     }
 }

include/SugarOauth.php

Indentation +39 added lines, -39 removed lines

@@ -145,34 +145,34 @@ 
          * @return array
          */
         public function getAccessToken($url,
-                                       Zend_Oauth_Token_Request $token = null,
-                                       $httpMethod = null,
-                                       Zend_Oauth_Http_AccessToken $request = null)
+                                        Zend_Oauth_Token_Request $token = null,
+                                        $httpMethod = null,
+                                        Zend_Oauth_Http_AccessToken $request = null)
         {
             $this->setAccessTokenUrl($url);
             $this->_last = $token = parent::getAccessToken($_REQUEST, $this->makeRequestToken());
             return array('oauth_token' => $token->getToken(), 'oauth_token_secret' => $token->getTokenSecret());
         }
 
-       /**
-        * Fetch URL with OAuth
-        * @param string $url
-        * @param string $params Query params
-        * @param string $method HTTP method
-        * @param array $headers HTTP headers
-        * @return string
-        */
+        /**
+         * Fetch URL with OAuth
+         * @param string $url
+         * @param string $params Query params
+         * @param string $method HTTP method
+         * @param array $headers HTTP headers
+         * @return string
+         */
         
         public function fetch($url, $params = null, $method = 'GET', $headers = null)
         {
             $acc = $this->makeAccessToken();
             if ( strpos($url,'?') ) {
-               list($clean_url, $query) = explode('?', $url);
-               if($query) {
-                   $url = $clean_url;
-                   parse_str($query, $query_params);
-                   $params = array_merge($params?$params:array(), $query_params);
-               }
+                list($clean_url, $query) = explode('?', $url);
+                if($query) {
+                    $url = $clean_url;
+                    parse_str($query, $query_params);
+                    $params = array_merge($params?$params:array(), $query_params);
+                }
             }
             $client = $acc->getHttpClient($this->_oauth_config, $url);
             
@@ -212,33 +212,33 @@ 
             $this->_last = $resp = $client->request();
             $this->_lastReq = $client->getLastRequest();
             return $resp->getBody();
-       }
+        }
 
-       /**
-        * Get HTTP client
-        * @return Zend_Oauth_Client
-        */
-       public function getClient()
-       {
+        /**
+         * Get HTTP client
+         * @return Zend_Oauth_Client
+         */
+        public function getClient()
+        {
             $acc = $this->makeAccessToken();
             return $acc->getHttpClient($this->_oauth_config);
-       }
+        }
 
-       /**
-        * Get last response
-        * @return string
-        */
-       public function getLastResponse()
-       {
+        /**
+         * Get last response
+         * @return string
+         */
+        public function getLastResponse()
+        {
             return $this->_last;
-       }
+        }
 
-       /**
-        * Get last request
-        * @return string
-        */
-       public function getLastRequest()
-       {
+        /**
+         * Get last request
+         * @return string
+         */
+        public function getLastRequest()
+        {
             return $this->_lastReq;
-       }
+        }
     }

include/phpmailer/language/phpmailer.lang-ar.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 $PHPMAILER_LANG['mailer_not_supported'] = ' برنامج الإرسال غير مدعوم.';
 $PHPMAILER_LANG['provide_address']      = 'يجب توفير عنوان البريد الإلكتروني لمستلم واحد على الأقل.';
 $PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية ' .
-                                          'فشل في الارسال لكل من : ';
+                                            'فشل في الارسال لكل من : ';
 $PHPMAILER_LANG['signing']              = 'خطأ في التوقيع: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() غير ممكن.';
 $PHPMAILER_LANG['smtp_error']           = 'خطأ على مستوى الخادم SMTP: ';

include/SubPanel/registered_layout_defs.php

Indentation +2 added lines, -2 removed lines

@@ -49,8 +49,8 @@
 function get_layout_defs()
 {
     //TODO add global memory cache support here.  If there is an in memory cache, leverage it.
-	global $layout_defs;
-	return $layout_defs;
+    global $layout_defs;
+    return $layout_defs;
 }
 
 ?>
\ No newline at end of file

include/generic/SugarWidgets/SugarWidgetSubPanelGetLatestButton.php

Indentation +29 added lines, -29 removed lines

@@ -45,40 +45,40 @@
 
 class SugarWidgetSubPanelGetLatestButton extends SugarWidgetField
 {
-	function displayHeaderCell($layout_def)
-	{
-		return ' ';
-	}
+    function displayHeaderCell($layout_def)
+    {
+        return ' ';
+    }
 
-	function displayList($layout_def)
-	{
-		//if the contract has been executed or selected_revision is same as latest revision
-		//then hide the latest button. 		
-		//if the contract state is executed or document is not a template hide this action.
-		if ((!empty($layout_def['fields']['CONTRACT_STATUS']) && $layout_def['fields']['CONTRACT_STATUS']=='executed') or
-			$layout_def['fields']['SELECTED_REVISION_ID']== $layout_def['fields']['LATEST_REVISION_ID']) {
-			return "";
-		}
+    function displayList($layout_def)
+    {
+        //if the contract has been executed or selected_revision is same as latest revision
+        //then hide the latest button. 		
+        //if the contract state is executed or document is not a template hide this action.
+        if ((!empty($layout_def['fields']['CONTRACT_STATUS']) && $layout_def['fields']['CONTRACT_STATUS']=='executed') or
+            $layout_def['fields']['SELECTED_REVISION_ID']== $layout_def['fields']['LATEST_REVISION_ID']) {
+            return "";
+        }
 		
-		global $app_strings;
+        global $app_strings;
 		
 
-		$href = 'index.php?module=' . $layout_def['module']
-			. '&action=' . 'GetLatestRevision'
-			. '&record=' . $layout_def['fields']['ID']
-			. '&return_module=' . $_REQUEST['module']
-			. '&return_action=' . 'DetailView'
-			. '&return_id=' . $_REQUEST['record']
-			. '&get_latest_for_id=' . $layout_def['fields']['LINKED_ID'];
+        $href = 'index.php?module=' . $layout_def['module']
+            . '&action=' . 'GetLatestRevision'
+            . '&record=' . $layout_def['fields']['ID']
+            . '&return_module=' . $_REQUEST['module']
+            . '&return_action=' . 'DetailView'
+            . '&return_id=' . $_REQUEST['record']
+            . '&get_latest_for_id=' . $layout_def['fields']['LINKED_ID'];
 
-		$edit_icon_html = SugarThemeRegistry::current()->getImage( 'getLatestDocument','align="absmiddle" border="0"',null,null,'.gif',$app_strings['LNK_GET_LATEST']);
-		if($layout_def['EditView']){
-			return '<a href="' . $href . '"' . "title ='". $app_strings['LNK_GET_LATEST_TOOLTIP']  ."'"
-			. 'class="listViewTdToolsS1">' . $edit_icon_html . '&nbsp;' . $app_strings['LNK_GET_LATEST'] .'</a>&nbsp;';
-		}else{
-			return '';
-		}
-	}
+        $edit_icon_html = SugarThemeRegistry::current()->getImage( 'getLatestDocument','align="absmiddle" border="0"',null,null,'.gif',$app_strings['LNK_GET_LATEST']);
+        if($layout_def['EditView']){
+            return '<a href="' . $href . '"' . "title ='". $app_strings['LNK_GET_LATEST_TOOLTIP']  ."'"
+            . 'class="listViewTdToolsS1">' . $edit_icon_html . '&nbsp;' . $app_strings['LNK_GET_LATEST'] .'</a>&nbsp;';
+        }else{
+            return '';
+        }
+    }
 		
 }
 

include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateLeadNameButton.php

Indentation +67 added lines, -67 removed lines

@@ -51,77 +51,77 @@
         return parent::getWidgetId();
     }
 
-	function display($defines, $additionalFormFields = NULL, $nonbutton = false)
-	{
-		global $app_strings;
-		global $currentModule;
+    function display($defines, $additionalFormFields = NULL, $nonbutton = false)
+    {
+        global $app_strings;
+        global $currentModule;
 
-		$title = $app_strings['LBL_NEW_BUTTON_TITLE'];
-		//$accesskey = $app_strings['LBL_NEW_BUTTON_KEY'];
-		$value = $app_strings['LBL_NEW_BUTTON_LABEL'];
-		$this->module = 'Leads';
-		if( ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true)){
-			$button = "<input title='$title'class='button' type='button' name='button' value='  $value  ' disabled/>\n";
-			return $button;
-		}
+        $title = $app_strings['LBL_NEW_BUTTON_TITLE'];
+        //$accesskey = $app_strings['LBL_NEW_BUTTON_KEY'];
+        $value = $app_strings['LBL_NEW_BUTTON_LABEL'];
+        $this->module = 'Leads';
+        if( ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true)){
+            $button = "<input title='$title'class='button' type='button' name='button' value='  $value  ' disabled/>\n";
+            return $button;
+        }
 		
-		$additionalFormFields = array();
+        $additionalFormFields = array();
 		
-		//from accounts
-		if ($defines['focus']->object_name == 'Account') {
-			if(isset($defines['focus']->billing_address_street)) 
-				$additionalFormFields['primary_address_street'] = $defines['focus']->billing_address_street;
-			if(isset($defines['focus']->billing_address_city)) 
-				$additionalFormFields['primary_address_city'] = $defines['focus']->billing_address_city;						  		
-			if(isset($defines['focus']->billing_address_state)) 
-				$additionalFormFields['primary_address_state'] = $defines['focus']->billing_address_state;
-			if(isset($defines['focus']->billing_address_country)) 
-				$additionalFormFields['primary_address_country'] = $defines['focus']->billing_address_country;
-			if(isset($defines['focus']->billing_address_postalcode)) 
-				$additionalFormFields['primary_address_postalcode'] = $defines['focus']->billing_address_postalcode;
-			if(isset($defines['focus']->phone_office)) 
-				$additionalFormFields['phone_work'] = $defines['focus']->phone_office;
-			if(isset($defines['focus']->id)) 
-				$additionalFormFields['account_id'] = $defines['focus']->id;
-		}
-		//from contacts
-		if ($defines['focus']->object_name == 'Contact') {
-			if(isset($defines['focus']->salutation)) 
-				$additionalFormFields['salutation'] = $defines['focus']->salutation;
-			if(isset($defines['focus']->first_name)) 
-				$additionalFormFields['first_name'] = $defines['focus']->first_name;
-			if(isset($defines['focus']->last_name)) 
-				$additionalFormFields['last_name'] = $defines['focus']->last_name;
-			if(isset($defines['focus']->primary_address_street)) 
-				$additionalFormFields['primary_address_street'] = $defines['focus']->primary_address_street;
-			if(isset($defines['focus']->primary_address_city)) 
-				$additionalFormFields['primary_address_city'] = $defines['focus']->primary_address_city;						  		
-			if(isset($defines['focus']->primary_address_state)) 
-				$additionalFormFields['primary_address_state'] = $defines['focus']->primary_address_state;
-			if(isset($defines['focus']->primary_address_country)) 
-				$additionalFormFields['primary_address_country'] = $defines['focus']->primary_address_country;
-			if(isset($defines['focus']->primary_address_postalcode)) 
-				$additionalFormFields['primary_address_postalcode'] = $defines['focus']->primary_address_postalcode;
-			if(isset($defines['focus']->phone_work)) 
-				$additionalFormFields['phone_work'] = $defines['focus']->phone_work;
-			if(isset($defines['focus']->id)) 
-				$additionalFormFields['contact_id'] = $defines['focus']->id;
-		}
+        //from accounts
+        if ($defines['focus']->object_name == 'Account') {
+            if(isset($defines['focus']->billing_address_street)) 
+                $additionalFormFields['primary_address_street'] = $defines['focus']->billing_address_street;
+            if(isset($defines['focus']->billing_address_city)) 
+                $additionalFormFields['primary_address_city'] = $defines['focus']->billing_address_city;						  		
+            if(isset($defines['focus']->billing_address_state)) 
+                $additionalFormFields['primary_address_state'] = $defines['focus']->billing_address_state;
+            if(isset($defines['focus']->billing_address_country)) 
+                $additionalFormFields['primary_address_country'] = $defines['focus']->billing_address_country;
+            if(isset($defines['focus']->billing_address_postalcode)) 
+                $additionalFormFields['primary_address_postalcode'] = $defines['focus']->billing_address_postalcode;
+            if(isset($defines['focus']->phone_office)) 
+                $additionalFormFields['phone_work'] = $defines['focus']->phone_office;
+            if(isset($defines['focus']->id)) 
+                $additionalFormFields['account_id'] = $defines['focus']->id;
+        }
+        //from contacts
+        if ($defines['focus']->object_name == 'Contact') {
+            if(isset($defines['focus']->salutation)) 
+                $additionalFormFields['salutation'] = $defines['focus']->salutation;
+            if(isset($defines['focus']->first_name)) 
+                $additionalFormFields['first_name'] = $defines['focus']->first_name;
+            if(isset($defines['focus']->last_name)) 
+                $additionalFormFields['last_name'] = $defines['focus']->last_name;
+            if(isset($defines['focus']->primary_address_street)) 
+                $additionalFormFields['primary_address_street'] = $defines['focus']->primary_address_street;
+            if(isset($defines['focus']->primary_address_city)) 
+                $additionalFormFields['primary_address_city'] = $defines['focus']->primary_address_city;						  		
+            if(isset($defines['focus']->primary_address_state)) 
+                $additionalFormFields['primary_address_state'] = $defines['focus']->primary_address_state;
+            if(isset($defines['focus']->primary_address_country)) 
+                $additionalFormFields['primary_address_country'] = $defines['focus']->primary_address_country;
+            if(isset($defines['focus']->primary_address_postalcode)) 
+                $additionalFormFields['primary_address_postalcode'] = $defines['focus']->primary_address_postalcode;
+            if(isset($defines['focus']->phone_work)) 
+                $additionalFormFields['phone_work'] = $defines['focus']->phone_work;
+            if(isset($defines['focus']->id)) 
+                $additionalFormFields['contact_id'] = $defines['focus']->id;
+        }
 		
-		//from opportunities
-		if ($defines['focus']->object_name == 'Opportunity') {
-			if(isset($defines['focus']->id)) 
-				$additionalFormFields['opportunity_id'] = $defines['focus']->id;
-			if(isset($defines['focus']->account_name)) 
-				$additionalFormFields['account_name'] = $defines['focus']->account_name;
-			if(isset($defines['focus']->account_id)) 
-				$additionalFormFields['account_id'] = $defines['focus']->account_id;
-		}
+        //from opportunities
+        if ($defines['focus']->object_name == 'Opportunity') {
+            if(isset($defines['focus']->id)) 
+                $additionalFormFields['opportunity_id'] = $defines['focus']->id;
+            if(isset($defines['focus']->account_name)) 
+                $additionalFormFields['account_name'] = $defines['focus']->account_name;
+            if(isset($defines['focus']->account_id)) 
+                $additionalFormFields['account_id'] = $defines['focus']->account_id;
+        }
 		
-		$button = $this->_get_form($defines, $additionalFormFields);
-		$button .= "<input title='$title' class='button' type='submit' name='{$this->getWidgetId()}_button' id='{$this->getWidgetId()}' value='  $value  '/>\n";
-		$button .= "</form>";
-		return $button;
-	}
+        $button = $this->_get_form($defines, $additionalFormFields);
+        $button .= "<input title='$title' class='button' type='submit' name='{$this->getWidgetId()}_button' id='{$this->getWidgetId()}' value='  $value  '/>\n";
+        $button .= "</form>";
+        return $button;
+    }
 }
 ?>
\ No newline at end of file

include/generic/SugarWidgets/SugarWidgetFieldrelate.php

Indentation +16 added lines, -16 removed lines

@@ -174,25 +174,25 @@ 
         return $this->_get_column_select($layout_def) . " IN ('" . implode("', '", $ids) . "')";
     }
 
-	//for to_pdf/to_csv
-	function displayListPlain($layout_def) {
-	    $reporter = $this->layout_manager->getAttribute("reporter");
-		$field_def = $reporter->all_fields[$layout_def['column_key']];
-		$display = strtoupper($field_def['secondary_table'].'_name');
-		//#31797  , we should get the table alias in a global registered array:selected_loaded_custom_links
-		if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
-			$display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
-		}
+    //for to_pdf/to_csv
+    function displayListPlain($layout_def) {
+        $reporter = $this->layout_manager->getAttribute("reporter");
+        $field_def = $reporter->all_fields[$layout_def['column_key']];
+        $display = strtoupper($field_def['secondary_table'].'_name');
+        //#31797  , we should get the table alias in a global registered array:selected_loaded_custom_links
+        if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
+            $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
+        }
         elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
         {
             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]['join_table_alias'].'_name');
         }
-		elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
-			$display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']]['join_table_alias'].'_name');
-		}
-		$cell = $layout_def['fields'][$display];
-		return $cell;
-	}
+        elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
+            $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']]['join_table_alias'].'_name');
+        }
+        $cell = $layout_def['fields'][$display];
+        return $cell;
+    }
 
     function displayList($layout_def) {
         $reporter = $this->layout_manager->getAttribute("reporter");
@@ -201,7 +201,7 @@ 
 
         //#31797  , we should get the table alias in a global registered array:selected_loaded_custom_links
         if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
-             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
+                $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
         }
         elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
         {