version

.gitignore

@@ -15,3 +15,4 @@
 /client
 /test.php
 /main.html
+/tests/testData/Utils/Config/config.php

.htaccess

@@ -1,10 +1,27 @@
+<ifModule mod_headers.c>
+  Header always set Access-Control-Allow-Methods "POST, GET, PUT, PATCH, DELETE"
+</ifModule>
+
 DirectoryIndex index.php index.html
 
-RedirectMatch 403 \.config$
+# PROTECTED DIRECTORIES
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteCond %{REQUEST_FILENAME} -d
+  RewriteRule (?i)(data|api) - [F]
+</IfModule>
+RedirectMatch 403 (?i)/data/config\.php$
+RedirectMatch 403 (?i)/data/logs
+RedirectMatch 403 (?i)/data/cache
+RedirectMatch 403 (?i)/data/upload
+RedirectMatch 403 (?i)/application
+RedirectMatch 403 (?i)/custom
+RedirectMatch 403 (?i)/vendor
+#END PROTECTED DIRECTORIES
 
 <IfModule mod_rewrite.c>
-RewriteEngine On
-RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
+  RewriteEngine On
+  RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
 
-RewriteRule reset/?$ reset.html [QSA,L]
+  RewriteRule reset/?$ reset.html [QSA,L]
 </IfModule>

Gruntfile.js

@@ -1,4 +1,50 @@
 module.exports = function (grunt) {
+
+	var jsFilesToMinify = [
+					'client/lib/jquery-2.0.2.min.js',
+					'client/lib/underscore-min.js',
+					'client/lib/backbone-min.js',
+					'client/lib/handlebars.js',
+					'client/lib/base64.js',
+					'client/lib/jquery-ui.min.js',
+					'client/lib/moment.min.js',
+					'client/lib/moment-timezone-with-data.min.js',
+					'client/lib/jquery.timepicker.min.js',
+					'client/lib/jquery.autocomplete.js',
+					'client/lib/bootstrap.min.js',
+					'client/lib/bootstrap-datepicker.js',
+					'client/lib/bull.min.js',					
+					'client/src/namespace.js',
+					'client/src/exceptions.js',
+					'client/src/app.js',
+					'client/src/utils.js',
+					'client/src/storage.js',
+					'client/src/loader.js',
+					'client/src/pre-loader.js',
+					'client/src/ui.js',
+					'client/src/acl.js',
+					'client/src/model.js',
+					'client/src/model-offline.js',
+					'client/src/metadata.js',
+					'client/src/language.js',
+					'client/src/cache.js',
+					'client/src/controller.js',
+					'client/src/router.js',
+					'client/src/date-time.js',
+					'client/src/field-manager.js',
+					'client/src/search-manager.js',
+					'client/src/collection.js',
+					'client/src/multi-collection.js',
+					'client/src/view-helper.js',
+					'client/src/layout-manager.js',
+					'client/src/model-factory.js',
+					'client/src/collection-factory.js',
+					'client/src/models/settings.js',
+					'client/src/models/user.js',
+					'client/src/models/preferences.js',
+					'client/src/controllers/base.js',
+					'client/src/view.js',
+	];
 	
 	grunt.initConfig({
 		pkg: grunt.file.readJSON('package.json'),
@@ -44,53 +90,9 @@ module.exports = function (grunt) {
 				mangle: false,
 				banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
 			},
-			'build/tmp/client/espo.min.js': [
-					'frontend/client/lib/jquery-2.0.2.min.js',
-					'frontend/client/lib/underscore-min.js',
-					'frontend/client/lib/backbone-min.js',
-					'frontend/client/lib/handlebars.js',
-					'frontend/client/lib/base64.js',
-					'frontend/client/lib/jquery-ui.min.js',
-					'frontend/client/lib/moment.min.js',
-					'frontend/client/lib/moment-timezone-with-data.min.js',
-					'frontend/client/lib/jquery.timepicker.min.js',
-					'frontend/client/lib/jquery.autocomplete.js',
-					'frontend/client/lib/bootstrap.min.js',
-					'frontend/client/lib/bootstrap-datepicker.js',
-					'frontend/client/lib/bull.min.js',					
-					'frontend/client/src/namespace.js',
-					'frontend/client/src/exceptions.js',
-					'frontend/client/src/app.js',
-					'frontend/client/src/utils.js',
-					'frontend/client/src/storage.js',
-					'frontend/client/src/loader.js',
-					'frontend/client/src/pre-loader.js',
-					'frontend/client/src/ui.js',
-					'frontend/client/src/acl.js',
-					'frontend/client/src/model.js',
-					'frontend/client/src/model-offline.js',
-					'frontend/client/src/metadata.js',
-					'frontend/client/src/language.js',
-					'frontend/client/src/cache.js',
-					'frontend/client/src/controller.js',
-					'frontend/client/src/router.js',
-					'frontend/client/src/date-time.js',
-					'frontend/client/src/field-manager.js',
-					'frontend/client/src/search-manager.js',
-					'frontend/client/src/collection.js',
-					'frontend/client/src/multi-collection.js',
-					'frontend/client/src/view-helper.js',
-					'frontend/client/src/layout-manager.js',
-					'frontend/client/src/model-factory.js',
-					'frontend/client/src/collection-factory.js',
-					'frontend/client/src/models/settings.js',
-					'frontend/client/src/models/user.js',
-					'frontend/client/src/models/preferences.js',
-					'frontend/client/src/controllers/base.js',
-					'frontend/client/src/view.js',
-					'frontend/client/src/views/base.js',
-					'frontend/client/src/views/login.js',
-			]
+			'build/tmp/client/espo.min.js': jsFilesToMinify.map(function (item) {
+				return 'frontend/' + item;
+			})
 		},
 		copy: {
 			frontendFolders: {
@@ -134,7 +136,7 @@ module.exports = function (grunt) {
 					'index.php',
 					'LICENSE.txt',
 					'.htaccess',
-					'Web.config',
+					'web.config',
 				],
 				dest: 'build/tmp/',
 			},

Web.config

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-    <system.webServer>
-        <rewrite>
-            <rules>
-                <rule name="rule 1X" stopProcessing="true">
-                    <match url="reset/?$"  />
-                    <action type="Rewrite" url="reset.html"  appendQueryString="true" />
-                </rule>
-            </rules>
-        </rewrite>
-
-        <defaultDocument>
-            <files>
-                <clear />
-                <add value="index.php" />
-            </files>
-        </defaultDocument>
-    </system.webServer>
-
-</configuration>

application/.htaccess

@@ -1,2 +0,0 @@
-Order Deny,Allow
-Deny from all

application/Espo/Controllers/Email.php

@@ -24,5 +24,11 @@ namespace Espo\Controllers;
 
 class Email extends \Espo\Core\Controllers\Record
 {
-
+	public function actionGetCopiedAttachments($params, $data, $request)
+	{		
+		$id = $request->get('id');
+		
+		return $this->getRecordService()->getCopiedAttachments($id);
+	}
 }
+

application/Espo/Controllers/EmailAccount.php

@@ -0,0 +1,40 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Controllers;
+
+class EmailAccount extends \Espo\Core\Controllers\Record
+{
+	public function actionGetFolders($params, $data, $request)
+	{		
+		return $this->getRecordService()->getFolders(array(
+			'host' => $request->get('host'),
+			'port' => $request->get('port'),
+			'ssl' => $request->get('ssl'),
+			'username' => $request->get('username'),
+			'password' => $request->get('password'),
+			'id' => $request->get('id')
+		));
+
+	}
+}
+

application/Espo/Controllers/EmailAddress.php

@@ -24,5 +24,14 @@ namespace Espo\Controllers;
 
 class EmailAddress extends \Espo\Core\Controllers\Record
 {
-
+	public function actionSearchInAddressBook($params, $data, $request)
+	{
+		$q = $request->get('q');
+		$limit = intval($request->get('limit'));
+		if (empty($limit) || $limit > 30) {
+			$limit = 5;
+		}
+		return $this->getRecordService()->searchInAddressBook($q, $limit);
+	}
 }
+

application/Espo/Controllers/ExternalAccount.php

@@ -0,0 +1,104 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Controllers;
+
+use \Espo\Core\Exceptions\Error;
+use \Espo\Core\Exceptions\Forbidden;
+
+class ExternalAccount extends \Espo\Core\Controllers\Record
+{
+	public static $defaultAction = 'list';
+	
+	public function actionList($params, $data, $request)
+	{
+		$integrations = $this->getEntityManager()->getRepository('Integration')->find();	
+		$arr = array();
+		foreach ($integrations as $entity) {
+			if ($entity->get('enabled') && $this->getMetadata()->get('integrations.' . $entity->id .'.allowUserAccounts')) {				
+				$arr[] = array(
+					'id' => $entity->id
+				);
+			}
+		}
+		return array(
+			'list' => $arr
+		);
+	}
+	
+	public function actionGetOAuthCredentials($params, $data, $request)
+	{
+		$id = $request->get('id');
+		list($integration, $userId) = explode('__', $id);
+		
+		if (!$this->getUser()->isAdmin()) {
+			if ($this->getUser()->id != $userId) {
+				throw new Forbidden();
+			}
+		}
+		
+		$entity = $this->getEntityManager()->getEntity('Integration', $integration);
+		if ($entity) {
+			return array(
+				'clientId' => $entity->get('clientId'),
+				'redirectUri' => $this->getConfig()->get('siteUrl') . '/oauthcallback'
+			);
+		}
+	}
+
+	public function actionRead($params, $data, $request)
+	{
+		list($integration, $userId) = explode('__', $params['id']);
+		
+		if (!$this->getUser()->isAdmin()) {
+			if ($this->getUser()->id != $userId) {
+				throw new Forbidden();
+			}
+		}
+		
+		$entity = $this->getEntityManager()->getEntity('ExternalAccount', $params['id']);		
+		return $entity->toArray();
+	}
+	
+	public function actionUpdate($params, $data)
+	{
+		return $this->actionPatch($params, $data);
+	}
+	
+	public function actionPatch($params, $data)
+	{
+		list($integration, $userId) = explode('__', $params['id']);
+		
+		if (!$this->getUser()->isAdmin()) {
+			if ($this->getUser()->id != $userId) {
+				throw new Forbidden();
+			}
+		}
+		
+		$entity = $this->getEntityManager()->getEntity('ExternalAccount', $params['id']);
+		$entity->set($data);
+		$this->getEntityManager()->saveEntity($entity);
+		
+		return $entity->toArray();		
+	}
+}
+

application/Espo/Controllers/GlobalSearch.php

@@ -34,7 +34,7 @@ class GlobalSearch extends \Espo\Core\Controllers\Base
 		$offset = $request->get('offset');
 		$maxSize = $request->get('maxSize');		
 		
-		return $this->getService('GlobalSearch')->find($query, $offset);
+		return $this->getService('GlobalSearch')->find($query, $offset, $maxSize);
 	}
 }
 

application/Espo/Controllers/Import.php

@@ -44,7 +44,8 @@ class Import extends \Espo\Core\Controllers\Base
 		$contents = $data;
 		
 		$attachment = $this->getEntityManager()->getEntity('Attachment');
-		$attachment->set('type', 'text/csv');		
+		$attachment->set('type', 'text/csv');
+		$attachment->set('role', 'Import File');		
 		$this->getEntityManager()->saveEntity($attachment);
 		
 		$this->getFileManager()->putContents('data/upload/' . $attachment->id, $contents);

application/Espo/Controllers/Integration.php

@@ -0,0 +1,61 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Controllers;
+
+use \Espo\Core\Exceptions\Error;
+
+class Integration extends \Espo\Core\Controllers\Record
+{	
+	protected function checkControllerAccess()
+	{
+		if (!$this->getUser()->isAdmin()) {
+			throw new Forbidden();
+		}
+	}
+	
+	public function actionIndex($params, $data, $request)
+	{
+		return false;
+	}
+
+	public function actionRead($params, $data, $request)
+	{
+		$entity = $this->getEntityManager()->getEntity('Integration', $params['id']);		
+		return $entity->toArray();
+	}
+	
+	public function actionUpdate($params, $data)
+	{
+		return $this->actionPatch($params, $data);
+	}
+	
+	public function actionPatch($params, $data)
+	{
+		$entity = $this->getEntityManager()->getEntity('Integration', $params['id']);
+		$entity->set($data);
+		$this->getEntityManager()->saveEntity($entity);
+		
+		return $entity->toArray();		
+	}
+}
+

application/Espo/Controllers/Layout.php

@@ -25,6 +25,7 @@ namespace Espo\Controllers;
 use Espo\Core\Utils as Utils;
 use \Espo\Core\Exceptions\NotFound;
 use \Espo\Core\Exceptions\Error;
+use \Espo\Core\Exceptions\Forbidden;
 
 class Layout extends \Espo\Core\Controllers\Base
 {
@@ -39,6 +40,10 @@ class Layout extends \Espo\Core\Controllers\Base
 
 	public function actionUpdate($params, $data)
 	{
+        if (!$this->getUser()->isAdmin()) {
+        	throw new Forbidden();
+        }
+        
         $result = $this->getContainer()->get('layout')->set($data, $params['scope'], $params['name']);
 
 		if ($result === false) {

application/Espo/Controllers/Notification.php

@@ -54,7 +54,13 @@ class Notification extends \Espo\Core\Controllers\Base
 	public function actionNotReadCount()
 	{
 		$userId = $this->getUser()->id;
-		return $this->getService('Notification')->getNotReadCount($userId);	
+		return $this->getService('Notification')->getNotReadCount($userId);
+	}
+	
+	public function actionMarkAllRead($params, $data, $request)
+	{
+		$userId = $this->getUser()->id;
+		return $this->getService('Notification')->markAllRead($userId);
 	}
 }
 

application/Espo/Controllers/Preferences.php

@@ -68,6 +68,8 @@ class Preferences extends \Espo\Core\Controllers\Base
 			$entity->set('smtpEmailAddress', $user->get('emailAddress'));			
 			$entity->set('name', $user->get('name'));
 			
+			$entity->clear('smtpPassword');
+			
 			return $entity->toArray();		
 		}
 		throw new Error();
@@ -83,6 +85,9 @@ class Preferences extends \Espo\Core\Controllers\Base
 		
 		$entity->set('smtpEmailAddress', $user->get('emailAddress'));
 		$entity->set('name', $user->get('name'));
+		
+		$entity->clear('smtpPassword');
+		
 		if ($entity) {
 			return $entity->toArray();		
 		}

application/Espo/Controllers/Settings.php

@@ -63,6 +63,12 @@ class Settings extends \Espo\Core\Controllers\Base
 			throw new Error('Cannot save settings');
 		}
 
+		/** Rebuild for Currency Settings */
+		if (isset($data['baseCurrency']) || isset($data['currencyRates'])) {
+			$this->getContainer()->get('dataManager')->rebuildDatabase(array());
+		}
+		/** END Rebuild for Currency Settings */
+
 		return $this->getConfigData();
 	}
 }

