Commit graph

361 commits

Author SHA1 Message Date
Laurent Destailleur
3d1eeb35af Fix sanitize urlfrom like backtopage - reported by codex 2026-07-20 11:09:58 +02:00
MDW
5db08a3151
Qual: Fix 'SqlInjection' notices (#39213)
# Qual: Fix 'SqlInjection' notices

Batch of 25 files with changes to fix 'SqlInjection' Notices
2026-07-19 17:32:14 +02:00
Laurent Destailleur
c7b0f1e10e Automated merge from 23.0 to develop 2026-06-09 00:27:55 +02:00
Laurent Destailleur
e1eb9de6ef Automated merge from 22.0 to 23.0 by tool pullmerge.sh 2026-06-09 00:11:42 +02:00
Laurent Destailleur
5acee1b470 Automated merge from 21.0 to 22.0 by tool pullmerge.sh 2026-06-09 00:04:20 +02:00
Laurent Destailleur
19d22ae703 Clean code after paybox removal 2026-06-02 13:01:40 +02:00
w3houde
2f3c8f4e40
Fix #35593 use acceptLocalLinktoMedia in mailing editor (#38525)
Since v21 the wysiwyg editor in comm/mailing/card.php was created with
$uselocalbrowser=-1, which DolEditor maps to the hidden constant
WYSIWYG_ALLOW_UPLOAD_MEDIA_FILES (default 0). The local image browser
that was available before v21 disappears for any installation that
does not explicitly set that constant.

The email templates editor at admin/mails_templates.php solves this
with the dedicated helper acceptLocalLinktoMedia() (also gated on
MAIN_DISALLOW_MEDIAS_IN_EMAIL_TEMPLATES, plus an IP allowlist for
private networks). The two editors are intended to behave the same way
(maintainer comment on the issue thread).

Mirror that pattern in the mailing page: compute
$acceptlocallinktomedia once near the top and pass it as the
$uselocalbrowser argument to all five DolEditor instances. The
default-deny behavior for installs exposed to the internet is preserved
through acceptLocalLinktoMedia()'s own checks, and an existing local
install on a private network gets the image browser back without
having to set the hidden WYSIWYG_ALLOW_UPLOAD_MEDIA_FILES flag.

Signed-off-by: Dolicraft <contact@dolicraft.com>
Co-authored-by: Dolicraft <contact@dolicraft.com>
2026-05-30 22:39:57 +02:00
Laurent Destailleur
b045de9e9b Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into develop 2026-05-25 01:09:03 +02:00
Laurent Destailleur
f32a4884e8 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 23.0 2026-05-25 01:07:38 +02:00
sonikf
9118a310d1
fix translation for non latin languages (#38334)
* fix translation

* fix translation

* fix phan

* fix phan
2026-05-21 21:55:44 +02:00
Frédéric FRANCE
33c7c1d0ad
clean code (#38265)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code
2026-05-18 02:43:24 +02:00
Pcauderlier
f11738c888
FIX Add missing addMoreActionsButtons hook in mailing card actions (#38083)
* Fix perms

* Fix CI

* UX Accountancy - Ledger - Add icon for more comprehension

* Fix phpunit

* Debug v23

* Debug v23

* Fix CI

* Qual: Update PHP-CS-Fixer configuration and DolibarrModules class

- Update PHP-CS-Fixer configuration to replace deprecated 'visibility_required' rule with 'modifier_keywords'
- Update DolibarrModules class to use const instead of public const for PHP 7.0 compatibility (revert recent change)

* fix warning in upgrade2.php

* Debug v23

* add modulepart for direct print capabilities

* add project

* add project

* add more

* add ficheuinter

* qual: Update phpstan-baseline.neon to remove unresolvable type issues

Removed multiple entries related to unresolvable types in dol_sort_array function calls and property assignments.

* FIX #36447 Email Collector subject/body exclusion filters not working

The '!' prefix was removed at line 1369-1373 before being tested
at lines 1398 and 1406, causing exclusion filters to never work.

This fix uses the $not variable (already set correctly) instead of
re-testing for '!' on the modified rulevalue.

* Qual: Improve type hinting for phpstan in dol_sort_array()

#Qual: Improve type hinting for phpstan in dol_sort_array()

- Improve phpdoc for phpstan in dol_sort_array()

* qual: Add type hint for $arraydata in select_juridicalstatus method

This change adds a type hint for the $arraydata variable in the select_juridicalstatus method for phpstan

* Qual: Change array assignment for phpstan type deduction

* Qual: Change array assignment for phpstan type deduction

* Qual: Cast properties to string in get_full_arbo method

* Qual: Type casting in select_country and loadCacheInputReason methods

* fix: Improve type casting and array initialization in user.class.php

- Added explicit type casting for array values
- Improved array initialization syntax for better readability and maintainability

* qual: Add type hint for group_list array

Add a type hint for the $group_list array for phpstan.

* qual: Update type hints and casting in select_juridicalstatus method

- Changed type hint for $arraydata
- Added explicit casting for `code` and `country_code` in the array assignment

* Qual: Cast label to string to ensure type consistency (phpstan)

* Qual: Add types for $workflow and $workflowcodes.

* Update upgrade2.php

* Debug v23

* Doc

* CSS

* Doc

* Fix prevent use of TRACE method in waf

* FIX: reinstate shipment with origin

* add another

* implem

* fix space

* add another

* fix space

* CSS

* Fix webhook history record save on error

* fix CI

* fix missing migration

* fix missing migration

* add more

* add more

* add more

* add more

* add more

* add more

* add more

* PHPStan > Update baseline

* FIX: ticket module - use random_int() for secure ID generation instead of microtime

* ENH: Accessibility on modulebuilder setup page

Add label for input fields

* Clarify supported versions for security reports

* Update supported versions for security reports

* Add default supplier type handling in card.php in creation mode

Hi
By default supplier is a professional in creation mode.

* Add default supplier type handling in card.php in creation mode

* CSS

* Add new phpunit tests

* Comment

* Debug v23

* Comment

* Update ticket.lib.php

* Fix: Do not transform [__XXX__] string when
MAIN_RESTRICTHTML_ONLY_VALID_HTML is on.

* Update card.php

* Fix formatting and add new line in card.php

* CSS

* Modification of the family VARCHAR field to VARCHAR(64), causing the failure of module re-activation.

* FIX must not allow deletion of invoice if printed or sent by email.

* Debug v23

* clean code

* Trans

* FIX: now there are two values for INVOICE_USE_SITUATION (1 = legacy, 2 = new), leading to two interpretations of situation_percent; in some algorithms, only the old algorithm was applied even when the new mode was on

* FIX: now there are two values for INVOICE_USE_SITUATION (1 = legacy, 2 = new), leading to two interpretations of situation_percent; in some algorithms, only the old algorithm was applied even when the new mode was on

* WIP Loi finance

* Fix yearly events and duplicate recurring events

* Debug v23

* Fix LNE

* Update addTimeSpent api method to use default progress

with null parameters, swagger validator fail

* Fix permission check from 'lire' to 'read'

* FIX: use suspended status in FactureFournisseurRec::updateline()

- The method checks `$this->status == self::STATUS_SUSPENDED`.
- For recurring **supplier** invoices, `$this->status` is not populated (it is always `null`).
- The real field used to store the suspended flag of the template is `$this->suspended`.

* Fix replace DISTINCT

* Fix progress assignment in addTimeSpent method

* FIX: INVOICE_USE_SITUATION (1 = legacy, 2 = new): some functions still use only the legacy algorithm

* FIX wrong indentation

* WIP LNE

* FIX missing space before cast

* FIX bad ratio calculation

* phpdoc: wrong return type

* WIP LNE

* Fix setup margin

* CSS

* Update blockedlog.php

* new: defaut to True show unit price on title and sub total

* Debug v23 - Navigation in timespent and style

* Trans

* Fix detection of security commit

* Fix detection of security commit

* Fix warning

* Fix webportal css

* Debug v23

* CSS

* Fix warning

* Fix warning

* Fixed shipping and availability updating. Updated contributor details.

* FIX #36407 BUG: API POST contact to a non-existing socid gives DB error

* Update blockedlog.php

* Fix CI

* Fix CI

* Better compatibility

* Fix CI

* Fix CI

* CSS

* Fix dialog for iframe

* restaure times

* Fix isset usage

* Fix isset usage

* Allow to define if data is user input or not into GETPOSTFLOAT.

* Typo

* Update holiday api methods from setValidate/setApproved to validate/approve

* CSS

* Doc

* Debug v23

* Fix some phan warnings

* remove var_dump

* Fix for #36550

there are \n and other characters that need to get handled here, otherwise they will get replaced with space character later.

* CSS

* Translation

* Debug v23

* Debug v23

* Debug v23

* Fix var_dump

* Debug v23 - fix link social networks

* Debug v23 - hide field with unknown meaning.

* fix modal css and display

* Fix CI

* Update odf.php

* Added postLine method to expense report API. Added mandatory expense report line fields check.

* Added deleteLine method. Updated contributor details.

* Added getLines method

* Added setToDraft method

* Cleaned code

* Updated PHPDoc

* Updated PHPDoc

* Updated PHPDoc

* Added cancel exepense report method

* Added return object

* CSS

* CSS

* Fix CI

* Fix CI

* CSS

* CSS

* CSS

* CSS

* Debug v23. Bad balance ul/li in menu.

* Debug v23

* FIX Add missing addMoreActionsButtons hook in mailing card actions

Add missing call to addMoreActionsButtons hook in mailing card.php to allow external modules to inject custom action buttons, ensuring consistency with other modules.

---------

Co-authored-by: Laurent Destailleur <eldy@users.sourceforge.net>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Co-authored-by: MDW <mdeweerd@users.noreply.github.com>
Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: Frédéric FRANCE <frederic.france@free.fr>
Co-authored-by: Steph501 <stmallet@gmail.com>
Co-authored-by: Lucas Marcouiller <lmarcouiller@dolicloud.com>
Co-authored-by: Mélina JOUM <melina.joum@altairis.fr>
Co-authored-by: Rémi Champlon <r.champlon@vold.lu>
Co-authored-by: Lucas Marcouiller <45882981+Hystepik@users.noreply.github.com>
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
Co-authored-by: atm-jonathan <jonathan.lescaut@atm-consulting.fr>
Co-authored-by: Benjamin Falière <benjamin.faliere@altairis.fr>
Co-authored-by: Francis <162715304+le-reparateur@users.noreply.github.com>
Co-authored-by: atm-nicolasV <nicolas.vidal@atm-consulting.fr>
Co-authored-by: atm-florian <florian.mortgat@atm-consulting.fr>
Co-authored-by: Charlène Benke <1179011+defrance@users.noreply.github.com>
Co-authored-by: lelex86 <75493227+lelex86@users.noreply.github.com>
Co-authored-by: Florian HENRY <florian.henry@open-concept.pro>
Co-authored-by: John BOTELLA <68917336+thersane-john@users.noreply.github.com>
Co-authored-by: William Mead <william@m34d.com>
Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Joachim Kueter <priojk@users.noreply.github.com>
2026-05-04 17:37:40 +02:00
Laurent Destailleur
b0dca0eb46 Clean code 2026-05-04 09:54:31 +02:00
Laurent Destailleur
0e4b92975e Debug v24 2026-04-28 04:53:06 +02:00
Laurent Destailleur
4039e62eae Debug v24 2026-04-28 04:30:47 +02:00
Laurent Destailleur
f312cfcfae spellcheck war 2026-04-24 13:10:42 +02:00
Laurent Destailleur
212fd26fe3 Trans 2026-04-12 14:01:09 +02:00
Laurent Destailleur
6310e48b48 Removed old option PAYMENT_SECURITY_TOKEN_UNIQUE has been removed 2026-04-10 15:21:37 +02:00
Jon Bendtsen
a5b163c99d
NEW Add mass mailing tab - with counts to project tabs (#37703)
* Add mass mailing tab - with counts to project tabs

* Separate mailing tab from event tab so they can be active independently + correcter link to mass mailings

* Now loads the project head ontop of all the mass mailings

* Make the project tab for mass mailings use the correct translation files

* If you supply a project ID, it will overwrite the search_refproject variable

* Making the mass mailing list search for project id directly

* Just typecast integers

* make it possible to add another mass mailing with prefilled project from the list of mass mailings in a project

* change indent to make pre_commit check happy

* Trying to make phan happy by declaring the variable in both situations

* when on mailing card, click project link, show projects mass mailings

* declaring variable so phan does not complain

* Still working on making phan happy about

* Working on  and phan

* Change the UX so the project links goes to project and there is an other link to other mass mailings in this project + when editing we open in a new window

* Correct mailing tab condition syntax

Fix syntax error in condition for mailing tab display.

* Fix syntax error in mailing tab condition

---------

Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-04-07 05:09:02 +02:00
Laurent Destailleur
1f09296717 Debug v23 2026-03-03 21:11:57 +01:00
Laurent Destailleur
8f8c70922e Debug v23 2026-03-03 21:11:38 +01:00
Regis Houssin
0aa6652005
FIX #35141 (#36390)
* FIX #35141

* FIX avoid problem with chinese language
2025-11-24 16:03:38 +01:00
ldestailleur
70768832c5 FIX Edit of email in emailing. Property messtype not set. 2025-09-11 16:40:54 +02:00
ldestailleur
88e75755fa Debug v22 2025-06-02 21:10:45 +02:00
ldestailleur
9888a200e7 Debug v22 2025-05-31 12:39:55 +02:00
ldestailleur
bcefd989bd Fix CI 2025-05-15 18:51:14 +02:00
ldestailleur
a9b470555d Fix option to clone emailing 2025-05-15 18:46:25 +02:00
ldestailleur
86506c32b7 Debug v22 2025-04-22 15:51:11 +02:00
ldestailleur
dcbd2437e7 Fix info on server 2025-04-22 15:21:30 +02:00
Laurent Destailleur
a40aec6029 Debug v22 2025-04-17 03:56:54 +02:00
ldestailleur
6361c1032b Debug v22 2025-03-27 14:18:52 +01:00
ldestailleur
6f9d1a50dd Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-27 13:43:22 +01:00
ldestailleur
576ea1fe56 Fix responsive 2025-03-27 10:54:43 +01:00
MDW
d64298f6c1
Qual: Fix phan notices (htdocs/compta) (#33427) 2025-03-12 20:41:50 +01:00
Laurent Destailleur
821565e031 Debug v21 2025-01-23 01:29:29 +01:00
Laurent Destailleur
5e72196245 Fix link 2026-01-20 23:43:58 +01:00
Laurent Destailleur
e81cac68ec Debug v23 2026-01-10 13:14:01 +01:00
Laurent Destailleur
5faccd7216 Debug v23 2026-01-10 12:47:13 +01:00
Laurent Destailleur
b61ff7d17a Devug v23 2025-11-24 16:29:21 +01:00
Laurent Destailleur
0c8581f80d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-11-24 16:23:07 +01:00
Laurent Destailleur
9a8820b9c6 NEW Add column title in emailing and add more filters 2025-10-19 03:33:09 +02:00
Jon Bendtsen
a9b468bbcd
New: Adding linked project to mass mailing card (#35723)
* New: Adding linked project to mass mailing card

* modify project on mailing card

* mailing card load fk_project pre commit fix

* only fetch projects with id>0

* fix PHPstan errors regarding mesg

* projects related to mass mailings does not have a soc or socid

* remove last trace of soc and socid

* checking if mesg is set before using it

* just loading all projects, because maybe you have a mailing list with workers for a thirdparty? think company party

* showing the project during edit

* given that action is already something else, it will never not be classify

* making PHPstan happy

* Adding project column to list of mass mailings. Search, order and click able

* pasted the wrong place

* no need to check for filtermail

* x now also clears project search

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-10-15 03:19:45 +02:00
Frédéric FRANCE
1ad2d24a4b
fix img_pictos (#35722)
* fix img_pictos

* fix img_pictos

* fix img_pictos

* fix img_pictos

* fix img_pictos

* fix img_pictos

* fix img_pictos

* fix img_pictos
2025-10-14 19:31:06 +02:00
ldestailleur
3f91f3f1fc Debug v23 2025-10-06 02:50:07 +02:00
ldestailleur
88825c460b Spellcheck 2025-10-03 10:22:58 +02:00
kkhelifa-opendsi
21af311344
NEW : Change the path for the mailing files (#34878)
* NEW : Change the path for the mailing files because if you have more than 100 mailing you have the files of the previous mailing show in the newest.
Only activate if the global MAILING_USE_NEW_PATH_FOR_FILES is set to 1.
Add a script for move files to new path.

* Place migration script into repair.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: tnegre <tnegre@open-dsi.fr>
2025-09-27 00:08:56 +02:00
ldestailleur
e3bf8bcb47 FIX Edit of email in emailing. Property messtype not set. 2025-09-11 16:40:20 +02:00
ldestailleur
3af041a5b2 Standardize code 2025-08-07 13:42:11 +02:00
Laurent Destailleur (aka Eldy)
691b542b4d Debug v21 2024-12-29 19:45:13 +01:00
Laurent Destailleur
254c15fae1 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-09 15:55:41 +01:00