Commit graph

133486 commits

Author SHA1 Message Date
Laurent Destailleur
7ed45a43a5 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-08 15:09:42 +01:00
Laurent Destailleur
265fff296c Fix warnings Close #27917 2024-02-08 15:06:35 +01:00
Laurent Destailleur
7783575bf7 Fix bad parameter 2024-02-08 15:02:54 +01:00
Laurent Destailleur
49c1c42d83 Doxygen 2024-02-08 14:58:30 +01:00
Laurent Destailleur
18d05ef570 Fix phpstan 2024-02-08 14:26:49 +01:00
Laurent Destailleur
510e05f870 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-08 14:12:11 +01:00
Laurent Destailleur
4ce325fadb Fix phpstan 2024-02-08 14:11:54 +01:00
Lucas Marcouiller
14090f3515
New make replyto as origin_email email collector ticket part (#28040)
* New make replyto as origin_email email collector ticket part

* fix by adding a field

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-02-08 13:58:40 +01:00
MDW
828496776b
Qual: pre-commit: run phpcs on all files in 'main' branches. (#28018) (#28067)
This change to the workflow will run phpcs on all files in develop,
17.0, 18.0, ... (rule== branch ends in .0).

This ensures that phpcs is run in a github workflow for fast phpcs
issue detection in the develop and other main branches.

Ultimately, this means that the PHPCS action can be disabled
in branches where it is active.  But I propose to verify that
the updated action does the job as expected (tested in a fork
it is ok).

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-08 13:57:05 +01:00
Frédéric FRANCE
b92b8c443d
fix cunits.class.php (backport) (#28068) 2024-02-08 13:09:39 +01:00
William Mead
ebe2a42067
Fix undefined hookmanager (#28069) 2024-02-08 13:07:53 +01:00
Laurent Destailleur
94cd823a7c Fix #yogosha20662 2024-02-08 06:35:04 +01:00
Laurent Destailleur
8e0559f9a4 Debug v19 2024-02-08 04:23:29 +01:00
Laurent Destailleur
09f07d3f77 Clean language files 2024-02-08 02:32:25 +01:00
Laurent Destailleur
2d18a083fe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-08 02:21:03 +01:00
Laurent Destailleur
421e1f5586 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-02-08 02:20:52 +01:00
Libre Master
eb110f66c2
Simpler version of getRootURLFromURL (#27927)
* Simpler version

* Simpler version

* Simpler version

* Try more complete enhancement

* Update geturl.lib.php

* Simpler version

---------

Co-authored-by: Christophe TREMBLAY-GUILLOUX <christophe@libremaster.ovh>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-08 02:08:18 +01:00
William Mead
43ec918e63
FIX #27670 Qual clean ticket libstatut method (#28025)
* Fixed empty labelStatus. Refactored logic.

* Added contributor details

* Cleaned PHPDoc
2024-02-08 02:07:05 +01:00
Laurent Destailleur
ab900ddf58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-08 02:01:01 +01:00
Laurent Destailleur
f4b3081568 Clean code 2024-02-08 02:00:54 +01:00
Florian Mortgat
51efb8d1f6
NEW: FormSetupItem: show picto in front of confs applied across all entitie (#28024)
* NEW: FormSetupItem: show picto in front of confs applied across all entities

* Show globe picto only if multicompany is enabled + use img_picto instead of hard-coded HTML

* Update htdocs/core/class/html.formsetup.class.php

Missing assignment to $out
2024-02-08 01:51:25 +01:00
Laurent Destailleur
763d70cf52 Clean comment to avoid false alert with travis 2024-02-08 01:50:03 +01:00
Laurent Destailleur
1af2796a4a Fix running cron in all entities 2024-02-08 01:47:29 +01:00
Laurent Destailleur
cc89118dd6 css 2024-02-08 01:41:24 +01:00
Laurent Destailleur
e8e7a3fe95 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-08 01:36:24 +01:00
ariel-bentu
b4543c0894
QUAL Fix PDF generation to not ignore col align. (#28022)
* QUAL Fix PDF generation to not ignore col align.

before fix, if you change a column's content's alignment in a hook - it is ignored.

* fix function documentation

* Update commondocgenerator.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-08 01:30:18 +01:00
Lucas Marcouiller
44aff249a8
New : displays sender email in ticket message from (#28023)
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-02-08 01:28:06 +01:00
Laurent Destailleur
550e4e8c9a Fix compatibility
Conflicts:
	htdocs/resource/class/dolresource.class.php
2024-02-08 00:26:55 +01:00
Laurent Destailleur
038fcbab3d Fix compatibility 2024-02-08 00:24:27 +01:00
thibdrev
0b6467758b
qual: phpstan - last errors stating "getNextValue() should return string but returns int." (#28033)
* Update mod_commande_marbre.php

htdocs/core/modules/commande/mod_commande_marbre.php	152	Method mod_commande_marbre::getNextValue() should return string but returns int.

* Update mod_holiday_madonna.php

htdocs/core/modules/holiday/mod_holiday_madonna.php	150	Method mod_holiday_madonna::getNextValue() should return string but returns int.

* Update mod_project_simple.php

htdocs/core/modules/project/mod_project_simple.php	149	Method mod_project_simple::getNextValue() should return string but returns int.

* Update mod_commande_marbre.php

* Update mod_holiday_madonna.php
2024-02-08 00:22:49 +01:00
thibdrev
40450e4313
qual: phpstan for htdocs/comm/propal/class/propal.class.php (#28034)
* qual: phpstan for htdocs/comm/propal/class/propal.class.php

htdocs/comm/propal/class/propal.class.php	75	Property Propal::$table_element_line (int) does not accept default value of type string.
htdocs/comm/propal/class/propal.class.php	1414	Property CommonObject::$fk_delivery_address (int) does not accept string.
htdocs/comm/propal/class/propal.class.php	1426	Property CommonObject::$fk_project (int) does not accept string.
htdocs/comm/propal/class/propal.class.php	1499	Property CommonObject::$user_author (User) does not accept int.

* Update propal.class.php

use $object->user_creation_id rather than $object->user_author
2024-02-08 00:22:11 +01:00
thibdrev
b4f9038710
qual: phpstan for htdocs/fourn/class/paiementfourn.class.php (#28066)
htdocs/fourn/class/paiementfourn.class.php	412	Property Paiement::$amount (float) does not accept string.
htdocs/fourn/class/paiementfourn.class.php	414	Property Paiement::$multicurrency_amount (float) does not accept string.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-08 00:18:31 +01:00
thibdrev
bdb90a2806
qual: phpstan for htdocs/fourn/class/fournisseur.product.class.php (#28065)
htdocs/fourn/class/fournisseur.product.class.php	898	Property ProductFournisseur::$fourn_price (float) does not accept string.
htdocs/fourn/class/fournisseur.product.class.php	899	Property ProductFournisseur::$fourn_qty (float) does not accept string.
htdocs/fourn/class/fournisseur.product.class.php	900	Property ProductFournisseur::$fourn_remise_percent (float) does not accept string.
htdocs/fourn/class/fournisseur.product.class.php	901	Property ProductFournisseur::$fourn_remise (float) does not accept string.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-08 00:18:13 +01:00
thibdrev
f98c5b1481
qual: phpstan for htdocs/compta/bank/class/account.class.php (#28060)
* qual: phpstan for htdocs/compta/bank/class/account.class.php

htdocs/compta/bank/class/account.class.php	798	Property AccountLine::$fk_type (int) does not accept string.
htdocs/compta/bank/class/account.class.php	1290	Method Account::solde() should return int but returns string.

* phpcs
2024-02-08 00:17:43 +01:00
thibdrev
21af889405
qual: phpstan for htdocs/compta/facture/class/facture-rec.class.php (#28061)
* qual: phpstan for htdocs/compta/facture/class/facture-rec.class.php

htdocs/compta/facture/class/facture-rec.class.php	1271	Method FactureRec::strikeIfMaxNbGenReached() should return bool but returns string.
htdocs/compta/facture/class/facture-rec.class.php	1299	Property CommonObject::$output (string) does not accept null.

* typo

* phpcs
2024-02-08 00:17:02 +01:00
thibdrev
cb7134871b
qual: phpstan for htdocs/compta/paiement/class/cpaiement.class.php (#28062)
* qual: phpstan for htdocs/compta/paiement/class/cpaiement.class.php

htdocs/compta/paiement/class/cpaiement.class.php	98	Property Cpaiement::$active (int) does not accept string.
htdocs/compta/paiement/class/cpaiement.class.php	253	Property Cpaiement::$active (int) does not accept string.
htdocs/compta/paiement/class/cpaiement.class.php	373	Property Cpaiement::$active (int) does not accept string.

* Update commondict.class.php
2024-02-08 00:16:22 +01:00
thibdrev
ad141c1e1f qual: phpstan for htdocs/core/class/cunits.class.php (#28064)
htdocs/core/class/cunits.class.php	88	Property CommonDict::$active (int) does not accept string.
htdocs/core/class/cunits.class.php	415	Method CUnits::getUnitFromCode() should return int but returns string.
2024-02-08 00:15:44 +01:00
thibdrev
1588fc3072
qual: phpstan for htdocs/core/class/cunits.class.php (#28064)
htdocs/core/class/cunits.class.php	88	Property CommonDict::$active (int) does not accept string.
htdocs/core/class/cunits.class.php	415	Method CUnits::getUnitFromCode() should return int but returns string.
2024-02-08 00:15:16 +01:00
thibdrev
c81ac78594
qual: phpstan for htdocs/core/class/commonobject.class.php (#28063)
htdocs/core/class/commonobject.class.php	9613	Method CommonObject::quote() should return string but returns int.
2024-02-08 00:14:48 +01:00
Laurent Destailleur
94b88ebc89 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-08 00:12:35 +01:00
Laurent Destailleur
0592d4dffd Fix phpcs 2024-02-08 00:12:20 +01:00
thibdrev
2df7852a1e
qual: phpstan for htdocs/bom/class/bom.class.php (#28059)
* Update bom.class.php

* Update bom.class.php

* Update bom.class.php
2024-02-08 00:10:23 +01:00
Laurent Destailleur
b8b68ed820 Close #28058 2024-02-08 00:09:17 +01:00
Laurent Destailleur
a7529665da Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/ticket/class/ticket.class.php
2024-02-08 00:06:52 +01:00
Laurent Destailleur
1322c20f91 Clean code 2024-02-08 00:04:50 +01:00
Laurent Destailleur
5d6448a8a2 css 2024-02-07 23:54:30 +01:00
Laurent Destailleur
9acceb8e8e Debug v19 2024-02-07 23:52:03 +01:00
Laurent Destailleur
d813bf4ae7 NEW Add option TICKET_INCLUDE_SUSPENDED_STATUS (Suspended status no more
visible by default)
2024-02-07 23:49:36 +01:00
Laurent Destailleur
66beccf6ae Fix sql error 2024-02-07 22:59:22 +01:00
Laurent Destailleur
a90b51c5dc Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-07 22:48:58 +01:00