application/Espo/Controllers/User.php

@@ -44,7 +44,7 @@ class User extends \Espo\Core\Controllers\Record
 			throw new NotFound();
 		}
 		
-		$acl = new \Espo\Core\Acl($user);
+		$acl = new \Espo\Core\Acl($user, $this->getConfig(), $this->getContainer()->get('fileManager'), $this->getMetadata());
 		
 		return $acl->toArray();					
 	}

application/Espo/Core/Acl.php

@@ -34,11 +34,15 @@ class Acl
 
 	private $levelList = array('all', 'team', 'own', 'no');
 	
-	private $fileManager;
+	protected $fileManager;
+	
+	protected $metadata;
 
-	public function __construct(\Espo\Entities\User $user, $config = null, $fileManager = null)
+	public function __construct(\Espo\Entities\User $user, $config = null, $fileManager = null, $metadata = null)
 	{
-		$this->user = $user;		
+		$this->user = $user;
+		
+		$this->metadata = $metadata;		
 		
 		if (!$this->user->isFetched()) {
 			throw new Error();
@@ -197,32 +201,11 @@ class Acl
 	
 	private function initSolid()
 	{
-		$this->data['User'] = array(
-			'read' => 'all',
-			'edit' => 'no',
-			'delete' => 'no',					
-		);
-		$this->data['Team'] = array(
-			'read' => 'all',
-			'edit' => 'no',
-			'delete' => 'no',					
-		);
-		$this->data['Role'] = false;
-		$this->data['Note'] = array(
-			'read' => 'own',
-			'edit' => 'own',
-			'delete' => 'own',					
-		);
-		$this->data['EmailAddress'] = array(
-			'read' => 'no',
-			'edit' => 'no',
-			'delete' => 'no',					
-		);
-		$this->data['Note'] = array(
-			'read' => 'all',
-			'edit' => 'own',
-			'delete' => 'own',					
-		);
+		$data = $this->metadata->get('app.acl.solid', array());
+		
+		foreach ($data as $entityName => $item) {
+			$this->data[$entityName] = $item;
+		}
 	}
 
 	private function merge($tables)

application/Espo/Core/Container.php

@@ -51,7 +51,6 @@ class Container
     		$obj = $this->$loadMethod();
     		$this->data[$name] = $obj;
     	} else {
-            //external loader class \Espo\Core\Loaders\<className> or \Espo\Custom\Core\Loaders\<className> with load() method
 			$className = '\Espo\Custom\Core\Loaders\\'.ucfirst($name);
             if (!class_exists($className)) {
             	$className = '\Espo\Core\Loaders\\'.ucfirst($name);
@@ -63,13 +62,18 @@ class Container
 			}
     	}
 
-		// TODO throw an exception
     	return null;
     }
+    
+    protected function getServiceClassName($name, $default)
+    {
+    	$metadata = $this->get('metadata');
+    	$className = $metadata->get('app.serviceContainer.classNames.' . $name, $default);
+    	return $className;
+    }
 
     private function loadSlim()
     {
-        //return new \Slim\Slim();
         return new \Espo\Core\Utils\Api\Slim();
     }
 
