From de573be9977e4453af31e33368e1e59107821581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Chamizo=20Gonz=C3=A1lez?=
 <46187267+juanSTIC@users.noreply.github.com>
Date: Wed, 21 Aug 2024 13:13:40 +0200
Subject: [PATCH 1/2] =?UTF-8?q?Hotfix=20-=20SinergiaDA=20-=20Correcci?=
 =?UTF-8?q?=C3=B3n=20de=20tipo=20en=20campos=20virtuales=20(#362)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SDAVardefs.php                            | 20 +++++++++----------
 .../SDAVardefs.php                            | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/stic_Accounts_Relationships/SDAVardefs.php b/modules/stic_Accounts_Relationships/SDAVardefs.php
index b2bfee13a77..254e3719bb1 100644
--- a/modules/stic_Accounts_Relationships/SDAVardefs.php
+++ b/modules/stic_Accounts_Relationships/SDAVardefs.php
@@ -52,8 +52,8 @@
         'expression' => "CASE
             WHEN (start_date IS NULL OR start_date <= LAST_DAY(CONCAT(YEAR(CURDATE()),'-12-31')))
             AND (end_date IS NULL OR end_date >= CONCAT(YEAR(CURDATE()),'-01-01'))
-            THEN 1
-            ELSE 0
+            THEN '1'
+            ELSE '0'
         END",
     ),
     'SDA_ACTIVE_CURRENT_YEAR_MINUS_1' => array(
@@ -65,8 +65,8 @@
         'expression' => "CASE
             WHEN (start_date IS NULL OR start_date <= LAST_DAY(CONCAT(YEAR(CURDATE())-1,'-12-31')))
             AND (end_date IS NULL OR end_date >= CONCAT(YEAR(CURDATE())-1,'-01-01'))
-            THEN 1
-            ELSE 0
+            THEN '1'
+            ELSE '0'
         END",
     ),
     'SDA_ACTIVE_CURRENT_YEAR_MINUS_2' => array(
@@ -78,8 +78,8 @@
         'expression' => "CASE
             WHEN (start_date IS NULL OR start_date <= LAST_DAY(CONCAT(YEAR(CURDATE())-2,'-12-31')))
             AND (end_date IS NULL OR end_date >= CONCAT(YEAR(CURDATE())-2,'-01-01'))
-            THEN 1
-            ELSE 0
+            THEN '1'
+            ELSE '0'
         END",
     ),
     'SDA_ACTIVE_CURRENT_YEAR_MINUS_3' => array(
@@ -91,8 +91,8 @@
         'expression' => "CASE
             WHEN (start_date IS NULL OR start_date <= LAST_DAY(CONCAT(YEAR(CURDATE())-3,'-12-31')))
             AND (end_date IS NULL OR end_date >= CONCAT(YEAR(CURDATE())-3,'-01-01'))
-            THEN 1
-            ELSE 0
+            THEN '1'
+            ELSE '0'
         END",
     ),
     'SDA_ACTIVE_CURRENT_YEAR_MINUS_4' => array(
@@ -104,8 +104,8 @@
         'expression' => "CASE
             WHEN (start_date IS NULL OR start_date <= LAST_DAY(CONCAT(YEAR(CURDATE())-4,'-12-31')))
             AND (end_date IS NULL OR end_date >= CONCAT(YEAR(CURDATE())-4,'-01-01'))
-            THEN 1
-            ELSE 0
+            THEN '1'
+            ELSE '0'
         END",
     ),
 );
diff --git a/modules/stic_Contacts_Relationships/SDAVardefs.php b/modules/stic_Contacts_Relationships/SDAVardefs.php
index b2bfee13a77..254e3719bb1 100644
--- a/modules/stic_Contacts_Relationships/SDAVardefs.php
+++ b/modules/stic_Contacts_Relationships/SDAVardefs.php
@@ -52,8 +52,8 @@
         'expression' => "CASE
             WHEN (start_date IS NULL OR start_date <= LAST_DAY(CONCAT(YEAR(CURDATE()),'-12-31')))
             AND (end_date IS NULL OR end_date >= CONCAT(YEAR(CURDATE()),'-01-01'))
-            THEN 1
-            ELSE 0
+            THEN '1'
+            ELSE '0'
         END",
     ),
     'SDA_ACTIVE_CURRENT_YEAR_MINUS_1' => array(
@@ -65,8 +65,8 @@
         'expression' => "CASE
             WHEN (start_date IS NULL OR start_date <= LAST_DAY(CONCAT(YEAR(CURDATE())-1,'-12-31')))
             AND (end_date IS NULL OR end_date >= CONCAT(YEAR(CURDATE())-1,'-01-01'))
-            THEN 1
-            ELSE 0
+            THEN '1'
+            ELSE '0'
         END",
     ),
     'SDA_ACTIVE_CURRENT_YEAR_MINUS_2' => array(
@@ -78,8 +78,8 @@
         'expression' => "CASE
             WHEN (start_date IS NULL OR start_date <= LAST_DAY(CONCAT(YEAR(CURDATE())-2,'-12-31')))
             AND (end_date IS NULL OR end_date >= CONCAT(YEAR(CURDATE())-2,'-01-01'))
-            THEN 1
-            ELSE 0
+            THEN '1'
+            ELSE '0'
         END",
     ),
     'SDA_ACTIVE_CURRENT_YEAR_MINUS_3' => array(
@@ -91,8 +91,8 @@
         'expression' => "CASE
             WHEN (start_date IS NULL OR start_date <= LAST_DAY(CONCAT(YEAR(CURDATE())-3,'-12-31')))
             AND (end_date IS NULL OR end_date >= CONCAT(YEAR(CURDATE())-3,'-01-01'))
-            THEN 1
-            ELSE 0
+            THEN '1'
+            ELSE '0'
         END",
     ),
     'SDA_ACTIVE_CURRENT_YEAR_MINUS_4' => array(
@@ -104,8 +104,8 @@
         'expression' => "CASE
             WHEN (start_date IS NULL OR start_date <= LAST_DAY(CONCAT(YEAR(CURDATE())-4,'-12-31')))
             AND (end_date IS NULL OR end_date >= CONCAT(YEAR(CURDATE())-4,'-01-01'))
-            THEN 1
-            ELSE 0
+            THEN '1'
+            ELSE '0'
         END",
     ),
 );

From d4ed4d93fdb88b3d2806ec4cdf2c29fef0ba83fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paula=20Carmona=20S=C3=A1nchez?=
 <125350097+PaulaaSTIC@users.noreply.github.com>
Date: Wed, 21 Aug 2024 13:31:17 +0200
Subject: [PATCH 2/2] SinergiaCRM 1.6.5 Release (#365)

---
 config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.php b/config.php
index d05a9200bc0..6d8f1f0ad2c 100644
--- a/config.php
+++ b/config.php
@@ -576,7 +576,7 @@
     
     // STIC Custom 20231124 JBL - SemVer in SinergiaCRM
     // STIC#1319
-    'sinergiacrm_version' => '1.6.4',
+    'sinergiacrm_version' => '1.6.5',
     'js_custom_version' => 9,
     'stic_show_update_alert' => 0,
     // END STIC