Publish 2.2.10 (#135)

* Improve the use of variable (#131) * Improve the use of variable * Update global.inc.php * Update global.inc.php * Improve work in progress * Update global.inc.php * Infos * notifications * fixes * Update global.inc.php * Calendar + Tab * Update global.inc.php * Compatibility Quicklist * Add option MAIN_CHECKBOX_LEFT_COLUMN & language * Reverse PR131 * Publish 2.2.9 - Remove PR131 & fix some CSS (#132) * Version * 2022.5.3 2.2.10 (#134) * Publish version 2.2.10 * New Logo --------- Co-authored-by: Sylvain Legrand <[email protected]>
aspangaro · Sep 12, 2023 · ff73871 · ff73871
1 parent fbaa54a
commit ff73871
Show file tree

Hide file tree

Showing 11 changed files with 107 additions and 15 deletions.
diff --git a/htdocs/custom/oblyon/CHANGELOG.md b/htdocs/custom/oblyon/CHANGELOG.md
@@ -1,5 +1,14 @@
 ## Changelog ##
 
+### Version 2.2.10 - Compatibility 14.0.x - 19-alpha (2023/09/12)
+- NEW Add option to access directly in project list when you click in menu (PROJECT_FORCE_LIST_ACCESS)
+- NEW Add option to show reconciliation link in menu bank (OBLYON_ENABLE_MENU_BANK_RECONCILIATE)
+
+### Version 2.2.9 - Compatibility 14.0.x - 19-alpha (2023/09/01)
+- NEW Add option to switch select column to the left (MAIN_CHECKBOX_LEFT_COLUMN) 
+- Compatibility module Quicklist with function "Fix the reference banner and action buttons during vertical scrolling"
+- Upgrade CSS Compatibility with v18/v19
+
 ### Version 2.2.8 - Compatibility 14.0.x - 18.0.x (2023/07/10)
 - Add constant PROJECT_HIDE_MENU_TASKS_ACTIVITY to hide in project menu the link to manage activity
 - Upgrade CSS

diff --git a/htdocs/custom/oblyon/VERSION b/htdocs/custom/oblyon/VERSION
@@ -1 +1 @@
-2.2.8
+2.2.10
diff --git a/htdocs/custom/oblyon/admin/options.php b/htdocs/custom/oblyon/admin/options.php
@@ -118,8 +118,13 @@
 	oblyon_print_liste_titre($metas);
 	$metas						= array(array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'options');
 	oblyon_print_input('FIX_AREAREF_TABACTION',					'on_off', $langs->trans('FixAreaRefAndTabAction'),			'', $metas, 2, 1);	// Sticky area ref & tab action
-
+	// List
+	$metas						= array(array(3), 'List');
+	oblyon_print_liste_titre($metas);
 	$easyaVersion = (float) !empty($conf->global->EASYA_VERSION) ? $conf->global->EASYA_VERSION : '';
+	if ($easyaVersion >= "2024.0.0" || (float) DOL_VERSION >= 18.0) {
+		oblyon_print_input('MAIN_CHECKBOX_LEFT_COLUMN', 			'on_off', $langs->trans('SwitchColunmOnLeft'), 	'', $metas, 2, 1);    // Sticky table headers columns
+	}
 	if ($easyaVersion >= "2022.5.2" || (float) DOL_VERSION >= 17.0) {
 		oblyon_print_input('FIX_STICKY_HEADER_CARD', 			'on_off', $langs->trans('FixStickyTableHeadersColumns'), 	'', $metas, 2, 1);    // Sticky table headers columns
 	}

diff --git a/htdocs/custom/oblyon/core/menus/standard/oblyon.lib.php b/htdocs/custom/oblyon/core/menus/standard/oblyon.lib.php
@@ -292,10 +292,14 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
 			$title = $langs->trans("Leads");
 			$showmodep = 0;
 		}
-		$menu->add('/projet/index.php?mainmenu=project&amp;leftmenu=', $title, 0, $showmode, $atarget, "project", '', 70, $id, $idsel, $classname);
-		//$menu->add('/projet/index.php?mainmenu=project&amp;leftmenu=&search_opp_status=openedopp', $langs->trans("ListLeads"), 0, $showmodel & $conf->global->PROJECT_USE_OPPORTUNITIES, $atarget, "project", '', 70, $id, $idsel, $classname);
-		//$menu->add('/projet/index.php?mainmenu=project&amp;leftmenu=&search_opp_status=notopenedopp', $langs->trans("ListProjects"), 0, $showmodep, $atarget, "project", '', 70, $id, $idsel, $classname);
-	}
+        if (!empty($conf->global->PROJECT_FORCE_LIST_ACCESS)) {
+            $menu->add('/projet/list.php?mainmenu=project&amp;leftmenu=projets', $title, 0, $showmode, $atarget, "project", '', 70, $id, $idsel, $classname);
+        } else {
+            $menu->add('/projet/index.php?mainmenu=project&amp;leftmenu=', $title, 0, $showmode, $atarget, "project", '', 70, $id, $idsel, $classname);
+        }
+        //$menu->add('/projet/index.php?mainmenu=project&amp;leftmenu=&search_opp_status=openedopp', $langs->trans("ListLeads"), 0, $showmodel & $conf->global->PROJECT_USE_OPPORTUNITIES, $atarget, "project", '', 70, $id, $idsel, $classname);
+        //$menu->add('/projet/index.php?mainmenu=project&amp;leftmenu=&search_opp_status=notopenedopp', $langs->trans("ListProjects"), 0, $showmodep, $atarget, "project", '', 70, $id, $idsel, $classname);
+    }
 
 	// Commercial (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)
 	$tmpentry = array(
@@ -2145,7 +2149,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 		}
 
 		// We update newmenu for special dynamic menus