@@ -108,7 +112,8 @@ class Container
 
 	private function loadMailSender()
     {
-    	return new \Espo\Core\Mail\Sender(
+    	$className = $this->getServiceClassName('mailSernder', '\\Espo\\Core\\Mail\\Sender');
+    	return new $className(
 			$this->get('config')
 		);
     }
@@ -157,10 +162,12 @@ class Container
 
 	private function loadAcl()
 	{
-		return new \Espo\Core\Acl(
+		$className = $this->getServiceClassName('acl', '\\Espo\\Core\\Acl');
+		return new $className(
 			$this->get('user'),
 			$this->get('config'),
-			$this->get('fileManager')
+			$this->get('fileManager'),
+			$this->get('metadata')
 		);
 	}
 

application/Espo/Core/ControllerManager.php

@@ -78,7 +78,7 @@ class ControllerManager
 			throw new NotFound("Controller '$controllerName' is not found");
 		}
 
-		$controller = new $controllerClassName($this->container);
+		$controller = new $controllerClassName($this->container, $request->getMethod());
 
 		if ($actionName == 'index') {
 			$actionName = $controllerClassName::$defaultAction;

application/Espo/Core/Controllers/Base.php

@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Controllers;
 
@@ -29,15 +29,21 @@ use \Espo\Core\Utils\Util;
 abstract class Base
 {
 	protected $name;
-	
+
 	private $container;
-	
+
+	private $requestMethod;
+
 	public static $defaultAction = 'index';
 
-	public function __construct(Container $container)
+	public function __construct(Container $container, $requestMethod = null)
 	{
 		$this->container = $container;
-		
+
+		if (isset($requestMethod)) {
+			$this->setRequestMethod($requestMethod);
+		}
+
 		if (empty($this->name)) {
 			$name = get_class($this);
 			if (preg_match('@\\\\([\w]+)$@', $name, $matches)) {
@@ -45,40 +51,55 @@ abstract class Base
 			}
 			$this->name = $name;
     	}
-    	
+
     	$this->checkControllerAccess();
 	}
-	
+
 	protected function checkControllerAccess()
 	{
 		return;
 	}
-	
+
 	protected function getContainer()
 	{
 		return $this->container;
 	}
-	
+
+	/**
+	 * Get request method name (Uppercase)
+	 *
+	 * @return string
+	 */
+	protected function getRequestMethod()
+	{
+		return $this->requestMethod;
+	}
+
+	protected function setRequestMethod($requestMethod)
+	{
+		$this->requestMethod = strtoupper($requestMethod);
+	}
+
 	protected function getUser()
 	{
 		return $this->container->get('user');
 	}
-	
+
 	protected function getAcl()
 	{
 		return $this->container->get('acl');
 	}
-	
+
 	protected function getConfig()
 	{
 		return $this->container->get('config');
 	}
-	
+
 	protected function getPreferences()
 	{
 		return $this->container->get('preferences');
 	}
-	
+
 	protected function getMetadata()
 	{
 		return $this->container->get('metadata');
@@ -88,7 +109,7 @@ abstract class Base
 	{
 		return $this->container->get('serviceFactory');
 	}
-	
+
 	protected function getService($name)
 	{
 		return $this->getServiceFactory()->create($name);

application/Espo/Core/Cron/Service.php

@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Cron;
 
@@ -46,22 +46,22 @@ class Service
 		$serviceName = $job['service_name'];
 
 		if (!$this->getServiceFactory()->checkExists($serviceName)) {
-			throw new NotFound(); 										
+			throw new NotFound();
 		}
 
-		$service = $this->getServiceFactory()->create($serviceName);	
-		$serviceMethod = $job['method'];	
+		$service = $this->getServiceFactory()->create($serviceName);
+		$serviceMethod = $job['method'];
 
 		if (!method_exists($service, $serviceMethod)) {
-			throw new NotFound();					
-		}	
+			throw new NotFound();
+		}
 
 		$data = $job['data'];
 		if (Json::isJSON($data)) {
 			$data = Json::decode($data, true);
 		}
 
-		$service->$serviceMethod($data);		
+		$service->$serviceMethod($data);
 	}
 
 }

application/Espo/Core/CronManager.php

@@ -34,6 +34,11 @@ class CronManager
 	private $jobService;
 	private $scheduledJobService;
 
+	const PENDING = 'Pending';
+	const RUNNING = 'Running';
+	const SUCCESS = 'Success';
+	const FAILED = 'Failed';
+
 	protected $lastRunTime = 'data/cache/application/cronLastRunTime.php';
 
 
@@ -128,13 +133,12 @@ class CronManager
 		//Check scheduled jobs and create related jobs
 		$this->createJobsFromScheduledJobs();
 
-
 		$pendingJobs = $this->getJobService()->getPendingJobs();
 
 		foreach ($pendingJobs as $job) {
 
 			$this->getJobService()->updateEntity($job['id'], array(
-				'status' => 'Running',
+				'status' => self::RUNNING,
 			));
 
 			$isSuccess = true;
@@ -150,7 +154,7 @@ class CronManager
 				$GLOBALS['log']->error('Failed job running, job ['.$job['id'].']. Error Details: '.$e->getMessage());
 			}
 
-			$status = $isSuccess ? 'Success' : 'Failed';
+			$status = $isSuccess ? self::SUCCESS : self::FAILED;
 
 			$this->getJobService()->updateEntity($job['id'], array(
 				'status' => $status,
@@ -180,7 +184,6 @@ class CronManager
 			$cronExpression = \Cron\CronExpression::factory($scheduling);
 
 			try {
-				//$nextDate = $cronExpression->getNextRunDate()->format('Y-m-d H:i:s');
 				$prevDate = $cronExpression->getPreviousRunDate()->format('Y-m-d H:i:s');
 			} catch (\Exception $e) {
 				$GLOBALS['log']->error('ScheduledJob ['.$scheduledJob['id'].']: CronExpression - Impossible CRON expression ['.$scheduling.']');
@@ -197,7 +200,7 @@ class CronManager
 				//create a job
 				$data = array(
 					'name' => $scheduledJob['name'],
-					'status' => 'Pending',
+					'status' => self::PENDING,
 					'scheduledJobId' => $scheduledJob['id'],
 					'executeTime' => $prevDate,
 					'method' => $scheduledJob['job'],

application/Espo/Core/DataManager.php

@@ -121,8 +121,9 @@ class DataManager
 	 */
 	public function updateCacheTimestamp()
 	{
-		return $this->getContainer()->get('config')->updateCacheTimestamp();
+		$this->getContainer()->get('config')->updateCacheTimestamp();
+		$this->getContainer()->get('config')->save();
+		return true;
 	}
+}
 
-
-}

application/Espo/Core/Loaders/EntityManager.php

@@ -25,7 +25,7 @@ namespace Espo\Core\Loaders;
 use Doctrine\ORM\Tools\Setup,
     Espo\Core\Doctrine\ORM\Mapping\Driver\EspoPHPDriver;
 
-class EntityManager
+class EntityManager implements Loader
 {
 	private $container;
 

application/Espo/Core/Loaders/Loader.php

@@ -0,0 +1,31 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
+
+namespace Espo\Core\Loaders;
+
+
+interface Loader
+{
+	public function load();
+
+}
+

application/Espo/Core/Loaders/Log.php

@@ -25,7 +25,7 @@ namespace Espo\Core\Loaders;
 use Espo\Core\Utils,
 	Espo\Core\Utils\Log\Monolog\Handler;
 
-class Log
+class Log implements Loader
 {
 	private $container;
 

application/Espo/Core/Mail/Importer.php

@@ -0,0 +1,244 @@
+<?php
+
+namespace Espo\Core\Mail;
+
+use \Zend\Mime\Mime as Mime;
+
+class Importer
+{	
+	private $entityManager;
+	
+	private $fileManager;
+	
+	public function __construct($entityManager, $fileManager)
+	{
+		$this->entityManager = $entityManager;
+		$this->fileManager = $fileManager;
+	}
+	
+	protected function getEntityManager()
+	{
+		return $this->entityManager;
+	}
+	
+	protected function getFileManager()
+	{
+		return $this->fileManager;
+	}
+	
+	public function importMessage($message, $userId, $teamsIds = array())
+	{
+		try {
+			$email = $this->getEntityManager()->getEntity('Email');
+			
+			$email->set('isHtml', false);		
+			$email->set('name', $message->subject);
+			$email->set('status', 'Archived');
+			$email->set('attachmentsIds', array());			
+			$email->set('assignedUserId', $userId);
+			$email->set('teamsIds', $teamsIds);
+			
+			$fromArr = $this->getAddressListFromMessage($message, 'from');			
+			if (isset($message->from)) {
+				$email->set('fromName', $message->from);
+			}			
+			$email->set('from', $fromArr[0]);
+			$email->set('to', implode(';', $this->getAddressListFromMessage($message, 'to')));		
+			$email->set('cc', implode(';', $this->getAddressListFromMessage($message, 'cc')));
+			
+			if (isset($message->messageId) && !empty($message->messageId)) { 
+				$email->set('messageId', $message->messageId);
+				if (isset($message->deliveredTo)) {
+					$email->set('messageIdInternal', $message->messageId . '-' . $message->deliveredTo);
+				}
+			}
+			
+			if ($this->checkIsDuplicate($email)) {
+				return false;
+			}			
+
+			if (isset($message->date)) {
+				$dt = new \DateTime($message->date);
+				if ($dt) {
+					$dateSent = $dt->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d H:i:s');		
+					$email->set('dateSent', $dateSent);
+				}
+			}
+			if (isset($message->deliveryDate)) {
+				$dt = new \DateTime($message->deliveryDate);
+				if ($dt) {
+					$deliveryDate = $dt->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d H:i:s');		
+					$email->set('deliveryDate', $deliveryDate);
+				}
+			}
+			
+			$inlineIds = array();
+	
+			if ($message->isMultipart()) {				
+				foreach (new \RecursiveIteratorIterator($message) as $part) {
+					$this->importPartDataToEmail($email, $part, $inlineIds);
+				}			
+			} else {
+				$this->importPartDataToEmail($email, $message, $inlineIds);
+			}
+			
+			$body = $email->get('body');
+			if (!empty($body)) {
+				foreach ($inlineIds as $cid => $attachmentId) {
+					$body = str_replace('cid:' . $cid, '?entryPoint=attachment&amp;id=' . $attachmentId, $body);
+				}
+				$email->set('body', $body);
+			}
+
+			$this->getEntityManager()->saveEntity($email);
+			
+			return $email;
+					
+		} catch (\Exception $e) {}
+	}
+	
+	protected function checkIsDuplicate($email)
+	{
+		if ($email->get('messageIdInternal')) {
+			$duplicate = $this->getEntityManager()->getRepository('Email')->where(array(
+				'messageIdInternal' => $email->get('messageIdInternal')
+			))->findOne();
+			if ($duplicate) {
+				return true;
+			}
+		}
+	}
+	
+	protected function getAddressListFromMessage($message, $type)
+	{
+		$addressList = array();
+		if (isset($message->$type)) {
+			
+			$list = $message->getHeader($type)->getAddressList();
+			foreach ($list as $address) {
+				$addressList[] = $address->getEmail();
+			}
+		}
+		return $addressList;
+	}
+	
+	protected function importPartDataToEmail(\Espo\Entities\Email $email, $part, &$inlineIds = array())
+	{		
+		try {
+			$type = strtok($part->contentType, ';');
+			$encoding = null;
+			
+			switch ($type) {
+				case 'text/plain':					
+					$content = $this->getContentFromPart($part);				
+					if (!$email->get('body')) {				
+						$email->set('body', $content);
+					}
+					$email->set('bodyPlain', $content);
+					break;
+				case 'text/html':
+					$content = $this->getContentFromPart($part);
+					$email->set('body', $content);
+					$email->set('isHtml', true);
+					break;
+				default:
+					$content = $part->getContent();					
+					$disposition = null;
+					
+					$fileName = null;
+					$contentId = null;
+							
+					if (isset($part->ContentDisposition)) {				
+						if (strpos($part->ContentDisposition, 'attachment') === 0) {
+							if (preg_match('/filename="?([^"]+)"?/i', $part->ContentDisposition, $m)) {
+								$fileName = $m[1];
+								$disposition = 'attachment';
+							}							
+						} else if (strpos($part->ContentDisposition, 'inline') === 0) {
+							$contentId = trim($part->contentID, '<>');
+							$fileName = $contentId;
+							$disposition = 'inline';
+						}						
+					}
+					
+					if (isset($part->contentTransferEncoding)) {
+						$encoding = strtolower($part->getHeader('Content-Transfer-Encoding')->getTransferEncoding());
+					}
+					
+					$attachment = $this->getEntityManager()->getEntity('Attachment');
+					$attachment->set('name', $fileName);							
+					$attachment->set('type', $type);
+					
+					if ($disposition == 'inline') {
+						$attachment->set('role', 'Inline Attachment');
+					} else {
+						$attachment->set('role', 'Attachment');
+					}
+					
+					if ($encoding == 'base64') {
+						$content = base64_decode($content);
+					}
+					
+					$attachment->set('size', strlen($content));
+							
+					$this->getEntityManager()->saveEntity($attachment);
+												
+					$path = 'data/upload/' . $attachment->id;					
+					$this->getFileManager()->putContents($path, $content);					
+					
+					if ($disposition == 'attachment') {
+						$attachmentsIds = $email->get('attachmentsIds');
+						$attachmentsIds[] = $attachment->id;
+						$email->set('attachmentsIds', $attachmentsIds);	
+					} else if ($disposition == 'inline') {
+						$inlineIds[$contentId] = $attachment->id;
+					}		
+			}
+		} catch (\Exception $e) {}		
+	}
+	
+	protected function getContentFromPart($part)
+	{
+		if ($part instanceof \Zend\Mime\Part) {
+			$content = $part->getRawContent();
+			if (strtolower($part->charset) != 'utf-8') {
+				$content = mb_convert_encoding($content, 'UTF-8', $part->charset);
+			}
+		} else {
+			$content = $part->getContent();
+			
+			$encoding = null;
+			
+			if (isset($part->contentTransferEncoding)) {
+				$cteHeader = $part->getHeader('Content-Transfer-Encoding');
+				$encoding = strtolower($cteHeader->getTransferEncoding());
+			}
+			
+			if ($encoding == 'base64') {
+				$content = base64_decode($content);
+			}
+			
+			$charset = 'UTF-8';			
+			
+			if (isset($part->contentType)) {
+				$ctHeader = $part->getHeader('Content-Type');
+				$charsetParamValue = $ctHeader->getParameter('charset');
+				if (!empty($charsetParamValue)) {
+					$charset = strtoupper($charsetParamValue);
+				}
+			}
+			
+			if ($charset !== 'UTF-8') {
+				$content = mb_convert_encoding($content, 'UTF-8', $charset);
+			}			
+			
+			if (isset($part->contentTransferEncoding)) {
+				$cteHeader = $part->getHeader('Content-Transfer-Encoding');			
+				if ($cteHeader->getTransferEncoding() == 'quoted-printable') {					
+					$content = quoted_printable_decode($content);
+				}
+			}			
+		}
+		return $content;
+	}
+}

application/Espo/Core/Mail/Sender.php

@@ -124,23 +124,25 @@ class Sender
 		return $this;
 	}
 
-	public function send(Email $email)
+	public function send(Email $email, $params = array())
 	{
 		$message = new Message();
 
 		$config = $this->config;
+		
+		$params = $this->params + $params;
 
 		if ($email->get('from')) {
 			$fromName = null;
-			if (!empty($this->params['fromName'])) {
-				$fromName = $this->params['fromName'];
+			if (!empty($params['fromName'])) {
+				$fromName = $params['fromName'];
 			} else {
 				$fromName = $config->get('outboundEmailFromName');
 			}
 			$message->addFrom(trim($email->get('from')), $fromName);
 		} else {
-			if (!empty($this->params['fromAddress'])) {
-				$fromAddress = $this->params['fromAddress'];
+			if (!empty($params['fromAddress'])) {
+				$fromAddress = $params['fromAddress'];
 			} else {
 				if (!$config->get('outboundEmailFromAddress')) {
 					throw new Error('outboundEmailFromAddress is not specified in config.');
@@ -148,14 +150,22 @@ class Sender
 				$fromAddress = $config->get('outboundEmailFromAddress');
 			}
 
-			if (!empty($this->params['fromName'])) {
-				$fromName = $this->params['fromName'];
+			if (!empty($params['fromName'])) {
+				$fromName = $params['fromName'];
 			} else {
 				$fromName = $config->get('outboundEmailFromName');
 			}
 
 			$message->addFrom($fromAddress, $fromName);
 		}
+		
+		if (!empty($params['replyToAddress'])) {
+			$replyToName = null;
+			if (!empty($params['replyToName'])) {
+				$replyToName = $params['replyToName'];
+			}
+			$message->setReplyTo($params['replyToAddress'], $replyToName);
+		}
 
 		$value = $email->get('to');
 		if ($value) {
@@ -191,23 +201,21 @@ class Sender
 
 		$body = new MimeMessage;
 		$parts = array();
-		
+	
 
+		$bodyPart = new MimePart($email->getBodyPlainForSending());			
+		$bodyPart->type = 'text/plain';
+		$bodyPart->charset = 'utf-8';
+		$parts[] = $bodyPart;
+
+		
 		if ($email->get('isHtml')) {
 			$bodyPart = new MimePart($email->getBodyForSending());
 			$bodyPart->type = 'text/html';
 			$bodyPart->charset = 'utf-8';
-		} else {			
-			if ($email->get('bodyPlain')) {
-				$bodyPart = new MimePart($email->get('bodyPlain'));
-			} else {
-				$bodyPart = new MimePart($email->get('body'));
-			}
-			$bodyPart->type = 'text/plain';
-			$bodyPart->charset = 'utf-8';
+			$parts[] = $bodyPart;
 		}
-
-		$parts[] = $bodyPart;
+		
 
 		$aCollection = $email->get('attachments');
 		if (!empty($aCollection)) {
@@ -241,9 +249,19 @@ class Sender
 
 		$body->setParts($parts);
 		$message->setBody($body);
+		
+		if ($email->get('isHtml')) {
+			$message->getHeaders()->get('content-type')->setType('multipart/alternative');
+		}
 
 		try {
 			$this->transport->send($message);
+			
+			$headers = $message->getHeaders();
+			if ($headers->has('messageId')) {			
+				$email->set('messageId', $headers->get('messageId')->getId());
+			}
+
 			$email->set('status', 'Sent');
 			$email->set('dateSent', date("Y-m-d H:i:s"));
 		} catch (\Exception $e) {

application/Espo/Core/Mail/Storage/Imap.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Espo\Core\Mail\Storage;
+
+class Imap extends \Zend\Mail\Storage\Imap
+{	
+	public function getIdsFromUID($uid)
+	{
+		$uid = intval($uid) + 1;
+		return $this->protocol->search(array('UID ' . $uid . ':*'));
+	}
+	
+	public function getIdsFromDate($date)
+	{		
+		return $this->protocol->search(array('SINCE "' . $date . '"'));
+	}
+	
+}
+

application/Espo/Core/SelectManagers/Base.php

@@ -39,6 +39,8 @@ class Base
 	protected $entityName;
 
 	protected $metadata;
+	
+	const MIN_LENGTH_FOR_CONTENT_SEARCH = 4;
 
     public function __construct($entityManager, \Espo\Entities\User $user, Acl $acl, $metadata)
     {
@@ -106,10 +108,19 @@ class Base
 						if (empty($result['whereClause'])) {
 							$result['whereClause'] = array();
 						}
+						$fieldDefs = $this->entityManager->getEntity($this->entityName)->getFields();
 						$fieldList = $this->getTextFilterFields();
 						$d = array();
-						foreach ($fieldList as $field) {
-							$d[$field . '*'] = $item['value'] . '%';
+						foreach ($fieldList as $field) {						
+							if (
+								strlen($item['value']) >= self::MIN_LENGTH_FOR_CONTENT_SEARCH 
+								&&
+								!empty($fieldDefs[$field]['type']) && $fieldDefs[$field]['type'] == 'text'
+							) {
+								$d[$field . '*'] = '%' . $item['value'] . '%';
+							} else {
+								$d[$field . '*'] = $item['value'] . '%';
+							}
 						}
 						$where['OR'] = $d;				
 					}
@@ -176,18 +187,23 @@ class Base
     		}
     		$result['whereClause']['assignedUserId'] = $this->user->id;
     	}
-    	if ($this->acl->checkReadOnlyTeam($this->entityName)) {
+    	if (!$this->user->isAdmin() && $this->acl->checkReadOnlyTeam($this->entityName)) {
     		if (!array_key_exists('whereClause', $result)) {
     			$result['whereClause'] = array();
     		}
+    		$result['distinct'] = true;
     		if (!array_key_exists('joins', $result)) {
     			$result['joins'] = array();
     		}
     		if (!in_array('teams', $result['joins'])) {
-    			$result['joins'][] = 'teams';
+    			$result['leftJoins'][] = 'teams';
     		}
 
-    		$result['whereClause']['Team.id'] = $this->user->get('teamsIds');
+			$result['whereClause']['OR'] = array(
+				'Team.id' => $this->user->get('teamsIds'),
+				'assignedUserId' => $this->user->id
+			);
+    		//$result['whereClause']['Team.id'] = $this->user->get('teamsIds');
     	}
     }
 

application/Espo/Core/Services/Base.php

@@ -26,7 +26,11 @@ use \Espo\Core\Interfaces\Injectable;
 
 abstract class Base implements Injectable
 {
-	protected $dependencies = array();
+	protected $dependencies = array(
+		'config',
+		'entityManager',
+		'user',
+	);
 	
 	protected $injections = array();
 	
@@ -53,5 +57,20 @@ abstract class Base implements Injectable
 	{
 		return $this->dependencies;
 	}
+	
+	protected function getEntityManager()
+	{
+		return $this->getInjection('entityManager');
+	}
+	
+	protected function getConfig()
+	{
+		return $this->getInjection('config');
+	}
+
+	protected function getUser()
+	{
+		return $this->getInjection('user');
+	}
 }
 

application/Espo/Core/Upgrades/Base.php

@@ -319,7 +319,7 @@ abstract class Base
 
 			$manifestPath = Util::concatPath($upgradePath, $this->manifestName);
 			if (!file_exists($manifestPath)) {
-				throw new Error('It\'s not an uprgade package.');
+				throw new Error('It\'s not an upgrade package.');
 			}
 
 			$manifestJson = $this->getFileManager()->getContents($manifestPath);
@@ -390,4 +390,4 @@ abstract class Base
 	}
 
 
-}
+}

application/Espo/Core/Utils/Auth.php

@@ -51,11 +51,12 @@ class Auth
 		$entityManager = $this->container->get('entityManager');
 
 		$user = $entityManager->getRepository('User')->get('system');
-		$user->set('isAdmin', $isAdmin);
 		if (!$user) {
 			throw new Error('System user is not found');
 		}
 
+		$user->set('isAdmin', $isAdmin);
+
 		$entityManager->setUser($user);
 		$this->container->setUser($user);
 	}

application/Espo/Core/Utils/Config.php

@@ -56,6 +56,7 @@ class Config
 	private $data;
 
 	private $changedData = array();
+	private $removeData = array();
 
 	private $fileManager;
 
@@ -112,11 +113,33 @@ class Config
 		}
 
 		foreach ($name as $key => $value) {
+
+			if (is_object($value)) {
+				$value = (array) $value;
+			}
+
 			$this->data[$key] = $value;
 			$this->changedData[$key] = $value;
 		}
 	}
 
+	/**
+	 * Remove an option in config
+	 *
+	 * @param  string $name
+	 * @return bool | null - null if an option doesn't exist
+	 */
+	public function remove($name)
+	{
+		if (array_key_exists($name, $this->data)) {
+			unset($this->data[$name]);
+			$this->removeData[] = $name;
+			return true;
+		}
+
+		return null;
+	}
+
 	public function save()
 	{
 		$values = $this->changedData;
@@ -125,9 +148,12 @@ class Config
 			$values = array_merge($this->updateCacheTimestamp(true), $values);
 		}
 
-		$result = $this->getFileManager()->mergeContentsPHP($this->configPath, $values, true);
+		$removeData = empty($this->removeData) ? null : $this->removeData;
+
+		$result = $this->getFileManager()->mergeContentsPHP($this->configPath, $values, 1, $removeData);
 		if ($result) {
 			$this->changedData = array();
+			$this->removeData = array();
 			$this->loadConfig(true);
 		}
 

application/Espo/Core/Utils/Database/DBAL/FieldTypes/Bool.php

@@ -18,15 +18,13 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils\Database\DBAL\FieldTypes;
 
-use Doctrine\DBAL\Types\Type;
-use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\BooleanType;
 
-
-class Bool extends Type
+class Bool extends BooleanType
 {
 	const BOOL = 'bool';
 
@@ -39,27 +37,4 @@ class Bool extends Type
 	{
 		return 'TINYINT';
 	}
-
-
-    public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
-    {
-        return $platform->getBooleanTypeDeclarationSQL($fieldDeclaration);
-    }
-
-
-    public function convertToDatabaseValue($value, AbstractPlatform $platform)
-    {
-        return $platform->convertBooleans($value);
-    }
-
-
-    public function convertToPHPValue($value, AbstractPlatform $platform)
-    {
-        return (null === $value) ? null : (bool) $value;
-    }
-
-    public function getBindingType()
-    {
-        return \PDO::PARAM_BOOL;
-    }
 }

application/Espo/Core/Utils/Database/DBAL/FieldTypes/Int.php

@@ -18,38 +18,18 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils\Database\DBAL\FieldTypes;
 
-use Doctrine\DBAL\Types\Type;
-use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\IntegerType;
 
-
-class Int extends Type
+class Int extends IntegerType
 {
 	const INTtype = 'int';
 
-
     public function getName()
     {
         return self::INTtype;
     }
-
-    public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
-    {
-        return $platform->getIntegerTypeDeclarationSQL($fieldDeclaration);
-    }
-
-
-    public function convertToPHPValue($value, AbstractPlatform $platform)
-    {
-        return (null === $value) ? null : (int) $value;
-    }
-
-    
-    public function getBindingType()
-    {
-        return \PDO::PARAM_INT;
-    }
 }

application/Espo/Core/Utils/Database/DBAL/FieldTypes/Password.php

@@ -18,14 +18,13 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils\Database\DBAL\FieldTypes;
 
-use Doctrine\DBAL\Types\Type;
-use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\StringType;
 
-class Password extends Type
+class Password extends StringType
 {
     const PASSWORD = 'password';
 
@@ -38,23 +37,5 @@ class Password extends Type
 	{
 		return 'VARCHAR';
 	}
-
-    public function getSqlDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
-    {
-        return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration);
-		//return "MD5";
-    }
-
-    /*public function convertToPHPValue($value, AbstractPlatform $platform)
-    {
-        return $value;
-    }
-
-    public function convertToDatabaseValue($value, AbstractPlatform $platform)
-    {
-        return $value;
-    } */
-
-
 }
 

application/Espo/Core/Utils/Database/DBAL/FieldTypes/Varchar.php

@@ -18,15 +18,13 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils\Database\DBAL\FieldTypes;
 
-use Doctrine\DBAL\Types\Type;
-use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\StringType;
 
-
-class Varchar extends Type
+class Varchar extends StringType
 {
 	const VARCHAR = 'varchar';
 
@@ -34,16 +32,4 @@ class Varchar extends Type
     {
         return self::VARCHAR;
     }
-
-    public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
-    {
-        return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration);
-		//return 'varchar';
-    }
-
-
-    public function getDefaultLength(AbstractPlatform $platform)
-    {
-        return $platform->getVarcharDefaultLength();
-    }
 }

application/Espo/Core/Utils/Database/Orm/Base.php

@@ -244,17 +244,8 @@ class Base
 		$foreignField = $this->getMetadata()->get('entityDefs.'.$entityName.'.fields.'.$name);
 
 		if ($foreignField['type'] != 'varchar') {
-			$fieldDefs = $this->getMetadata()->get('fields.'.$foreignField['type']);
-			$naming = isset($fieldDefs['naming']) ? $fieldDefs['naming'] : 'postfix';
-
-			if (isset($fieldDefs['actualFields']) && is_array($fieldDefs['actualFields'])) {
-				$foreignFieldArray = array();
-				foreach($fieldDefs['actualFields'] as $fieldName) {
-					if ($fieldName != 'salutation') {
-						$foreignFieldArray[] = Util::getNaming($name, $fieldName, $naming);
-					}
-				}
-				return explode('|', implode('| |', $foreignFieldArray)); //add an empty string between items
+			if ($foreignField['type'] == 'personName') {
+				return array('first' . ucfirst($name), ' ', 'last' . ucfirst($name));
 			}
 		}
 

application/Espo/Core/Utils/Database/Orm/Converter.php

@@ -57,6 +57,7 @@ class Converter
 		'len' => 'len',
 		'notNull' => 'notNull',
 		'autoincrement' => 'autoincrement',
+		'entity' => 'entity',
 		'notStorable' => 'notStorable',
 		'link' => 'relation',
 		'field' => 'foreign',  //todo change "foreign" to "field"

application/Espo/Core/Utils/Database/Orm/Fields/Email.php

@@ -39,7 +39,7 @@ class Email extends \Espo\Core\Utils\Database\Orm\Base
 								JOIN email_address ON email_address.id = entity_email_address.email_address_id
 								WHERE 
 									entity_email_address.deleted = 0 AND entity_email_address.entity_type = '{$entityName}' AND
-									email_address.deleted = 0 AND email_address.name LIKE '{text}'          		
+									email_address.deleted = 0 AND email_address.name LIKE {value}          		
 							)",
 							'=' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
 								SELECT entity_id 
@@ -47,7 +47,15 @@ class Email extends \Espo\Core\Utils\Database\Orm\Base
 								JOIN email_address ON email_address.id = entity_email_address.email_address_id
 								WHERE 
 									entity_email_address.deleted = 0 AND entity_email_address.entity_type = '{$entityName}' AND
-									email_address.deleted = 0 AND email_address.name = '{text}'          		
+									email_address.deleted = 0 AND email_address.name = {value}          		
+							)",
+							'<>' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
+								SELECT entity_id 
+								FROM entity_email_address
+								JOIN email_address ON email_address.id = entity_email_address.email_address_id
+								WHERE 
+									entity_email_address.deleted = 0 AND entity_email_address.entity_type = '{$entityName}' AND
+									email_address.deleted = 0 AND email_address.name <> {value}          		
 							)"
 						),
 						'orderBy' => 'email_address.name {direction}',

application/Espo/Core/Utils/Database/Orm/Fields/PersonName.php

@@ -28,7 +28,8 @@ class PersonName extends \Espo\Core\Utils\Database\Orm\Base
 {
 	protected function load($fieldName, $entityName)
 	{
-		$foreignField = $this->getForeignField($fieldName, $entityName);
+		$foreignField = array('first' . ucfirst($fieldName), ' ', 'last' . ucfirst($fieldName));
+		
 		$tableName = Util::toUnderScore($entityName);
 
 		$fullList = array(); //contains empty string (" ") like delimiter
@@ -44,8 +45,8 @@ class PersonName extends \Espo\Core\Utils\Database\Orm\Base
 				$columnName = $tableName.'.'.Util::toUnderScore($fieldNameTrimmed);
 
 				$fullList[] = $fieldList[] = $columnName;
-				$like[] = $columnName." LIKE '{text}'";
-				$equal[] = $columnName." = '{text}'";
+				$like[] = $columnName." LIKE {value}";
+				$equal[] = $columnName." = {value}";
 			} else {
 				$fullList[] = "'".$foreignFieldName."'";
 			}
@@ -60,8 +61,8 @@ class PersonName extends \Espo\Core\Utils\Database\Orm\Base
 						'type' => 'varchar',
 						'select' => $this->getSelect($fullList),
 						'where' => array(
-							'LIKE' => "(".implode(" OR ", $like)." OR CONCAT(".implode(", ", $fullList).") LIKE '{text}' OR CONCAT(".implode(", ", $fullListReverse).") LIKE '{text}')",
-							'=' => "(".implode(" OR ", $equal)." OR CONCAT(".implode(", ", $fullList).") = '{text}' OR CONCAT(".implode(", ", $fullListReverse).") = '{text}')",
+							'LIKE' => "(".implode(" OR ", $like)." OR CONCAT(".implode(", ", $fullList).") LIKE {value} OR CONCAT(".implode(", ", $fullListReverse).") LIKE {value})",
+							'=' => "(".implode(" OR ", $equal)." OR CONCAT(".implode(", ", $fullList).") = {value} OR CONCAT(".implode(", ", $fullListReverse).") = {value})",
 						),
 						'orderBy' => implode(", ", array_map(function ($item) {return $item . ' {direction}';}, $fieldList)),
 					),
@@ -86,4 +87,4 @@ class PersonName extends \Espo\Core\Utils\Database\Orm\Base
 		return $select;
 	}
 
