SinergiaCRM 1.6.5 Release merge

SinergiaTIC · Aug 21, 2024 · 9bd5436 · 9bd5436
2 parents 90706b6 + d4ed4d9
commit 9bd5436
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git 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

diff --git 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
@@ -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",
     ),
 );