Merge branch 'master' into 'master'

Fixing Documents not being sent as Email Attachments #1506

When sending Email and adding a CRM Document as an attachment, the Document was not sending due to missing filepath value
Fixes #1506

See merge request !847

modules/Emails/models/Record.php

@@ -348,6 +348,7 @@ class Emails_Record_Model extends Vtiger_Record_Model {
 				$documentsList[$i]['attachment'] = decode_html($db->query_result($documentRes, $i, 'name'));
                 $documentsList[$i]['storedname'] = decode_html($db->query_result($documentRes, $i, 'storedname'));
 				$documentsList[$i]['type'] = $db->query_result($documentRes, $i, 'type');
+				$documentsList[$i]['filenamewithpath'] = $documentsList[$i]['path'].$documentsList[$i]['fileid'].'_'.$documentsList[$i]['storedname'];
 			}
 		}
 		return $documentsList;
@@ -827,4 +828,4 @@ class Emails_Record_Model extends Vtiger_Record_Model {
 		}
 		return false;
 	}
-}
+}
\ No newline at end of file