-		if (!empty($user->rights->banque->lire) && $mainmenu == 'bank')	// Entry for each bank account
+		if (!empty($user->rights->banque->lire) && $mainmenu == 'bank' && $conf->global->OBLYON_ENABLE_MENU_BANK_RECONCILIATE)	// Entry for each bank account
 		{
 			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 

diff --git a/htdocs/custom/oblyon/core/modules/modOblyon.class.php b/htdocs/custom/oblyon/core/modules/modOblyon.class.php
@@ -33,7 +33,6 @@
 	// Description and activation class *************
 	class modoblyon extends DolibarrModules
 	{
-
 		/************************************************
 		 * Constructor. Define names, constants, directories, boxes, permissions
 		 * @param DoliDB $db Database handler
@@ -74,7 +73,7 @@ function __construct($db)
 			$this->depends			= array();									// List of modules id that must be enabled if this module is enabled
 			$this->requiredby		= array();									// List of modules id to disable if this one is disabled
 			$this->conflictwith		= array();									// List of modules id this module is in conflict with
-			$this->phpmin			= array(5, 6);								// Minimum version of PHP required by module
+			$this->phpmin			= array(7, 0);								// Minimum version of PHP required by module
       		$this->need_dolibarr_version = array(14,0);							// Minimum version of Dolibarr required by module
 			$this->langfiles		= array($this->name.'@'.$this->name);
 			$this->const			= array();									// List of particular constants to add when module is enabled

diff --git a/htdocs/custom/oblyon/img/object_opendsi_big.png b/htdocs/custom/oblyon/img/object_opendsi_big.png
diff --git a/htdocs/custom/oblyon/langs/en_US/oblyon.lang b/htdocs/custom/oblyon/langs/en_US/oblyon.lang
@@ -62,6 +62,7 @@ OblyonLogin = Login page
 LoginRight = Offset the connection block to the right of the screen
 CardBehavior = Behavior of the cards
 FixAreaRefAndTabAction = Fix the reference banner and action buttons during vertical scrolling
+SwitchColunmOnLeft = Toggle selection / search / mass action column to the left
 FixStickyTableHeadersColumns = Fix the table column header on the elements during vertical scrolling
 General = General parameters
 OblyonFontSize = Basic text size in pixels (must be between 10 and 16)
@@ -98,6 +99,22 @@ OBLYON_COLOR_BUTTON_ACTION1 = Button background color 1
 OBLYON_COLOR_BUTTON_ACTION2 = Button background color 2
 OBLYON_COLOR_BUTTON_DELETE1 = Color 1 of the background of the dangerous buttons
 OBLYON_COLOR_BUTTON_DELETE2 = Color 2 background of the dangerous buttons
+OBLYON_COLOR_INFO_BORDER = Color border on information message
+OBLYON_COLOR_INFO_BCKGRD = Color background on information message
+OBLYON_COLOR_INFO_TEXT = Color text on information message
+OBLYON_COLOR_WARNING_BORDER = Color border on warning message
+OBLYON_COLOR_WARNING_BCKGRD = Color background on warning message
+OBLYON_COLOR_WARNING_TEXT = Color text on warning message
+OBLYON_COLOR_ERROR_BORDER = Color border on error message
+OBLYON_COLOR_ERROR_BCKGRD = Color background on error message
+OBLYON_COLOR_ERROR_TEXT = Color text on error message
+OBLYON_COLOR_NOTIF_INFO_BCKGRD = Color background on notification information message
+OBLYON_COLOR_NOTIF_INFO_TEXT = Color text on notification information message
+OBLYON_COLOR_NOTIF_WARNING_BCKGRD = Color background on notification warning message
+OBLYON_COLOR_NOTIF_WARNING_TEXT = Color text on notification warning message
+OBLYON_COLOR_NOTIF_ERROR_BCKGRD = Color background on notification error message
+OBLYON_COLOR_NOTIF_ERROR_TEXT = Color text on notification error message
+OBLYON_COLOR_TEXTTABACTIVE=Color text of active tabs
 Eldys = Basic colors
 THEME_ELDY_TOPBORDER_TITLE1 = Title border color
 THEME_ELDY_LINEIMPAIR1 = Background color 1 of the odd lines of the tables

diff --git a/htdocs/custom/oblyon/langs/fr_FR/oblyon.lang b/htdocs/custom/oblyon/langs/fr_FR/oblyon.lang
@@ -62,6 +62,7 @@ OblyonLogin = Page de connexion
 LoginRight = Décentrer le bloc de connexion sur la droite de l'écran
 CardBehavior = Comportement des fiches
 FixAreaRefAndTabAction = Fixer le bandeau des références et les boutons d'actions pendant le défilement vertical
+SwitchColunmOnLeft = Basculer la colonne de sélection / recherche / action en masse à gauche
 FixStickyTableHeadersColumns = Fixer l'entête de colonne des tableaux sur les éléments lors d'un défilement vertical
 General = Paramètres généraux
 OblyonFontSize = Taille du texte de base en pixels (doit être entre 10 et 16)

diff --git a/htdocs/theme/oblyon/global.inc.php b/htdocs/theme/oblyon/global.inc.php
@@ -286,11 +286,37 @@
 {
     float:<?php print $right; ?>;
 }
-
+.block
+{
+    display:block;
+}
 .inline-block
 {
     display:inline-block;
 }
+.inline-blockimp
+{
+    display:inline-block !important;
+}
+.largenumber {
+    font-size: 1.4em;
+}
+button[name='button_search_x'] span.fa.fa-search {
+    font-size: 1.3em;
+}
+button[name='button_removefilter_x'] span.fa.fa-remove {
+    opacity: 0.5;
+    font-size: 1.3em;
+}
+button:focus {
+    outline: none;
+}
+.fa-info-circle {
+    padding-<?php echo $left; ?>: 3px;
+}
+.line-height-large {
+    line-height: 1.8em;
+}
 
 /* th a, .thumbstat, a.tab { font-weight: bold !important; } */
 
@@ -321,8 +347,14 @@
 .centpercent {
 	width: 100%;
 }
+.centpercentimp {
+    width: 100% !important;
+}
+.centpercentwithout1imp {
+    width: calc(100% - 1px) !important;
+}
 .centpercentwithoutmenu {
-	width: calc(100% - 200px);
+    width: calc(100% - 200px);
 }
 .quatrevingtpercent, .inputsearch {
 	width: 80%;
@@ -1395,10 +1427,10 @@
 /**
 * State Ok, Warning, Error
 */
-
-.ok      { color: #114466; }
-.warning { color: #f07b6e !important }
-.error   { color: #7e1515 !important; font-weight: bold; }
+.ok	        { color: #114466; }
+.warning    { color: #f07b6e !important }
+.error      { color: #7e1515 !important; font-weight: bold; }
+.green      { color: #118822 !important; }
 
 .bloc_success {
     background-color: #33cc66;
@@ -10197,3 +10229,8 @@
 include dol_buildpath($path.'/theme/'.$theme.'/progress.inc.php', 0);
 include dol_buildpath($path.'/theme/'.$theme.'/timeline.inc.php', 0);
 
+// Compatibility module
+include dol_buildpath($path.'/theme/'.$theme.'/modules.inc.php', 0);
+
+
+
diff --git a/htdocs/theme/oblyon/modules.inc.php b/htdocs/theme/oblyon/modules.inc.php
@@ -0,0 +1,12 @@
+<?php
+if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet');
+?>
+/* <style type="text/css" > */
+
+<?php
+/*
+ * Module: Quicklist
+ * Editor: Easya Solutions (Open-Dsi)
+ * -------------------
+ */
+include dol_buildpath($path.'/theme/'.$theme.'/modules/quicklist/quicklist.inc.php', 0);
diff --git a/htdocs/theme/oblyon/modules/quicklist/quicklist.inc.php b/htdocs/theme/oblyon/modules/quicklist/quicklist.inc.php
@@ -0,0 +1,8 @@
+<?php if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
+/* <style type="text/css" > */
+
+<?php if (!empty($conf->global->FIX_AREAREF_TABACTION)) { ?>
+.quicklist-dropdown-content {
+    z-index: 2 !important;
+}
+<?php } ?>