Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix customreports.lib.php (#31771)

Browse Source 
* fix customreports.lib.php

* Update commondict.class.php

* Update ctyperesource.class.php

* fix

* CommonDict is not a business class

* Update ctyperesource.class.php

* Update ctyperesource.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
Frédéric FRANCE 2024-11-12 03:38:38 +01:00 committed by GitHub
parent 3b0ccddaea
commit 836bb71303
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/phpstan/phpstan-baseline.neon
View File

@ -17930,21 +17930,6 @@ parameters:
count: 1
path: ../../htdocs/opensurvey/results.php
-
message: "#^Parameter \\#4 \\$month of function dol_mktime expects int, array\\|string given\\.$#"
count: 1
path: ../../htdocs/opensurvey/wizard/create_survey.php
-
message: "#^Parameter \\#5 \\$day of function dol_mktime expects int, array\\|string given\\.$#"
count: 1
path: ../../htdocs/opensurvey/wizard/create_survey.php
-
message: "#^Parameter \\#6 \\$year of function dol_mktime expects int, array\\|string given\\.$#"
count: 1
path: ../../htdocs/opensurvey/wizard/create_survey.php
-
message: "#^Variable \\$allow_comments might not be defined\\.$#"
count: 1

4
htdocs/core/lib/customreports.lib.php
View File

@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2024 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2024 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
@ -591,7 +591,7 @@ function fillArrayOfFilterFields($object, $tablealias, $labelofobject, &$arrayof
'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key] + ($count * 100000),
'table' => $object->table_element,
'tablefromt' => $tablepath,
'type' => $val['type'] // TODO: Check this, seems a copy/paste error
'type' => $extrafields->attributes[$object->table_element]['type'][$key],
);
}
}

2
htdocs/opensurvey/wizard/create_survey.php
View File

@ -93,7 +93,7 @@ if (!empty($creation_sondage_date) || !empty($creation_sondage_autre)) {
$testdate = false;
$champdatefin = (int) dol_mktime(23, 59, 59, GETPOSTINT('champdatefinmonth'), GETPOSTINT('champdatefinday'), GETPOSTINT('champdatefinyear'));
if ($champdatefin > 0) { // A date was provided, $error still 0 here
if ($champdatefin > 0) { // A date was provided
// Expire date is not before today
if ($champdatefin >= dol_now()) {
$testdate = true;