-}
+}

application/Espo/Core/Utils/Database/Orm/Fields/Phone.php

@@ -39,7 +39,7 @@ class Phone extends \Espo\Core\Utils\Database\Orm\Base
 								JOIN phone_number ON phone_number.id = entity_phone_number.phone_number_id
 								WHERE 
 									entity_phone_number.deleted = 0 AND entity_phone_number.entity_type = '{$entityName}' AND
-									phone_number.deleted = 0 AND phone_number.name LIKE '{text}'          		
+									phone_number.deleted = 0 AND phone_number.name LIKE {value}          		
 							)",
 							'=' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
 								SELECT entity_id 
@@ -47,7 +47,15 @@ class Phone extends \Espo\Core\Utils\Database\Orm\Base
 								JOIN phone_number ON phone_number.id = entity_phone_number.phone_number_id
 								WHERE 
 									entity_phone_number.deleted = 0 AND entity_phone_number.entity_type = '{$entityName}' AND
-									phone_number.deleted = 0 AND phone_number.name = '{text}'          		
+									phone_number.deleted = 0 AND phone_number.name = {value}          		
+							)",
+							'<>' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
+								SELECT entity_id 
+								FROM entity_phone_number
+								JOIN phone_number ON phone_number.id = entity_phone_number.phone_number_id
+								WHERE 
+									entity_phone_number.deleted = 0 AND entity_phone_number.entity_type = '{$entityName}' AND
+									phone_number.deleted = 0 AND phone_number.name <> {value}          		
 							)"
 						),
 						'orderBy' => 'phone_number.name {direction}',

application/Espo/Core/Utils/Database/Orm/Relations/Base.php

@@ -31,7 +31,12 @@ class Base extends \Espo\Core\Utils\Database\Orm\Base
 	protected $foreignLinkName = null;
 	protected $foreignEntityName = null;
 
