pkg/vtiger/modules/MailManager/modules/MailManager/views/Relation.php

@@ -55,7 +55,13 @@ class MailManager_Relation_View extends MailManager_Abstract_View {
 
 			// Check if the message is already linked.
 			$linkedto = MailManager_Relate_Action::associatedLink($request->get('_msguid'));
-			// If the message was not linked, lookup for matching records, using FROM address
+			// If the message was not linked, lookup for matching records, using FROM address unless it is in the sent folder
+      $folder=$request->get('_folder');
+      if ($folder=="Sent"){
+        $contacts=$request->get('_msendto');
+      }else{
+			  $contacts=$request->get('_mfrom');
+			}
 			if (empty($linkedto)) {
 				$results = array();
 				$modules = array();
@@ -63,10 +69,8 @@ class MailManager_Relation_View extends MailManager_Abstract_View {
 				foreach (self::$MODULES as $MODULE) {
 					if(!in_array($MODULE, $allowedModules)) continue;
 
-					$from = $request->get('_mfrom');
-					if(empty($from)) continue;
-
-					$results[$MODULE] = $this->lookupModuleRecordsWithEmail($MODULE, $from);
+					if(empty($contacts)) continue;
+					$results[$MODULE] = $this->lookupModuleRecordsWithEmail($MODULE, $contacts);
 					$describe = $this->ws_describe($MODULE);
 					$modules[$MODULE] = array('label' => $describe['label'], 'name' => textlength_check($describe['name']), 'id' => $describe['idPrefix'] );
 
@@ -417,18 +421,22 @@ class MailManager_Relation_View extends MailManager_Abstract_View {
 	 * @param Email Address $email
 	 * @return Array
 	 */
-	public function lookupModuleRecordsWithEmail($module, $email) {
+	public function lookupModuleRecordsWithEmail($module, $emails) {
 		$currentUserModel = vglobal('current_user');
-		$query = $this->buildSearchQuery($module, $email, 'EMAIL');
-		$qresults = vtws_query( $query, $currentUserModel );
-		$describe = $this->ws_describe($module);
-		$labelFields = explode(',', $describe['labelFields']);
-
+    //could be to multiple email addresses
 		$results = array();
-		foreach($qresults as $qresult) {
-			$labelValues = array();
-			foreach($labelFields as $fieldname) {
-				if(isset($qresult[$fieldname])) $labelValues[] = $qresult[$fieldname];
+    foreach(explode(",",$emails) as $email){
+      $query = $this->buildSearchQuery($module, $email, 'EMAIL');
+      $qresults = vtws_query( $query, $currentUserModel );
+      $describe = $this->ws_describe($module);
+      $labelFields = explode(',', $describe['labelFields']);
+      foreach($qresults as $qresult) {
+        $labelValues = array();
+        foreach($labelFields as $fieldname) {
+          if(isset($qresult[$fieldname])) $labelValues[] = $qresult[$fieldname];
+        }
+        $ids = vtws_getIdComponents($qresult['id']);
+        $results[] = array( 'wsid' => $qresult['id'], 'id' => $ids[1], 'label' => implode(' ', $labelValues));
 			}
 			$ids = vtws_getIdComponents($qresult['id']);
 			$results[] = array( 'wsid' => $qresult['id'], 'id' => $ids[1], 'label' => implode(' ', $labelValues));
@@ -440,4 +448,4 @@ class MailManager_Relation_View extends MailManager_Abstract_View {
             return $request->validateWriteAccess(); 
         }
 }
-?>
\ No newline at end of file
+?>

pkg/vtiger/modules/MailManager/templates/resources/MailManager.js

@@ -766,6 +766,7 @@ if (typeof(MailManager) == 'undefined') {
 
 			var meta = MailManager.mail_open_meta;
                         AppConnector.request(MailManager._baseurl() + "_operation=relation&_operationarg=find&_mfrom=" + encodeURIComponent(meta['from']) +
+                        '&_msendto='+ encodeURIComponent(meta['sendto']) +
 				'&_folder=' +encodeURIComponent(meta['folder']) +'&_msgno=' +encodeURIComponent(meta['msgno']) +'&_msguid=' +
 				encodeURIComponent(meta['msguid'].replace('<', '&lt;').replace('>', '&gt;'))).then(function(responseJSON) { 
                                         responseJSON = JSON.parse(responseJSON);

pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/models/Record.php

@@ -20,7 +20,8 @@ class SMSNotifier_Record_Model extends Vtiger_Record_Model {
 
 		$statusColor = $this->getColorForStatus($statusDetails[0]['status']);
 
-		$this->setData($statusDetails[0]);
+		$data = array_merge($statusDetails[0], array('statuscolor' => $statusColor));
+		$this->setData($data);
 
 		return $this;
 	}

resources/app.js

@@ -406,24 +406,13 @@ var app = {
 
 	formAlignmentAfterValidation : function(form){
 		// to avoid hiding of error message under the fixed nav bar
-		var destination = form.find(".formError:not('.greenPopup'):first").offset().top;
-		var resizedDestnation = destination-105;
-		jQuery('html').animate({
-			scrollTop:resizedDestnation
-		}, 'slow');
-	},
-
-	/**
-	 * Function to push down the error message size when validation is invoked
-	 * @params : form Element
-	 */
-	formAlignmentAfterValidation : function(form){
-		// to avoid hiding of error message under the fixed nav bar
-		var destination = form.find(".formError:not('.greenPopup'):first").offset().top;
-		var resizedDestnation = destination-105;
-		jQuery('html').animate({
-			scrollTop:resizedDestnation
-		}, 'slow');
+        var formOffset = form.find(".formError:not('.greenPopup'):first").offset();
+        if(formOffset !== null && typeof(formOffset) === 'object' && formOffset.hasOwnProperty('top')) {
+            var resizedDestnation = formOffset.top - 105;
+            $('html, body').animate({
+                scrollTop:resizedDestnation
+            }, 'slow');
+        }
 	},
 
 	convertToDatePickerFormat: function(dateFormat){

schema/DatabaseSchema.xml

@@ -587,6 +587,7 @@
 		<field name="user_name" type="C" size="50" />
 		<field name="user_password" type="C" size="30" />
 		<field name="type" type="C" size="5" />
+		<field name="cryptmode" type="C" size="20" />
 		<field name="last_login_time" type="T" />
 		<field name="login_time" type="T" />
 		<field name="logout_time" type="T" />
@@ -5401,7 +5402,7 @@
 		<field name="listprice" type="N" size="25.3" />
 		<field name="discount_percent" type="N" size="7.3" />
 		<field name="discount_amount" type="N" size="25.3" />
-		<field name="comment" type="C" size="250" />
+		<field name="comment" type="X" />
 		<field name="description" type="X" />
 		<field name="incrementondel" type="I" size="11">
 			<notnull />

vtlib/Vtiger/Field.php

@@ -236,7 +236,7 @@ class Vtiger_Field extends Vtiger_FieldBasic {
 		global $adb;
 		$instances = false;
 
-		$query = "SELECT * FROM vtiger_field WHERE tabid=? ORDER BY sequence";
+		$query = "SELECT * FROM vtiger_field left join vtiger_blocks on vtiger_field.block=vtiger_blocks.blockid WHERE vtiger_field.tabid=? ORDER BY vtiger_blocks.sequence,vtiger_field.sequence";
 		$queryParams = Array($moduleInstance->id);
 
 		$result = $adb->pquery($query, $queryParams);
@@ -259,4 +259,4 @@ class Vtiger_Field extends Vtiger_FieldBasic {
 		self::log("Deleting fields of the module ... DONE");
 	}
 }
-?>
\ No newline at end of file
+?>