From 13c76eec25b194228a2c6390c1c53c121253b18f Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sun, 11 Oct 2020 14:39:26 +0200
Subject: [PATCH] fix upgrade145.sql , default value must be 1 for actif, sql
 wrong

---
 include/class/card_multiple.class.php | 2 +-
 include/constant.php                  | 1 +
 include/sql/patch/upgrade145.sql      | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/class/card_multiple.class.php b/include/class/card_multiple.class.php
index 2fbd1a4d8..d70c23745 100644
--- a/include/class/card_multiple.class.php
+++ b/include/class/card_multiple.class.php
@@ -57,7 +57,7 @@ class Card_Multiple
                   ".MAX_CARD_SEARCH;
         } else {
             $string_sql=sprintf($this->sql." where f_id in (select f_id from fiche_detail where 
-                    ad_id = '%s' and ad_value ilike '%%%s%%') and %s"
+                    ad_id = '%s' and ad_value ilike '%%%s%%')  %s"
                     , sql_string($sql_array["search_in"]),$query,$filter);
         }
         return $string_sql;
diff --git a/include/constant.php b/include/constant.php
index b8d723d9c..7382a81e2 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -212,6 +212,7 @@ define( 'ATTR_DEF_ACCOUNT_ND_TVA',50);
 define('ATTR_DEF_ACCOUNT_ND_TVA_ND',51);
 define ('ATTR_DEF_ACCOUNT_ND_PERSO',52);
 define ('ATTR_DEF_ACCOUNT_ND',53);
+define ('ATTR_DEF_ACTIF',54);
 
 define ("FICHE_TYPE_CLIENT",9);
 define ("FICHE_TYPE_VENTE",1);
diff --git a/include/sql/patch/upgrade145.sql b/include/sql/patch/upgrade145.sql
index 98b6fffef..cd5a13cfb 100644
--- a/include/sql/patch/upgrade145.sql
+++ b/include/sql/patch/upgrade145.sql
@@ -23,6 +23,7 @@ insert into attr_def(ad_id,ad_text,ad_type,ad_size) values (54,'Actif','check','
 insert into attr_min(frd_id,ad_id) select frd_id , 54 from fiche_def_ref ;
 insert into jnt_fic_attr  (fd_id,ad_id,jnt_order) select fd_id,54,30 from fiche_def;
 insert into fiche_detail (f_id,ad_id,ad_value) select f_id, 54,1 from fiche_detail where ad_id=1 and f_id not in (select f_id from fiche_detail where ad_id=54);
+update fiche_detail set ad_value='1' where ad_id=54;
 insert into menu_ref(me_code,me_menu,me_file,me_type) values ('CSV:FollowUpContactOption','Export action suivi','export_follow_up_contact_csv.php','PR');
 insert into profile_menu (me_code,p_id,p_type_display) select 'CSV:FollowUpContactOption',p_id,'P' from profile;