-	protected $allowParams = array();
+	protected $allowedParams = array(
+		'relationName',
+		'conditions',
+		'additionalColumns',
+		'midKeys',
+	);
 
 	protected function getParams()
 	{
@@ -106,10 +111,10 @@ class Base extends \Espo\Core\Utils\Database\Orm\Base
 		$linkName = $this->getLinkName();
 		$entityName = $this->getEntityName();
 
-		if (!empty($this->allowParams)) {
+		if (!empty($this->allowedParams)) {
 			$linkParams = &$loads[$entityName]['relations'][$linkName];
 
-			foreach ($this->allowParams as $name) {
+			foreach ($this->allowedParams as $name) {
 
 				$additionalParrams = $this->getAllowedAdditionalParams($name);
 

application/Espo/Core/Utils/Database/Orm/Relations/HasMany.php

@@ -24,12 +24,6 @@ namespace Espo\Core\Utils\Database\Orm\Relations;
 
 class HasMany extends Base
 {
-	protected $allowParams = array(
-		'relationName',
-		'conditions',
-		'additionalColumns',
-	);
-
 	protected function load($linkName, $entityName)
 	{
 		$linkParams = $this->getLinkParams();

application/Espo/Core/Utils/Database/Orm/Relations/ManyMany.php

@@ -26,12 +26,6 @@ use Espo\Core\Utils\Util;
 
 class ManyMany extends Base
 {
-	protected $allowParams = array(
-		'relationName',
-		'conditions',
-		'additionalColumns',
-	);
-
 	protected function load($linkName, $entityName)
 	{
 		$foreignEntityName = $this->getForeignEntityName();

application/Espo/Core/Utils/Database/Schema/Converter.php

@@ -276,7 +276,8 @@ class Converter
 			case 'array':
 			case 'jsonArray':
 			case 'text':
-				$dbFieldParams['default'] = ''; //for db type TEXT can't be defined a default value
+			case 'longtext':
+				unset($dbFieldParams['default']); //for db type TEXT can't be defined a default value
 				break;
 
 			case 'bool':

application/Espo/Core/Utils/Database/Schema/rebuildActions/Currency.php

@@ -18,24 +18,32 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 namespace Espo\Core\Utils\Database\Schema\rebuildActions;
 
 class Currency extends \Espo\Core\Utils\Database\Schema\BaseRebuildActions
 {
-	
-	public function afterRebuild()
-	{	 
-		$currencyConfig = $this->getConfig()->get('currency');	
-		$currencyConfig['rate'][ $currencyConfig['base'] ] = '1.00';	
 
-		$pdo = $this->getEntityManager()->getPDO();	
+	public function afterRebuild()
+	{
+		$defaultCurrency = $this->getConfig()->get('defaultCurrency');
+
+		$baseCurrency = $this->getConfig()->get('baseCurrency');
+		$currencyRates = $this->getConfig()->get('currencyRates');
+
+		if ($defaultCurrency != $baseCurrency) {
+			$currencyRates = $this->exchangeRates($baseCurrency, $defaultCurrency, $currencyRates);
+		}
+
+		$currencyRates[$defaultCurrency] = '1.00';
+
+		$pdo = $this->getEntityManager()->getPDO();
 
 		$sql = "TRUNCATE `currency`";
 		$pdo->prepare($sql)->execute();
 
-		foreach ($currencyConfig['rate'] as $currencyName => $rate) {
+		foreach ($currencyRates as $currencyName => $rate) {
 
 			$sql = "
 				INSERT INTO `currency`
@@ -43,9 +51,34 @@ class Currency extends \Espo\Core\Utils\Database\Schema\BaseRebuildActions
 				VALUES
 				(".$pdo->quote($currencyName) . ", " . $pdo->quote($rate) . ")
 			";
-			$pdo->prepare($sql)->execute();			
-		}					
-	}	
-	
+			$pdo->prepare($sql)->execute();
+		}
+	}
+
+	/**
+	 * Calculate exchange rates if defaultCurrency doesn't equals baseCurrency
+	 *
+	 * @param  string $baseCurrency
+	 * @param  string $defaultCurrency
+	 * @param  array $currencyRates   [description]
+	 * @return array  - List of new currency rates
+	 */
+	protected function exchangeRates($baseCurrency, $defaultCurrency, array $currencyRates)
+	{
+		$precision = 5;
+		$defaultCurrencyRate = round(1 / $currencyRates[$defaultCurrency], $precision);
+
+		$exchangedRates = array();
+		$exchangedRates[$baseCurrency] = $defaultCurrencyRate;
+
+		unset($currencyRates[$baseCurrency], $currencyRates[$defaultCurrency]);
+
+		foreach ($currencyRates as $currencyName => $rate) {
+			$exchangedRates[$currencyName] = round($rate * $defaultCurrencyRate, $precision);
+		}
+
+		return $exchangedRates;
+	}
+
 }
 

application/Espo/Core/Utils/File/Manager.php

@@ -225,22 +225,33 @@ class Manager
 	 * @param string | array $path
 	 * @param string $content JSON string
 	 * @param bool $isJSON
-	 * @param array $mergeOptions
+	 * @param string | array $mergeOptions
+	 * @param string | array $removeOptions - List of unset keys from content
+	 * @param bool $isReturn - Is result to be returned or stored
 	 *
-	 * @return bool
+	 * @return bool | array
 	 */
-	public function mergeContents($path, $content, $isJSON = false, $mergeOptions = null)
+	public function mergeContents($path, $content, $isJSON = false, $mergeOptions = null, $removeOptions = null, $isReturn = false)
 	{
 		$fileContent = $this->getContents($path);
 
 		$savedDataArray = Utils\Json::getArrayData($fileContent);
 		$newDataArray = Utils\Json::getArrayData($content);
 
+		if (isset($removeOptions)) {
+			$savedDataArray = Utils\Util::unsetInArray($savedDataArray, $removeOptions);
+			$newDataArray = Utils\Util::unsetInArray($newDataArray, $removeOptions);
+		}
+
 		$data = Utils\Util::merge($savedDataArray, $newDataArray, $mergeOptions);
 		if ($isJSON) {
 			$data = Utils\Json::encode($data, JSON_PRETTY_PRINT);
 		}
 
+		if ($isReturn) {
+			return $data;
+		}
+
 		return $this->putContents($path, $data);
 	}
 
@@ -248,26 +259,14 @@ class Manager
 	 * Merge PHP content and save it to a file
 	 *
 	 * @param string | array $path
-	 * @param string $content
-	 * @param bool $onlyFirstLevel - Merge only first level. Ex. current: array('test'=>array('item1', 'item2')).  $content= array('test'=>array('item1'),). Result will be array('test'=>array('item1')).
-	 *
+	 * @param string $content JSON string
+	 * @param string | array $mergeOptions
+	 * @param string | array $removeOptions - List of unset keys from content
 	 * @return bool
 	 */
-	public function mergeContentsPHP($path, $content, $onlyFirstLevel = false, $mergeOptions = null)
+	public function mergeContentsPHP($path, $content, $mergeOptions = null, $removeOptions = null)
 	{
-		$fileContent = $this->getContents($path);
-
-		$savedDataArray = Utils\Json::getArrayData($fileContent);
-		$newDataArray = Utils\Json::getArrayData($content);
-
-		if ($onlyFirstLevel) {
-			foreach($newDataArray as $key => $val) {
-				$setVal = is_array($val) ? array() : '';
-				$savedDataArray[$key] = $setVal;
-			}
-		}
-
-		$data = Utils\Util::merge($savedDataArray, $newDataArray, $mergeOptions);
+		$data = $this->mergeContents($path, $content, false, $mergeOptions, $removeOptions, true);
 
 		return $this->putContentsPHP($path, $data);
 	}

application/Espo/Core/Utils/File/Permission.php

@@ -480,11 +480,12 @@ class Permission
 				if (file_exists($item)) {
 
 					try {
-						$res = $this->chmod($item, $permission, true);
+						$this->chmod($item, $permission, true);
 					} catch (\Exception $e) {
-						$res = false;
 					}
 
+					$res = is_readable($item);
+
 					/** check is wtitable */
 					if ($type == 'writable') {
 

application/Espo/Core/Utils/File/Unifier.php

@@ -101,8 +101,8 @@ class Unifier
 		$dirName = $this->getFileManager()->getDirName($dirPath, false);
 		$defaultValues = $this->loadDefaultValues($dirName, $type);
 
-		$content= array();
-		$unsets= array();
+		$content = array();
+		$unsets = array();
 		foreach($fileList as $dirName => $fileName) {
 
 			if (is_array($fileName)) {  /*get content from files in a sub directory*/
@@ -125,7 +125,7 @@ class Unifier
 		}
 
 		//unset content
-		$content= Utils\Util::unsetInArray($content, $unsets);
+		$content = Utils\Util::unsetInArray($content, $unsets);
 		//END: unset content
 
 		return $content;
@@ -141,27 +141,16 @@ class Unifier
 	 */
 	protected function unifyGetContents($paths, $defaults)
 	{
-		$fileContent= $this->getFileManager()->getContents($paths);
-		$decoded= Utils\Json::getArrayData($fileContent);
+		$fileContent = $this->getFileManager()->getContents($paths);
 
-		if (empty($decoded) && !is_array($decoded)) {
-			$GLOBALS['log']->emergency('Syntax error or empty file - '.Utils\Util::concatPath($folderPath, $fileName));
-		} else {
-			//Default values
-			if (is_string($defaults) && !empty($defaults)) {
-				$defType= $defaults;
-				unset($defaults);
-				$name= $this->getFileManager()->getFileName($fileName, '.json');
+		$decoded = Utils\Json::getArrayData($fileContent, null);
 
-				$defaults= $this->loadDefaultValues($name, $defType);
-			}
-			$mergedValues= Utils\Util::merge($defaults, $decoded);
-			//END: Default values
-
-			return $mergedValues;
+		if (!isset($decoded)) {
+			$GLOBALS['log']->emergency('Syntax error in '.Utils\Util::concatPath($paths));
+			return array();
 		}
 
-		return array();
+		return $decoded;
 	}
 
 	/**
@@ -174,10 +163,10 @@ class Unifier
 	 */
 	protected function loadDefaultValues($name, $type='metadata')
 	{
-		$defaultPath= $this->params['defaultsPath'];
+		$defaultPath = $this->params['defaultsPath'];
 
-		$defaultValue= $this->getFileManager()->getContents( array($defaultPath, $type, $name.'.json') );
-		if ($defaultValue!==false) {
+		$defaultValue = $this->getFileManager()->getContents( array($defaultPath, $type, $name.'.json') );
+		if ($defaultValue !== false) {
 			//return default array
 			return Utils\Json::decode($defaultValue, true);
 		}

application/Espo/Core/Utils/Json.php

@@ -118,7 +118,7 @@ class Json
 	*
 	* @return array
 	*/
-	public static function getArrayData($data)
+	public static function getArrayData($data, $returns = array())
 	{
 		if (is_array($data)) {
 			return $data;
@@ -127,7 +127,7 @@ class Json
 			return static::decode($data, true);
 		}
 
-		return array();
+		return $returns;
 	}
 
 

application/Espo/Core/Utils/Language.php

@@ -154,10 +154,10 @@ class Language
 
 		return $translated;
 	}
-	
+
 	public function translateOption($value, $field, $scope)
 	{
-		$options = $this->get($scope. '.options.' . $field);		
+		$options = $this->get($scope. '.options.' . $field);
 		if (array_key_exists($value, $options)) {
 			return $options[$value];
 		}
@@ -241,7 +241,7 @@ class Language
 				$i18nCacheFile = str_replace('{*}', $i18nName, $this->cacheFile);
 
 				if ($i18nName != $this->defaultLanguage) {
-					$i18nData = Util::merge($this->fullData[$this->defaultLanguage], $i18nData);
+					$i18nData = Util::merge($this->fullData[$this->defaultLanguage], $i18nData, null, null, true);
 				}
 				$result &= $this->getFileManager()->putContentsPHP($i18nCacheFile, $i18nData);
 			}

application/Espo/Core/Utils/Metadata.php

@@ -142,13 +142,13 @@ class Metadata
 	* Get Metadata
 	*
 	* @param string $key
-	* @param mixed $return
+	* @param mixed $default
 	*
 	* @return array
 	*/
-	public function get($key = null, $returns = null)
+	public function get($key = null, $default = null)
 	{
-		return Util::getValueByKey($this->getData(), $key, $returns);
+		return Util::getValueByKey($this->getData(), $key, $default);
 	}
 
 
@@ -430,4 +430,4 @@ class Metadata
 		return false;
 	}
 
-}
+}

application/Espo/Core/Utils/Util.php

@@ -125,10 +125,13 @@ class Util
 	 *                     	),
 	 *                     )
 	 * @param $rewriteKeyName string  - Rewrite key name. It is ignored if $rewriteLevel is NULL.
+	 * @param $rewriteArrays bool  - Rewrite single arrays. Examples:
+	 *                             TRUE: array is [0, 1, 2], main array is [3, 4, 5], Result is [3, 4, 5].
+	 *                             FALSE: array is [0, 1, 2], main array is [3, 4, 5], Result is [0, 1, 2, 3, 4, 5].
 	 *
 	 * @return array
 	 */
-	public static function merge($array, $mainArray, $rewriteLevel = null, $rewriteKeyName = null)
+	public static function merge($array, $mainArray, $rewriteLevel = null, $rewriteKeyName = null, $rewriteArrays = false)
 	{
 		if (is_array($array) && !is_array($mainArray)) {
 			return $array;
@@ -169,7 +172,7 @@ class Util
 						} /** END: check the $rewriteKeyName */
 
 						if (!isset($rowRewriteLevel) || $rowRewriteLevel != 1) {
-							$array[$mainKey] = static::merge((array) $value, (array) $mainValue, --$rowRewriteLevel, $rewriteKeyName);
+							$array[$mainKey] = static::merge((array) $value, (array) $mainValue, --$rowRewriteLevel, $rewriteKeyName, $rewriteArrays);
 							continue;
 						}
 
@@ -185,7 +188,11 @@ class Util
 						$array[$mainKey] = $mainValue;
 					}
 					elseif (!in_array($mainValue, $array)) {
-						$array[] = $mainValue;
+						if ($rewriteArrays) {
+							$array[$mainKey] = $mainValue;
+						} else {
+							$array[] = $mainValue;
+						}
 					} /** END: merge logic */
 
 					break;
@@ -359,11 +366,17 @@ class Util
 				if (!empty($unsetSett)){
 					$keyItems = explode('.', $unsetSett);
 					$currVal = isset($content[$rootKey]) ? "\$content['{$rootKey}']" : "\$content";
+
+					$lastKey = array_pop($keyItems);
 					foreach($keyItems as $keyItem){
 						$currVal .= "['{$keyItem}']";
 					}
 
-					$currVal = "if (isset({$currVal})) unset({$currVal});";
+					$unsetElem = $currVal . "['{$lastKey}']";
+					$currVal = "
+						if (isset({$unsetElem}) || array_key_exists({$lastKey}, {$currVal})) {
+							unset({$unsetElem});
+						} ";
 					eval($currVal);
 				}
 			}
@@ -395,10 +408,10 @@ class Util
 	 *
 	 * @param  array $array
 	 * @param  string $key     Ex. of key is "entityDefs", "entityDefs.User"
-	 * @param  mixed $returns
+	 * @param  mixed $default
 	 * @return mixed
 	 */
-	public static function getValueByKey(array $array, $key = null, $returns = null)
+	public static function getValueByKey(array $array, $key = null, $default = null)
 	{
 		if (!isset($key) || empty($key)) {
 			return $array;
@@ -411,7 +424,7 @@ class Util
 			if (isset($lastItem[$keyName]) && is_array($lastItem)) {
 				$lastItem = $lastItem[$keyName];
 			} else {
-				return $returns;
+				return $default;
 			}
 		}
 

application/Espo/Core/defaults/config.php

@@ -46,11 +46,8 @@ return array (
 	array (
 	),
 	'defaultCurrency' => 'USD',
-	'currency' =>
-	array(
-		'base' => 'USD',
-		'rate' => array(
-		),
+	'baseCurrency' => 'USD',
+	'currencyRates' => array(
 	),
 	'outboundEmailIsShared' => true,
 	'outboundEmailFromName' => 'EspoCRM',
@@ -62,12 +59,14 @@ return array (
 	'smtpUsername' => '',
 	'smtpPassword' => '',
 	'languageList' => array(
-		'en_US',		
+		'en_US',
 		'de_DE',
 		'es_ES',
 		'fr_FR',
+		'nl_NL',
 		'tr_TR',
 		'ro_RO',
+		'pl_PL',
 		'pt_BR',
 		'vi_VN'
 	),
@@ -90,6 +89,10 @@ return array (
 	"tabList" => array("Account", "Contact", "Lead", "Opportunity", "Calendar", "Meeting", "Call", "Task", "Case", "Email"),
 	"quickCreateList" => array("Account", "Contact", "Lead", "Opportunity", "Meeting", "Call", "Task", "Case"),
 	'calendarDefaultEntity' => 'Meeting',
+	'disableExport' => false,
+	'assignmentEmailNotifications' => false,
+	'assignmentEmailNotificationsEntityList' => array('Lead', 'Opportunity', 'Task', 'Case'),
+	'emailMessageMaxSize' => 10,
 	'isInstalled' => false,
 );
 

application/Espo/Entities/Email.php

@@ -46,6 +46,21 @@ class Email extends \Espo\Core\ORM\Entity
 		}
 	}
 	
+	public function getBodyPlainForSending()
+	{
+		$bodyPlain = $this->get('bodyPlain');		
+		if (!empty($bodyPlain)) {
+			return $bodyPlain;
+		}
+
+		$body = $this->get('body');
+		
+		$breaks = array("<br />","<br>","<br/>","<br />","&lt;br /&gt;","&lt;br/&gt;","&lt;br&gt;");
+		$body = str_ireplace($breaks, "\r\n", $body);
+		$body = strip_tags($body);
+		return $body;
+	}
+	
 	public function getBodyForSending()
 	{
 		$body = $this->get('body');
@@ -55,6 +70,7 @@ class Email extends \Espo\Core\ORM\Entity
 				$body = str_replace("?entryPoint=attachment&amp;id={$attachment->id}", "cid:{$attachment->id}", $body);
 			}
 		}
+		
 		$body = str_replace("<table class=\"table table-bordered\">", "<table class=\"table table-bordered\" width=\"100%\">", $body);
 		
 		return $body;

application/Espo/Entities/EmailAccount.php

@@ -0,0 +1,30 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Entities;
+
+class EmailAccount extends \Espo\Core\ORM\Entity
+{
+
+
+}
+

application/Espo/Entities/ExternalAccount.php

@@ -0,0 +1,28 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Entities;
+
+class ExternalAccount extends Integration
+{	
+}
+

application/Espo/Entities/Integration.php

@@ -0,0 +1,152 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Entities;
+
+class Integration extends \Espo\Core\ORM\Entity
+{	
+	public function get($name)
+	{
+		if ($name == 'id') {
+			return $this->id;
+		}
+		
+		if ($this->hasField($name)) {
+			if (array_key_exists($name, $this->valuesContainer)) {
+				return $this->valuesContainer[$name];
+			}
+		} else {
+			if ($this->get('data')) { 
+				$data = json_decode($this->get('data'), true);
+			} else {
+				$data = array();
+			}
+			if (isset($data[$name])) {
+				return $data[$name];
+			}
+		}
+		return null;
+	}
+	
+	public function set($p1, $p2)
+	{
+		if (is_array($p1)) {
+			if ($p2 === null) {
+				$p2 = false;
+			}
+			$this->populateFromArray($p1, $p2);
+			return;
+		}
+		
+		$name = $p1;
+		$value = $p2;
+		
+		if ($name == 'id') {
+			$this->id = $value;
+			return;
+		}
+				
+		if ($this->hasField($name)) {
+			$this->valuesContainer[$name] = $value;
+		} else {
+			$data = json_decode($this->get('data'), true);
+			if (empty($data)) {
+				$data = array();
+			}
+			$data[$name] = $value;
+			$this->set('data', json_encode($data));		
+		}
+	}
+	
+	public function populateFromArray(array $arr, $onlyAccessible = true, $reset = false)
+	{
+		if ($reset) {
+			$this->reset();
+		}
+	
+		foreach ($arr as $field => $value) {			
+			if (is_string($field)) {
+				if (is_array($value)) {
+					$value = json_encode($value);
+				}
+				
+				if ($this->hasField($field)) {
+					$fields = $this->getFields();
+					$fieldDefs = $fields[$field];
+					
+					if (!is_null($value)) {
+						switch ($fieldDefs['type']) {
+							case self::VARCHAR:						
+								break;
+							case self::BOOL:
+								$value = ($value === 'true' || $value === '1' || $value === true);
+								break;
+							case self::INT:
+								$value = intval($value);
+								break;
+							case self::FLOAT:
+								$value = floatval($value);
+								break;
+							case self::JSON_ARRAY:
+								$value = is_string($value) ? json_decode($value) : $value;
+								if (!is_array($value)) {
+									$value = null;
+								}
+								break;
+							default:
+								break;
+						}
+					}
+				}
+				
+
+				$this->set($field, $value);
+			}
+		}
+	}
+	
+	public function toArray()
+	{		
+		$arr = array();
+		if (isset($this->id)) {
+			$arr['id'] = $this->id;
+		}
+		foreach ($this->fields as $field => $defs) {		
+			if ($field == 'id') {
+				continue;
+			}
+			if ($this->has($field)) {
+				$arr[$field] = $this->get($field);
+			}
+		}
+		
+		$data = json_decode($this->get('data'), true);
+		if (empty($data)) {
+			$data = array();
+		}
+
+		$arr = array_merge($arr, $data);		
+		return $arr;
+	}
+	
+}
+

application/Espo/EntryPoints/Download.php

@@ -30,6 +30,10 @@ class Download extends \Espo\Core\EntryPoints\Base
 {
 	public static $authRequired = true;
 	
+	protected $fileTypesToShowInline = array(
+		'application/pdf',
+	);
+	
 	public function run()
 	{	
 		$id = $_GET['id'];
@@ -54,13 +58,21 @@ class Download extends \Espo\Core\EntryPoints\Base
 		
 		if (!file_exists($fileName)) {
 			throw new NotFound();
-		}		
+		}
+		
+		$type = $attachment->get('type');
+		
+		$disposition = 'attachment';
+		if (in_array($type, $this->fileTypesToShowInline)) {
+			$disposition = 'inline';
+		}
+			
 		
 		header('Content-Description: File Transfer');
-		if ($attachment->get('type')) {
-			header('Content-Type: ' . $attachment->get('type'));
+		if ($type) {
+			header('Content-Type: ' . $type);
 		}
-		header('Content-Disposition: attachment; filename=' . $attachment->get('name'));
+		header('Content-Disposition: ' . $disposition . '; filename=' . $attachment->get('name'));
 		header('Expires: 0');
 		header('Cache-Control: must-revalidate');
 		header('Pragma: public');

application/Espo/Hooks/Common/AssignmentEmailNotification.php

@@ -0,0 +1,58 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Hooks\Common;
+
+use Espo\ORM\Entity;
+
+class AssignmentEmailNotification extends \Espo\Core\Hooks\Base
+{	
+	
+	public function afterSave(Entity $entity)
+	{
+		if (
+			$this->getConfig()->get('assignmentEmailNotifications')
+			&& 
+			in_array($entity->getEntityName(), $this->getConfig()->get('assignmentEmailNotificationsEntityList', array()))
+		) {		
+		
+			$userId = $entity->get('assignedUserId');
+			if (!empty($userId) && $userId != $this->getUser()->id && $entity->isFieldChanged('assignedUserId')) {
+				$job = $this->getEntityManager()->getEntity('Job');
+				$job->set(array(
+					'serviceName' => 'EmailNotification',
+					'method' => 'notifyAboutAssignmentJob',
+					'data' => json_encode(array(
+						'userId' => $userId,
+						'assignerUserId' => $this->getUser()->id,
+						'entityId' => $entity->id,
+						'entityType' => $entity->getEntityName()
+					)),
+					'executeTime' => date('Y-m-d H:i:s'),
+				));
+				$this->getEntityManager()->saveEntity($job);
+			}			
+		}
+	}
+
+}
+

application/Espo/Hooks/Common/Stream.php

@@ -69,26 +69,29 @@ class Stream extends \Espo\Core\Hooks\Base
 	{
 		$linkDefs = $this->getMetadata()->get("entityDefs." . $entity->getEntityName() . ".links", array());
 			
+		$scopeNotifiedList = array();
 		foreach ($linkDefs as $link => $defs) {
 			if ($defs['type'] == 'belongsTo') {
 				$foreign = $defs['foreign'];
 				$scope = $defs['entity'];
 				$entityId = $entity->get($link . 'Id');
 				if (!empty($scope) && !empty($entityId)) {
-					if (!$this->isLinkObservableInStream($scope, $foreign)) {
+					if (in_array($scope, $scopeNotifiedList) || !$this->isLinkObservableInStream($scope, $foreign)) {
 						continue;
 					}
 					$this->getStreamService()->noteCreateRelated($entity, $scope, $entityId);
+					$scopeNotifiedList[] = $scope;
 				}
 			} else if ($defs['type'] == 'belongsToParent') {		
 				$foreign = $defs['foreign'];
 				$scope = $entity->get($link . 'Type');
 				$entityId = $entity->get($link . 'Id');
 				if (!empty($scope) && !empty($entityId)) {
-					if (!$this->isLinkObservableInStream($scope, $foreign)) {
+					if (in_array($scope, $scopeNotifiedList) || !$this->isLinkObservableInStream($scope, $foreign)) {
 						continue;
 					}
 					$this->getStreamService()->noteCreateRelated($entity, $scope, $entityId);
+					$scopeNotifiedList[] = $scope;
 					
 				}
 			} else if ($defs['type'] == 'hasMany') {		
@@ -96,11 +99,12 @@ class Stream extends \Espo\Core\Hooks\Base
 				$scope = $defs['entity'];
 				$entityIds = $entity->get($link . 'Ids');
 				if (!empty($scope) && is_array($entityIds) && !empty($entityIds)) {
-					if (!$this->isLinkObservableInStream($scope, $foreign)) {
+					if (in_array($scope, $scopeNotifiedList) || !$this->isLinkObservableInStream($scope, $foreign)) {
 						continue;
 					}
 					$entityId = $entityIds[0];
-					$this->getStreamService()->noteCreateRelated($entity, $scope, $entityId);					
+					$this->getStreamService()->noteCreateRelated($entity, $scope, $entityId);
+					$scopeNotifiedList[] = $scope;					
 				}
 			}
 		}

application/Espo/Modules/Crm/Controllers/Opportunity.php

@@ -28,32 +28,8 @@ class Opportunity extends \Espo\Core\Controllers\Record
 	{
 		$dateFrom = $request->get('dateFrom');
 		$dateTo = $request->get('dateTo');
-		
-		$pdo = $this->getEntityManager()->getPDO();
-		
-		$sql = "
-			SELECT opportunity.lead_source AS `leadSource`, SUM(opportunity.amount * currency.rate * opportunity.probability / 100) as `amount`
-			FROM opportunity
-			JOIN currency ON currency.id = opportunity.amount_currency
-			WHERE 
-				opportunity.deleted = 0 AND
-				opportunity.close_date >= ".$pdo->quote($dateFrom)." AND
-				opportunity.close_date < ".$pdo->quote($dateTo)." AND
-				opportunity.stage <> 'Closed Lost' AND
-				opportunity.lead_source <> ''
-			GROUP BY opportunity.lead_source				
-		";
-		
-		$sth = $pdo->prepare($sql);
-		$sth->execute();
-		
-		$rows = $sth->fetchAll(\PDO::FETCH_ASSOC);
-		
-		$result = array();
-		foreach ($rows as $row) {
-			$result[$row['leadSource']] = floatval($row['amount']);
-		}		
-		return $result;
+				
+		return $this->getService('Opportunity')->reportByLeadSource($dateFrom, $dateTo);
 	}
 	
 	public function actionReportByStage($params, $data, $request)
@@ -61,32 +37,7 @@ class Opportunity extends \Espo\Core\Controllers\Record
 		$dateFrom = $request->get('dateFrom');
 		$dateTo = $request->get('dateTo');
 		
-		$pdo = $this->getEntityManager()->getPDO();
-		
-		$sql = "
-			SELECT opportunity.stage AS `stage`, SUM(opportunity.amount * currency.rate) as `amount`
-			FROM opportunity
-			JOIN currency ON currency.id = opportunity.amount_currency
-			WHERE 
-				opportunity.deleted = 0 AND
-				opportunity.close_date >= ".$pdo->quote($dateFrom)." AND
-				opportunity.close_date < ".$pdo->quote($dateTo)." AND
-				opportunity.stage <> 'Closed Lost'
-			GROUP BY opportunity.lead_source
-			ORDER BY `amount` DESC			
-		";
-		
-		$sth = $pdo->prepare($sql);
-		$sth->execute();
-		
-		$rows = $sth->fetchAll(\PDO::FETCH_ASSOC);
-		
-		$result = array();
-		foreach ($rows as $row) {
-			$result[$row['stage']] = floatval($row['amount']);
-		}	
-				
-		return $result;
+		return $this->getService('Opportunity')->reportByStage($dateFrom, $dateTo);
 	}
 	
 	public function actionReportSalesByMonth($params, $data, $request)
@@ -94,34 +45,7 @@ class Opportunity extends \Espo\Core\Controllers\Record
 		$dateFrom = $request->get('dateFrom');
 		$dateTo = $request->get('dateTo');
 				
-		$pdo = $this->getEntityManager()->getPDO();
-		
-		$sql = "
-			SELECT DATE_FORMAT(opportunity.close_date, '%Y-%m') AS `month`, SUM(opportunity.amount * currency.rate) as `amount`
-			FROM opportunity
-			JOIN currency ON currency.id = opportunity.amount_currency
-			WHERE 
-				opportunity.deleted = 0 AND
-				opportunity.close_date >= ".$pdo->quote($dateFrom)." AND
-				opportunity.close_date < ".$pdo->quote($dateTo)." AND
-				opportunity.stage = 'Closed Won'
-			
-			GROUP BY DATE_FORMAT(opportunity.close_date, '%Y-%m')
-			ORDER BY opportunity.close_date						
-		";
-		
-		$sth = $pdo->prepare($sql);
-		$sth->execute();
-		
-		$rows = $sth->fetchAll(\PDO::FETCH_ASSOC);
-		
-		$result = array();
-		foreach ($rows as $row) {
-			$result[$row['month']] = floatval($row['amount']);
-		}	
-				
-		return $result;
-		
+		return $this->getService('Opportunity')->reportSalesByMonth($dateFrom, $dateTo);		
 	}
 	
 	public function actionReportSalesPipeline($params, $data, $request)

application/Espo/Modules/Crm/Jobs/CheckInboundEmails.php

@@ -28,12 +28,23 @@ class CheckInboundEmails extends \Espo\Core\Jobs\Base
 {
 	public function run()
 	{	
-		$service = $this->getServiceFactory()->create('InboundEmail');
-		
-		$collection = $this->getEntityManager()->getRepository('InboundEmail')->find();
+		$service = $this->getServiceFactory()->create('InboundEmail');		
+		$collection = $this->getEntityManager()->getRepository('InboundEmail')->where(array('status' => 'Active'))->find();
 		foreach ($collection as $entity) {
-			$service->fetchFromMailServer($entity->id);
+			try {
+				$service->fetchFromMailServer($entity);
+			} catch (\Exception $e) {}
 		}
+		
+		$service = $this->getServiceFactory()->create('EmailAccount');		
+		$collection = $this->getEntityManager()->getRepository('EmailAccount')->where(array('status' => 'Active'))->find();
+		foreach ($collection as $entity) {
+			try {
+				$service->fetchFromMailServer($entity);
+			} catch (\Exception $e) {}
+		}
+		
+		return true;
 	}	
 }
 

application/Espo/Modules/Crm/Repositories/Lead.php

@@ -0,0 +1,43 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Modules\Crm\Repositories;
+
+use Espo\ORM\Entity;
+
+class Lead extends \Espo\Core\ORM\Repositories\RDB
+{	
+	public function handleSelectParams(&$params)
+	{
+		parent::handleSelectParams($params);		
+		
+		if (empty($params['customJoin'])) {
+			$params['customJoin'] = '';	
+		}
+		
+		$params['customJoin'] .= " 
+			LEFT JOIN currency ON currency.id = lead.opportunity_amount_currency
+		";
+	}	
+
+}
+

application/Espo/Modules/Crm/Repositories/Opportunity.php

@@ -0,0 +1,43 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Modules\Crm\Repositories;
+
+use Espo\ORM\Entity;
+
+class Opportunity extends \Espo\Core\ORM\Repositories\RDB
+{	
+	public function handleSelectParams(&$params)
+	{
+		parent::handleSelectParams($params);		
+		
+		if (empty($params['customJoin'])) {
+			$params['customJoin'] = '';	
+		}
+		
+		$params['customJoin'] .= " 
+			LEFT JOIN currency ON currency.id = opportunity.amount_currency
+		";
+	}	
+
+}
+

application/Espo/Modules/Crm/Resources/i18n/de_DE/Call.json

@@ -30,5 +30,10 @@
 		"Set Held": "Auf Gehalten setzen",
 		"Set Not Held": "Auf nicht gehalten setzen",
 		"Send Invitations": "Einladungen versenden"		
+	},
+	"presetFilters": {
+		"planned": "Geplant",
+		"held": "Durchgeführt",
+		"todays": "Heutige"
 	}
 }

application/Espo/Modules/Crm/Resources/i18n/de_DE/Case.json

@@ -34,5 +34,9 @@
 	},
 	"labels": {
 		"Create Case": "Neuer Fall"
+	},
+	"presetFilters": {
+		"open": "Offen",
+		"closed": "Abgeschlossen"
 	}
 }

application/Espo/Modules/Crm/Resources/i18n/de_DE/Contact.json

@@ -9,7 +9,7 @@
 		"accountType": "Firmentyp",
 		"doNotCall": "Nicht anrufen",
 		"address": "Adresse",
-		"opportunityRole": "Opportunity Role",
+		"opportunityRole": "Verkaufschance Rolle",
 		"accountRole": "Rolle",
 		"description": "Beschreibung"
 	},
@@ -22,10 +22,10 @@
 	},
 	"options": {
 		"opportunityRole": {
-			"": "--None--",
-			"Decision Maker": "Decision Maker",
-			"Evaluator": "Evaluator",
-			"Influencer": "Influencer"
+			"": "--Kein(e)--",
+			"Decision Maker": "Entscheider",
+			"Evaluator": "Vorentscheider",
+			"Influencer": "Einflussreiche Person"
 		}
 	}
 }

application/Espo/Modules/Crm/Resources/i18n/de_DE/Global.json

@@ -16,7 +16,7 @@
 		"Account": "Firmen",
 		"Contact": "Kontakte",
 		"Lead": "Interessenten",
-		"Target": "Targets",
+		"Target": "Zielkontakte",
 		"Opportunity": "Verkaufschancen",
 		"Meeting": "Meetings",
 		"Calendar": "Kalender",
@@ -31,6 +31,8 @@
 		"Tasks": "Meine Aufgaben",
 		"Cases": "Meine Fälle",
 		"Calendar": "Kalender",
+		"Calls": "Meine Anrufe",
+		"Meetings": "Meine Meetings",
 		"OpportunitiesByStage": "Verkaufschancen nach Verkaufsphase",
 		"OpportunitiesByLeadSource": "Verkaufschancen nach Quelle",
 		"SalesByMonth": "Umsätze nach Monat",
@@ -61,11 +63,11 @@
 		"addressCountry": "Land",
 		"addressState": "Bundesland",
 		"addressPostalCode": "PLZ",		
-		"shippingAddressCity": "City (Shipping)",
-		"shippingAddressStreet": "Street (Shipping)",
-		"shippingAddressCountry": "Country (Shipping)",
-		"shippingAddressState": "State (Shipping)",
-		"shippingAddressPostalCode": "Postal Code (Shipping)"
+		"shippingAddressCity": "Ort (Lieferadresse)",
+		"shippingAddressStreet": "Straße (Lieferadresse)",
+		"shippingAddressCountry": "Land (Lieferadresse)",
+		"shippingAddressState": "Bundesland\/Kanton (Lieferadresse)",
+		"shippingAddressPostalCode": "PLZ (Lieferadresse)"
 	},
 	"links": {
 		"contacts": "Kontakte",

application/Espo/Modules/Crm/Resources/i18n/de_DE/InboundEmail.json

@@ -16,8 +16,17 @@
 		"caseDistribution": "Fall Verteilung",
 		"replyEmailTemplate": "Vorlage E-Mail Antwort",
 		"replyFromAddress": "Von Adresse antworten",
+		"replyToAddress": "Antwort an Adresse",
 		"replyFromName": "Von Name antworten"
 	},
+	"tooltips": {
+		"reply": "Absender informieren dass die E-Mail empfangen wurde.",
+		"createCase": "Fall aus eingehender E-Mail automatisch erstellen.",
+		"replyToAddress": "Geben Sie die E-Mail Adresse dieser Mailbox an, um Antworten hier zu empfangen.",
+		"caseDistribution": "Wie Fälle zugewiesen werden. Entweder direkt dem Benutzer oder im Team.",
+		"assignToUser": "Benutzer E-Mails\/Fälle werden zugewiesen an",
+		"team": "Team E-Mails\/Fälle werden verknüpft mit"
+	},
 	"links": {
 	},
 	"options": {

application/Espo/Modules/Crm/Resources/i18n/de_DE/Lead.json

@@ -16,6 +16,7 @@
 		"status": "Status",
 		"source": "Quelle",
 		"opportunityAmount": "Verkaufschance Betrag",
+		"opportunityAmountConverted": "Verkaufschance Betrag (konvertiert)",
 		"description": "Beschreibung",
 		"createdAccount": "Firma",
 		"createdContact": "Kontakt",
@@ -42,5 +43,8 @@
 			"Campaign": "Kampagne",
 			"Other": "Andere"
 		}
+	},
+	"presetFilters": {
+		"active": "Aktiv"
 	}
 }

application/Espo/Modules/Crm/Resources/i18n/de_DE/Meeting.json

@@ -24,6 +24,13 @@
 		"Create Meeting": "Neues Meeting",
 		"Set Held": "Auf Gehalten setzen",
 		"Set Not Held": "Auf nicht gehalten setzen",
-		"Send Invitations": "Einladungen versenden"
+		"Send Invitations": "Einladungen versenden",
+		"Saved as Held": "Gespeichert als durchgeführt",
+		"Saved as Not Held": "Gespeichert als nicht durchgeführt"
+	},
+	"presetFilters": {
+		"planned": "Geplant",
+		"held": "Durchgeführt",
+		"todays": "Heutige"
 	}
 }

application/Espo/Modules/Crm/Resources/i18n/de_DE/Opportunity.json

@@ -9,7 +9,8 @@
 		"doNotCall": "Nicht anrufen",
 		"closeDate": "Abschlussdatum",
 		"contacts": "Kontakte",
-		"description": "Beschreibung"
+		"description": "Beschreibung",
+		"amountConverted": "Betrag (konvertiert)"
 	},
 	"links": {
 		"contacts": "Kontakte"
@@ -23,12 +24,16 @@
 			"Id. Decision Makers": "Entscheider ident.",
 			"Perception Analysis": "Analyse Sichtweise",
 			"Proposal/Price Quote": "Preisangebot",
-			"Negotiation/Review": "Verhandlung/Überarbeitung",
+			"Negotiation/Review": "Verhandlung\/Überarbeitung",
 			"Closed Won": "Gewonnen",
 			"Closed Lost": "Verloren" 
 		}
 	},
 	"labels": {
 		"Create Opportunity": "Neue Verkaufschance"
+	},
+	"presetFilters": {
+		"open": "Offen",
+		"won": "Gewonnen"
 	}
 }

