From b1a7c23daa560aab3bb9362946e21d591a983764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Champlon?= <remi.champlon@vold.lu>
Date: Wed, 1 Feb 2023 11:20:44 +0100
Subject: [PATCH 01/45] fix updateExtrafield option key empty set null

---
 htdocs/core/class/commonobject.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 9fa15da550c..ae2acb36d7f 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6350,7 +6350,7 @@ abstract class CommonObject
 			}
 
 			if ($linealreadyfound) {
-				if ($this->array_options["options_".$key] === null) {
+				if ($this->array_options["options_".$key] === null || $this->array_options["options_".$key] === "") {
 					$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key." = null";
 				} else {
 					$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key." = '".$this->db->escape($this->array_options["options_".$key])."'";

From aa60bd29c1c309f1a6fe2fab14f12612e94e5256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Champlon?= <remi.champlon@vold.lu>
Date: Mon, 20 Feb 2023 16:39:03 +0100
Subject: [PATCH 02/45] check link empty in switch

---
 htdocs/core/class/commonobject.class.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index ae2acb36d7f..a10c649b6e2 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6304,6 +6304,11 @@ abstract class CommonObject
 						$this->array_options["options_".$key] = null;
 					}
 					break;
+				case 'link':
+					if ($this->array_options["options_".$key] === '') {
+						$this->array_options["options_".$key] = null;
+  					}
+					break;
 				/*
 				case 'link':
 					$param_list = array_keys($attributeParam['options']);
@@ -6350,7 +6355,7 @@ abstract class CommonObject
 			}
 
 			if ($linealreadyfound) {
-				if ($this->array_options["options_".$key] === null || $this->array_options["options_".$key] === "") {
+				if ($this->array_options["options_".$key] === null) {
 					$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key." = null";
 				} else {
 					$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key." = '".$this->db->escape($this->array_options["options_".$key])."'";

From baa28e175da73879d0cc3b14e76aca389efa1e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Champlon?= <remi.champlon@vold.lu>
Date: Mon, 20 Feb 2023 16:47:01 +0100
Subject: [PATCH 03/45] indent

---
 htdocs/core/class/commonobject.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a10c649b6e2..58a057834f8 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6307,7 +6307,7 @@ abstract class CommonObject
 				case 'link':
 					if ($this->array_options["options_".$key] === '') {
 						$this->array_options["options_".$key] = null;
-  					}
+					}
 					break;
 				/*
 				case 'link':

From 94b0095f0d8305d26af9458de147ba2c4aa8585c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Fali=C3=A8re?= <benjamin.faliere@altairis.fr>
Date: Wed, 31 May 2023 11:01:17 +0200
Subject: [PATCH 04/45] FIX update product on translation update

---
 htdocs/product/traduction.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 7f91e9c73a8..1f0c766bb13 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) 2005-2018 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2007      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2010-2012 Destailleur Laurent <eldy@users.sourceforge.net>
- * Copyright (C) 2014 	   Henry Florian <florian.henry@open-concept.pro>
+ * Copyright (C) 2010-2012 Destailleur Laurent 	<eldy@users.sourceforge.net>
+ * Copyright (C) 2014 	   Henry Florian 		<florian.henry@open-concept.pro>
+ * Copyright (C) 2023 	   Benjamin Falière		<benjamin.faliere@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -135,6 +136,8 @@ if (empty($reshook)) {
 				$object->label = GETPOST("libelle-" . $key);
 				$object->description = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml'));
 				$object->other = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml'));
+
+				$object->update($object->id, $user);
 			} else {
 				$object->multilangs[$key]["label"] = GETPOST("libelle-" . $key);
 				$object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml'));

From 18d8d0826b479f1929756c274cce0453288ac4a1 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 1 Jun 2023 09:58:25 +0200
Subject: [PATCH 05/45] add stock to date in auguria menu

---
 htdocs/core/menus/init_menu_auguria.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 0e756dc2193..9ac9eff352e 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -139,7 +139,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3102__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/list.php?mainmenu=products', 'List', 1, 'stocks', '$user->rights->stock->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3104__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/movement_list.php?mainmenu=products', 'Movements', 1, 'stocks', '$user->rights->stock->mouvement->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->supplier_order->enabled', __HANDLER__, 'left', 3105__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/replenish.php?mainmenu=products', 'Replenishments', 1, 'stocks', '$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire', '', 2, 4, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php?mainmenu=products', 'MassStockTransferShort', 1, 'stocks', '$user->rights->stock->mouvement->creer', '', 2, 5, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/stockatdate.php?mainmenu=products', 'StockAtDate', 1, 'stocks', '$user->rights->produit->lire && $user->rights->stock->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3107__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php?mainmenu=products', 'MassStockTransferShort', 1, 'stocks', '$user->rights->stock->mouvement->creer', '', 2, 5, __ENTITY__);
 
 -- Product - Categories
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3200__+MAX_llx_menu__, 'products', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?mainmenu=products&amp;leftmenu=cat&amp;type=0', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);

From 984ad5febf565fe6d17ff18935226cb8864ce657 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Thu, 1 Jun 2023 11:03:12 +0200
Subject: [PATCH 06/45] FIX : Add/Update required modules for thirdparties (by
 categ) & partnership

---
 htdocs/core/modules/mailings/partnership.modules.php  | 2 +-
 htdocs/core/modules/mailings/thirdparties.modules.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/mailings/partnership.modules.php b/htdocs/core/modules/mailings/partnership.modules.php
index 7813d93f54d..a554f2dfa28 100644
--- a/htdocs/core/modules/mailings/partnership.modules.php
+++ b/htdocs/core/modules/mailings/partnership.modules.php
@@ -29,7 +29,7 @@ class mailing_partnership extends MailingTargets
 	public $desc = "Thirdparties or members included into a partnership program";
 	public $require_admin = 0;
 
-	public $require_module = array(); // This module allows to select by categories must be also enabled if category module is not activated
+	public $require_module = array('partnership'); // This module allows to select by categories must be also enabled if category module is not activated
 
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 81a9bfaea51..a2bd1d3c321 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -29,7 +29,7 @@ class mailing_thirdparties extends MailingTargets
 	public $desc = "Third parties (by categories)";
 	public $require_admin = 0;
 
-	public $require_module = array("societe"); // This module allows to select by categories must be also enabled if category module is not activated
+	public $require_module = array("societe", "category"); // This module allows to select by categories must be also enabled if category module is not activated
 
 	public $enabled = '$conf->societe->enabled';
 

From 57defe43828304ff4d0c54bc6ab54d1e1f72228c Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 1 Jun 2023 17:02:10 +0200
Subject: [PATCH 07/45] fix: display budget field on load

---
 htdocs/projet/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 040b3ea2772..aa02597f029 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -984,7 +984,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 				print '<br>';
 			}
 			if (empty($conf->global->PROJECT_HIDE_TASKS)) {
-				print '<input type="checkbox" id="usage_task" name="usage_task"' . (GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')) . '"> ';
+				print '<input type="checkbox" id="usage_task" name="usage_task"' . (GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')) . '> ';
 				$htmltext = $langs->trans("ProjectFollowTasks");
 				print '<label for="usage_task">'.$form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext).'</label>';
 				print '<script>';
@@ -1023,7 +1023,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 
 					function set_usage_bill_time() {
 						console.log("set_usage_bill_time");
-						if (jQuery("#usage_bill_time").prop("checked")) {
+						if (jQuery("#usage_bill_time").prop("checked") || jQuery("#usage_task").prop("checked") ) {
 							console.log("Show bill time fields");
 							jQuery(".classusebilltime").show();
 						} else {
@@ -1250,7 +1250,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 				print '<br>';
 			}
 			if (empty($conf->global->PROJECT_HIDE_TASKS)) {
-				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
+				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'> ';
 				$htmltext = $langs->trans("ProjectFollowTasks");
 				print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 				print '<br>';

From 94ff097ed04483fde7a792f399388e8f158c3675 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Mon, 5 Jun 2023 14:55:46 +0200
Subject: [PATCH 08/45] FIX : no change on thirdparties.modules.php required
 modules

---
 htdocs/core/modules/mailings/thirdparties.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index a2bd1d3c321..81a9bfaea51 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -29,7 +29,7 @@ class mailing_thirdparties extends MailingTargets
 	public $desc = "Third parties (by categories)";
 	public $require_admin = 0;
 
-	public $require_module = array("societe", "category"); // This module allows to select by categories must be also enabled if category module is not activated
+	public $require_module = array("societe"); // This module allows to select by categories must be also enabled if category module is not activated
 
 	public $enabled = '$conf->societe->enabled';
 

From 229588a32387c3e5721a70a35a6d1f9f20c29bf3 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 7 Jun 2023 17:47:48 +0200
Subject: [PATCH 09/45] fix: remove extra acolade in style sheet

---
 htdocs/theme/eldy/info-box.inc.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 716ca7eac27..285de8e7a80 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -504,4 +504,3 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 		border: 1px solid #e0e0e0;
 	}
 }
-}

From 4d88a69e38ce6074137aed93271691659f9b0c72 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 7 Jun 2023 19:06:40 +0200
Subject: [PATCH 10/45] FIX can define empty qty by default when create object
 line

---
 htdocs/core/tpl/objectline_create.tpl.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 51ae07640e6..adc490aeb09 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -421,7 +421,8 @@ if ($nolinesbefore) {
 	$coldisplay++;
 	?>
 	<td class="nobottom linecolqty right">
-	<input type="text" name="qty" id="qty" class="flat width40 right" value="<?php echo (GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : 1); ?>">
+	<?php $default_qty = (empty($conf->global->MAIN_OBJECTLINE_CREATE_EMPTY_QTY_BY_DEFAULT) ? 1 : ''); ?>
+	<input type="text" name="qty" id="qty" class="flat width40 right" value="<?php echo (GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : $default_qty); ?>">
 	</td>
 	<?php
 	if (!empty($conf->global->PRODUCT_USE_UNITS)) {

From 30af15f3794ac8ba291af945765d77d2d3805dd4 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Thu, 8 Jun 2023 11:31:07 +0200
Subject: [PATCH 11/45] FIX wrong var name

---
 htdocs/product/stock/replenish.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index e168ef568d4..16896a31e42 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -577,7 +577,7 @@ print '<span class="opacitymedium">'.$langs->trans("ReplenishmentStatusDesc").'<
 
 //$link = '<a title=' .$langs->trans("MenuNewWarehouse"). ' href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans("MenuNewWarehouse").'</a>';
 
-if (empty($fk_warhouse) && !empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) {
+if (empty($fk_entrepot) && !empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) {
 	print '<span class="opacitymedium">'.$langs->trans("ReplenishmentStatusDescPerWarehouse").'</span>'."\n";
 }
 print '<br><br>';

From 9f5c014341b40aff85f4dbcec805af7f6e344e86 Mon Sep 17 00:00:00 2001
From: atm-florian <florian.mortgat@atm-consulting.fr>
Date: Thu, 8 Jun 2023 12:01:12 +0200
Subject: [PATCH 12/45] FIX commonobject: getRights() did not find rights
 correctly for objects built using modulebuilder

---
 htdocs/core/class/commonobject.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5a9ce90af0d..4bfec85ead1 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8457,8 +8457,9 @@ abstract class CommonObject
 			$element = 'facture';
 		} elseif ($element == 'invoice_supplier_rec') {
 			return $user->rights->fournisseur->facture;
-		} elseif ($element == 'evaluation') {
-			return $user->rights->hrm->evaluation;
+		} elseif (!empty($user->rights->{$this->module}->{$element})) {
+			// for modules built with ModuleBuilder
+			return $user->rights->{$this->module}->{$element};
 		}
 
 		return $user->rights->{$element};

From 96c0172a07672f6ab116c1482500731284766cfa Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Thu, 8 Jun 2023 12:09:34 +0200
Subject: [PATCH 13/45] FIX can not remove the last selected value with
 checkbox

---
 htdocs/core/class/extrafields.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index d9b8918e4b2..666b6dfb0ed 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -2029,7 +2029,7 @@ class ExtraFields
 					continue;
 				}
 
-				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && (! in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'chkbxlst')))) {
+				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && (! in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'checkbox', 'chkbxlst')))) {
 					//when unticking boolean field, it's not set in POST
 					continue;
 				}
@@ -2056,7 +2056,7 @@ class ExtraFields
 				if (empty($enabled)
 					|| (
 						$onlykey === '@GETPOSTISSET'
-						&& in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'chkbxlst'))
+						&& in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'checkbox', 'chkbxlst'))
 						&& in_array(abs($enabled), array(2, 5))
 						&& ! GETPOSTISSET('options_' . $key) // Update hidden checkboxes and multiselect only if they are provided
 					)

From 47e1396e1dacef2f3a80d8d91c98ae2dc6c5c255 Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Thu, 8 Jun 2023 16:52:03 +0200
Subject: [PATCH 14/45] Fix #24953 : Call to udefined pages in hrm.lib.php

---
 htdocs/core/lib/hrm.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/hrm.lib.php b/htdocs/core/lib/hrm.lib.php
index 5335dc1c75e..34166f7a9e2 100644
--- a/htdocs/core/lib/hrm.lib.php
+++ b/htdocs/core/lib/hrm.lib.php
@@ -52,7 +52,7 @@ function establishment_prepare_head($object)
 	$head[$h][2] = 'info';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/hrm/admin/setup.php", 1);
+	/*$head[$h][0] = dol_buildpath("/hrm/admin/setup.php", 1);
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
@@ -60,7 +60,7 @@ function establishment_prepare_head($object)
 	$head[$h][0] = dol_buildpath("/hrm/admin/about.php", 1);
 	$head[$h][1] = $langs->trans("About");
 	$head[$h][2] = 'about';
-	$h++;
+	$h++;*/
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm');
 

From dd3ff15fe4f3abb39ace6916e02e717ed107dc36 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 8 Jun 2023 17:26:21 +0200
Subject: [PATCH 15/45] FIX Total sum on annual report bank

---
 htdocs/compta/bank/annuel.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 177855c9302..d2e1e0f5f8a 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -195,10 +195,10 @@ print '</tr>';
 for ($mois = 1; $mois < 13; $mois++) {
 	print '<tr class="oddeven">';
 	print "<td>".dol_print_date(dol_mktime(1, 1, 1, $mois, 1, 2000), "%B")."</td>";
-	for ($annee = $year_start; $annee <= $year_end; $annee++) {
-		$totsorties[$annee] = 0;
-		$totentrees[$annee] = 0;
 
+	$totsorties[$annee] = 0;
+	$totentrees[$annee] = 0;
+	for ($annee = $year_start; $annee <= $year_end; $annee++) {
 		$case = sprintf("%04s-%02s", $annee, $mois);
 
 		print '<td class="right" width="10%">&nbsp;';

From 367d7360dbc45ba5fd29907bd4e7e82d1933ddcf Mon Sep 17 00:00:00 2001
From: Delthair <41671350+Delthair@users.noreply.github.com>
Date: Thu, 8 Jun 2023 17:36:07 +0200
Subject: [PATCH 16/45] FIX #24997 Update slovakia vat rate

---
 htdocs/install/mysql/data/llx_c_tva.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 1a14967357f..9da8311c96e 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -285,7 +285,7 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2
 -- SLOVAKIA (id country=201)
 INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2011, 201,  '0', '0', 'VAT rate 0', 1);
 INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2012, 201, '10', '0', 'VAT rate - reduced', 1);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2013, 201, '19', '0', 'VAT rate - standard', 1);
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2013, 201, '20', '0', 'VAT rate - standard', 1);
 
 -- SLOVENIA (id country=202)
 INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2021, 202,  '0', '0', 'VAT rate 0', 1);

