Commit Graph

136659 Commits

Author SHA1 Message Date
Laurent Destailleur
cbc28b0afd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-08-01 14:02:36 +02:00
Laurent Destailleur
6593a7e8d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-08-01 13:58:42 +02:00
Laurent Destailleur
e5aa605994 Debug v21 - Fix regression 2024-08-01 13:58:29 +02:00
Laurent Destailleur
534570a85b Disable deprecated entry 2024-08-01 13:39:27 +02:00
Laurent Destailleur
269a8a2fa1 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-08-01 13:36:59 +02:00
Laurent Destailleur
faac9602f8 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-08-01 13:31:51 +02:00
Laurent Destailleur
27435508a3 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-08-01 13:30:05 +02:00
Laurent Destailleur
a5cba3235e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-08-01 13:29:38 +02:00
MDW
6a98adcc3c Qual: Further phpdoc fixes for phpstan (#30506)
* Fix int<0> typing to int<0,0> for phpstan

* Fix phpdoc for phpstan

* Fix phpdoc for phpstan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-08-01 13:25:01 +02:00
Laurent Destailleur
4fc272698f Clean code 2024-08-01 13:07:12 +02:00
MDW
46eb5f83c2 Qual: Updates for phpstan notices (#30509)
* Fix int<0> typing to int<0,0> for phpstan

* Fix phpdoc for phpstan

* Fix phpdoc for phpstan

* Qual: Several phpstan notice fixes

* Fix phpdoc

* Qual: totalpaid is never null, remove null test

* improve phpdoc typing

* Also return null to statisfy phpstan

* Allow null value for $var

* object->Object to make it meaningful

* Type EvalMathStack properties

* Comment out unused private methods (phpstan)

* Changes for phpstan (return values, phpdoc, code)

* Change order of tests for phpstan

* phpdoc object to Object for correct typing

* Typing hing for phpstan

* UPdate test for phpstan

* Change phpdoc position for phpstan

* Update phpdoc for phpstan

This needs further improvement

* Change $op to $ope to fix phpstan

* Update sqlite3.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-08-01 12:59:45 +02:00
Laurent Destailleur
03676d0b36 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-08-01 12:53:14 +02:00
atm-adrien
2c92e57fe7 FIX : Display the real_PMP on inventory when its value is equal to 0 (#22291)
* FIX : Display the real_PMP on inventory when its value is equal to 0

* FIX : PR Returns

* FIX : PR returns
2024-08-01 12:52:53 +02:00
MDW
75a4a31841 Qual: CommonObject improvements (Phan notices) (#30507)
Improve phpdoc, initialisation, field test
2024-08-01 12:49:01 +02:00
Laurent Destailleur
34fefcaeb2 Clean code 2024-08-01 12:46:30 +02:00
Frédéric FRANCE
bc0b5a876f fix travis test (#30517) 2024-08-01 12:41:44 +02:00
Laurent Destailleur
483a30078d Try to avoid to reload token when not necessary. 2024-08-01 11:55:49 +02:00
Laurent Destailleur
66da3d7f9b Debug v20 - Fix use of oauth for alternative send email setup 2024-08-01 11:46:54 +02:00
Laurent Destailleur
efb8a9d4d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-08-01 11:36:38 +02:00
Laurent Destailleur
46cde6431a NEW Can use a specific profile to send email for password forgotten 2024-08-01 11:36:21 +02:00
Laurent Destailleur
2efb14c767 Debug v20 - Fix use of oauth for alternative send email setup 2024-08-01 11:35:42 +02:00
MDW
63aab818e6 Qual: Fixes related to CMailFile for phan notices (#30510)
* Qual: Fix CMailFile related phan notices

# Qual: Fix CMailFile related phan notices

Fix several phan notices by typing and typing checks.

* Fix initialisation of CMailFile instantiation

* Update phan baseline

* Update mails_emailing.php

* Update mails_emailing.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-08-01 11:09:26 +02:00
Frédéric FRANCE
173dc1a70e fix constructor expects int (#30512)
* constructor expects int

* fix constructor expects int

* fix constructor expects int

* fix constructor expects int

* fix constructor expects int

* fix constructor expects int

* fix constructor expects int

* fix constructor expects int

* fix constructor expects int

* fix constructor expects int

* fix constructor expects int

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-08-01 10:52:53 +02:00
Laurent Destailleur
2068f29b44 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-08-01 10:51:25 +02:00
Laurent Destailleur
6210c2429a Fix phan 2024-08-01 10:50:52 +02:00
Laurent Destailleur
f82eabbab7 FIX #30513 FIX #30515 2024-08-01 10:48:17 +02:00
Laurent Destailleur
87c7a7a7d7 WIP Page to setup email for reset password 2024-07-31 22:26:54 +02:00
Laurent Destailleur
75158556c9 Debug 2024-07-31 19:36:57 +02:00
lamrani abdelwadoud
31a560422d New Preview mai topic value on Ckeditor (#30195)
* New update for templateMail by creating files

* New updating for get php content

* Update html.formmail.class.php

* Fix updating content news

* Fix CTI Errors

* edit html file for news

* Add automaticaly subject value to editor

* Update html.formmail.class.php

* FIX name and path of file

* Fix path for files

* Fix errors variables

* replace file in ajax folder

* rename path

* update the news file

* fix phan errors

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-31 19:12:40 +02:00
Laurent Destailleur
3069937698 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-31 18:55:10 +02:00
Laurent Destailleur
ee0412dd27 Fix phan warning 2024-07-31 18:54:52 +02:00
MDW
5da6995a56 Qual: Update Phan baseline - Fix phpstan regex (#30504)
* Add missing escapes in regex

* Qual: Fix phpstan regex
2024-07-31 18:39:02 +02:00
Sébastien NASSIET
d8a9ae3961 Update card.php Bad translation Key for demand_reason (#30486)
The Right translation for Demand Reason is Source as it was defined line 2615
2024-07-31 15:43:53 +02:00
Christian Humpel
b96c7f8318 NEW API Document implementation for MRP (MO) (#30488)
* Get /documents

* PUT /documents/builddoc

* POST /documents/upload
2024-07-31 15:43:13 +02:00
Sébastien NASSIET
7d996cf59f Update list.php Bad translation Key for demand_reason (#30487)
The Right translation for Demand Reason is Origin and not Channel. (see in propale where the translation works fine)
2024-07-31 15:41:59 +02:00
Frédéric FRANCE
2cf5b9bc42 Update phpstan.neon.dist (#30489) 2024-07-31 15:41:14 +02:00
Charlène Benke
0a2d4bee75 FIX sanitize must allow space on attribute (#30490)
* sanitize must allow space on attribute

otherwhise  "on update CURRENT_TIMESTAMP" for tms fields goes wrong

* Update mysqli.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-31 15:41:00 +02:00
IC-Ilies
3fda1ce4c0 FIX#30491 token not set to launch cron task manually (#30492) 2024-07-31 15:36:07 +02:00
Francis Appels
dc58a90a48 Fix modulebuilder MAIN_ODT_AS_PDF (#30496) 2024-07-31 15:35:15 +02:00
Laurent Destailleur
5911a67a31 Debug v21 2024-07-31 15:34:54 +02:00
Sylvain Legrand
2c7dc2f28f NEW option: assign default roles to "individual" third-party contacts (#30499)
* New option: assign default roles to "individual" third-party contacts

When the option to automatically create a contact for third parties of the "Individuals" type is active (THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION).

Allow to define the default roles assigned to these contacts.

Process:
1 Selection of default roles in the settings (and saving)
2 Creation of a third party of the "Individuals" type and therefore of its associated contact.
3 The contact thus created is automatically assigned the predefined roles.

* Update societe.php

* Update societe.php
2024-07-31 15:32:07 +02:00
Regis Houssin
84dff519b6 FIX possibility to add an internal contact (#30498)
* FIX possibility to add an internal contact

* FIX doc
2024-07-31 15:29:02 +02:00
Laurent Destailleur
871e01d955 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-31 14:32:55 +02:00
Laurent Destailleur
09eaf38bd1 Fix phpstan 2024-07-31 14:31:29 +02:00
Laurent Destailleur
32d3424423 Fix warning 2024-07-31 14:29:42 +02:00
Laurent Destailleur
700edf8768 Fix warnings 2024-07-31 14:19:08 +02:00
Laurent Destailleur
e5609f4617 Fix phpstan 2024-07-31 13:44:48 +02:00
Laurent Destailleur
04d213e676 Doxygen 2024-07-31 13:24:23 +02:00
Laurent Destailleur
d2bd6a03ec Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-31 13:21:02 +02:00
Laurent Destailleur
2f7a252244 Fix warnings 2024-07-31 13:09:10 +02:00