fix dashboard

.htaccess

@@ -15,6 +15,7 @@ DirectoryIndex index.php index.html
   RewriteRule ^/?data/logs/ - [F]
   RewriteRule ^/?data/cache/ - [F]
   RewriteRule ^/?data/upload/ - [F]
+  RewriteRule ^/?data/\.backup/ - [F]
   RewriteRule ^/?application/ - [F]
   RewriteRule ^/?custom/ - [F]
   RewriteRule ^/?vendor/ - [F]

Gruntfile.js

@@ -21,7 +21,7 @@
 module.exports = function (grunt) {
 
     var jsFilesToMinify = [
-        'client/lib/jquery-2.0.2.min.js',
+        'client/lib/jquery-2.1.4.min.js',
         'client/lib/underscore-min.js',
         'client/lib/backbone-min.js',
         'client/lib/handlebars.js',
@@ -36,34 +36,8 @@ module.exports = function (grunt) {
         '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',
+        'client/src/utils.js'
     ];
 
     grunt.initConfig({

application/Espo/Controllers/Attachment.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\Controllers;
 
@@ -26,17 +26,17 @@ class Attachment extends \Espo\Core\Controllers\Record
 {
 
     public function actionUpload($params, $data)
-    {        
+    {
         list($prefix, $contents) = explode(',', $data);
         $contents = base64_decode($contents);
-        
+
         $attachment = $this->getEntityManager()->getEntity('Attachment');
-        $this->getEntityManager()->saveEntity($attachment);        
+        $this->getEntityManager()->saveEntity($attachment);
         $this->getContainer()->get('fileManager')->putContents('data/upload/' . $attachment->id, $contents);
-        
+
         return array(
             'attachmentId' => $attachment->id
-        );    
+        );
     }
 
 }

application/Espo/Controllers/Stream.php

@@ -38,6 +38,7 @@ class Stream extends \Espo\Core\Controllers\Base
         $offset = intval($request->get('offset'));
         $maxSize = intval($request->get('maxSize'));
         $after = $request->get('after');
+        $filter = $request->get('filter');
 
         $service = $this->getService('Stream');
 
@@ -52,6 +53,7 @@ class Stream extends \Espo\Core\Controllers\Base
             'offset' => $offset,
             'maxSize' => $maxSize,
             'after' => $after,
+            'filter' => $filter
         ));
 
         return array(

application/Espo/Controllers/Template.php

@@ -0,0 +1,31 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 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 Template extends \Espo\Core\Controllers\Record
+{
+
+}
+

application/Espo/Controllers/User.php

@@ -53,7 +53,10 @@ class User extends \Espo\Core\Controllers\Record
         if (!$request->isPost()) {
             throw new BadRequest();
         }
-        return $this->getService('User')->changePassword($this->getUser()->id, $data['password']);
+        if (!array_key_exists('password', $data) || !array_key_exists('currentPassword', $data)) {
+            throw new BadRequest();
+        }
+        return $this->getService('User')->changePassword($this->getUser()->id, $data['password'], true, $data['currentPassword']);
     }
 
     public function actionChangePasswordByRequest($params, $data, $request)

application/Espo/Core/Acl/Base.php

@@ -105,7 +105,7 @@ class Base implements Injectable
     public function checkScope(User $user, $data, $scope, $action = null, $isOwner = null, $inTeam = null, Entity $entity = null)
     {
         if (is_null($data)) {
-            return true;
+            return false;
         }
         if ($data === false) {
             return false;

application/Espo/Core/Container.php

@@ -161,6 +161,14 @@ class Container
         );
     }
 
+    private function loadNumber()
+    {
+        return new \Espo\Core\Utils\Number(
+            $this->get('config')->get('decimalMark'),
+            $this->get('config')->get('thousandSeparator')
+        );
+    }
+
     private function loadServiceFactory()
     {
         return new \Espo\Core\ServiceFactory(

application/Espo/Core/Controllers/Record.php

@@ -77,7 +77,7 @@ class Record extends Base
     public function actionCreate($params, $data, $request)
     {
         if (!$request->isPost()) {
-            throw BadRequest();
+            throw new BadRequest();
         }
 
         if (!$this->getAcl()->check($this->name, 'edit')) {
@@ -96,7 +96,7 @@ class Record extends Base
     public function actionUpdate($params, $data, $request)
     {
         if (!$request->isPut() && !$request->isPatch()) {
-            throw BadRequest();
+            throw new BadRequest();
         }
 
         if (!$this->getAcl()->check($this->name, 'edit')) {
@@ -185,7 +185,7 @@ class Record extends Base
     public function actionDelete($params, $data, $request)
     {
         if (!$request->isDelete()) {
-            throw BadRequest();
+            throw new BadRequest();
         }
 
         $id = $params['id'];

application/Espo/Core/EntryPoints/Base.php

@@ -67,6 +67,21 @@ abstract class Base
         return $this->getContainer()->get('metadata');
     }
 
+    protected function getDateTime()
+    {
+        return $this->getContainer()->get('dateTime');
+    }
+
+    protected function getNumber()
+    {
+        return $this->getContainer()->get('number');
+    }
+
+    protected function getFileManager()
+    {
+        return $this->getContainer()->get('fileManager');
+    }
+
     public function __construct(Container $container)
     {
         $this->container = $container;

application/Espo/Core/Htmlizer/Htmlizer.php

@@ -0,0 +1,140 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 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\Htmlizer;
+
+use Espo\ORM\Entity;
+use Espo\Core\Exceptions\Error;
+
+use Espo\Core\Utils\File\Manager as FileManager;
+use Espo\Core\Utils\DateTime;
+use Espo\Core\Utils\Number;
+
+require('vendor/zordius/lightncandy/src/lightncandy.php');
+
+class Htmlizer
+{
+    protected $fileManager;
+
+    protected $dateTime;
+
+    protected $config;
+
+    public function __construct(FileManager $fileManager, DateTime $dateTime, Number $number)
+    {
+        $this->fileManager = $fileManager;
+        $this->dateTime = $dateTime;
+        $this->number = $number;
+    }
+
+    protected function formatNumber($value)
+    {
+        return $this->number->format($value);
+    }
+
+    protected function format($value)
+    {
+        if (is_float($value) || is_int($value)) {
+            $value = $this->formatNumber($value);
+        } else if (is_string($value)) {
+            $value = nl2br($value);
+        }
+        return $value;
+    }
+
+    protected function getDataFromEntity(Entity $entity)
+    {
+        $data = $entity->toArray();
+
+
+
+        $fieldDefs = $entity->getFields();
+        $fieldList = array_keys($fieldDefs);
+
+        foreach ($fieldList as $field) {
+            $type = null;
+            if (!empty($fieldDefs[$field]['type'])) {
+                $type = $fieldDefs[$field]['type'];
+            }
+            if ($type == Entity::DATETIME) {
+                if (!empty($data[$field])) {
+                    $data[$field] = $this->dateTime->convertSystemDateTime($data[$field]);
+                }
+            } else if ($type == Entity::DATE) {
+                if (!empty($data[$field])) {
+                    $data[$field] = $this->dateTime->convertSystemDate($data[$field]);
+                }
+            } else if ($type == Entity::JSON_ARRAY) {
+                if (!empty($data[$field])) {
+                    $list = $data[$field];
+                    $newList = [];
+                    foreach ($list as $item) {
+                        $v = $item;
+                        if ($item instanceof \StdClass) {
+                            $v = get_object_vars($v);
+                        }
+                        foreach ($v as $k => $w) {
+                            $v[$k] = $this->format($v[$k]);
+                        }
+                        $newList[] = $v;
+                    }
+                    $data[$field] = $newList;
+                }
+            } else if ($type == Entity::JSON_OBJECT) {
+                if (!empty($data[$field])) {
+                    $value = $data[$field];
+                    if ($value instanceof \StdClass) {
+                        $data[$field] = get_object_vars($value);
+                    }
+                    foreach ($data[$field] as $k => $w) {
+                        $data[$field][$k] = $this->format($data[$field][$k]);
+                    }
+                }
+            }
+
+            if (array_key_exists($field, $data)) {
+               $data[$field] = $this->format($data[$field]);
+            }
+        }
+
+        return $data;
+    }
+
+    public function render(Entity $entity, $template)
+    {
+        $code = \LightnCandy::compile($template);
+        $id = uniqid('', true);
+        $fileName = 'data/cache/template-' . $id;
+        $this->fileManager->putContents($fileName, $code);
+        $renderer = include($fileName);
+        $this->fileManager->removeFile($fileName);
+
+        $data = $this->getDataFromEntity($entity);
+
+        $html = $renderer($data);
+
+        $html = str_replace('?entryPoint=attachment&amp;', '?entryPoint=attachment&', $html);
+        $html = preg_replace('/\?entryPoint=attachment\&id=(.*)/', 'data/upload/$1', $html);
+
+        return $html;
+    }
+}

application/Espo/Core/Mail/Importer.php

@@ -300,9 +300,19 @@ class Importer
                             $disposition = 'attachment';
                         }
                     } else if (strpos($part->ContentDisposition, 'inline') === 0) {
-                        $contentId = trim($part->contentID, '<>');
-                        $fileName = $contentId;
-                        $disposition = 'inline';
+                        if (isset($part->contentID)) {
+                            $contentId = trim($part->contentID, '<>');
+                            $fileName = $contentId;
+                            $disposition = 'inline';
+                        } else {
+                            // hack for iOS not proper attachments
+                            if (empty($fileName)) {
+                                if (preg_match('/filename="?([^"]+)"?/i', $part->ContentDisposition, $m)) {
+                                    $fileName = $m[1];
+                                    $disposition = 'attachment';
+                                }
+                            }
+                        }
                     }
                 }
 

application/Espo/Core/Mail/Mail/Headers.php

@@ -10,37 +10,5 @@ use Zend\Loader\PluginClassLocator;
 
 class Headers extends \Zend\Mail\Headers
 {
-    public static function fromString($string, $EOL = self::EOL)
-    {
-        $headers     = new static();
-        $currentLine = '';
 
-        // iterate the header lines, some might be continuations
-        foreach (explode($EOL, $string) as $line) {
-            // check if a header name is present
-            if (preg_match('/^(?P<name>[\x21-\x39\x3B-\x7E]+):.*$/', $line, $matches)) {
-                if ($currentLine) {
-                    // a header name was present, then store the current complete line
-                    $headers->addHeaderLine($currentLine);
-                }
-                $currentLine = trim($line);
-            } elseif (preg_match('/^\s+.*$/', $line, $matches)) {
-                // continuation: append to current line
-                $currentLine .= $line;
-            } elseif (preg_match('/^\s*$/', $line)) {
-                // empty line indicates end of headers
-                break;
-            } else {
-                // Line does not match header format!
-                throw new Exception\RuntimeException(sprintf(
-                    'Line "%s"does not match header format!',
-                    $line
-                ));
-            }
-        }
-        if ($currentLine) {
-            $headers->addHeaderLine($currentLine);
-        }
-        return $headers;
-    }
 }

application/Espo/Core/Mail/Sender.php

@@ -131,7 +131,7 @@ class Sender
         return $this;
     }
 
-    public function send(Email $email, $params = array())
+    public function send(Email $email, $params = array(), &$message = null)
     {
         $message = new Message();
         $config = $this->config;

application/Espo/Core/Pdf/Tcpdf.php

@@ -0,0 +1,50 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 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\Pdf;
+
+require "vendor/tecnick.com/tcpdf/tcpdf.php";
+
+class Tcpdf extends \TCPDF
+{
+    protected $footerHtml = '';
+
+    protected $footerPosition = 15;
+
+    public function setFooterHtml($html)
+    {
+        $this->footerHtml = $html;
+    }
+
+    public function setFooterPosition($position)
+    {
+        $this->footerPosition = $position;
+    }
+
+    public function Footer() {
+        $this->SetY((-1) * $this->footerPosition);
+
+        $html = str_replace('{pageNumber}', '{:pnp:}', $this->footerHtml);
+        $this->writeHTMLCell(0, 0, '', '', $html, 0, 1, 0, '', 0, false, 'T');
+    }
+
+}

application/Espo/Core/Utils/EntityManager.php

@@ -129,11 +129,12 @@ class EntityManager
         $filePath = "application/Espo/Core/Templates/Metadata/{$type}/scopes.json";
         $scopesDataContents = $this->getFileManager()->getContents($filePath);
         $scopesDataContents = str_replace('{entityType}', $name, $scopesDataContents);
-        $scopesData = Json::decode($entityDefsDataContents, true);
+        $scopesData = Json::decode($scopesDataContents, true);
 
         $scopesData['stream'] = $stream;
         $scopesData['type'] = $type;
         $scopesData['module'] = 'Custom';
+        $scopesData['object'] = true;
         $scopesData['isCustom'] = true;
 
         $this->getMetadata()->set('scopes', $name, $scopesData);
@@ -277,6 +278,12 @@ class EntityManager
             throw new Conflict('Link ['.$entityForeign.'::'.$linkForeign.'] already exists.');
         }
 
+        if ($entity === $entityForeign) {
+            if ($link === ucfirst($entity) || $linkForeign === ucfirst($entity)) {
+                throw new Conflict();
+            }
+        }
+
         switch ($linkType) {
             case 'oneToMany':
                 if ($this->getMetadata()->get('entityDefs.' . $entityForeign . '.field.' . $linkForeign)) {

application/Espo/Core/Utils/Number.php

@@ -0,0 +1,60 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 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\Utils;
+
+class Number
+{
+    protected $decimalMark;
+
+    protected $thousandSeparator;
+
+    public function __construct($decimalMark = '.', $thousandSeparator = ',')
+    {
+        $this->decimalMark = $decimalMark;
+        $this->thousandSeparator = $thousandSeparator;
+    }
+
+    public function format($value, $decimals = null)
+    {
+        if (!is_null($decimals)) {
+             return number_format($value, $decimals, $this->decimalMark, $this->thousandSeparator);
+        } else {
+            $s = strval($value);
+            $arr = explode('.', $value);
+
+            $r = '0';
+            if (!empty($arr[0])) {
+                $r = number_format(intval($arr[0]), 0, '.', $this->thousandSeparator);
+            }
+
+            if (!empty($arr[1])) {
+                $r = $r . $this->decimalMark . $arr[1];
+            }
+
+            return $r;
+        }
+    }
+
+}
+
+

application/Espo/Core/defaults/systemConfig.php

@@ -89,9 +89,6 @@ return array (
     'adminItems' =>
     array (
         'devMode',
-        'outboundEmailIsShared',
-        'outboundEmailFromName',
-        'outboundEmailFromAddress',
         'smtpServer',
         'smtpPort',
         'smtpAuth',

application/Espo/Entities/Template.php

@@ -0,0 +1,28 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 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 Template extends \Espo\Core\ORM\Entity
+{
+
+}

application/Espo/EntryPoints/Download.php

@@ -43,10 +43,10 @@ class Download extends \Espo\Core\EntryPoints\Base
 
     public function run()
     {
-        $id = $_GET['id'];
-        if (empty($id)) {
+        if (empty($_GET['id'])) {
             throw new BadRequest();
         }
+        $id = $_GET['id'];
 
         $attachment = $this->getEntityManager()->getEntity('Attachment', $id);
 

application/Espo/EntryPoints/Image.php

@@ -30,13 +30,13 @@ use \Espo\Core\Exceptions\Error;
 class Image extends \Espo\Core\EntryPoints\Base
 {
     public static $authRequired = true;
-    
+
     protected $allowedFileTypes = array(
         'image/jpeg',
         'image/png',
         'image/gif',
     );
-    
+
     protected $imageSizes = array(
         'xxx-small' => array(18, 18),
         'xx-small' => array(32, 32),
@@ -47,59 +47,58 @@ class Image extends \Espo\Core\EntryPoints\Base
         'x-large' => array(864, 864),
         'xx-large' => array(1024, 1024),
     );
-    
-    
+
+
     public function run()
     {
         if (empty($_GET['id'])) {
             throw new BadRequest();
         }
-
         $id = $_GET['id'];
-            
+
         $size = null;
         if (!empty($_GET['size'])) {
             $size = $_GET['size'];
         }
-        
+
         $this->show($id, $size);
     }
-    
+
     protected function show($id, $size)
     {
         $attachment = $this->getEntityManager()->getEntity('Attachment', $id);
-        
+
         if (!$attachment) {
             throw new NotFound();
         }
-        
+
         if ($attachment->get('parentId') && $attachment->get('parentType')) {
             $parent = $this->getEntityManager()->getEntity($attachment->get('parentType'), $attachment->get('parentId'));
             if ($parent && !$this->getAcl()->check($parent)) {
                 throw new Forbidden();
             }
         }
-        
+
         $filePath = "data/upload/{$attachment->id}";
-        
+
         $fileType = $attachment->get('type');
-        
+
         if (!file_exists($filePath)) {
             throw new NotFound();
         }
-        
+
         if (!in_array($fileType, $this->allowedFileTypes)) {
             throw new Error();
         }
-        
+
         if (!empty($size)) {
             if (!empty($this->imageSizes[$size])) {
                 $thumbFilePath = "data/upload/thumbs/{$attachment->id}_{$size}";
-                
+
                 if (!file_exists($thumbFilePath)) {
                     $targetImage = $this->getThumbImage($filePath, $fileType, $size);
                     ob_start();
-                    
+
                     switch ($fileType) {
                         case 'image/jpeg':
                             imagejpeg($targetImage);
@@ -117,12 +116,12 @@ class Image extends \Espo\Core\EntryPoints\Base
                     $this->getContainer()->get('fileManager')->putContents($thumbFilePath, $contents);
                 }
                 $filePath = $thumbFilePath;
-        
+
             } else {
                 throw new Error();
             }
         }
-        
+
         if (!empty($size)) {
             $fileName = $attachment->id . '_' . $size . '.jpg';
         } else {
@@ -143,12 +142,12 @@ class Image extends \Espo\Core\EntryPoints\Base
         readfile($filePath);
         exit;
     }
-    
+
     protected function getThumbImage($filePath, $fileType, $size)
     {
         list($originalWidth, $originalHeight) = getimagesize($filePath);
         list($width, $height) = $this->imageSizes[$size];
-    
+
         if ($originalWidth <= $width && $originalHeight <= $height) {
             $targetWidth = $originalWidth;
             $targetHeight = $originalHeight;
@@ -169,7 +168,7 @@ class Image extends \Espo\Core\EntryPoints\Base
                 }
             }
         }
-                
+
         $targetImage = imagecreatetruecolor($targetWidth, $targetHeight);
         switch ($fileType) {
             case 'image/jpeg':
@@ -189,8 +188,8 @@ class Image extends \Espo\Core\EntryPoints\Base
                 imagecopyresampled($targetImage, $sourceImage, 0, 0, 0, 0, $targetWidth, $targetHeight, $originalWidth, $originalHeight);
                 break;
         }
-        
-        
+
+
         return $targetImage;
     }
 }

application/Espo/EntryPoints/Pdf.php

@@ -0,0 +1,95 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 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\EntryPoints;
+
+use \Espo\Core\Exceptions\NotFound;
+use \Espo\Core\Exceptions\Forbidden;
+use \Espo\Core\Exceptions\BadRequest;
+use \Espo\Core\Htmlizer\Htmlizer;
+
+
+class Pdf extends \Espo\Core\EntryPoints\Base
+{
+    public static $authRequired = true;
+
+    public function run()
+    {
+
+        if (empty($_GET['entityId']) || empty($_GET['entityType']) || empty($_GET['templateId'])) {
+            throw new BadRequest();
+        }
+        $entityId = $_GET['entityId'];
+        $entityType = $_GET['entityType'];
+        $templateId = $_GET['templateId'];
+
+        $entity = $this->getEntityManager()->getEntity($entityType, $entityId);
+        $template = $this->getEntityManager()->getEntity('Template', $templateId);
+
+        $this->getContainer()->get('serviceFactory')->create($entityType)->loadAdditionalFields($entity);
+
+        if (!$entity || !$template) {
+            throw new NotFound();
+        }
+
+        if ($template->get('entityType') !== $entityType) {
+            throw new Forbidden();
+        }
+
+        if (!$this->getAcl()->check($entity, 'read') || !$this->getAcl()->check($template, 'read')) {
+            throw new Forbidden();
+        }
+
+        $fileName = $entity->get('name') . '.pdf';
+
+        $htmlizer = new Htmlizer($this->getFileManager(), $this->getDateTime(), $this->getNumber());
+
+        $pdf = new \Espo\Core\Pdf\Tcpdf();
+        $pdf->setFont('freesans', '', 12, '', true);
+        $pdf->setPrintHeader(false);
+
+        $pdf->setAutoPageBreak(true, $template->get('bottomMargin'));
+        $pdf->setMargins($template->get('leftMargin'), $template->get('topMargin'), $template->get('rightMargin'));
+
+
+        if ($template->get('printFooter')) {
+            $htmlFooter = $htmlizer->render($entity, $template->get('footer'));
+            $pdf->setFooterPosition($template->get('footerPosition'));
+            $pdf->setFooterHtml($htmlFooter);
+        } else {
+            $pdf->setPrintFooter(false);
+        }
+
+        $pdf->addPage();
+
+        $htmlHeader = $htmlizer->render($entity, $template->get('header'));
+        $pdf->writeHTML($htmlHeader, true, false, true, false, '');
+
+        $htmlBody = $htmlizer->render($entity, $template->get('body'));
+        $pdf->writeHTML($htmlBody, true, false, true, false, '');
+
+        $pdf->output($fileName);
+
+        exit;
+    }
+}
+

application/Espo/Modules/Crm/Business/Reminder/EmailReminder.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 /************************************************************************
  * This file is part of EspoCRM.
  *
@@ -27,16 +27,16 @@ use \Espo\ORM\Entity;
 class EmailReminder
 {
     protected $entityManager;
-    
+
     protected $mailSender;
-    
+
     protected $config;
-    
+
     protected $dateTime;
-    
+
     protected $language;
-    
-    
+
+
     public function __construct($entityManager, $mailSender, $config, $dateTime, $language)
     {
         $this->entityManager = $entityManager;
@@ -45,17 +45,17 @@ class EmailReminder
         $this->dateTime = $dateTime;
         $this->language = $language;
     }
-    
+
     protected function getEntityManager()
     {
         return $this->entityManager;
     }
-    
+
     protected function parseInvitationTemplate($contents, $entity, $user = null)
     {
-        
+
         $contents = str_replace('{eventType}', strtolower($this->language->translate($entity->getEntityName(), 'scopeNames')), $contents);
-        
+
         $preferences = $this->getEntityManager()->getEntity('Preferences', $user->id);
         $timezone = $preferences->get('timeZone');
 
@@ -103,7 +103,7 @@ class EmailReminder
 
         return file_get_contents($fileName);
     }
-    
+
     public function send(Entity $reminder)
     {
         $user = $this->getEntityManager()->getEntity('User', $reminder->get('userId'));
@@ -123,7 +123,7 @@ class EmailReminder
 
         $subject = $this->parseInvitationTemplate($subjectTpl, $entity, $user);
         $subject = str_replace(array("\n", "\r"), '', $subject);
-        
+
         $body = $this->parseInvitationTemplate($bodyTpl, $entity, $user);
 
         $email->set('subject', $subject);
@@ -134,7 +134,7 @@ class EmailReminder
         $emailSender = $this->mailSender;
 
         $emailSender->send($email);
-       
+
         $this->getEntityManager()->removeEntity($email);
     }
 }

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

@@ -91,8 +91,6 @@ class Meeting extends \Espo\Core\ORM\Repositories\RDB
         }
 
         return $reminders;
-
-        $entity->set('reminders', $reminders);
     }
 
     protected function afterSave(Entity $entity, array $options)

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

@@ -10,16 +10,21 @@
         "sicCode": "WKN Nummer",
         "industry": "Branche",
         "type": "Typ",
-        "contactRole": "Rolle"
+        "contactRole": "Funktion",
+        "campaign": "Kampagne"
     },
     "links": {
         "contacts": "Kontakte",
         "opportunities": "Verkaufschancen",
         "cases": "Fälle",
         "documents": "Dokumente",
-        "meetingsPrimary": "Meetings (intern)",
-        "callsPrimary": "Anrufe (intern)",
-        "tasksPrimary": "Aufgaben (intern)"
+        "meetingsPrimary": "Meetings (erweitert)",
+        "callsPrimary": "Anrufe (erweitert)",
+        "tasksPrimary": "Aufgaben (erweitert)",
+        "emailsPrimary": "E-Mails (erweitert)",
+        "targetLists": "Kontaktlisten",
+        "campaignLogRecords": "Kampagnen Log",
+        "campaign": "Kampagne"
     },
     "options": {
         "type": {
@@ -49,7 +54,7 @@
             "Real Estate": "Immobilien",
             "Service": "Dienstleistung",
             "Sports": "Sport",
-            "Sofware": "Software",
+            "Software": "Software",
             "Technology": "Technologie",
             "Telecommunications": "Telekommunikation",
             "Television": "Fernsehen",
@@ -60,5 +65,9 @@
     "labels": {
         "Create Account": "Firma erstellen",
         "Copy Billing": "Rechnungsadresse kopieren"
+    },
+    "presetFilters": {
+        "customers": "Kunden",
+        "partners": "Partner"
     }
 }

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

@@ -1,5 +1,6 @@
 {
     "layouts": {
-        "detailConvert": "Interessent umwandeln"
+        "detailConvert": "Interessent umwandeln",
+        "listForAccount": "Liste (für Firma)"
     }
 }

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

@@ -14,7 +14,8 @@
         "reminders": "Erinnerungen",
         "account": "Firma"
     },
-    "links": {},
+    "links": {
+    },
     "options": {
         "status": {
             "Planned": "Geplant",
@@ -32,6 +33,10 @@
             "Tentative": "Mit Vorbehalt"
         }
     },
+    "massActions": {
+        "setHeld": "Auf gehalten setzen",
+        "setNotHeld": "Auf nicht gehalten setzen"
+    },
     "labels": {
         "Create Call": "Anruf erstellen",
         "Set Held": "Auf gehalten setzen",

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

@@ -0,0 +1,55 @@
+{
+    "fields": {
+        "name": "Name",
+        "description": "Beschreibung",
+        "status": "Status",
+        "type": "Typ",
+        "startDate": "Startdatum",
+        "endDate": "Enddatum",
+        "targetLists": "Kontaktlisten",
+        "sentCount": "Gesendet",
+        "openedCount": "Geöffnet",
+        "clickedCount": "Geklickt",
+        "optedOutCount": "Keine E-Mails",
+        "bouncedCount": "Nicht zustellbar",
+        "hardBouncedCount": "Hard Bounced",
+        "softBouncedCount": "Soft Bounced",
+        "leadCreatedCount": "Erstellte Interessenten",
+        "revenue": "Umsatz",
+        "revenueConverted": "Umsatz (konvertiert)"
+    },
+    "links": {
+        "targetLists": "Kontaktlisten",
+        "accounts": "Firmen",
+        "contacts": "Kontakte",
+        "leads": "Interessenten",
+        "opportunities": "Verkaufschancen",
+        "campaignLogRecords": "Protokoll"
+    },
+    "options": {
+        "type": {
+            "Email": "E-Mail",
+            "Web": "Web",
+            "Television": "Fernsehen",
+            "Radio": "Radio Button",
+            "Newsletter": "Newsletter",
+            "Mail": "Mail"
+        },
+        "status": {
+            "Planning": "Planung",
+            "Active": "Aktiv",
+            "Inactive": "Inaktiv",
+            "Complete": "Fertig"
+        }
+    },
+    "labels": {
+        "Create Campaign": "Neue Kampagne",
+        "Target Lists": "Kontaktlisten",
+        "Statistics": "Statistik",
+        "hard": "hart",
+        "soft": "weich"
+    },
+    "presetFilters": {
+        "active": "Aktiv"
+    }
+}

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

@@ -0,0 +1,24 @@
+{
+    "fields": {
+        "action": "Aktion",
+        "actionDate": "Datum",
+        "data": "Daten",
+        "campaign": "Kampagne",
+        "parent": "Zielkontakt",
+        "object": "Objekt",
+        "application": "Applikation"
+    },
+    "options": {
+    	"action": {
+            "Sent": "Gesendet",
+            "Opened": "Geöffnet",
+            "Opted Out": "Keine E-Mails",
+            "Bounced": "Nicht zustellbar",
+            "Clicked": "Geklickt",
+            "Lead Created": "Interessent erstellt"
+    	}
+    },
+    "labels": {
+        "All": "Alle"
+    }
+}

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

@@ -9,7 +9,8 @@
         "type": "Typ",
         "description": "Beschreibung"
     },
-    "links": {},
+    "links": {
+    },
     "options": {
         "status": {
             "New": "Neu",
@@ -19,7 +20,7 @@
             "Rejected": "Abgelehnt",
             "Duplicate": "Duplizieren"
         },
-        "priority": {
+        "priority" : {
             "Low": "Niedrig",
             "Normal": "Normal",
             "High": "Hoch",

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

@@ -10,12 +10,18 @@
         "doNotCall": "Nicht anrufen",
         "address": "Adresse",
         "opportunityRole": "Verkaufschance Rolle",
-        "accountRole": "Rolle",
-        "description": "Beschreibung"
+        "accountRole": "Funktion",
+        "description": "Beschreibung",
+        "campaign": "Kampagne",
+        "targetLists": "Kontaktlisten",
+        "targetList": "Kontaktliste"
     },
     "links": {
         "opportunities": "Verkaufschancen",
-        "cases": "Fälle"
+        "cases": "Fälle",
+        "targetLists": "Kontaktlisten",
+        "campaignLogRecords": "Kampagnen Log",
+        "campaign": "Kampagne"
     },
     "labels": {
         "Create Contact": "Kontakt erstellen"

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

@@ -11,11 +11,14 @@
         "source": "Quelle",
         "publishDate": "Veröffentlichungsdatum",
         "expirationDate": "Ablaufdatum",
-        "description": "Beschreibung"
+        "description": "Beschreibung",
+        "accounts": "Firmen",
+        "folder": "Ordner"
     },
     "links": {
         "accounts": "Firmen",
-        "opportunities": "Verkaufschancen"
+        "opportunities": "Verkaufschancen",
+        "folder": "Ordner"
     },
     "options": {
         "status": {
@@ -23,6 +26,13 @@
             "Draft": "Entwurf",
             "Expired": "Abgelaufen",
             "Canceled": "Storniert"
+        },
+        "type": {
+            "": "Kein(e)",
+            "Contract": "Vertrag",
+            "NDA": "NDA",
+            "EULA": "EULA",
+            "License Agreement": "Lizenz Vereinbarung"
         }
     },
     "presetFilters": {

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

@@ -0,0 +1,9 @@
+{
+    "labels": {
+        "Create DocumentFolder": "Dokumente Ordner erstellen",
+        "Manage Categories": "Ordner verwalten"
+    },
+    "links": {
+        "documents": "Dokumente"
+    }
+}

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

@@ -0,0 +1,8 @@
+{
+    "labels": {
+        "Create Lead": "Interessent erstellen",
+        "Create Contact": "Kontakt erstellen",
+        "Create Task": "Neue Aufgabe",
+        "Create Case": "Fall erstellen"
+    }
+}

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

@@ -10,8 +10,10 @@
         "Call": "Anruf",
         "Task": "Aufgabe",
         "Case": "Fall",
-        "InboundEmail": "Eingehende E-Mails",
-        "Document": "Dokument"
+        "Document": "Dokument",
+        "DocumentFolder": "Dokumente Ordner",
+        "Campaign": "Kampagne",
+        "TargetList": "Kontaktliste"
     },
     "scopeNamesPlural": {
         "Account": "Firmen",
@@ -24,8 +26,10 @@
         "Call": "Anrufe",
         "Task": "Aufgaben",
         "Case": "Fälle",
-        "InboundEmail": "Eingehende E-Mails",
-        "Document": "Dokumente"
+        "Document": "Dokumente",
+        "DocumentFolder": "Dokumente Ordner",
+        "Campaign": "Kampagnen",
+        "TargetList": "Kontaktlisten"
     },
     "dashlets": {
         "Leads": "Meine Interessenten",
@@ -38,7 +42,7 @@
         "OpportunitiesByStage": "Verkaufschancen nach Verkaufsphase",
         "OpportunitiesByLeadSource": "Verkaufschancen nach Quelle",
         "SalesByMonth": "Umsätze nach Monat",
-        "SalesPipeline": "Verkaufspipeline"    
+        "SalesPipeline": "Verkaufspipeline"
     },
     "labels": {
         "Create InboundEmail": "Eingehende E-Mail erstellen",
@@ -58,17 +62,17 @@
         "billingAddressCity": "Ort",
         "billingAddressCountry": "Land",
         "billingAddressPostalCode": "PLZ",
-        "billingAddressState": "Bundesland\/Kanton",
+        "billingAddressState": "Bundesland/Kanton",
         "billingAddressStreet": "Straße",
         "addressCity": "Ort",
         "addressStreet": "Straße",
         "addressCountry": "Land",
-        "addressState": "Bundesland\/Kanton",
+        "addressState": "Bundesland/Kanton",
         "addressPostalCode": "PLZ",        
         "shippingAddressCity": "Ort (Lieferadresse)",
         "shippingAddressStreet": "Straße (Lieferadresse)",
         "shippingAddressCountry": "Land (Lieferadresse)",
-        "shippingAddressState": "Bundesland\/Kanton (Lieferadresse)",
+        "shippingAddressState": "Bundesland/Kanton (Lieferadresse)",
         "shippingAddressPostalCode": "PLZ (Lieferadresse)"
     },
     "links": {

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

@@ -20,9 +20,16 @@
         "description": "Beschreibung",
         "createdAccount": "Firma",
         "createdContact": "Kontakt",
-        "createdOpportunity": "Verkaufschance"
+        "createdOpportunity": "Verkaufschance",
+        "campaign": "Kampagne",
+        "targetLists": "Kontaktlisten",
+        "targetList": "Kontaktliste"
+    },
+    "links": {
+        "targetLists": "Kontaktlisten",
+        "campaignLogRecords": "Kampagnen Log",
+        "campaign": "Kampagne"
     },
-    "links": {},
     "options": {
         "status": {
             "New": "Neu",
@@ -33,6 +40,7 @@
             "Dead": "'Gestorben'"
         },
         "source": {
+            "": "Kein(e)",
             "Call": "Anruf",
             "Email": "E-Mail",
             "Existing Customer": "Bestehender Kunde",
@@ -44,6 +52,7 @@
         }
     },
     "presetFilters": {
-        "active": "Aktiv"
+        "active": "Aktiv",
+        "converted": "Umgewandelt"
     }
 }

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

@@ -13,7 +13,8 @@
         "reminders": "Erinnerungen",
         "account": "Firma"
     },
-    "links": {},
+    "links": {
+    },
     "options": {
         "status": {
             "Planned": "Geplant",
@@ -27,13 +28,17 @@
             "Tentative": "Mit Vorbehalt"
         }
     },
+    "massActions": {
+        "setHeld": "Auf gehalten setzen",
+        "setNotHeld": "Auf nicht gehalten setzen"
+    },
     "labels": {
         "Create Meeting": "Meeting erstellen",
         "Set Held": "Auf gehalten setzen",
         "Set Not Held": "Auf nicht gehalten setzen",
         "Send Invitations": "Einladungen versenden",
         "on time": "Aktuelle Zeit",
-        "before": "Bevor"
+        "before": "bevor"
     },
     "presetFilters": {
         "planned": "Geplant",

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

@@ -11,11 +11,13 @@
         "contacts": "Kontakte",
         "description": "Beschreibung",
         "amountConverted": "Betrag (konvertiert)",
-        "amountWeightedConverted": "Betrag gewichtet"
+        "amountWeightedConverted": "Betrag gewichtet",
+        "campaign": "Kampagne"
     },
     "links": {
         "contacts": "Kontakte",
-        "documents": "Dokumente"
+        "documents": "Dokumente",
+        "campaign": "Kampagne"
     },
     "options": {
         "stage": {
@@ -26,9 +28,9 @@
             "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" 
+            "Closed Lost": "Verloren"
         }
     },
     "labels": {

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

@@ -10,7 +10,8 @@
         "address": "Adresse",
         "description": "Beschreibung"
     },
-    "links": {},
+    "links": {
+    },
     "labels": {
         "Create Target": "Zielkontakt erstellen",
         "Convert to Lead": "Zu Interessent umwandeln"

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

@@ -0,0 +1,29 @@
+{
+    "fields": {
+        "name": "Name",
+        "description": "Beschreibung",
+        "entryCount": "Eingabezähler",
+        "campaigns": "Kampagnen",
+        "endDate": "Enddatum",
+        "targetLists": "Kontaktlisten"
+    },
+    "links": {
+        "accounts": "Firmen",
+        "contacts": "Kontakte",
+        "leads": "Interessenten",
+        "campaigns": "Kampagnen"
+    },
+    "options": {
+        "type": {
+            "Email": "E-Mail",
+            "Web": "Web",
+            "Television": "Fernsehen",
+            "Radio": "Radio Button",
+            "Newsletter": "Newsletter"
+        }
+    },
+    "labels": {
+        "Create TargetList": "Kontaktliste erstellen",
+        "Opted Out": "Keine E-Mails"
+    }
+}

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

@@ -5,19 +5,27 @@
         "status": "Status",
         "dateStart": "Startdatum",
         "dateEnd": "Fällig am",
+        "dateStartDate": "Startdatum (ganztägig)",
+        "dateEndDate": "Enddatum (ganztägig)",
         "priority": "Priorität",
         "description": "Beschreibung",
-        "isOverdue": "Ist überfällig"
+        "isOverdue": "Ist überfällig",
+        "account": "Firma",
+        "dateCompleted": "Datum erledigt",
+        "attachments": "Anhänge"
+    },
+    "links": {
+        "attachments": "Anhänge"
     },
-    "links": {},
     "options": {
         "status": {
             "Not Started": "Nicht begonnen",
             "Started": "In Bearbeitung",
             "Completed": "Abgeschlossen",
-            "Canceled": "Storniert"
+            "Canceled": "Storniert",
+            "Deferred": "Zurückgestellt"
         },
-        "priority": {
+        "priority" : {
             "Low": "Niedrig",
             "Normal": "Normal",
             "High": "Hoch",

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

@@ -0,0 +1,5 @@
+{
+    "links": {
+        "targetLists": "Kontaktlisten"
+    }
+}

application/Espo/Modules/Crm/Resources/i18n/es_ES/Document.json

@@ -11,11 +11,14 @@
         "source": "Fuente",
         "publishDate": "Publicar Fecha",
         "expirationDate": "Fecha de Expiración",
-        "description": "Descripción"
+        "description": "Descripción",
+        "folder": "Carpeta"
     },
     "links": {
         "accounts": "Cuentas",
-        "opportunities": "Oportunidades"
+        "opportunities": "Oportunidades",
+        "accounts": "Cuentas",
+        "folder": "Carpeta"
     },
     "options": {
         "status": {

application/Espo/Modules/Crm/Resources/layouts/Account/detailSmall.json

@@ -1 +1,12 @@
-[{"label":"","rows":[[{"name":"name"}],[{"name":"website"}],[{"name":"emailAddress"}],[{"name":"phoneNumber"}]]}]
+[
+    {
+        "label":"",
+        "rows":[
+                [{"name":"name"}],
+                [{"name":"website"}],
+                [{"name":"emailAddress"}],
+                [{"name":"phoneNumber"}],
+                [{"name":"type"}, {"name":"industry"}]
+            ]
+        }
+]

application/Espo/Modules/Crm/Resources/layouts/Account/filters.json

@@ -4,5 +4,6 @@
 	"createdAt",
 	"emailAddress",
 	"industry",
+    "phoneNumber",
 	"type"
 ]

application/Espo/Modules/Crm/Resources/layouts/Call/detail.json

@@ -5,7 +5,7 @@
             [{"name":"name"},{"name":"parent"}],
             [{"name":"status"}, {"name":"direction"}],
             [{"name":"dateStart"}, {"name":"reminders"}],
-            [{"name":"duration"}],
+            [{"name":"duration"}, false],
             [{"name":"description", "fullWidth": true}]
         ]
     }

application/Espo/Modules/Crm/Resources/layouts/Call/detailSmall.json

@@ -3,8 +3,7 @@
 		"label":"",
 		"rows":[
 			[{"name":"name"}],
-			[{"name":"status"}],
-			[{"name":"direction"}],
+			[{"name":"status"}, {"name":"direction"}],
 			[{"name":"dateStart"}],
 			[{"name":"duration"}],
 			[{"name":"parent"}],

application/Espo/Modules/Crm/Resources/layouts/Campaign/detailSmall.json

@@ -3,8 +3,7 @@
         "label": "",
         "rows": [
             [{"name":"name"}],
-            [{"name":"type"}],
-            [{"name":"status"}],
+            [{"name":"type"}, {"name":"status"}],
             [{"name":"endDate"}]
         ]
     }

application/Espo/Modules/Crm/Resources/layouts/Case/detailSmall.json

@@ -3,9 +3,8 @@
 		"label":"",
 		"rows":[
 			[{"name":"name"}],
-			[{"name":"status"}],
-			[{"name":"priority"}],
-			[{"name":"type"}],
+			[{"name":"status"}, {"name":"priority"}],
+			[{"name":"type"}, {"name":"number"}],
 			[{"name":"account"}],
 			[{"name":"description"}]
 		]

application/Espo/Modules/Crm/Resources/layouts/Contact/filters.json

@@ -1,9 +1,10 @@
 [
 	"account",
+    "address",
 	"assignedUser",
 	"createdAt",
 	"emailAddress",
+    "phoneNumber",
 	"title",
-	"address",
 	"targetLists"
 ]

application/Espo/Modules/Crm/Resources/layouts/Document/detailSmall.json

@@ -2,12 +2,9 @@
     {
         "label": false,
         "rows": [
-            [{"name":"source"}],
-            [{"name":"file"}],
+            [{"name":"file"}, {"name":"source"}],
             [{"name":"name"}],
-            [{"name":"folder"}],
-            [{"name":"type"}],
-            [{"name":"status"}]
+            [{"name":"status"}, {"name":"folder"}]
         ]
     }
 ]

application/Espo/Modules/Crm/Resources/layouts/Document/list.json

@@ -1,7 +1,6 @@
 [
-    {"name":"name","width":35,"link":true},
+    {"name":"name","width":40,"link":true},
     {"name":"file","width":10, "notSortable": true},
-    {"name":"type"},
     {"name":"status"},
     {"name":"createdAt"}
 ]

application/Espo/Modules/Crm/Resources/layouts/Document/listSmall.json

@@ -1,6 +1,6 @@
 [
     {"name":"name","width":40,"link":true},
     {"name":"file","width":10, "notSortable": true},
-    {"name":"type"},
+    {"name":"folder"},
     {"name":"createdAt"}
 ]

application/Espo/Modules/Crm/Resources/layouts/Document/massUpdate.json

@@ -0,0 +1,5 @@
+[
+    "assignedUser",
+    "teams",
+    "folder"
+]

application/Espo/Modules/Crm/Resources/layouts/DocumentFolder/relationships.json

@@ -1,3 +1,4 @@
 [
-    "children"
+    "children",
+    "documents"
 ]

application/Espo/Modules/Crm/Resources/layouts/Lead/detailSmall.json

@@ -12,7 +12,13 @@
                 {"name":"phoneNumber"}
             ],
             [
-                {"name":"status"}
+                {"name":"accountName"}
+            ],
+            [
+                {"name":"status"}, {"name":"source"}
+            ],
+            [
+                {"name":"description"}
             ]
         ]
     }

application/Espo/Modules/Crm/Resources/layouts/Lead/filters.json

@@ -7,6 +7,7 @@
     "status",
     "source",
     "opportunityAmountConverted",
+    "phoneNumber",
     "targetLists",
     "teams",
     "createdAccount"

application/Espo/Modules/Crm/Resources/layouts/Opportunity/detailSmall.json

@@ -1 +1,12 @@
-[{"label":"","rows":[[{"name":"name"}],[{"name":"account"}],[{"name":"stage"}],[{"name":"amount"}],[{"name":"closeDate"}]]}]
+[
+    {
+        "label":"",
+        "rows":[
+            [{"name":"name", "fullWidth": true}],
+            [{"name":"account", "fullWidth": true}],
+            [{"name":"stage"}, {"name":"closeDate"}],
+            [{"name":"amount"}],
+            [{"name":"description"}]
+        ]
+    }
+]

application/Espo/Modules/Crm/Resources/layouts/Task/detailSmall.json

@@ -3,8 +3,7 @@
 		"label":"",
 		"rows":[
 			[{"name":"name"}],
-			[{"name":"status"}],
-			[{"name":"priority"}],
+			[{"name":"status"}, {"name":"priority"}],
 			[{"name":"dateStart"}],
 			[{"name":"dateEnd"}],
 			[{"name":"parent"}],

application/Espo/Modules/Crm/Resources/metadata/clientDefs/Account.json

@@ -1,5 +1,5 @@
 {
-   "controller": "Controllers.Record",
+   "controller": "controllers/record",
    "views":{
       "detail":"Crm:Account.Detail"
    },

application/Espo/Modules/Crm/Resources/metadata/clientDefs/Call.json

@@ -1,5 +1,5 @@
 {
-    "controller": "Controllers.Record",
+    "controller": "controllers/record",
     "views":{
         "detail":"Crm:Call.Detail"
     },

application/Espo/Modules/Crm/Resources/metadata/clientDefs/Campaign.json

@@ -1,5 +1,5 @@
 {
-    "controller": "Controllers.Record",
+    "controller": "controllers/record",
     "menu": {
         "list": {
             "buttons": [

application/Espo/Modules/Crm/Resources/metadata/clientDefs/Case.json

@@ -1,5 +1,5 @@
 {
-   "controller": "Controllers.Record",
+   "controller": "controllers/record",
    "bottomPanels":{
       "detail":[
       ]

application/Espo/Modules/Crm/Resources/metadata/clientDefs/Contact.json

@@ -1,5 +1,5 @@
 {
-   "controller": "Controllers.Record",
+   "controller": "controllers/record",
    "views":{
       "detail":"Crm:Contact.Detail"
    },

application/Espo/Modules/Crm/Resources/metadata/clientDefs/Document.json

@@ -1,5 +1,5 @@
 {
-    "controller": "Controllers.Record",
+    "controller": "controllers/record",
     "views": {
         "list": "Crm:Document.List"
     },

application/Espo/Modules/Crm/Resources/metadata/clientDefs/DocumentFolder.json

@@ -1,6 +1,6 @@
 {
-    "controller": "Controllers.RecordTree",
-    "collection": "Collections.Tree",
+    "controller": "controllers/record-tree",
+    "collection": "collections/tree",
     "menu": {
         "listTree": {
             "buttons": [

application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json

@@ -1,5 +1,5 @@
 {
-   "controller": "Crm:Controllers.Lead",
+   "controller": "crm:controllers/lead",
    "views":{
       "detail":"Crm:Lead.Detail"
    },

application/Espo/Modules/Crm/Resources/metadata/clientDefs/Meeting.json

@@ -1,5 +1,5 @@
 {
-    "controller": "Controllers.Record",
+    "controller": "controllers/record",
     "views":{
         "detail":"Crm:Meeting.Detail"
     },

application/Espo/Modules/Crm/Resources/metadata/clientDefs/Opportunity.json

@@ -1,5 +1,5 @@
 {
-   "controller": "Controllers.Record",
+   "controller": "controllers/record",
    "views":{
       "detail":"Crm:Opportunity.Detail"
    },

application/Espo/Modules/Crm/Resources/metadata/clientDefs/Target.json

@@ -1,5 +1,5 @@
 {
-   "controller": "Controllers.Record",
+   "controller": "controllers/record",
    "views":{
       "detail":"Crm:Target.Detail"
    },

application/Espo/Modules/Crm/Resources/metadata/clientDefs/TargetList.json

@@ -1,5 +1,5 @@
 {
-   "controller": "Controllers.Record",
+   "controller": "controllers/record",
    "boolFilterList": ["onlyMy"],
    "sidePanels":{
       "detail":[

application/Espo/Modules/Crm/Resources/metadata/clientDefs/Task.json

@@ -1,5 +1,5 @@
 {
-   "controller": "Controllers.Record",
+   "controller": "controllers/record",
    "recordViews":{
       "list": "Crm:Task.Record.List",
       "detail": "Crm:Task.Record.Detail"

application/Espo/Modules/Crm/Resources/metadata/dashlets/Calendar.json

@@ -1 +1,4 @@
-{"view":"Crm:Dashlets.Calendar"}
+{
+    "view":"Crm:Dashlets.Calendar",
+    "aclScope": "Calendar"
+}

application/Espo/Modules/Crm/Resources/metadata/dashlets/Calls.json

@@ -1 +1,4 @@
-{"view":"Crm:Dashlets.Calls"}
+{
+    "view":"Crm:Dashlets.Calls",
+    "aclScope": "Call"
+}

application/Espo/Modules/Crm/Resources/metadata/dashlets/Cases.json

@@ -1 +1,4 @@
-{"view":"Crm:Dashlets.Cases"}
+{
+    "view":"Crm:Dashlets.Cases",
+    "aclScope": "Case"
+}

application/Espo/Modules/Crm/Resources/metadata/dashlets/Leads.json

@@ -1 +1,4 @@
-{"view":"Crm:Dashlets.Leads"}
+{
+    "view":"Crm:Dashlets.Leads",
+    "aclScope": "Lead"
+}

application/Espo/Modules/Crm/Resources/metadata/dashlets/Meetings.json

@@ -1 +1,4 @@
-{"view":"Crm:Dashlets.Meetings"}
+{
+    "view":"Crm:Dashlets.Meetings",
+    "aclScope": "Meeting"
+}

application/Espo/Modules/Crm/Resources/metadata/dashlets/Opportunities.json

@@ -1 +1,4 @@
-{"view":"Crm:Dashlets.Opportunities"}
+{
+    "view":"Crm:Dashlets.Opportunities",
+    "aclScope": "Opportunity"
+}

application/Espo/Modules/Crm/Resources/metadata/dashlets/OpportunitiesByLeadSource.json

@@ -1 +1,4 @@
-{"view":"Crm:Dashlets.OpportunitiesByLeadSource"}
+{
+    "view":"Crm:Dashlets.OpportunitiesByLeadSource",
+    "aclScope": "Opportunity"
+}

application/Espo/Modules/Crm/Resources/metadata/dashlets/OpportunitiesByStage.json

@@ -1 +1,4 @@
-{"view":"Crm:Dashlets.OpportunitiesByStage"}
+{
+    "view":"Crm:Dashlets.OpportunitiesByStage",
+    "aclScope": "Opportunity"
+}

application/Espo/Modules/Crm/Resources/metadata/dashlets/SalesByMonth.json

@@ -1 +1,4 @@
-{"view":"Crm:Dashlets.SalesByMonth"}
+{
+    "view":"Crm:Dashlets.SalesByMonth",
+    "aclScope": "Opportunity"
+}

application/Espo/Modules/Crm/Resources/metadata/dashlets/SalesPipeline.json

@@ -1 +1,4 @@
-{"view":"Crm:Dashlets.SalesPipeline"}
+{
+    "view":"Crm:Dashlets.SalesPipeline",
+    "aclScope": "Opportunity"
+}

application/Espo/Modules/Crm/Resources/metadata/dashlets/Tasks.json

@@ -1 +1,4 @@
-{"view":"Crm:Dashlets.Tasks"}
+{
+    "view":"Crm:Dashlets.Tasks",
+    "aclScope": "Task"
+}

application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json

@@ -46,7 +46,8 @@
             "type": "text"
         },
         "parent": {
-            "type": "linkParent"
+            "type": "linkParent",
+            "entityList": ["Account", "Lead", "Opportunity", "Case"]
         },
         "account": {
             "type": "link",
@@ -170,7 +171,6 @@
         },
         "parent": {
             "type": "belongsToParent",
-            "entityList": ["Account", "Lead", "Opportunity", "Case"],
             "foreign": "calls"
         }
     },

application/Espo/Modules/Crm/Resources/metadata/entityDefs/DocumentFolder.json

@@ -61,7 +61,7 @@
         },
         "documents": {
             "type": "hasMany",
-            "foreign": "folders",
+            "foreign": "folder",
             "entity": "Document"
         }
     },

application/Espo/Modules/Crm/Resources/metadata/entityDefs/Email.json

@@ -3,15 +3,15 @@
         "account": {
             "type": "link",
             "disabled": true
+        },
+        "parent": {
+            "entityList": ["Account", "Lead", "Opportunity", "Case"]
         }
     },
     "links": {
         "account": {
             "type": "belongsTo",
             "entity": "Account"
-        },
-        "parent": {
-            "entityList": ["Account", "Lead", "Opportunity", "Case"]
         }
     }
 }

application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json

@@ -41,7 +41,8 @@
             "type": "text"
         },
         "parent": {
-            "type": "linkParent"
+            "type": "linkParent",
+            "entityList": ["Account", "Lead", "Opportunity", "Case"]
         },
         "account": {
             "type": "link",
@@ -165,7 +166,6 @@
         },
         "parent": {
             "type": "belongsToParent",
-            "entityList": ["Account", "Lead", "Opportunity", "Case"],
             "foreign": "meetings"
         }
     },

application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json

@@ -53,7 +53,8 @@
             "type": "text"
         },
         "parent": {
-            "type": "linkParent"
+            "type": "linkParent",
+            "entityList": ["Account", "Contact", "Lead", "Opportunity", "Case"]
         },
         "account": {
             "type": "link",
@@ -108,7 +109,6 @@
         },
         "parent": {
             "type": "belongsToParent",
-            "entityList": ["Account", "Contact", "Lead", "Opportunity", "Case"],
             "foreign": "tasks"
         },
         "account": {

application/Espo/Modules/Crm/Resources/metadata/scopes/Account.json

@@ -7,5 +7,6 @@
     "customizable": true,
     "stream": true,
     "importable": true,
-    "notifications": true
+    "notifications": true,
+    "object": true
 }

application/Espo/Modules/Crm/Resources/metadata/scopes/Call.json

@@ -6,5 +6,6 @@
     "module": "Crm",
     "customizable": true,
     "importable": true,
-    "notifications": true
+    "notifications": true,
+    "object": true
 }

application/Espo/Modules/Crm/Resources/metadata/scopes/Campaign.json

@@ -6,5 +6,6 @@
     "module": "Crm",
     "customizable": true,
     "stream": false,
-    "importable": false
+    "importable": false,
+    "object": true
 }

application/Espo/Modules/Crm/Resources/metadata/scopes/Case.json

@@ -7,5 +7,6 @@
     "customizable": true,
     "stream": true,
     "importable": true,
-    "notifications": true
+    "notifications": true,
+    "object": true
 }

application/Espo/Modules/Crm/Resources/metadata/scopes/Contact.json

@@ -7,5 +7,6 @@
     "customizable": true,
     "stream": true,
     "importable": true,
-    "notifications": true
+    "notifications": true,
+    "object": true
 }

application/Espo/Modules/Crm/Resources/metadata/scopes/Document.json

@@ -6,5 +6,6 @@
     "module": "Crm",
     "customizable": true,
     "importable": false,
-    "notifications": true
+    "notifications": true,
+    "object": true
 }

application/Espo/Modules/Crm/Resources/metadata/scopes/Lead.json

@@ -7,5 +7,6 @@
     "customizable": true,
     "stream": true,
     "importable": true,
-    "notifications": true
+    "notifications": true,
+    "object": true
 }

application/Espo/Modules/Crm/Resources/metadata/scopes/Meeting.json

@@ -6,5 +6,6 @@
     "module": "Crm",
     "customizable": true,
     "importable": true,
-    "notifications": true
+    "notifications": true,
+    "object": true
 }

application/Espo/Modules/Crm/Resources/metadata/scopes/Opportunity.json

@@ -7,5 +7,6 @@
     "customizable": true,
     "stream": true,
     "importable": true,
-    "notifications": true
+    "notifications": true,
+    "object": true
 }

application/Espo/Modules/Crm/Resources/metadata/scopes/Target.json

@@ -6,5 +6,6 @@
     "module": "Crm",
     "customizable": false,
     "importable": false,
-    "notifications": false
+    "notifications": false,
+    "object": true
 }

application/Espo/Modules/Crm/Resources/metadata/scopes/TargetList.json

@@ -7,5 +7,6 @@
     "customizable": false,
     "stream": false,
     "importable": false,
-    "notifications": true
+    "notifications": true,
+    "object": true
 }

application/Espo/Modules/Crm/Resources/metadata/scopes/Task.json

@@ -6,5 +6,6 @@
     "module": "Crm",
     "customizable": true,
     "importable": true,
-    "notifications": true
+    "notifications": true,
+    "object": true
 }