From 1578715f54acbcb4829db0f06c937b705b674f2a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Nov 2025 16:57:26 +0100 Subject: [PATCH 1/2] PHPStan > Update baseline (#36242) Co-authored-by: Dolibot --- dev/build/phpstan/phpstan-baseline.neon | 56 +------------------------ 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon index a8c6abb961a..3d7bcb8d524 100644 --- a/dev/build/phpstan/phpstan-baseline.neon +++ b/dev/build/phpstan/phpstan-baseline.neon @@ -8178,12 +8178,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/rapport/pdf_paiement.class.php - - - message: '#^Property Reception\:\:\$trueWeight \(float\|int\) in isset\(\) is not nullable\.$#' - identifier: isset.property - count: 1 - path: ../../../htdocs/core/modules/reception/doc/pdf_squille.modules.php - - message: '#^Ternary operator condition is always false\.$#' identifier: ternary.alwaysFalse @@ -8838,12 +8832,6 @@ parameters: count: 1 path: ../../../htdocs/eventorganization/conferenceorboothattendee_list.php - - - message: '#^Variable \$projectref might not be defined\.$#' - identifier: variable.undefined - count: 2 - path: ../../../htdocs/eventorganization/conferenceorboothattendee_list.php - - message: '#^Property ExpeditionLigne\:\:\$detail_children \(array\\>\) on left side of \?\? is not nullable\.$#' identifier: nullCoalesce.property @@ -14226,12 +14214,6 @@ parameters: count: 2 path: ../../../htdocs/reception/class/reception.class.php - - - message: '#^Property Reception\:\:\$size_units \(int\|string\) in isset\(\) is not nullable\.$#' - identifier: isset.property - count: 2 - path: ../../../htdocs/reception/class/reception.class.php - - message: '#^Property Reception\:\:\$socid \(int\) in isset\(\) is not nullable\.$#' identifier: isset.property @@ -14244,30 +14226,6 @@ parameters: count: 2 path: ../../../htdocs/reception/class/reception.class.php - - - message: '#^Property Reception\:\:\$trueDepth \(float\|int\) in isset\(\) is not nullable\.$#' - identifier: isset.property - count: 1 - path: ../../../htdocs/reception/class/reception.class.php - - - - message: '#^Property Reception\:\:\$trueHeight \(float\|int\) in isset\(\) is not nullable\.$#' - identifier: isset.property - count: 1 - path: ../../../htdocs/reception/class/reception.class.php - - - - message: '#^Property Reception\:\:\$trueWeight \(float\|int\) in isset\(\) is not nullable\.$#' - identifier: isset.property - count: 1 - path: ../../../htdocs/reception/class/reception.class.php - - - - message: '#^Property Reception\:\:\$trueWidth \(float\|int\) in isset\(\) is not nullable\.$#' - identifier: isset.property - count: 1 - path: ../../../htdocs/reception/class/reception.class.php - - message: '#^Ternary operator condition is always true\.$#' identifier: ternary.alwaysTrue @@ -15390,12 +15348,6 @@ parameters: count: 1 path: ../../../htdocs/takepos/index.php - - - message: '#^Loose comparison using \=\= between 0 and 1 will always evaluate to false\.$#' - identifier: equal.alwaysFalse - count: 1 - path: ../../../htdocs/takepos/index.php - - message: '#^Property CommonInvoiceLine\:\:\$product_type \(int\) in isset\(\) is not nullable\.$#' identifier: isset.property @@ -16059,13 +16011,7 @@ parameters: - message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#' identifier: function.alreadyNarrowedType - count: 2 - path: ../../../htdocs/user/perms.php - - - - message: '#^Variable \$menumanager might not be defined\.$#' - identifier: variable.undefined - count: 2 + count: 1 path: ../../../htdocs/user/perms.php - From 81e5e0a3cbbf2b24d270626107263bf92bc9e66e Mon Sep 17 00:00:00 2001 From: Lucas Marcouiller <45882981+Hystepik@users.noreply.github.com> Date: Thu, 13 Nov 2025 17:53:06 +0100 Subject: [PATCH 2/2] New import profile for leave requests (#36244) Co-authored-by: Lucas Marcouiller --- htdocs/core/modules/modHoliday.class.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php index a31ef571e70..fd351ee1104 100644 --- a/htdocs/core/modules/modHoliday.class.php +++ b/htdocs/core/modules/modHoliday.class.php @@ -290,6 +290,28 @@ class modHoliday extends DolibarrModules // $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)'; // $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture'; // $r++; + + // Imports + //-------- + $r = 0; + + // Import list of leave request + + $r++; + $this->import_code[$r] = $this->rights_class.'_'.$r; + $this->import_label[$r] = "ListeCP"; // Translation key + $this->import_icon[$r] = 'holiday'; + $this->import_tables_array[$r] = array('d' => MAIN_DB_PREFIX.'holiday'); + $this->import_fields_array[$r] = array( + 'd.ref' => 'Ref*', 'd.fk_user' => 'UserID*', 'd.fk_type' => 'TypeOfLeaveId*','d.fk_validator' => 'ApprovedBy*', + 'd.date_debut' => 'DateStart*', 'd.date_fin' => 'DateEnd*', 'd.halfday' => 'HalfDay', 'd.description' => 'Description*', + 'd.date_create' => 'DateCreation*' + ); + + $keyforselect = 'holiday'; + $keyforelement = 'holiday'; + $keyforaliasextra = 'extra'; + include DOL_DOCUMENT_ROOT.'/core/extrafieldsinimport.inc.php'; } /**