[Noalyss-commit] [noalyss] 02/07: Task #2094: Menu : confusion entre catégorie et modèle

[Dany De Bontridder]

sparkyx pushed a commit to branch devel
in repository noalyss.

commit b98cda6e32197f8abc542ab42638224ae03ce46a
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Sat Nov 27 21:57:06 2021 +0100

    Task #2094: Menu : confusion entre catégorie et modèle
---
 include/constant.php             |   2 +-
 include/sql/patch/upgrade170.sql |  12 ++++
 sql/upgrade.sql                  | 118 +--------------------------------------
 3 files changed, 15 insertions(+), 117 deletions(-)

diff --git a/include/constant.php b/include/constant.php
index 22cb41e..d85a0a8 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -116,7 +116,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
 if ( ! defined ("SYSINFO_DISPLAY")) {
     define ("SYSINFO_DISPLAY",TRUE);
 }
-define ("DBVERSION",170);
+define ("DBVERSION",171);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",20);
 define ('NOTFOUND','--not found--');
diff --git a/include/sql/patch/upgrade170.sql b/include/sql/patch/upgrade170.sql
new file mode 100644
index 0000000..dff957d
--- /dev/null
+++ b/include/sql/patch/upgrade170.sql
@@ -0,0 +1,12 @@
+begin;
+update menu_ref set me_code='CMCARD' where me_code='CFGCARDCAT';
+update menu_ref set me_code='CCARD' where me_code='CFGCARD';
+update menu_ref set me_code='CCARDAT' where me_code='CFGATCARD';
+update MENU_REF set ME_MENU='Modèle de fiches' , me_description ='Gestion de 
modèle de fiches',me_description_etendue ='Permet de changer le poste comptable 
de base des modèles de fiches' where me_code='CMCARD';
+update BOOKMARK set b_action=replace(b_action,'CFGCARDCAT','CMCARD');
+update BOOKMARK set b_action=replace(b_action,'CFGCARD','CCARD');
+update BOOKMARK set b_action=replace(b_action,'CFGATCARD','CCARDAT');
+
+
+insert into version (val,v_description) values (171,'change name for menu ');
+commit;
\ No newline at end of file
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 80a91f2..f865fd5 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,116 +1,2 @@
- with sqlletter as 
-             (
-select
-       j_id,
-       jl_id
-from
-       letter_cred
-union all
-select
-       j_id ,
-       jl_id
-from
-       letter_deb )
-             select
-       distinct substring(jr_pj_number, '[0-9]+$'),
-       j1.j_id,
-       j_date,
-       to_char(j_date, 'DD.MM.YYYY') as j_date_fmt,
-       j_qcode,
-       case
-               when j_debit = 't' then j_montant
-               else 0
-       end as deb_montant,
-       case
-               when j_debit = 'f' then j_montant
-               else 0
-       end as cred_montant,
-       jr_comment as description,
-       jrn_def_name as jrn_name,
-       j_poste,
-       jr_pj_number,
-       j_debit,
-       jr_internal,
-       jr_id,
-       (
-       select
-               distinct jl_id
-       from
-               sqlletter
-       where
-               sqlletter.j_id = j1.j_id ) as letter ,
-       jr_optype ,
-       jr_tech_per,
-       p_exercice,
-       jrn_def_name,
-       (with cred as (
-       select
-               jl_id,
-               sum(j_montant) as amount_cred
-       from
-               letter_cred lc1
-       left join jrnx as j3 on
-               (j3.j_id = lc1.j_id)
-       group by
-               jl_id ),
-       deb as (
-       select
-               jl_id,
-               sum(j_montant) as amount_deb
-       from
-               letter_deb ld1
-       left join jrnx as j2 on
-               (j2.j_id = ld1.j_id)
-       group by
-               jl_id )
-       select
-               amount_deb-amount_cred
-       from
-               cred
-       full join deb
-                       using (jl_id)
-       where
-               jl_id =(
-               select
-                       distinct jl_id
-               from
-                       sqlletter
-               where
-                       sqlletter.j_id = j1.j_id )) as delta_letter,
-       jrn_def_code,
-       jrn.currency_rate,
-       jrn.currency_rate_ref,
-       jrn.currency_id,
-       (
-       select
-               cr_code_iso
-       from
-               currency
-       where
-               id = jrn.currency_id) as cr_code_iso,
-       j_montant,
-       sum_oc_amount as oc_amount,
-       sum_oc_vat_amount as oc_vat_amount,
-       case when exists(select 1 from operation_analytique oa where 
j1.j_id=oa.j_id) then 1 else 0 end as op_analytic
-from
-       jrnx as j1
-left join jrn_def on
-       jrn_def_id = j_jrn_def
-left join (
-       select
-               j_id,
-               coalesce(oc_amount, 0) as sum_oc_amount ,
-               coalesce(oc_vat_amount, 0) as sum_oc_vat_amount
-       from
-               jrnx
-       left join operation_currency
-                       using (j_id)
-                                              ) as v1 on
-       (v1.j_id = j1.j_id )
-left join jrn on
-       jr_grpt_id = j_grpt
-left join parm_periode on
-       (p_id = jr_tech_per)
-       where
-       j1.j_qcode = $1
-and j_date > '2020-01-01'
+set search_path=public,comptaproc;
+update parm_periode set p_exercice_label =p_exercice ;
\ No newline at end of file