From 2e5cef2abb20109fc06d6bbcd1919d36c1f36542 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurak@list.ru>
Date: Fri, 26 Sep 2014 17:54:39 +0300
Subject: [PATCH] change currency converted

---
 .../Utils/Database/Orm/Fields/Currency.php    | 18 ++++++
 .../Database/Orm/Fields/CurrencyConverted.php | 58 -------------------
 .../metadata/fields/currencyConverted.json    |  2 +-
 3 files changed, 19 insertions(+), 59 deletions(-)
 delete mode 100644 application/Espo/Core/Utils/Database/Orm/Fields/CurrencyConverted.php

diff --git a/application/Espo/Core/Utils/Database/Orm/Fields/Currency.php b/application/Espo/Core/Utils/Database/Orm/Fields/Currency.php
index b3d677af2d..1febef7540 100644
--- a/application/Espo/Core/Utils/Database/Orm/Fields/Currency.php
+++ b/application/Espo/Core/Utils/Database/Orm/Fields/Currency.php
@@ -30,6 +30,10 @@ class Currency extends \Espo\Core\Utils\Database\Orm\Base
 	{
 		$converedFieldName = $fieldName . 'Converted';
 		
+		$currencyColumnName = Util::toUnderScore($fieldName);
+		
+		$alias = Util::toUnderScore($fieldName) . "_currency_alias";
+		
 		return array(
 			$entityName => array(
 				'fields' => array(					
@@ -37,6 +41,20 @@ class Currency extends \Espo\Core\Utils\Database\Orm\Base
 						"type" => "float",
 						"orderBy" => $converedFieldName . " {direction}"							
 					),
+					$fieldName . 'Converted' => array(
+						'type' => 'float',
+						'select' => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate" ,
+						'where' =>
+						array (
+								"=" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate = {value}",
+								">" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate > {value}",
+								"<" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate < {value}",
+								">=" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate >= {value}",
+								"<=" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate <= {value}",
+								"<>" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate <> {value}"
+						),
+						'notStorable' => true						
+					),
 				),
 			),
 		);
diff --git a/application/Espo/Core/Utils/Database/Orm/Fields/CurrencyConverted.php b/application/Espo/Core/Utils/Database/Orm/Fields/CurrencyConverted.php
deleted file mode 100644
index 13bae84ea6..0000000000
--- a/application/Espo/Core/Utils/Database/Orm/Fields/CurrencyConverted.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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\Utils\Database\Orm\Fields;
-
-use Espo\Core\Utils\Util;
-
-class CurrencyConverted extends \Espo\Core\Utils\Database\Orm\Base
-{
-	protected function load($fieldName, $entityName)
-	{
-		$currencyColumnName = str_replace('_converted', '', Util::toUnderScore($fieldName));
-		
-		$alias = $currencyColumnName . "_currency_alias";
-		
-		return array(
-			$entityName => array(
-				'fields' => array(
-					$fieldName => array(
-						'type' => 'float',
-						'select' => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate" ,
-						'where' =>
-						array (
-								"=" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate = {value}",
-								">" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate > {value}",
-								"<" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate < {value}",
-								">=" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate >= {value}",
-								"<=" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate <= {value}",
-								"<>" => Util::toUnderScore($entityName) . "." . $currencyColumnName . " * {$alias}.rate <> {value}"
-						),
-						'notStorable' => true						
-					),
-
-				),
-			),
-		);
-	}
-
-}
diff --git a/application/Espo/Resources/metadata/fields/currencyConverted.json b/application/Espo/Resources/metadata/fields/currencyConverted.json
index 50d4b0babf..124118157c 100644
--- a/application/Espo/Resources/metadata/fields/currencyConverted.json
+++ b/application/Espo/Resources/metadata/fields/currencyConverted.json
@@ -4,6 +4,6 @@
    "filter": true,
    "notCreatable": true,
    "fieldDefs":{
-      "notStorable":true
+      "skip": true
    }
 }