From 2616b97d1737f2e36044a13b4a1569729c1cb4ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yann=20Le=20Doar=C3=A9?= <yann@linuxconsole.org>
Date: Thu, 8 Jun 2023 17:16:17 +0000
Subject: [PATCH 17/45] fix for #24877

---
 htdocs/product/stock/class/entrepot.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index edb51647a1f..e305824d6ce 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -127,7 +127,7 @@ class Entrepot extends CommonObject
 		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>25, 'searchall'=>1),
 		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-2, 'position'=>35, 'searchall'=>1),
 		'lieu' =>array('type'=>'varchar(64)', 'label'=>'LocationSummary', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'showoncombobox'=>2, 'searchall'=>1),
-		'fk_parent' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ParentWarehouse', 'enabled'=>1, 'visible'=>-2, 'position'=>41),
+		'fk_parent' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:1:((statut:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ParentWarehouse', 'enabled'=>1, 'visible'=>-2, 'position'=>41),
 		'fk_project' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>25),
 		'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-2, 'position'=>45, 'searchall'=>1),
 		'zip' =>array('type'=>'varchar(10)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>-2, 'position'=>50, 'searchall'=>1),

From 0aaf7988b14f6abed5e484134735d5f9176e0cd3 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 8 Jun 2023 21:20:26 +0200
Subject: [PATCH 18/45] FIX #24985 Societe - Function thirdparty merging not
 working with module whose tables are not deployed by default

---
 htdocs/societe/card.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 8b54c66ad58..caaee4a92b9 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -264,7 +264,7 @@ if (empty($reshook)) {
 					// TODO Mutualise the list into object societe.class.php
 					$objects = array(
 						'Adherent' => '/adherents/class/adherent.class.php',
-						'Don' => '/don/class/don.class.php',
+						'Don' => array('file' => '/don/class/don.class.php', 'enabled' => isModEnabled('don')),
 						'Societe' => '/societe/class/societe.class.php',
 						//'Categorie' => '/categories/class/categorie.class.php',
 						'ActionComm' => '/comm/action/class/actioncomm.class.php',
@@ -285,7 +285,7 @@ if (empty($reshook)) {
 						'Delivery' => '/delivery/class/delivery.class.php',
 						'Product' => '/product/class/product.class.php',
 						'Project' => '/projet/class/project.class.php',
-						'Ticket' => '/ticket/class/ticket.class.php',
+						'Ticket' => array('file' => '/ticket/class/ticket.class.php', 'enabled' => isModEnabled('ticket')),
 						'User' => '/user/class/user.class.php',
 						'Account' => '/compta/bank/class/account.class.php',
 						'ConferenceOrBoothAttendee' => '/eventorganization/class/conferenceorboothattendee.class.php'
@@ -293,6 +293,13 @@ if (empty($reshook)) {
 
 					//First, all core objects must update their tables
 					foreach ($objects as $object_name => $object_file) {
+						if (is_array($object_file)) {
+							if (empty($object_file['enabled'])) {
+								continue;
+							}
+							$object_file = $object_file['file'];
+						}
+
 						require_once DOL_DOCUMENT_ROOT.$object_file;
 
 						if (!$error && !$object_name::replaceThirdparty($db, $soc_origin->id, $object->id)) {

From 217b3d6f5918a2dc1ab76c0bda6d72ef2fa31209 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 8 Jun 2023 21:58:30 +0200
Subject: [PATCH 19/45] FIX Donation - Missing Language key

---
 htdocs/langs/en_US/donations.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang
index d512abb2eea..7661e9e1051 100644
--- a/htdocs/langs/en_US/donations.lang
+++ b/htdocs/langs/en_US/donations.lang
@@ -29,7 +29,7 @@ FreeTextOnDonations=Free text to show in footer
 FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
+DONATION_ART978=Show article 978 from CGI if you are concerned
 DonationPayment=Donation payment
 DonationValidated=Donation %s validated
 DonationUseThirdparties=Use an existing thirdparty as coordinates of donators

From 59496f106687738b1ebf07937bfcfeab4930fa80 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 8 Jun 2023 23:32:59 +0200
Subject: [PATCH 20/45] review: always display budget field and fix bad quote

---
 htdocs/projet/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index aa02597f029..feab60aa06c 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -771,7 +771,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 	}
 
 	// Budget
-	print '<tr class="classusetask classusebilltime"><td>'.$langs->trans("Budget").'</td>';
+	print '<tr><td>'.$langs->trans("Budget").'</td>';
 	print '<td><input class="width75 right" type="text" name="budget_amount" value="'.dol_escape_htmltag(GETPOSTISSET('budget_amount') ? GETPOST('budget_amount') : '').'">';
 	print ' '.$langs->getCurrencySymbol($conf->currency);
 	print '</td>';
@@ -1023,7 +1023,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 
 					function set_usage_bill_time() {
 						console.log("set_usage_bill_time");
-						if (jQuery("#usage_bill_time").prop("checked") || jQuery("#usage_task").prop("checked") ) {
+						if (jQuery("#usage_bill_time").prop("checked")) {
 							console.log("Show bill time fields");
 							jQuery(".classusebilltime").show();
 						} else {
@@ -1142,7 +1142,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		}
 
 		// Budget
-		print '<tr class="classusetask classusebilltime"><td>'.$langs->trans("Budget").'</td>';
+		print '<tr><td>'.$langs->trans("Budget").'</td>';
 		print '<td><input class="width75 right" type="text" name="budget_amount" value="'.(GETPOSTISSET('budget_amount') ? GETPOST('budget_amount') : (strcmp($object->budget_amount, '') ? price2num($object->budget_amount) : '')).'">';
 		print $langs->getCurrencySymbol($conf->currency);
 		print '</td>';

From 1a821d09c2284061402a8912676a534e9ccc7721 Mon Sep 17 00:00:00 2001
From: IC-faycal <faycal@inovea-conseil.com>
Date: Thu, 8 Jun 2023 23:38:51 +0200
Subject: [PATCH 21/45] FIX translation extrafield mass action #24080

---
 htdocs/core/tpl/massactions_pre.tpl.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 656b5b263aa..74b4c84901d 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -224,6 +224,10 @@ if ($massaction == 'edit_extrafields') {
 	if (!empty($extrafields_list)) {
 		$myParamExtra = $object->showOptionals($extrafields, 'create');
 
+		foreach ($extrafields_list as $extraKey => $extraLabel) {
+			$extrafields_list[$extraKey] = $langs->trans($extraLabel);
+		}
+
 		$formquestion[] = array(
 			'type' => 'other',
 			'value' => $form->selectarray('extrafield-key-to-update', $extrafields_list, GETPOST('extrafield-key-to-update'), 1)

From 4aa4d1e1e3c914db531949936bd7a20bb77d0779 Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Fri, 9 Jun 2023 00:06:07 +0200
Subject: [PATCH 22/45] fix : ajax on off setup type

---
 htdocs/core/class/html.formsetup.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 8843a9f9177..3f793b35b67 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -243,7 +243,7 @@ class FormSetup
 	 */
 	public function saveConfFromPost($noMessageInUpdate = false)
 	{
-		global $hookmanager;
+		global $hookmanager,$conf;
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formSetupBeforeSaveConfFromPost', $parameters, $this); // Note that $action and $object may have been modified by some hooks
@@ -264,6 +264,10 @@ class FormSetup
 		$this->db->begin();
 		$error = 0;
 		foreach ($this->items as $item) {
+			if ($item->getType() == 'yesno' && !empty($conf->use_javascript_ajax)) {
+				continue;
+			}
+
 			$res = $item->setValueFromPost();
 			if ($res > 0) {
 				$item->saveConfValue();

From 2df7dfa05f094e464d84ab573137ef307e37e91b Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 9 Jun 2023 00:16:09 +0200
Subject: [PATCH 23/45] fix dump of 17

---
 dev/initdemo/mysqldump_dolibarr_17.0.0.sql | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev/initdemo/mysqldump_dolibarr_17.0.0.sql b/dev/initdemo/mysqldump_dolibarr_17.0.0.sql
index 71c7c8e50ea..c4af061da20 100644
--- a/dev/initdemo/mysqldump_dolibarr_17.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_17.0.0.sql
@@ -1976,7 +1976,11 @@ CREATE TABLE `llx_c_holiday_types` (
 
 LOCK TABLES `llx_c_holiday_types` WRITE;
 /*!40000 ALTER TABLE `llx_c_holiday_types` DISABLE KEYS */;
-INSERT INTO `llx_c_holiday_types` VALUES (1,'LEAVE_SICK','Sick leave',0,0,0.00000,NULL,1,NULL),(2,'LEAVE_OTHER','Other leave',0,0,0.00000,NULL,1,NULL),(3,'LEAVE_PAID','Paid vacation',1,7,0.00000,NULL,1,NULL),(4,'LEAVE_RTT_FR','RTT',1,7,0.83000,1,0,NULL),(5,'LEAVE_PAID_FR','Paid vacation',1,30,2.08334,1,0,NULL);
+INSERT INTO `llx_c_holiday_types` VALUES (1,'LEAVE_SICK','Sick leave',0,0,0.00000,NULL,0,1,NULL);
+INSERT INTO `llx_c_holiday_types` VALUES (2,'LEAVE_OTHER','Other leave',0,0,0.00000,NULL,0,1,NULL);
+INSERT INTO `llx_c_holiday_types` VALUES (3,'LEAVE_PAID','Paid vacation',1,7,0.00000,NULL,0,1,NULL);
+INSERT INTO `llx_c_holiday_types` VALUES (4,'LEAVE_RTT_FR','RTT',1,7,0.83000,1,0,0,NULL);
+INSERT INTO `llx_c_holiday_types` VALUES (5,'LEAVE_PAID_FR','Paid vacation',1,30,2.08334,1,0,0,NULL);
 /*!40000 ALTER TABLE `llx_c_holiday_types` ENABLE KEYS */;
 UNLOCK TABLES;
 

From 455293da94112f4f24f7abfa6f41281fd409ee49 Mon Sep 17 00:00:00 2001
From: Nicolas <info@inovea-conseil.com>
Date: Fri, 9 Jun 2023 10:08:09 +0200
Subject: [PATCH 24/45] FIX #24695

---
 htdocs/langs/en_US/ticket.lang | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index 9897422d0c9..3f65434b647 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -135,6 +135,8 @@ TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
 TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
+TicketMessageMailSignatureText = Ticket signature on mail
+
 #
 # Index & list page
 #
@@ -319,4 +321,4 @@ BoxNoTicketLastXDays=No new tickets the last %s days
 BoxNumberOfTicketByDay=Number of new tickets by day
 BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
 TicketCreatedToday=Ticket created today
-TicketClosedToday=Ticket closed today
\ No newline at end of file
+TicketClosedToday=Ticket closed today

From 085643edd6ec6821fcc7bd4eb0fd13ae902e6d61 Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Fri, 9 Jun 2023 12:29:23 +0200
Subject: [PATCH 25/45] fix impossibility to add default filter for
 search_billed

---
 htdocs/commande/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 948f195214a..a8325503060 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -105,7 +105,7 @@ $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc',
 $search_login = GETPOST('search_login', 'alpha');
 $search_categ_cus = GETPOST("search_categ_cus", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
-$search_billed = GETPOSTISSET('search_billed') ? GETPOST('search_billed', 'int') : GETPOST('billed', 'int');
+$search_billed = GETPOST('search_billed', 'int');
 $search_status = GETPOST('search_status', 'int');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');

From 6102139531ef1c888e1b02208e28463a22d4751f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Courtier?= <noe.courtier@scopen.fr>
Date: Fri, 9 Jun 2023 15:43:19 +0200
Subject: [PATCH 26/45] Fix: remove unwanted var_dump()

---
 htdocs/core/lib/functions.lib.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b1c412ec0bb..9827414c3ff 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7857,7 +7857,6 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null, $con
 			} else {
 				if (! $msgishtml) {
 					$valueishtml = dol_textishtml($value, 1);
-					var_dump("valueishtml=".$valueishtml);
 
 					if ($valueishtml) {
 						$text = dol_htmlentitiesbr($text);

From 3bb1c129421b0cbc100a5b0ac1e9cbf030181987 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 10 Jun 2023 09:38:17 +0200
Subject: [PATCH 27/45] Better fix

---
 htdocs/compta/bank/annuel.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index d2e1e0f5f8a..e020d306729 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -196,9 +196,10 @@ for ($mois = 1; $mois < 13; $mois++) {
 	print '<tr class="oddeven">';
 	print "<td>".dol_print_date(dol_mktime(1, 1, 1, $mois, 1, 2000), "%B")."</td>";
 
-	$totsorties[$annee] = 0;
-	$totentrees[$annee] = 0;
 	for ($annee = $year_start; $annee <= $year_end; $annee++) {
+		$totsorties[$annee] = isset($totsorties[$annee]) ? $totsorties[$annee] : 0;
+		$totentrees[$annee] = isset($totentrees[$annee]) ? $totentrees[$annee] : 0;
+
 		$case = sprintf("%04s-%02s", $annee, $mois);
 
 		print '<td class="right" width="10%">&nbsp;';

From e1939d1c0688fc123d94384bc39b7248c99275ab Mon Sep 17 00:00:00 2001
From: Jean <jean@tiaris.info>
Date: Sat, 10 Jun 2023 09:55:47 +0200
Subject: [PATCH 28/45] FIX #20304 propaldates update

---
 htdocs/comm/propal/card.php               | 19 +++++++++++++++++++
 htdocs/comm/propal/class/propal.class.php |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 7c5ab1d210e..193cbb68f3b 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -316,6 +316,25 @@ if (empty($reshook)) {
 			if ($result < 0) {
 				dol_print_error($db, $object->error);
 			}
+			else { 
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+					$outputlangs = $langs;
+					$newlang = '';
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+					if (!empty($newlang)) {
+						$outputlangs = new Translate("", $conf);
+						$outputlangs->setDefaultLang($newlang);
+					}
+					$model = $object->model_pdf;
+					$ret = $object->fetch($id); // Reload to get new records
+					if ($ret > 0) {
+						$object->fetch_thirdparty();
+					}
+					
+					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				}
+			}
 		}
 	} elseif ($action == 'setecheance' && $usercancreate) {
 		$result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index edf183e1446..359f3f1515f 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1999,7 +1999,7 @@ class Propal extends CommonObject
 			$this->db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET datep = '".$this->db->idate($date)."'";
-			$sql .= " WHERE rowid = ".((int) $this->id)." AND fk_statut = ".self::STATUS_DRAFT;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -2055,7 +2055,7 @@ class Propal extends CommonObject
 			$this->db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fin_validite = ".($date_fin_validite != '' ? "'".$this->db->idate($date_fin_validite)."'" : 'null');
-			$sql .= " WHERE rowid = ".((int) $this->id)." AND fk_statut = ".self::STATUS_DRAFT;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);

From 71d064e8db136f5e4e39f73445f92fa32e4a5332 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 10 Jun 2023 12:06:30 +0200
Subject: [PATCH 29/45] Fix phpcs

---
 htdocs/comm/propal/card.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 193cbb68f3b..43365bb6571 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -315,8 +315,7 @@ if (empty($reshook)) {
 			$result = $object->set_date($user, $datep);
 			if ($result < 0) {
 				dol_print_error($db, $object->error);
-			}
-			else { 
+			} else {
 				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 					$outputlangs = $langs;
 					$newlang = '';
@@ -331,7 +330,7 @@ if (empty($reshook)) {
 					if ($ret > 0) {
 						$object->fetch_thirdparty();
 					}
-					
+
 					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 			}

From ab49f3d13b2429870c253837ee00fed7685e291f Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 10 Jun 2023 17:42:52 +0200
Subject: [PATCH 30/45] Fix #23946 : wrong backtopage from warehouse to product

---
 htdocs/product/card.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index b8f4a8fa7f7..eee777e3087 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1204,7 +1204,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
 			print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
 			print $formproduct->selectWarehouses(GETPOST('fk_default_warehouse', 'int'), 'fk_default_warehouse', 'warehouseopen', 1, 0, 0, '', 0, 0, array(), 'minwidth300 widthcentpercentminusxx maxwidth500');
-			print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit').'">';
+			print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?action=create&type='.GETPOST('type', 'int')).'">';
 			print '<span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span>';
 			print '</a>';
 			print '</td>';
@@ -1748,7 +1748,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
 				print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
 				print $formproduct->selectWarehouses($object->fk_default_warehouse, 'fk_default_warehouse', 'warehouseopen', 1);
-				print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?action=create&type='.GETPOST('type', 'int')).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span></a>';
+				print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit').'">';
+				print '<span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span></a>';
 				print '</td></tr>';
 				/*
 				print "<tr>".'<td>'.$langs->trans("StockLimit").'</td><td>';

From 8b89ce60ed8007cdf38d08d6c98c71de42ecef1a Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sat, 10 Jun 2023 17:59:05 +0200
Subject: [PATCH 31/45] fix: css declaration

---
 htdocs/theme/eldy/global.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 1592fed7493..512fd3dd595 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6084,7 +6084,7 @@ input.select2-input {
 }
 div.select2-drop-above
 {
-	background: var(--colorbackvmenu1);e
+	background: var(--colorbackvmenu1);
 	-webkit-box-shadow: none !important;
 	box-shadow: none !important;
 }

From 8b8e931c46bf847dd23fde69d530347d00181baf Mon Sep 17 00:00:00 2001
From: Jean <jean@tiaris.info>
Date: Sat, 10 Jun 2023 18:10:51 +0200
Subject: [PATCH 32/45] FIX #24631 Filter on categories of warehouses faulty

---
 htdocs/product/stock/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index f5398e84939..d8fe15e8053 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -268,17 +268,17 @@ if (!empty($searchCategoryWarehouseList)) {
 	$listofcategoryid = '';
 	foreach ($searchCategoryWarehouseList as $searchCategoryWarehouse) {
 		if (intval($searchCategoryWarehouse) == -2) {
-			$searchCategoryWarehouseSqlList[] = "NOT EXISTS (SELECT ck.fk_warehouse FROM ".MAIN_DB_PREFIX."categorie_warehouse as ck WHERE p.rowid = ck.fk_warehouse)";
+			$searchCategoryWarehouseSqlList[] = "NOT EXISTS (SELECT ck.fk_warehouse FROM ".MAIN_DB_PREFIX."categorie_warehouse as ck WHERE t.rowid = ck.fk_warehouse)";
 		} elseif (intval($searchCategoryWarehouse) > 0) {
 			if ($searchCategoryWarehouseOperator == 0) {
-				$searchCategoryWarehouseSqlList[] = " EXISTS (SELECT ck.fk_warehouse FROM ".MAIN_DB_PREFIX."categorie_warehouse as ck WHERE p.rowid = ck.fk_warehouse AND ck.fk_categorie = ".((int) $searchCategoryWarehouse).")";
+				$searchCategoryWarehouseSqlList[] = " EXISTS (SELECT ck.fk_warehouse FROM ".MAIN_DB_PREFIX."categorie_warehouse as ck WHERE t.rowid = ck.fk_warehouse AND ck.fk_categorie = ".((int) $searchCategoryWarehouse).")";
 			} else {
 				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryWarehouse);
 			}
 		}
 	}
 	if ($listofcategoryid) {
-		$searchCategoryWarehouseSqlList[] = " EXISTS (SELECT ck.fk_warehouse FROM ".MAIN_DB_PREFIX."categorie_warehouse as ck WHERE p.rowid = ck.fk_warehouse AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+		$searchCategoryWarehouseSqlList[] = " EXISTS (SELECT ck.fk_warehouse FROM ".MAIN_DB_PREFIX."categorie_warehouse as ck WHERE t.rowid = ck.fk_warehouse AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
 	}
 	if ($searchCategoryWarehouseOperator == 1) {
 		if (!empty($searchCategoryWarehouseSqlList)) {

From fe4d826183bea4928507648b926bd564e578a18b Mon Sep 17 00:00:00 2001
From: Jean <jean@tiaris.info>
Date: Sat, 10 Jun 2023 21:25:34 +0200
Subject: [PATCH 33/45] FIX #24569 filters on stockadate page

---
 htdocs/product/stock/stockatdate.php | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 0b7baf643ff..c38a1b395e7 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -130,8 +130,9 @@ if ($date && $dateIsValid) {	// Avoid heavy sql if mandatory date is not defined
 	$sql .= " SUM(ps.reel) AS stock";
 	$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
 	$sql .= ", ".MAIN_DB_PREFIX."entrepot as w";
+	$sql .= ", ".MAIN_DB_PREFIX."product as p";
 	$sql .= " WHERE w.entity IN (".getEntity('stock').")";
-	$sql .= " AND w.rowid = ps.fk_entrepot";
+	$sql .= " AND w.rowid = ps.fk_entrepot AND p.rowid = ps.fk_product ";
 	if (!empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) {
 		$sql .= " AND w.statut IN (".$db->sanitize(implode(',', $warehouseStatus)).")";
 	}
@@ -141,6 +142,12 @@ if ($date && $dateIsValid) {	// Avoid heavy sql if mandatory date is not defined
 	if ($fk_warehouse > 0) {
 		$sql .= " AND ps.fk_entrepot = ".((int) $fk_warehouse);
 	}
+	if ($search_ref) {
+		$sql .= " AND p.ref LIKE '%".$db->escape($search_ref)."%' ";
+	}
+	if ($search_nom) {
+		$sql .= " AND p.label LIKE '%".$db->escape($search_nom)."%' ";
+	}
 	$sql .= " GROUP BY fk_product, fk_entrepot";
 	//print $sql;
 
@@ -180,8 +187,9 @@ if ($date && $dateIsValid) {
 	$sql = "SELECT sm.fk_product, sm.fk_entrepot, SUM(sm.value) AS stock, COUNT(sm.rowid) AS nbofmovement";
 	$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as sm";
 	$sql .= ", ".MAIN_DB_PREFIX."entrepot as w";
+	$sql .= ", ".MAIN_DB_PREFIX."product as p";
 	$sql .= " WHERE w.entity IN (".getEntity('stock').")";
-	$sql .= " AND w.rowid = sm.fk_entrepot";
+	$sql .= " AND w.rowid = sm.fk_entrepot AND p.rowid = sm.fk_product ";
 	if (!empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) {
 		$sql .= " AND w.statut IN (".$db->sanitize(implode(',', $warehouseStatus)).")";
 	}
@@ -196,7 +204,14 @@ if ($date && $dateIsValid) {
 	if ($fk_warehouse > 0) {
 		$sql .= " AND sm.fk_entrepot = ".((int) $fk_warehouse);
 	}
+	if ($search_ref) {
+		$sql .= " AND p.ref LIKE '%".$db->escape($search_ref)."%' ";
+	}
+	if ($search_nom) {
+		$sql .= " AND p.label LIKE '%".$db->escape($search_nom)."%' ";
+	}
 	$sql .= " GROUP BY sm.fk_product, sm.fk_entrepot";
+	
 	$resql = $db->query($sql);
 
 	if ($resql) {
@@ -274,6 +289,12 @@ if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 if (!empty($canvas)) {
 	$sql .= " AND p.canvas = '".$db->escape($canvas)."'";
 }
+if ($search_ref) {
+	$sql .= " AND p.ref LIKE '%".$db->escape($search_ref)."%' ";
+}
+if ($search_nom) {
+	$sql .= " AND p.label LIKE '%".$db->escape($search_nom)."%' ";
+}
 if ($fk_warehouse > 0) {
 	$sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price, p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
 	$sql .= ' p.tms, p.duration, p.tobuy, p.stock';

From 87ead82db0099e5098a63757ddf364279bf1a0bd Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 10 Jun 2023 22:55:56 +0200
Subject: [PATCH 34/45] Fix #23822 virtualstock calculation with credit note

---
 htdocs/product/class/product.class.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5374a216175..7dbe6e916a0 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2952,10 +2952,10 @@ class Product extends CommonObject
 			// If stock decrease is on invoice validation, the theorical stock continue to
 			// count the orders to ship in theorical stock when some are already removed b invoice validation.
 			// If option DECREASE_ONLY_UNINVOICEDPRODUCTS is on, we make a compensation.
-			if (!empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+			if (!empty($conf->global->STOCK_CALCULATE_ON_BILL) && $forVirtualStock) {
 				if (!empty($conf->global->DECREASE_ONLY_UNINVOICEDPRODUCTS)) {
 					$adeduire = 0;
-					$sql = "SELECT sum(fd.qty) as count FROM ".MAIN_DB_PREFIX."facturedet fd ";
+					$sql = "SELECT sum(".$this->db->ifsql('f.type=2',-1,1)." * fd.qty) as count FROM ".MAIN_DB_PREFIX."facturedet fd ";
 					$sql .= " JOIN ".MAIN_DB_PREFIX."facture f ON fd.fk_facture = f.rowid ";
 					$sql .= " JOIN ".MAIN_DB_PREFIX."element_element el ON el.fk_target = f.rowid and el.targettype = 'facture' and sourcetype = 'commande'";
 					$sql .= " JOIN ".MAIN_DB_PREFIX."commande c ON el.fk_source = c.rowid ";
@@ -2968,6 +2968,9 @@ class Product extends CommonObject
 							$obj = $this->db->fetch_object($resql);
 							$adeduire += $obj->count;
 						}
+					} else {
+						$this->error = $this->db->error();
+						return -1;
 					}
 
 					$this->stats_commande['qty'] -= $adeduire;

From c7304271faae9b267d0bb9c13495d7dbfd0b1ebc Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 11 Jun 2023 00:42:29 +0200
Subject: [PATCH 35/45] Fix #23806 use dictionary position to display contact
 type list

---
 htdocs/projet/activity/perday.php   | 2 +-
 htdocs/projet/activity/permonth.php | 2 +-
 htdocs/projet/activity/perweek.php  | 2 +-
 htdocs/projet/tasks/contact.php     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 7e309ee2bf7..56ea3b645ef 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -481,7 +481,7 @@ print img_picto('', 'projecttask');
 $formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1, 0, 0, '', '', 'all', $usertoprocess);
 print '</div>';
 print ' ';
-print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', 0, 'maxwidth150onsmartphone');
+print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'position', 0, 'maxwidth150onsmartphone');
 print '<input type="submit" class="button valignmiddle" name="assigntask smallonsmartphone" value="'.dol_escape_htmltag($titleassigntask).'">';
 print '</div>';
 
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 21741a55f01..7710410815c 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -395,7 +395,7 @@ print img_picto('', 'projecttask', 'class="pictofixedwidth"');
 $formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1);
 print '</div>';
 print ' ';
-print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', 0, 'maxwidth150onsmartphone');
+print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'position', 0, 'maxwidth150onsmartphone');
 print '<input type="submit" class="button valignmiddle smallonsmartphone" name="assigntask" value="'.dol_escape_htmltag($titleassigntask).'">';
 print '</div>';
 
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index d4ab6108b7e..16ded15e524 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -492,7 +492,7 @@ print img_picto('', 'projecttask', 'class="pictofixedwidth"');
 $formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1, 0, 0, '', '', 'all', $usertoprocess);
 print '</div>';
 print ' ';
-print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', 0, 'maxwidth150onsmartphone');
+print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'position', 0, 'maxwidth150onsmartphone');
 print '<input type="submit" class="button valignmiddle smallonsmartphone" name="assigntask" value="'.dol_escape_htmltag($titleassigntask).'">';
 print '</div>';
 
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 1f74d1bbc75..a1d5ec74c42 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -406,7 +406,7 @@ if ($id > 0 || !empty($ref)) {
 			print $form->select_dolusers((GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 1, $langs->trans("ResourceNotAssignedToProject"));
 			print '</td>';
 			print '<td>';
-			$formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid');
+			$formcompany->selectTypeContact($object, '', 'type', 'internal', 'position');
 			print '</td>';
 			print '<td class="right" colspan="3" ><input type="submit" class="button" value="'.$langs->trans("Add").'" name="addsourceinternal"></td>';
 			print '</tr>';
@@ -431,7 +431,7 @@ if ($id > 0 || !empty($ref)) {
 				$nbofcontacts = $form->num;
 				print '</td>';
 				print '<td>';
-				$formcompany->selectTypeContact($object, '', 'typecontact', 'external', 'rowid');
+				$formcompany->selectTypeContact($object, '', 'typecontact', 'external', 'position');
 				print '</td>';
 				print '<td class="right" colspan="3" ><input type="submit" class="button" id="add-customer-contact" name="addsourceexternal" value="'.$langs->trans("Add").'"';
 				if (!$nbofcontacts) {

From e6b8f7271e9265333191a3b37ec91a963ee4bef5 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 11 Jun 2023 01:16:21 +0200
Subject: [PATCH 36/45] Fix #23740 ticket stats can't show amounts

---
 htdocs/ticket/stats/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index 37273ee4d1d..c2dc629834c 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -118,7 +118,7 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
 //var_dump($data);
 // $data = array(array('Lib',val1,val2,val3),...)
 
-if (empty($user->rights->societe->client->voir) || $user->socid) {
+/*if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filenameamount = $dir.'/ticketsamountinyear-'.$user->id.'-'.$year.'.png';
 	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$user->id.'-'.$year.'.png';
 } else {
@@ -181,7 +181,7 @@ if (!$mesg) {
 	$px3->SetTitle($langs->trans("AmountAverage"));
 
 	$px3->draw($filename_avg, $fileurl_avg);
-}
+}*/
 
 
 

From 6cba48156675e3d953281820544894b9767fc742 Mon Sep 17 00:00:00 2001
From: ATM-NicolasV <nicolas.vidal@atm-consulting.fr>
Date: Mon, 12 Jun 2023 16:04:20 +0200
Subject: [PATCH 37/45] add extrafields in supplier invoice note

---
 .../modules/supplier_invoice/doc/pdf_canelle.modules.php  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index 80844366d29..53bcd0b9d17 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -370,6 +370,14 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				// Displays notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
 
+				// Extrafields in note
+				if (!empty($conf->global->INVOICE_ADD_EXTRAFIELD_IN_NOTE)) {
+					$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+					if (!empty($extranote)) {
+						$notetoshow = dol_concatdesc($notetoshow, $extranote);
+					}
+				}
+
 				if ($notetoshow) {
 					$tab_top -= 2;
 

From 389993f10e43a091fc9671935b918fb062f4cfed Mon Sep 17 00:00:00 2001
From: ATM-NicolasV <nicolas.vidal@atm-consulting.fr>
Date: Mon, 12 Jun 2023 16:40:26 +0200
Subject: [PATCH 38/45] add extrafields in supplier invoice note

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 31b91e7203c..63bc0a82a61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 ***** ChangeLog for 17.0.2 compared to 17.0.1 *****
-
+FIX : Add hidden conf to add extrafields in canelle template : INVOICE_ADD_EXTRAFIELD_IN_NOTE
 FIX: #24414
 FIX: #24798 Deleting member subscription is not possible
 FIX: add a test for updating date on task update in tab time consummed pro…

From b6843e7c0e60a569d31034d20622be3d4aef0070 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jun 2023 11:49:12 +0200
Subject: [PATCH 39/45] FIX Showing bank account on list for direct debit

---
 htdocs/compta/prelevement/create.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index deb48fd98e9..590d8a4d0c5 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -423,11 +423,11 @@ if ($resql) {
 
 	if ($num) {
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
-		$bac = new CompanyBankAccount($db);
 
 		while ($i < $num && $i < $limit) {
 			$obj = $db->fetch_object($resql);
 
+			$bac = new CompanyBankAccount($db);
 			$bac->fetch(0, $obj->socid);
 
 			print '<tr class="oddeven">';

From 33f76025f95ee7a2a4feeed2638f6e2400123b5a Mon Sep 17 00:00:00 2001
From: Hystepik <lucas.marcouiller@gmail.com>
Date: Wed, 14 Jun 2023 16:51:23 +0200
Subject: [PATCH 40/45] Fix #24154 :  Description adds linebreak at every Save
 update

---
 htdocs/product/stock/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 74469967195..4c477fcddc0 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -198,7 +198,7 @@ if (empty($reshook)) {
 			$object->label = GETPOST("libelle");
 			$object->fk_parent   = GETPOST("fk_parent");
 			$object->fk_project = GETPOST('projectid');
-			$object->description = GETPOST("desc");
+			$object->description = GETPOST("desc", 'restricthtml');
 			$object->statut      = GETPOST("statut");
 			$object->lieu        = GETPOST("lieu");
 			$object->address     = GETPOST("address");

From 6607dda4a70fcbd8efa20d3fcb9e9a2300e00eed Mon Sep 17 00:00:00 2001
From: Hystepik <lucas.marcouiller@gmail.com>
Date: Thu, 15 Jun 2023 11:29:14 +0200
Subject: [PATCH 41/45] Fix : bug with object id -1 in security check

---
 htdocs/core/lib/security.lib.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 52e7a975338..2d5b06fe999 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -353,6 +353,9 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
 	} else {
 		$objectid = $object;		// $objectid can be X or 'X,Y,Z'
 	}
+	if ($objectid == "-1") {
+		$objectid = 0;
+	}
 	if ($objectid) {
 		$objectid = preg_replace('/[^0-9\.\,]/', '', $objectid);	// For the case value is coming from a non sanitized user input
 	}

From f5ee615c9fa43b154934409399c642b1c25cc34c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jun 2023 13:19:52 +0200
Subject: [PATCH 42/45] FIX default value for condition of payment on proposal

---
 htdocs/comm/propal/card.php | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 4fe93ad4df7..2454c074da2 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1651,9 +1651,18 @@ if ($action == 'create') {
 
 	print load_fiche_titre($langs->trans("NewProp"), '', 'propal');
 
+	$cond_reglement_id = $mode_reglement_id = 0;
+
 	$soc = new Societe($db);
 	if ($socid > 0) {
 		$res = $soc->fetch($socid);
+
+		if (GETPOSTINT('cond_reglement_id') == 0) {
+			$cond_reglement_id = $soc->cond_reglement_id;
+		}
+		if (GETPOSTINT('mode_reglement_id') == 0) {
+			$mode_reglement_id = $soc->mode_reglement_id;
+		}
 	}
 
 	// Load objectsrc
@@ -1725,6 +1734,15 @@ if ($action == 'create') {
 		}
 	}
 
+	// when payment term is empty (means not override by payment mode form a other object, like third-party), try to use default value
+	if (empty($cond_reglement_id)) {
+		$cond_reglement_id = GETPOST("cond_reglement_id", 'int');
+	}
+	// when payment mode is empty (means not override by payment mode form a other object, like third-party), try to use default value
+	if (empty($mode_reglement_id)) {
+		$mode_reglement_id = GETPOST("mode_reglement_id", 'int');
+	}
+
 	//Warehouse default if null
 	if ($soc->fk_warehouse > 0) {
 		$warehouse_id = $soc->fk_warehouse;
@@ -1825,13 +1843,13 @@ if ($action == 'create') {
 	// Terms of payment
 	print '<tr class="field_cond_reglement_id"><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
 	print img_picto('', 'paiment');
-	print $form->getSelectConditionsPaiements((GETPOSTISSET('cond_reglement_id') && GETPOST('cond_reglement_id', 'int') != 0) ? GETPOST('cond_reglement_id', 'int') : $soc->cond_reglement_id, 'cond_reglement_id', 1, 1, 0, '', (GETPOSTISSET('cond_reglement_id_deposit_percent') ? GETPOST('cond_reglement_id_deposit_percent', 'alpha') : $soc->deposit_percent));
+	print $form->getSelectConditionsPaiements($cond_reglement_id, 'cond_reglement_id', 1, 1, 0, '', (GETPOSTISSET('cond_reglement_id_deposit_percent') ? GETPOST('cond_reglement_id_deposit_percent', 'alpha') : $soc->deposit_percent));
 	print '</td></tr>';
 
 	// Mode of payment
 	print '<tr class="field_mode_reglement_id"><td class="titlefieldcreate">'.$langs->trans('PaymentMode').'</td><td class="valuefieldcreate">';
 	print img_picto('', 'bank', 'class="pictofixedwidth"');
-	print $form->select_types_paiements((GETPOSTISSET('mode_reglement_id') && GETPOST('mode_reglement_id', 'int') != 0) ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx', 1);
+	print $form->select_types_paiements($mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx', 1);
 	print '</td></tr>';
 
 	// Bank Account

From 3009cfa6286842d71740d9422ad7a775caee8d08 Mon Sep 17 00:00:00 2001
From: kkhelifa <kkhelifa@open-dsi.fr>
Date: Thu, 15 Jun 2023 14:22:07 +0200
Subject: [PATCH 43/45] FIX: Fix main and left menu info for the root menu of
 the list of accountancy journal

---
 htdocs/core/menus/standard/auguria.lib.php | 2 +-
 htdocs/core/menus/standard/eldy.lib.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index b191e24b117..2edba66fc54 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -363,7 +363,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 	}
 
 	if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') { 	// Entry in accountancy journal for each bank account
-		$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', 'accountancy', 'accountancy', 10);
+		$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', 'accountancy', 'accountancy_journal', 10);
 
 		// Multi journal
 		$sql = "SELECT rowid, code, label, nature";
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 13b16bac52d..50f8b707c05 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1278,7 +1278,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 				// Journals
 				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
-					$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', '', '');
+					$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'accountancy_journal');
 
 					// Multi journal
 					$sql = "SELECT rowid, code, label, nature";

From 39f8932b806b2a82534dc51488387f3b7c42a13a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2023 00:35:55 +0200
Subject: [PATCH 44/45] Fix phpcs

---
 htdocs/product/class/product.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 7dbe6e916a0..68b03d9912a 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2955,7 +2955,7 @@ class Product extends CommonObject
 			if (!empty($conf->global->STOCK_CALCULATE_ON_BILL) && $forVirtualStock) {
 				if (!empty($conf->global->DECREASE_ONLY_UNINVOICEDPRODUCTS)) {
 					$adeduire = 0;
-					$sql = "SELECT sum(".$this->db->ifsql('f.type=2',-1,1)." * fd.qty) as count FROM ".MAIN_DB_PREFIX."facturedet fd ";
+					$sql = "SELECT sum(".$this->db->ifsql('f.type=2', -1, 1)." * fd.qty) as count FROM ".MAIN_DB_PREFIX."facturedet fd ";
 					$sql .= " JOIN ".MAIN_DB_PREFIX."facture f ON fd.fk_facture = f.rowid ";
 					$sql .= " JOIN ".MAIN_DB_PREFIX."element_element el ON el.fk_target = f.rowid and el.targettype = 'facture' and sourcetype = 'commande'";
 					$sql .= " JOIN ".MAIN_DB_PREFIX."commande c ON el.fk_source = c.rowid ";

From 924a990bbd509661703f25e5d1f3ed7047d20e24 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 16 Jun 2023 00:59:04 +0200
Subject: [PATCH 45/45] Fix phpcs

---
 htdocs/product/stock/stockatdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index c38a1b395e7..4fe9632054d 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -211,7 +211,7 @@ if ($date && $dateIsValid) {
 		$sql .= " AND p.label LIKE '%".$db->escape($search_nom)."%' ";
 	}
 	$sql .= " GROUP BY sm.fk_product, sm.fk_entrepot";
-	
+
 	$resql = $db->query($sql);
 
 	if ($resql) {