application/Espo/Modules/Crm/Resources/i18n/de_DE/Target.json

@@ -13,7 +13,7 @@
 	"links": {
 	},
 	"labels": {
-		"Create Target": "Create Target",
+		"Create Target": "Neuer Zielkontakt",
 		"Convert to Lead": "Zu Interessent umwandeln"
 	}
 }

application/Espo/Modules/Crm/Resources/i18n/de_DE/Task.json

@@ -27,5 +27,11 @@
 	},
 	"labels": {
 		"Create Task": "Neue Aufgabe"
+	},
+	"presetFilters": {
+		"active": "Aktiv",
+		"completed": "Abgeschlossen",
+		"todays": "Heutige",
+		"overdue": "Überfällig"
 	}
 }

application/Espo/Modules/Crm/Resources/i18n/en_US/Account.json

@@ -35,6 +35,7 @@
 		}
 	},
 	"labels": {
-		"Create Account": "Create Account"
+		"Create Account": "Create Account",
+		"Copy Billing": "Copy Billing"
 	}
 }

application/Espo/Modules/Crm/Resources/i18n/en_US/Call.json

@@ -23,6 +23,11 @@
 		"direction": {
 			"Outbound": "Outbound",
 			"Inbound": "Inbound"
+		},
+		"acceptanceStatus": {
+			"None": "None",
+			"Accepted": "Accepted",
+			"Declined": "Declined"
 		}
 	},
 	"labels": {

application/Espo/Modules/Crm/Resources/i18n/en_US/Global.json

@@ -31,6 +31,8 @@
 		"Tasks": "My Tasks",
 		"Cases": "My Cases",
 		"Calendar": "Calendar",
+		"Calls": "My Calls",
+		"Meetings": "My Meetings",
 		"OpportunitiesByStage": "Opportunities by Stage",
 		"OpportunitiesByLeadSource": "Opportunities by Lead Source",
 		"SalesByMonth": "Sales by Month",

application/Espo/Modules/Crm/Resources/i18n/en_US/InboundEmail.json

@@ -16,8 +16,17 @@
 		"caseDistribution": "Case Distribution",
 		"replyEmailTemplate": "Reply Email Template",
 		"replyFromAddress": "Reply From Address",
+		"replyToAddress": "Reply To Address",
 		"replyFromName": "Reply From Name"
 	},
