[Noalyss-commit] [noalyss] 11/14: integre changement SQL

[dwm]

sparkyx pushed a commit to branch devel
in repository noalyss.

commit 58673932a9bc008eed8825eee336d0663ace3649
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Sat Feb 3 15:30:05 2024 +0100

    integre changement SQL
---
 include/class/acc_ledger.class.php                  | 2 +-
 include/constant.php                                | 2 +-
 sql/upgrade.sql => include/sql/patch/upgrade193.sql | 9 +++++++--
 sql/upgrade.sql                                     | 6 ------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/include/class/acc_ledger.class.php 
b/include/class/acc_ledger.class.php
index 9f773de79..1ee0c9ab0 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -617,7 +617,7 @@ class Acc_Ledger  extends jrn_def_sql
      */
     function confirm($p_array, $p_readonly=false)
     {
-        global $g_parameter;
+        global $g_parameter,$g_user;
         $http=new HttpInput();
         $msg=array();
         if (!$p_readonly)
diff --git a/include/constant.php b/include/constant.php
index 375b47214..ed6d1201b 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -123,7 +123,7 @@ if (!defined("NOALYSS_PACKAGE_REPOSITORY")) {
 if (!defined("SYSINFO_DISPLAY")) {
     define("SYSINFO_DISPLAY", TRUE);
 }
-define("DBVERSION", 193);
+define("DBVERSION", 194);
 define("MONO_DATABASE", 25);
 define("DBVERSIONREPO", 20);
 define('NOTFOUND', '--not found--');
diff --git a/sql/upgrade.sql b/include/sql/patch/upgrade193.sql
similarity index 64%
copy from sql/upgrade.sql
copy to include/sql/patch/upgrade193.sql
index c89bc475c..675c596c1 100644
--- a/sql/upgrade.sql
+++ b/include/sql/patch/upgrade193.sql
@@ -1,6 +1,11 @@
+begin;
 
-insert into action (ac_id,ac_description,ac_module,ac_code) values 
(1130,'Modifier le numéro de pièce','compta','UPDRECEIPT');
-insert into action (ac_id,ac_description,ac_module,ac_code) values 
(1140,'Modifier la date d''une operation' ,'compta','UPDDATE');
+insert into action (ac_id,ac_description,ac_module,ac_code) values 
(1130,'Modifier le numéro de pièce','compta','UPDRECEIPT') on conflict do 
nothing;
+insert into action (ac_id,ac_description,ac_module,ac_code) values 
(1140,'Modifier la date d''une operation' ,'compta','UPDDATE') on conflict do 
nothing;
 
 insert into user_sec_act(ua_login,ua_act_id) select distinct ua_login,1130 
from user_sec_act;
 insert into user_sec_act(ua_login,ua_act_id) select distinct ua_login,1140 
from user_sec_act;
+
+
+insert into version (val,v_description) values (194,'Renforcement sécurité');
+commit;
\ No newline at end of file
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index c89bc475c..e69de29bb 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,6 +0,0 @@
-
-insert into action (ac_id,ac_description,ac_module,ac_code) values 
(1130,'Modifier le numéro de pièce','compta','UPDRECEIPT');
-insert into action (ac_id,ac_description,ac_module,ac_code) values 
(1140,'Modifier la date d''une operation' ,'compta','UPDDATE');
-
-insert into user_sec_act(ua_login,ua_act_id) select distinct ua_login,1130 
from user_sec_act;
-insert into user_sec_act(ua_login,ua_act_id) select distinct ua_login,1140 
from user_sec_act;