E-All opportunity to Project Mapping

modules/Settings/Leads/models/Module.php

@@ -33,7 +33,7 @@ class Settings_Leads_Module_Model extends Vtiger_Module_Model {
 	 * @return <Array> list of field ids
 	 */
 	public function getMappingSupportedFieldIdsList() {
-		if (!$this->supportedFieldIdsList) {
+		if (!property_exists($this,'supportedFieldIdsList') || !$this->supportedFieldIdsList) {
 			$selectedTabidsList[] = getTabid($this->getName());
 			$restrictedFieldNames = array('campaignrelstatus');
 			$restrictedUitypes = $this->getRestrictedUitypes();

modules/Settings/Potentials/models/Mapping.php

@@ -51,7 +51,7 @@ class Settings_Potentials_Mapping_Model extends Settings_Leads_Mapping_Model {
 	 * @return <Array> list of mapping details
 	 */
 	public function getMapping($editable = false) {
-		if (!$this->mapping) {
+		if (!property_exists($this,'mapping') || !$this->mapping) {
 			$db = PearDatabase::getInstance();
 			$query = 'SELECT * FROM vtiger_convertpotentialmapping';
 			if ($editable) {
@@ -95,7 +95,7 @@ class Settings_Potentials_Mapping_Model extends Settings_Leads_Mapping_Model {
 		$db = PearDatabase::getInstance();
 		$deleteMappingsList = $updateMappingsList = $createMappingsList = array();
 		foreach ($mapping as $mappingDetails) {
-			$mappingId = $mappingDetails['mappingId'];
+			$mappingId = isset($mappingDetails['mappingId']) ? $mappingDetails['mappingId'] : '';
 			if ($mappingDetails['potential']) {
 				if ($mappingId) {
 					if ((array_key_exists('deletable', $mappingDetails)) || (!$mappingDetails['project'])) {