+	"tooltips": {
+		"reply": "Notify email senders that their emails has been received.",
+		"createCase": "Automatically create case from incoming emails.",
+		"replyToAddress": "Specify email address of this mailbox to make response come here.",
+		"caseDistribution": "How cases will be assigned to. Assigned directly to the user or among the team.",
+		"assignToUser": "User emails/cases will be assigned to.",
+		"team": "Team emails/cases will be related to."
+	},
 	"links": {
 	},
 	"options": {

application/Espo/Modules/Crm/Resources/i18n/en_US/Lead.json

@@ -16,6 +16,7 @@
 		"status": "Status",
 		"source": "Source",
 		"opportunityAmount": "Opportunity Amount",
+		"opportunityAmountConverted": "Opportunity Amount (converted)",
 		"description": "Description",
 		"createdAccount": "Account",
 		"createdContact": "Contact",

application/Espo/Modules/Crm/Resources/i18n/en_US/Meeting.json

@@ -18,6 +18,11 @@
 			"Planned": "Planned",
 			"Held": "Held",
 			"Not Held": "Not Held"
+		},
+		"acceptanceStatus": {
+			"None": "None",
+			"Accepted": "Accepted",
+			"Declined": "Declined"
 		}
 	},
 	"labels": {

application/Espo/Modules/Crm/Resources/i18n/en_US/Opportunity.json

@@ -9,7 +9,8 @@
 		"doNotCall": "Do Not Call",
 		"closeDate": "Close Date",
 		"contacts": "Contacts",
-		"description": "Description"
+		"description": "Description",
+		"amountConverted": "Amount (converted)"
 	},
 	"links": {
 		"contacts": "Contacts"

application/Espo/Modules/Crm/Resources/i18n/nl_NL/Account.json

@@ -0,0 +1,40 @@
+{
+	"fields": {
+		"name": "Record Naam",
+		"emailAddress": "Email",
+		"website": "Website",
+		"phoneNumber": "Telefoon",
+		"billingAddress": "Factuur Adres",
+		"shippingAddress": "Bezoek adres",
+		"description": "Beschrijving",
+		"sicCode": "Sic Code",
+		"industry": "Industrie",
+		"type": "Type",
+		"contactRole": "Voorwaarde"
+	},
+	"links": {
+		"contacts": "Contactpersoon",
+		"opportunities": "Kansen",
+		"cases": "Zaken"
+	},
+	"options": {
+		"type": {
+			"Customer": "Klant",
+			"Investor": "Investeerder",
+			"Partner": "Partner",
+			"Reseller": "Reseller"
+		},
+		"industry": {
+			"Apparel": "Apparel",
+			"Banking": "Banking",
+			"Computer Software": "Computer Software",
+			"Education": "Educatie",
+			"Electronics": "Electronica",
+			"Finance": "Finance",
+			"Insurance": "Verzekeringen"
+		}
+	},
+	"labels": {
+		"Create Account": "Maak Relatie"
+	}
+}

application/Espo/Modules/Crm/Resources/i18n/nl_NL/Calendar.json

@@ -0,0 +1,13 @@
+{
+	"modes": {
+		"month": "Maand",
+		"week": "Week",
+		"day": "Dag",
+		"agendaWeek": "Week",
+		"agendaDay": "Dag"
+	},
+	"labels": {
+		"Today": "Vandaag",
+		"Create": "Maak"
+	}
+}

application/Espo/Modules/Crm/Resources/i18n/nl_NL/Call.json

@@ -0,0 +1,39 @@
+{
+	"fields": {
+		"name": "Record Naam",
+		"parent": "Behorende bij",
+		"status": "Status",
+		"dateStart": "Start Datum",
+		"dateEnd": "Eind Datum",
+		"direction": "Richting",
+		"duration": "Gedurende",
+		"description": "Beschrijving",
+		"users": "Gebruikers",
+		"contacts": "Contactpersoon",
+		"leads": "Leads"
+	},
+	"links": {
+	},
+	"options": {
+		"status": {
+			"Planned": "Plannen",
+			"Held": "Volgen",
+			"Not Held": "Niet volgen"
+		},
+		"direction": {
+			"Outbound": "Uitgaande",
+			"Inbound": "Binnenkomende"
+		}
+	},
+	"labels": {
+		"Create Call": "Maak Call",
+		"Set Held": "Vasthouden",
+		"Set Not Held": "Niet Vasthouden",
+		"Send Invitations": "Uitnodiging versturen"		
+	},
+	"presetFilters": {
+		"planned": "Plannen",
+		"held": "Volgen",
+		"todays": "Vandaag"
+	}
+}

application/Espo/Modules/Crm/Resources/i18n/nl_NL/Case.json

@@ -0,0 +1,42 @@
+{
+	"fields": {
+		"name": "Record Naam",
+		"number": "Nummer",
+		"status": "Status",
+		"account": "Relatie",
+		"contact": "Contact",
+		"priority": "Prioriteit",
+		"type": "Type",
+		"description": "Beschrijving"
+	},
+	"links": {
+	},
+	"options": {
+		"status": {
+			"New": "Nieuw",
+			"Assigned": "Toegewezen",
+			"Pending": "Pending",
+			"Closed": "Gesloten",
+			"Rejected": "Geweigerd",
+			"Duplicate": "Dupliceer"
+		},
+		"priority" : {
+			"Low": "Laag",
+			"Normal": "Normaal",
+			"High": "Hoog",
+			"Urgent": "Urgent"
+		},
+		"type": {
+			"Question": "Vraag",
+			"Incident": "Incident",
+			"Problem": "Probleem"
+		}
+	},
+	"labels": {
+		"Create Case": "Maak Case"
+	},
+	"presetFilters": {
+		"open": "Open",
+		"closed": "Gesloten"
+	}
+}

application/Espo/Modules/Crm/Resources/i18n/nl_NL/Contact.json

@@ -0,0 +1,31 @@
+{
+	"fields": {
+		"name": "Record Naam",
+		"emailAddress": "Email",
+		"title": "Titel",
+		"account": "Relatie",
+		"accounts": "Relaties",
+		"phoneNumber": "Telefoon",
+		"accountType": "Relatie Type",
+		"doNotCall": "Niet Bellen",
+		"address": "Adres",
+		"opportunityRole": "Opportunity Role",
+		"accountRole": "Voorwaarde",
+		"description": "Beschrijving"
+	},
+	"links": {
+		"opportunities": "Kansen",
+		"cases": "Zaken"
+	},
+	"labels": {
+		"Create Contact": "Maak Contact"
+	},
+	"options": {
+		"opportunityRole": {
+			"": "--Geen--",
+			"Decision Maker": "Beslisser",
+			"Evaluator": "Evaluator",
+			"Influencer": "Beinvloeder"
+		}
+	}
+}

application/Espo/Modules/Crm/Resources/i18n/nl_NL/Global.json

@@ -0,0 +1,81 @@
+{
+	"scopeNames": {
+		"Account": "Relatie",
+		"Contact": "Contact",
+		"Lead": "Lead",
+		"Target": "Doel",
+		"Opportunity": "Kans",
+		"Meeting": "Vergadering",
+		"Calendar": "Kalender",
+		"Call": "Oproep",
+		"Task": "Taak",
+		"Case": "Zaak",
+		"InboundEmail": "Binnenkomende Email"
+	},
+	"scopeNamesPlural": {
+		"Account": "Relaties",
+		"Contact": "Contactpersoon",
+		"Lead": "Leads",
+		"Target": "Doel",
+		"Opportunity": "Kansen",
+		"Meeting": "Afspraken",
+		"Calendar": "Kalender",
+		"Call": "Tel.gesprekken",
+		"Task": "Taken",
+		"Case": "Zaken",
+		"InboundEmail": "Inkomende Emails"
+	},
+	"dashlets": {
+		"Leads": "Mijn Leads",
+		"Opportunities": "Mijn Kansen",
+		"Tasks": "Mijn Taken",
+		"Cases": "Mijn Zaken",
+		"Calendar": "Kalender",
+		"Calls": "Mijn Tel.gesprekken",
+		"Meetings": "Mijn Afspraken",
+		"OpportunitiesByStage": "Status van Kansen",
+		"OpportunitiesByLeadSource": "Kans van Lead bron",
+		"SalesByMonth": "Verkopen per maand",
+		"SalesPipeline": "Verkoop mogelijkheden"	
+	},
+	"labels": {
+		"Create InboundEmail": "Instellen Email Gebruiker",
+		"Activities": "Activiteiten",
+		"History": "Historie",
+		"Attendees": "Genodigden",
+		"Schedule Meeting": "Plan Afspraak",
+		"Schedule Call": "Geplande Oproep",
+		"Compose Email": "Maak een Email",
+		"Log Meeting": "Leg afspraak vast",
+		"Log Call": "Leg tel.afspraak vast",
+		"Archive Email": "Archiveer Email",
+		"Create Task": "Maak een Taak",
+		"Tasks": "Taken"		
+	},
+	"fields": {
+		"billingAddressCity": "Plaats",
+		"billingAddressCountry": "Land",
+		"billingAddressPostalCode": "Postcode",
+		"billingAddressState": "Deelstaat",
+		"billingAddressStreet": "Straat",
+		"addressCity": "Plaats",
+		"addressStreet": "Straat",
+		"addressCountry": "Land",
+		"addressState": "Deelstaat",
+		"addressPostalCode": "Postcode",		
+		"shippingAddressCity": "City (Shipping)",
+		"shippingAddressStreet": "Street (Shipping)",
+		"shippingAddressCountry": "Country (Shipping)",
+		"shippingAddressState": "State (Shipping)",
+		"shippingAddressPostalCode": "Postal Code (Shipping)"
+	},
+	"links": {
+		"contacts": "Contactpersoon",
+		"opportunities": "Kansen",
+		"leads": "Leads",		
+		"meetings": "Afspraken",
+		"calls": "Tel.gesprekken",
+		"tasks": "Taken",
+		"emails": "Emails"
+	}
+}

application/Espo/Modules/Crm/Resources/i18n/nl_NL/InboundEmail.json

@@ -0,0 +1,52 @@
+{
+	"fields": {
+		"name": "Record Naam",
+		"team": "Team",
+		"status": "Status",
+		"assignToUser": "Toegewezen aan gebruiker",
+		"host": "Host",
+		"username": "Gebruikersnaam",
+		"password": "Wachtwoord",
+		"port": "Poort",
+		"monitoredFolders": "Gecontroleerde Folders",
+		"trashFolder": "Prullenbak Folder",
+		"ssl": "SSL",		
+		"createCase": "Maak Case",
+		"reply": "Antw.",
+		"caseDistribution": "Zaak Verdelen",
+		"replyEmailTemplate": "Antw. Email Template",
+		"replyFromAddress": "Antw. van Adres",
+		"replyToAddress": "Reply To Address",
+		"replyFromName": "Antw. van Naam"
+	},
+	"tooltips": {
+		"reply": "Notify email senders that their emails has been received.",
+		"createCase": "Automatically create case from incoming emails.",
+		"replyToAddress": "Specify email address of this mailbox to make response come here.",
+		"caseDistribution": "How cases will be assigned to. Assigned directly to the user or among the team.",
+		"assignToUser": "User emails/cases will be assigned to.",
+		"team": "Team emails/cases will be related to."
+	},
+	"links": {
+	},
+	"options": {
+		"status": {
+			"Active": "Active",
+			"Inactive": "Inactive"
+		},
+		"caseDistribution": {
+			"Direct-Assignment": "Directe-Toewijzing",
+			"Round-Robin": "Round-Robin",
+			"Least-Busy": "Minst-Bezet"
+		}
+	},
+	"labels": {
+		"Create InboundEmail": "Instellen Email Gebruiker",
+		"IMAP": "IMAP",
+		"Actions": "Acties",
+		"Main": "Hoofd"		
+	},
+	"messages": {
+		"couldNotConnectToImap": "Kan geen verbinding maken met IMAP server"
+	}
+}

application/Espo/Modules/Crm/Resources/i18n/nl_NL/Lead.json

@@ -0,0 +1,50 @@
+{
+	"labels": {
+		"Converted To": "Vertaald naar",
+		"Create Lead": "Grote Lead",
+		"Convert": "Converteer"
+	},
+	"fields": {
+		"name": "Record Naam",
+		"emailAddress": "Email",
+		"title": "Titel",
+		"website": "Website",
+		"phoneNumber": "Telefoon",
+		"accountName": "Relatie Naam",
+		"doNotCall": "Niet Bellen",
+		"address": "Adres",
+		"status": "Status",
+		"source": "Bron",
+		"opportunityAmount": "Aantal uitdagingen",
+		"opportunityAmountConverted": "Opportunity Amount (converted)",
+		"description": "Beschrijving",
+		"createdAccount": "Relatie",
+		"createdContact": "Contact",
+		"createdOpportunity": "Kans"
+	},
+	"links": {
+	},
+	"options": {
+		"status": {
+			"New": "Nieuw",
+			"Assigned": "Toegewezen",
+			"In Process": "In Behandeling",
+			"Converted": "Converteren",
+			"Recycled": "Opnieuw verwerkt",
+			"Dead": "Dood"
+		},
+		"source": {
+			"Call": "Oproep",
+			"Email": "Email",
+			"Existing Customer": "Bestaande Klant",
+			"Partner": "Partner",
+			"Public Relations": "Public Relations",
+			"Web Site": "Web Pagina",
+			"Campaign": "Campagne",
+			"Other": "Ander"
+		}
+	},
+	"presetFilters": {
+		"active": "Active"
+	}
+}

application/Espo/Modules/Crm/Resources/i18n/nl_NL/Meeting.json

@@ -0,0 +1,36 @@
+{
+	"fields": {
+		"name": "Record Naam",
+		"parent": "Behorende bij",
+		"status": "Status",
+		"dateStart": "Start Datum",
+		"dateEnd": "Eind Datum",
+		"duration": "Gedurende",
+		"description": "Beschrijving",
+		"users": "Gebruikers",
+		"contacts": "Contactpersoon",
+		"leads": "Leads"
+	},
+	"links": {
+	},
+	"options": {
+		"status": {
+			"Planned": "Plannen",
+			"Held": "Volgen",
+			"Not Held": "Niet volgen"
+		}
+	},
+	"labels": {
+		"Create Meeting": "Plan Vergadering",
+		"Set Held": "Vasthouden",
+		"Set Not Held": "Niet Vasthouden",
+		"Send Invitations": "Uitnodiging versturen",
+		"Saved as Held": "Opslaan Bewaren",
+		"Saved as Not Held": "Opslaan niet Bewaren"
+	},
+	"presetFilters": {
+		"planned": "Plannen",
+		"held": "Volgen",
+		"todays": "Vandaag"
+	}
+}

application/Espo/Modules/Crm/Resources/i18n/nl_NL/Opportunity.json

@@ -0,0 +1,39 @@
+{
+	"fields": {
+		"name": "Record Naam",
+		"account": "Relatie",
+		"stage": "Status",
+		"amount": "Aantal",
+		"probability": "Naar waarschijnlijkheid, %",
+		"leadSource": "Lead Bron",
+		"doNotCall": "Niet Bellen",
+		"closeDate": "Datum gesloten",
+		"contacts": "Contactpersoon",
+		"description": "Beschrijving",
+		"amountConverted": "Amount (converted)"
+	},
+	"links": {
+		"contacts": "Contactpersoon"
+	},
+	"options": {
+		"stage": {
+			"Prospecting": "Prospecting",
+			"Qualification": "Kwalificeren",
+			"Needs Analysis": "Benodigde Analyse",
+			"Value Proposition": "Waarde Schatting",
+			"Id. Decision Makers": "Id. Beslissiers",
+			"Perception Analysis": "Perceptie Analyse",
+			"Proposal/Price Quote": "Prijs/Voorstel",
+			"Negotiation/Review": "Onderhandeling/Herziening",
+			"Closed Won": "Gesloten Gewonnen",
+			"Closed Lost": "Gesloten Verloren" 
+		}
+	},
+	"labels": {
+		"Create Opportunity": "Grote Uitdaging"
+	},
+	"presetFilters": {
+		"open": "Open",
+		"won": "Gewonnen"
+	}
+}

application/Espo/Modules/Crm/Resources/i18n/nl_NL/Target.json

@@ -0,0 +1,19 @@
+{
+	"fields": {
+		"name": "Record Naam",
+		"emailAddress": "Email",
+		"title": "Titel",
+		"website": "Website",
+		"accountName": "Relatie Naam",
+		"phoneNumber": "Telefoon",
+		"doNotCall": "Niet Bellen",
+		"address": "Adres",
+		"description": "Beschrijving"
+	},
+	"links": {
+	},
+	"labels": {
+		"Create Target": "Maak een doel",
+		"Convert to Lead": "Naar Lead omzetten"
+	}
+}

application/Espo/Modules/Crm/Resources/i18n/nl_NL/Task.json

@@ -0,0 +1,37 @@
+{
+	"fields": {
+		"name": "Record Naam",
+		"parent": "Behorende bij",
+		"status": "Status",
+		"dateStart": "Start Datum",
+		"dateEnd": "Vervaldatum",
+		"priority": "Prioriteit",
+		"description": "Beschrijving",
+		"isOverdue": "Te Laat"
+	},
+	"links": {
+	},
+	"options": {
+		"status": {
+			"Not Started": "Niet Gestart",
+			"Started": "Gestart",
+			"Completed": "Beeindigd",
+			"Canceled": "Geannuleerd"
+		},
+		"priority" : {
+			"Low": "Laag",
+			"Normal": "Normaal",
+			"High": "Hoog",
+			"Urgent": "Urgent"
+		}
+	},
+	"labels": {
+		"Create Task": "Maak een Taak"
+	},
+	"presetFilters": {
+		"active": "Active",
+		"completed": "Beeindigd",
+		"todays": "Vandaag",
+		"overdue": "Laat"
+	}
+}

application/Espo/Modules/Crm/Resources/i18n/pl_PL/Account.json

@@ -0,0 +1,40 @@
+{
+	"fields": {
+		"name": "Imię",
+		"emailAddress": "E-mail",
+		"website": "Strona Internetowa",
+		"phoneNumber": "Telefon",
+		"billingAddress": "Adres Firmy",
+		"shippingAddress": "Adres Dostawy",
+		"description": "Opis ",
+		"sicCode": "PKD",
+		"industry": "Branża",
+		"type": "Rodzaj",
+		"contactRole": "Rola"
+	},
+	"links": {
+		"contacts": "Kontakty",
+		"opportunities": "Szanse Sprzedaży",
+		"cases": "Zlecenia"
+	},
+	"options": {
+		"type": {
+			"Customer": "Klient",
+			"Investor": "Inwestor",
+			"Partner": "Partner",
+			"Reseller": "Sprzedawca"
+		},
+		"industry": {
+			"Apparel": "Odzież",
+			"Banking": "Bankowość",
+			"Computer Software": "Oprogramowanie Komputerowe",
+			"Education": "Edukacja",
+			"Electronics": "Elektronika",
+			"Finance": "Finanse",
+			"Insurance": "Ubezpieczenia"
+		}
+	},
+	"labels": {
+		"Create Account": "Utwórz Konto"
+	}
+}