Merge pull request #8 from YetiForceCompany/developer

from origin git

.gitignore

@@ -2,11 +2,13 @@
 /.settings
 /.project
 /.buildpath
-/README.md
+README.md
 /cache/templates_c
 /config/csrf_secret.php
 /config/config_override.php
 /cache/logs/*.log
 /cache/vtlib/
 /test/templates_c/basic/*.php
 /nbproject/private/
+tests/*
+.travis.yml

.htaccess

@@ -1,3 +1,5 @@
+RedirectMatch 403 (?i).*\.log$
+
 <IfModule mod_autoindex.c>
 	Options -Indexes
 </ifModule>

config/version.php

@@ -8,6 +8,6 @@
  * All Rights Reserved.
  * Contributor(s): YetiForce.com
  * ****************************************************************************** */
-$patch_version = '20160713';
-$YetiForce_current_version = '3.1.578';
+$patch_version = '20160714';
+$YetiForce_current_version = '3.1.583';
 $_SESSION['yetiforce_version'] = $YetiForce_current_version;

include/CRMEntity.php

@@ -624,7 +624,9 @@ function insertIntoEntityTable($table_name, $module, $fileid = '')
 			}
 
 			if ($insertion_mode == 'edit') {
-				$updateColumns[$columname] = $fldvalue;
+				if($uitype != '4'){
+					$updateColumns[$columname] = $fldvalue;
+				}
 			} else {
 				array_push($column, $columname);
 				array_push($value, $fldvalue);

install/install_schema/data.sql

@@ -24055,8 +24055,8 @@ insert  into `vtiger_settings_field`(`fieldid`,`blockid`,`name`,`iconpath`,`desc
 insert  into `vtiger_settings_field`(`fieldid`,`blockid`,`name`,`iconpath`,`description`,`linkto`,`sequence`,`active`,`pinned`) values (96,1,'LBL_LOCKS','adminIcon-locks','LBL_LOCKS_DESCRIPTION','index.php?module=Users&view=Locks&parent=Settings',8,0,0);
 insert  into `vtiger_settings_field`(`fieldid`,`blockid`,`name`,`iconpath`,`description`,`linkto`,`sequence`,`active`,`pinned`) values (97,4,'LBL_TYPE_NOTIFICATIONS','adminIcon-TypeNotification','LBL_TYPE_NOTIFICATIONS_DESCRIPTION','index.php?module=Notifications&view=List&parent=Settings',12,0,0);
 insert  into `vtiger_settings_field`(`fieldid`,`blockid`,`name`,`iconpath`,`description`,`linkto`,`sequence`,`active`,`pinned`) values (98,4,'LBL_NOTIFICATIONS_CONFIGURATION','adminIcon-NotificationConfiguration','LBL_TYPE_NOTIFICATIONS_DESCRIPTION','index.php?module=Notifications&view=Configuration&parent=Settings',13,0,0);
-insert  into `vtiger_settings_field`(`fieldid`,`blockid`,`name`,`iconpath`,`description`,`linkto`,`sequence`,`active`,`pinned`) values (99,5,'LBL_POS',NULL,NULL,'index.php?module=POS&view=Index&parent=Settings',10,1,0);
-insert  into `vtiger_settings_field`(`fieldid`,`blockid`,`name`,`iconpath`,`description`,`linkto`,`sequence`,`active`,`pinned`) values (100,5,'LBL_WEBSERVICE_APPS',NULL,NULL,'index.php?module=WebserviceApps&view=Index&parent=Settings',11,1,0);
+insert  into `vtiger_settings_field`(`fieldid`,`blockid`,`name`,`iconpath`,`description`,`linkto`,`sequence`,`active`,`pinned`) values (99,5,'LBL_POS',NULL,NULL,'index.php?module=POS&view=Index&parent=Settings',10,0,0);
+insert  into `vtiger_settings_field`(`fieldid`,`blockid`,`name`,`iconpath`,`description`,`linkto`,`sequence`,`active`,`pinned`) values (100,5,'LBL_WEBSERVICE_APPS',NULL,NULL,'index.php?module=WebserviceApps&view=Index&parent=Settings',11,0,0);
 insert  into `vtiger_settings_field`(`fieldid`,`blockid`,`name`,`iconpath`,`description`,`linkto`,`sequence`,`active`,`pinned`) values (101,1,'LBL_OWNER_ALLOCATION','adminIcon-owner','LBL_OWNER_ALLOCATION_DESCRIPTION','index.php?module=RecordAllocation&view=Index&parent=Settings&type=owner',9,0,0);
 insert  into `vtiger_settings_field`(`fieldid`,`blockid`,`name`,`iconpath`,`description`,`linkto`,`sequence`,`active`,`pinned`) values (102,1,'LBL_MULTIOWNER_ALLOCATION','adminIcon-shared-owner','LBL_MULTIOWNER_ALLOCATION_DESCRIPTION','index.php?module=RecordAllocation&view=Index&parent=Settings&type=sharedOwner',10,0,0);
 

modules/IStorages/models/Module.php

@@ -78,7 +78,7 @@ public static function setQtyInStock($moduleName, $data, $storageId, $action)
 		$relData = $result->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_COLUMN);
 		foreach ($qtyInStock as $ID => $value) {
 			if (array_key_exists($ID, $relData)) {
-				$where = $referenceInfo['base'] . ' = ? AND ' . $referenceInfo['rel'] . '` = ?;';
+				$where = $referenceInfo['base'] . ' = ? AND `' . $referenceInfo['rel'] . '` = ?;';
 				$db->update($referenceInfo['table'], ['qtyinstock' => $qty], $where , [$value, $storageId, $ID]);
 			} else {
 				$db->insert($referenceInfo['table'], [$referenceInfo['base'] => $storageId, $referenceInfo['rel'] => $ID, 'qtyinstock' => $operator == '+' ? $value : $operator . $value]);

modules/Import/actions/Data.php

@@ -184,7 +184,7 @@ public function createRecords()
 		$entityData = [];
 		$tableName = Import_Utils_Helper::getDbTableName($this->user);
 		$sql = 'SELECT * FROM %s  WHERE temp_status = %s';
-		$sql = sprintf($query, $tableName, Import_Data_Action::$IMPORT_RECORD_NONE);
+		$sql = sprintf($sql, $tableName, Import_Data_Action::$IMPORT_RECORD_NONE);
 
 		$moduleModel = Vtiger_Module_Model::getInstance($moduleName);
 		$isInventory = $moduleModel->isInventory();

modules/Vtiger/models/Module.php

@@ -1798,6 +1798,22 @@ public function getRelationQueryForActivities($recordId, $relatedModule, $relati
 		if (count($relatedListFields) == 0) {
 			$relatedListFields = $relatedModule->getRelatedListFields();
 		}
+		if(in_array('assigned_user_id',$relatedListFields)){
+			$queryGenerator->setCustomFrom([
+				'joinType' => 'LEFT',
+				'relatedTable' => 'vtiger_users',
+				'relatedIndex' => 'id',
+				'baseTable' => 'vtiger_crmentity',
+				'baseIndex' => 'smownerid',
+			]);
+			$queryGenerator->setCustomFrom([
+				'joinType' => 'LEFT',
+				'relatedTable' => 'vtiger_groups',
+				'relatedIndex' => 'groupid',
+				'baseTable' => 'vtiger_crmentity',
+				'baseIndex' => 'smownerid',
+			]);
+		}
 		$queryGenerator->setFields($relatedListFields);
 		$queryGenerator->setCustomColumn('crmid');
 		$queryGenerator->permissions = false;