From 769b50de11989fd6a2fe5296c4099299d33d8282 Mon Sep 17 00:00:00 2001 From: sparkyx Date: Thu, 25 Dec 2025 10:08:58 +0100 Subject: [PATCH] Align STABLE --- .gitignore | 5 +++++ html/css/style-classic7.css | 9 +-------- html/do.php | 2 -- html/export.php | 2 +- html/extension.raw.php | 1 - html/js/noalyss_script.js | 4 +++- include/admin_repo.inc.php | 1 - include/fiche.inc.php | 1 - include/sql/mod1/data.sql | 21 --------------------- include/sql/mod1/schema.sql | 6 ++++++ include/widget/agenda/agenda.php | 2 +- 11 files changed, 17 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 494f4bf7b..9560e8f5f 100644 --- a/.gitignore +++ b/.gitignore @@ -47,5 +47,10 @@ local/* .idea/* include/tfpdf/font/unifont/* html/ads.html +<<<<<<< HEAD +/nbproject/private/ +======= doc/code/* nbproject/private/ + +>>>>>>> unstable diff --git a/html/css/style-classic7.css b/html/css/style-classic7.css index e1a3dba2c..fecde1ce2 100644 --- a/html/css/style-classic7.css +++ b/html/css/style-classic7.css @@ -379,7 +379,6 @@ td.tool a.mtitle:hover { /** menu left (not used) */ - div.lmenu { float:left; clear:left; @@ -3994,7 +3993,6 @@ h2.h-section { background-color:yellow; background-image: linear-gradient(to bottom,yellow,white); } - /*** * Animate menu * @@ -4063,12 +4061,7 @@ h2.h-section { opacity: 0.9; } - } - .text-70 { - font-size:70% !important; - vertical-align: super; - - } + .nav-pills { font-family:var(--font-title) !important; } diff --git a/html/do.php b/html/do.php index 364891571..2f1ec3f12 100644 --- a/html/do.php +++ b/html/do.php @@ -59,8 +59,6 @@ global $g_user, $cn,$g_parameter,$http; $g_user = new Noalyss_user($cn); $http=new HttpInput(); -ITva_Popup::set_vat_code($g_user->get_vat_code_preference()); - IDate::set_firstDate($g_user->get_first_week_day()); ITva_Popup::set_vat_code($g_user->get_vat_code_preference()); diff --git a/html/export.php b/html/export.php index bc47b0d3c..d287a8ce4 100644 --- a/html/export.php +++ b/html/export.php @@ -102,4 +102,4 @@ if ( LOGINPUT) die (_('Export impossible')); } require_once NOALYSS_INCLUDE."/export/$prfile"; - ?> + ?> \ No newline at end of file diff --git a/html/extension.raw.php b/html/extension.raw.php index 81164d79a..4f6644f74 100644 --- a/html/extension.raw.php +++ b/html/extension.raw.php @@ -84,7 +84,6 @@ if ( $ext->search($http->request("plugin_code")) != -1 ) fwrite($file_loginput,"\n"); fclose($file_loginput); } - define ('ALLOWED',True); /* call the ajax script */ require_once NOALYSS_PLUGIN.DIRECTORY_SEPARATOR.dirname(trim($ext->getp('me_file'))).DIRECTORY_SEPARATOR.'raw.php'; } diff --git a/html/js/noalyss_script.js b/html/js/noalyss_script.js index 061b3240e..b3d949ce5 100644 --- a/html/js/noalyss_script.js +++ b/html/js/noalyss_script.js @@ -4752,6 +4752,7 @@ Widget.prototype.toggle_full_size=function (widget_domid) { (function(){window.addEventListener("onload", (event) => {remove_waiting_box()});})(); */ +//var bookmark=new Bookmark(); Noalyss = function () { @@ -5112,5 +5113,6 @@ VAT_Code.prototype.filter_country=function() return false; } } -noalyss=new Noalyss(); +var noalyss=new Noalyss(); + var bookmark=new Bookmark(); \ No newline at end of file diff --git a/include/admin_repo.inc.php b/include/admin_repo.inc.php index 4628b48e7..e1fd207c2 100644 --- a/include/admin_repo.inc.php +++ b/include/admin_repo.inc.php @@ -35,7 +35,6 @@ $action = $http->request("action","string", ""); $rep=new Database(); $User=new Noalyss_user($rep); $User->Check(); -$audit=true; /** * check if 2FA is completed */ diff --git a/include/fiche.inc.php b/include/fiche.inc.php index ca98cad24..111d37c6f 100644 --- a/include/fiche.inc.php +++ b/include/fiche.inc.php @@ -233,7 +233,6 @@ if ($histo->selected == -1) $p_cat=$http->get("cat","number"); $cond = " where f.fd_id = " . sql_string($p_cat); $cond .= " and f.f_enable='1'"; - } // Create nav bar diff --git a/include/sql/mod1/data.sql b/include/sql/mod1/data.sql index 6a49eb3bc..62e870ec7 100644 --- a/include/sql/mod1/data.sql +++ b/include/sql/mod1/data.sql @@ -15,35 +15,14 @@ SET row_security = off; SELECT pg_catalog.lo_create('2346174'); - - - SELECT pg_catalog.lo_create('2346176'); - - - SELECT pg_catalog.lo_create('2346177'); - - - SELECT pg_catalog.lo_create('2346178'); - - - SELECT pg_catalog.lo_create('2346179'); - - - SELECT pg_catalog.lo_create('2346181'); - - - SELECT pg_catalog.lo_create('2346476'); - - - INSERT INTO public.action (ac_id, ac_description, ac_module, ac_code) VALUES (800, 'Ajout de fiche', 'fiche', 'FICADD'); INSERT INTO public.action (ac_id, ac_description, ac_module, ac_code) VALUES (805, 'Création, modification et effacement de fiche', 'fiche', 'FIC'); INSERT INTO public.action (ac_id, ac_description, ac_module, ac_code) VALUES (910, 'création, modification et effacement de catégorie de fiche', 'fiche', 'FICCAT'); diff --git a/include/sql/mod1/schema.sql b/include/sql/mod1/schema.sql index 6fd9d06e4..afc0887fe 100644 --- a/include/sql/mod1/schema.sql +++ b/include/sql/mod1/schema.sql @@ -17,6 +17,12 @@ CREATE SCHEMA comptaproc; +<<<<<<< HEAD +======= + + + +>>>>>>> review-stash CREATE SCHEMA tva_belge; diff --git a/include/widget/agenda/agenda.php b/include/widget/agenda/agenda.php index 074561824..d15e17b75 100644 --- a/include/widget/agenda/agenda.php +++ b/include/widget/agenda/agenda.php @@ -63,4 +63,4 @@ class Agenda extends Widget -} +} \ No newline at end of file