Compare commits

...

5051 Commits

Author SHA1 Message Date
ldestailleur
f70b6b43ec Prepare 22.0.2 2025-09-27 01:09:20 +02:00
ldestailleur
964aca7c84 Prepare 22.0.2 2025-09-27 01:06:54 +02:00
Dylan Bourdere
56a73c5cd9 fix: PHP warning in mail and card presend (#35474)
* fix: PHP warning in mail and card presend

* phpstan

* fix: PHP warning in mail and card presend
2025-09-26 20:48:54 +02:00
Laurent Destailleur
ae8ed29ce2 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-26 19:12:41 +02:00
Laurent Destailleur
fa466150cb Fix CSS 2025-09-26 19:11:59 +02:00
ldestailleur
75438c60c7 Add try catch 2025-09-26 01:56:19 +02:00
ldestailleur
f65903d006 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-26 01:23:02 +02:00
ldestailleur
369b9510e0 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-26 01:21:57 +02:00
ldestailleur
deeca91581 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-09-26 01:21:12 +02:00
ldestailleur
1ed840384a Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-09-26 01:21:01 +02:00
ldestailleur
f93fdc641a Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-09-26 01:16:30 +02:00
ldestailleur
0226d75ec6 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-09-26 01:16:17 +02:00
ldestailleur
66aa736629 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-26 01:12:41 +02:00
ldestailleur
13cdc20266 Fix warning 2025-09-26 01:12:30 +02:00
Dylan Bourdere
a63eae7903 Fix: property api dir_temp (#35439)
* fix undefined property

* rename key
2025-09-25 11:59:09 +02:00
atm-GregM
35bb894393 FIX check commande liste validate (#35479) 2025-09-25 11:57:49 +02:00
ldestailleur
79210c0120 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-09-25 11:57:12 +02:00
ldestailleur
d87ebbf926 Merge branch '17.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0 2025-09-25 11:55:28 +02:00
ldestailleur
08b105502e Merge branch '16.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0 2025-09-25 11:55:21 +02:00
ldestailleur
bd2aba1a2f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2025-09-25 11:54:59 +02:00
ldestailleur
a4601686a6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2025-09-25 11:54:18 +02:00
Dylan Bourdere
b43524e467 add deprecated properties code_compta to remove some undefined properties warning (#35473) 2025-09-25 11:52:32 +02:00
lvessiller-opendsi
bcf6d6a7a2 FIX api orders : forward database error on failure (backpot commit d9e81cb) (#35478) 2025-09-25 11:47:51 +02:00
Dylan Bourdere
6916ca7ac8 fix: PHP warning: use getDolGlobalString (#35475) 2025-09-25 11:47:19 +02:00
Dylan Bourdere
0ba4c17e66 Fix some undefined array key warning (#35471)
* fix some undefined array key warning

* fix some undefined array key warning
2025-09-24 18:39:38 +02:00
ldestailleur
0e9d5cfda0 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-24 18:29:32 +02:00
ldestailleur
bb65d07c3d Fix log message 2025-09-24 18:29:20 +02:00
Regis Houssin
b0e0c9d17e FIX wrong extrafield template in create mode (#35241) (#35470) 2025-09-24 17:00:31 +02:00
Dylan Bourdere
22bd69f9fe FIX: Remove perms to access commerce tab when the only active permission is fournisseur:lire (#35467) 2025-09-24 16:11:51 +02:00
ldestailleur
db5f33442a Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-09-24 15:25:33 +02:00
ldestailleur
84ba1852aa Another try to have autoassignement on v18 2025-09-24 15:25:15 +02:00
Regis Houssin
161d0e4fdf FIX missing entity filter (#35461) 2025-09-24 10:38:16 +02:00
John BOTELLA
cd69b8deb1 Fix history tooltip display (#35464) 2025-09-24 10:37:53 +02:00
Jean Traullé
5432834836 FIX #35425 (#35426)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-23 23:26:25 +02:00
Dylan Bourdere
59ec1a2811 fix ui on multi line subtotal & fix text contrast (#35449)
* fix ui on multi line subtotal & fix text contrast

* extract subtotal pdf logic

* phpcs

* lint

* lint

* refactor

* phpcs

* phpcs

* phpcs

* Update pdf.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-23 23:24:37 +02:00
ldestailleur
35f6a98665 Fix CI 2025-09-23 22:00:54 +02:00
ldestailleur
5879968e60 Clean code 2025-09-23 18:15:40 +02:00
ldestailleur
6ead2839d0 Fix missing several test on permission on actions 2025-09-23 16:41:53 +02:00
ldestailleur
bf006a28be Fix permission to cancel 2025-09-23 13:47:33 +02:00
ldestailleur
f045761826 Fix missing trans 2025-09-23 13:04:42 +02:00
ldestailleur
7ced36c991 Fix delete of holiday 2025-09-23 12:37:57 +02:00
ldestailleur
6bae5b2538 Avoid fatal error 2025-09-23 10:37:53 +02:00
Dylan Bourdere
65a3b0893d fix undefined properties (#35435) 2025-09-22 20:31:50 +02:00
Dylan Bourdere
669c939bcd use getDolGlobalString to avoid getting undefined property (#35436) 2025-09-22 20:30:47 +02:00
John BOTELLA
f135c22cd1 Fix tootltip (#35441) 2025-09-22 20:28:04 +02:00
ldestailleur
fdb1564e18 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-22 13:41:11 +02:00
ldestailleur
b8353936b6 Fix column setup 2025-09-22 13:40:59 +02:00
Dylan Bourdere
92454d671f rename tab name in comment of modulebuilder (#35431) 2025-09-22 12:11:32 +02:00
Frédéric FRANCE
0dde113a71 fix CI v22 (#35430) 2025-09-22 11:55:36 +02:00
ldestailleur
838e6efd5f Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-22 09:56:59 +02:00
ldestailleur
83f1825b63 Fix avoid fatal error 2025-09-22 09:56:32 +02:00
Laurent Destailleur
a2640829ca Better sanitization of url and email 2025-09-22 02:38:48 +02:00
Frédéric FRANCE
b8cda55d26 fix bad test (#35418) 2025-09-21 12:13:09 +02:00
Frédéric FRANCE
1d56ed09f4 fix doc (#35416)
* fix doc

* Update commonobject.class.php

* Update mo.class.php
2025-09-21 12:12:37 +02:00
Frédéric FRANCE
4e7954b85c fix CI v19 (#35414) 2025-09-21 12:10:43 +02:00
Frédéric FRANCE
41e914f9ac fix CI v19 (#35413)
* fix CI v19

* Update ProductCombination.class.php

* Update combinations.php

* Update combinations.php

* Update actions_massactions.inc.php
2025-09-20 18:37:01 +02:00
ldestailleur
ca878b2d76 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-20 16:19:57 +02:00
ldestailleur
048b0f98e6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-20 16:15:15 +02:00
ldestailleur
37c119d51d Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-09-20 16:11:36 +02:00
ldestailleur
5614def20b Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-09-20 16:06:08 +02:00
ldestailleur
f33fe1036f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-09-20 16:05:06 +02:00
Frédéric FRANCE
f43f2909ff rule is deprecated (#35410) 2025-09-20 16:02:39 +02:00
PsyCrow
3a8f36d185 FIX: #35407 After updating to version 22, local taxes were no longer applied (#35408)
FIX: #35407
$tva_tx could be string so should not be casted to float
2025-09-20 16:02:20 +02:00
Frédéric FRANCE
74596bbdc2 fix Objectlink api (#35402)
* fix objectlink api

* fix objectlink api

* fix objectlink api

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-20 00:27:11 +02:00
Frédéric FRANCE
6a8d983f34 clean code for v20 - fix pre-commit (#35397)
* clean code

* Update ruleset.xml

* Update CMailFile.class.php
2025-09-19 23:36:53 +02:00
ldestailleur
977f552d8b Fix warning and missing unit of delay 2025-09-19 16:19:06 +02:00
ldestailleur
7658c08f01 Fix class not found on smartphone 2025-09-19 15:46:37 +02:00
ldestailleur
d9d6192eaf Fix css 2025-09-19 15:43:29 +02:00
ldestailleur
65336ae956 FIX vat detection when country of buyer is unknown. 2025-09-19 13:43:07 +02:00
ldestailleur
00095c904d FIX vat detection when country of buyer is unknown. 2025-09-19 13:25:33 +02:00
ldestailleur
63c8857be7 FIX vat detection when country of buyer is unknown. 2025-09-19 13:23:46 +02:00
ldestailleur
02d485ce4b FIX can't reset intracomm transport mode 2025-09-19 12:21:21 +02:00
ldestailleur
074e249e48 FIX Can't edit tags of a user. 2025-09-18 22:13:53 +02:00
ldestailleur
134243550b Try to restore options for stock inc/dev like in v21 2025-09-18 21:49:09 +02:00
ldestailleur
e9bd32e66c FIX can't save setup of odt template for stock 2025-09-18 20:35:09 +02:00
ldestailleur
f87fc4d9e3 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-18 19:49:45 +02:00
ldestailleur
8f4d36c1e8 Fix bad text for tooltip on stock increase/decrease option 2025-09-18 19:49:22 +02:00
HENRY Florian
9af7b44714 fix: display seleted log level if warning (#35377) 2025-09-18 11:23:45 +02:00
Regis Houssin
fc8b0a80c0 FIX missing check constant PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS (#33277)
* FIX missing check constant PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS

* use getDolGlobalString

like eldy suggest

* use getDolGlobalString

* Use getDolGlobalString

* use getDolGlobalString

* Use getDolGlobalString

---------

Co-authored-by: Eric - CAP-REL <1468823+rycks@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-18 11:22:36 +02:00
Eric - CAP-REL
4adc4a31e2 Merge pull request #35262 from SylvainLegrand/Fix_rights_for_user_creer
Fix rights for bank tab on user card
2025-09-18 09:31:22 +02:00
ldestailleur
6df2e2d236 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-17 18:28:29 +02:00
ldestailleur
7e93fe7a5c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-17 18:28:18 +02:00
ldestailleur
09eefb5031 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-17 18:26:27 +02:00
ldestailleur
c0c1ef276f Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-09-17 18:26:07 +02:00
ldestailleur
3fc6410b5f Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-09-17 18:24:24 +02:00
ldestailleur
70f6a23e6f Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-09-17 18:24:17 +02:00
ldestailleur
8c6ecd1144 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-09-17 18:23:37 +02:00
Francis Appels
7920cf8596 Fix option SERVICE_ARE_ECOMMERCE_200238EC (#35372) 2025-09-17 18:19:52 +02:00
HENRY Florian
bf5a0c9ce7 fix: php 8 warning (#35363)
* fix: php 8 warning

* fix: php 8 warning

* fix: php 8 warning

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-17 18:16:48 +02:00
ldestailleur
ea00719449 Fix default sort order in bom list 2025-09-17 15:55:33 +02:00
Bahfir Abbes
ce46611031 Fix:prevent handling update action by generic include of actions_addupdatedelete.inc.php (#35369)
* Fix:prevent handling update action by  generic include of actions_addupdatedelete.inc.php

Fix:
To prevent handling update action by generic post update action in inventories at /core/actions_addupdatedelete.inc.php, we need to unset $action variable, otherwise $object fileds are filled with with empty values.

* Update inventory.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-17 15:11:34 +02:00
Frédéric FRANCE
69c65c5f4d fix CI v22 (#35370)
* fix CI v22

* Update cron_run_jobs.php

* Update files.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-17 14:47:51 +02:00
Charlène Benke
c5451242e7 Add default values for database configuration (#35366)
warning error yet correct on old version
2025-09-17 14:46:32 +02:00
ldestailleur
86ceb63f91 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-17 14:45:11 +02:00
ldestailleur
0b7acfae9b Fix CI 2025-09-17 14:45:02 +02:00
John BOTELLA
776b9422e4 Fix WAF alert ModSecurity: Access denied with code 403 (phase 4). (#35360) 2025-09-17 14:20:33 +02:00
ldestailleur
549cb48e8f Fix sort first on entity then on priority 2025-09-17 13:17:25 +02:00
ldestailleur
27b38e3194 Fix title 2025-09-17 12:58:19 +02:00
ldestailleur
ee39ef632a FIX Generation of member cards (file not found and substitution broken) 2025-09-17 12:38:20 +02:00
ldestailleur
99efb68f79 Fix tab name 2025-09-16 12:58:49 +02:00
ldestailleur
910443eccb Fix hook doAction in contact tab 2025-09-16 12:37:39 +02:00
ldestailleur
568b47cb4a Clean code 2025-09-16 12:33:04 +02:00
ldestailleur
433793aff0 Fix hook name 2025-09-16 12:27:08 +02:00
ldestailleur
872cb213bf Fix name of tab 2025-09-16 12:21:33 +02:00
Laurent Destailleur
d4f39889f5 FIX #34678 2025-09-16 02:44:02 +02:00
Laurent Destailleur
e89421068d Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-16 02:25:00 +02:00
Laurent Destailleur
f39fde3f43 Fix corrupted type of vat -1. 2025-09-16 02:24:28 +02:00
Laurent Destailleur
349930ff03 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-09-16 00:24:10 +02:00
Laurent Destailleur
0625eef99a Fix conditions on module missing 2025-09-16 00:21:29 +02:00
ldestailleur
c3cb5e1c12 Fix css 2025-09-15 18:09:52 +02:00
ldestailleur
bae2a91727 Fix css 2025-09-15 16:08:06 +02:00
ldestailleur
60f0813520 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-12 23:05:15 +02:00
ldestailleur
20c189b55c Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-12 19:28:03 +02:00
ldestailleur
70d5454bfb Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-09-12 19:27:04 +02:00
ldestailleur
a54c5fcdcb Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-09-12 19:26:28 +02:00
Vincent Maury
e541438b7e Fix bug #35330 (#35331)
in table header, instead of extrafield filters, this message appears
ERROR : selectForForms: Error bad setup of field objectdescorig=
2025-09-12 18:57:44 +02:00
Florian Mortgat
60f089c015 FIX 17.0: ContratLigne::fetch() returns 1 even if the line doesn't exist (#35324) 2025-09-12 15:19:20 +02:00
Frédéric FRANCE
4414bf3b95 fix fatal error (#35284)
* fix fatal error

* Update card.php

* Update product.class.php
2025-09-12 02:34:50 +02:00
Fabian Volkers
a0fc45d523 🐛 Use reception email templates for receptions (#35310) 2025-09-12 02:30:59 +02:00
Laurent Destailleur
8e689c1479 Complete #35313 2025-09-12 02:26:21 +02:00
Eric - CAP-REL
8efe6d477e exclude escpos-php/doc from filelist_xml (#35313) 2025-09-12 02:15:56 +02:00
ldestailleur
e3de2dddb7 Fix spellcheck 2025-09-11 16:43:59 +02:00
ldestailleur
70768832c5 FIX Edit of email in emailing. Property messtype not set. 2025-09-11 16:40:54 +02:00
ldestailleur
d69e0b4a5d Fix size of popup 2025-09-11 15:10:29 +02:00
Eric - CAP-REL
870c2a8f50 Prepare 18.0.8 (#35299)
* Prepare 18.0.8

* Update filefunc.inc.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-11 12:21:33 +02:00
HENRY Florian
214ab20b76 fix: with PRODUCT_USE_UNIT preset the unit in document (#35288) 2025-09-11 12:13:46 +02:00
HENRY Florian
644a9ea179 fix: Filter event in agenda par Type (#35287)
* fix filter event per Type

* fix filter event per Type

* fix: php code sniffer

* fix: php code sniffer

* fix: php code sniffer

* fix: php code sniffer
2025-09-11 12:09:33 +02:00
Frédéric FRANCE
f4fe07b98a delete ecmfiles entry when deleting image (#35289) 2025-09-11 12:08:09 +02:00
ldestailleur
fa59daea62 Fix spellcheck 2025-09-10 19:23:24 +02:00
ldestailleur
ab6fbf253d Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-10 17:40:56 +02:00
ldestailleur
3b6b7fec5a Tooltip to help debug vat pb 2025-09-10 17:40:46 +02:00
ldestailleur
9c296c8d81 Fix object 2025-09-10 16:48:23 +02:00
ldestailleur
c2257b0d28 Show info to help debug 2025-09-10 16:47:31 +02:00
ldestailleur
df1262ace5 Show info to help debug 2025-09-10 16:43:18 +02:00
ldestailleur
8f0d2b1f7b Fix missing __THIRDPARTY_URL__ 2025-09-10 12:59:01 +02:00
VIAL-GOUTEYRON Quentin
eb3d752047 Fix (ecm): support for custom entity in file operations (#35283)
* fix(ecm): add support for custom entity in file operations

This commit addresses missing support for specifying custom `entity` values during file operations, ensuring proper handling of multi-entity configurations. Changes include:

- Adding an `entity` parameter to the `fetch` method of `EcmFiles` and ensuring proper filtering based on the provided entity.
- Modifying `dol_move`, `deleteFilesIntoDatabaseIndex`, and other file-related functions to support the `entity` parameter.
- Ensuring entity propagation in operations like file indexing, renaming, and deletion.

This resolves issues where operations were limited to the default entity value (`$conf->entity`), improving flexibility and correctness in multi-entity setups.

* fix(ecm): improve code formatting for entity checks

Ensure consistent coding style for entity-related conditions across file operations by adding spacing around `empty()` calls.

This improves code readability and maintains uniformity in the handling of multi-entity configurations within the `EcmFiles` class and related modules.

* fix(ecm): cast entity to int in SQL queries

Ensure `entity` values are explicitly cast to integers in SQL conditions, improving type safety and preventing potential SQL injection vulnerabilities.

This change applies consistent casting in multiple entity-related checks within the `EcmFiles` class to enhance code security and reliability.
2025-09-10 10:59:09 +02:00
John BOTELLA
601d1b986e Fix : sql filter for batch stats (#35272)
* Fix : sql filter for batch stats

* Fix : sql filter for batch stats

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-10 10:51:31 +02:00
atm-lucas
7d898184b5 Modify condition display button (#35257) 2025-09-09 19:30:14 +02:00
Alexandre SPANGARO
b03c12c129 FIX Societe - Problem of date on outstanding opened late (#35266) 2025-09-09 19:25:09 +02:00
ldestailleur
133bf410c0 Fix css 2025-09-09 13:47:53 +02:00
ldestailleur
ff20572c72 Fix CSS 2025-09-09 13:42:02 +02:00
Sylvain Legrand
bba84133e7 Update bank.php 2025-09-09 07:00:19 +03:00
ldestailleur
d1e4d393ce Fix trans 2025-09-09 01:47:16 +02:00
ldestailleur
824fd01a1f Doc 2025-09-09 01:40:32 +02:00
ldestailleur
0def25c38f css 2025-09-09 01:22:30 +02:00
ldestailleur
90fb029050 FIX invoice not set to closed when we add a credit note to close it 2025-09-08 15:25:22 +02:00
ldestailleur
1458e963ab Trans 2025-09-07 18:50:46 +02:00
Laurent Destailleur
16c019532f Fix insert 2025-09-06 01:34:05 +02:00
Laurent Destailleur
e45299b891 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-06 01:26:19 +02:00
Laurent Destailleur
9f12de428c Fix insert 2025-09-06 01:25:49 +02:00
ldestailleur
f160e23918 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-05 17:23:25 +02:00
ldestailleur
eca129a433 FIX Date planned of delivery is not propagated from order to shipment
when creating a new shipment from an order.
2025-09-05 16:27:06 +02:00
ldestailleur
0140d1e7cb Clean SQL 2025-09-05 16:18:06 +02:00
ldestailleur
2489a922d5 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-05 15:34:28 +02:00
ldestailleur
6c0873708a Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-05 15:34:13 +02:00
ldestailleur
17b1c5aa9d Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-05 15:14:09 +02:00
ldestailleur
80eb325a91 Trans 2025-09-05 15:13:37 +02:00
ldestailleur
8317030809 Fix label 2025-09-05 15:08:28 +02:00
HENRY Florian
a69bd1ba56 fix: divided by zero with customer packaging (#35224)
* fix: divided by zero with customer packaging

* fix: divided by zero with customer packaging

* fix: divided by zero with customer packaging

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-05 12:01:26 +02:00
HENRY Florian
5ba8c69e63 FIX: allow to create First Sutuation Invoice (#35228)
* FIX: allow to create First Sutuation Invoice

* Update card.php

* FIX: allow to create First Sutuation Invoice

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-05 12:00:59 +02:00
HENRY Florian
63a1d58e2a FIX: save the packaging qty on update buying price (#35234)
* FIX: save the packaging qty on update buying price

* FIX: save the packaging qty on update buying price
2025-09-05 12:00:13 +02:00
ldestailleur
c2ed4519b1 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-09-05 11:38:30 +02:00
Frédéric FRANCE
bcbcf30959 fix CI v22 (#35227)
* fix CI v22

* Update time.php

* Update card.php

* Update card.php

* Update card.php

* Update card.php

* Update card.php

* Update card.php

* Update card.php

* Update card.php
2025-09-04 20:58:40 +02:00
ldestailleur
91664a34db Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-09-04 20:47:24 +02:00
ldestailleur
781adf507b Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-09-04 20:47:13 +02:00
ldestailleur
e63ab139cc Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-04 17:57:38 +02:00
Vincent Maury
50f39de966 Fix 24338 In expense report list, all expense reports are a warning icon (#35225)
Co-authored-by: vmaury <vmaury@vmaury-Lafite-Pro-16-AMD>
2025-09-04 17:57:08 +02:00
ldestailleur
bdf62918e5 Fix label of tooltip not complete 2025-09-04 17:55:09 +02:00
ldestailleur
f82283a22e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-04 17:32:04 +02:00
Pratush Raj
dd05531744 #35216 (#35217)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-04 16:44:41 +02:00
ldestailleur
5832cfc198 Fix CI 2025-09-04 15:36:54 +02:00
ldestailleur
d0a4541b28 Fix CI 2025-09-04 15:00:47 +02:00
ThomasNgr-OpenDSI
01aa901f93 18.0 fix CVE 2024 40137 (#34762)
* Sec: Remove all functions that accept callable params - CVE-2024-40137

* FIX #34746 - More complete fix for CVE-2024-40137

---------

Co-authored-by: ldestailleur <eldy@destailleur.fr>
2025-09-04 14:59:44 +02:00
ldestailleur
d33682e9b4 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-04 14:37:49 +02:00
ldestailleur
72a24de948 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-04 14:36:11 +02:00
ldestailleur
cf536abe2e Fix warning 2025-09-04 14:35:44 +02:00
ldestailleur
9e2e6eea92 Fix warning 2025-09-04 14:35:02 +02:00
VIAL-GOUTEYRON Quentin
75ee26c3ed Add HRM module support in dol_check_secure_access_document() function to manage file access rights. (#35218)
* Add HRM module support in `dol_check_secure_access_document()` function to manage file access rights.

* fix space

* Update files.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-04 14:26:42 +02:00
ldestailleur
83f27af4c7 Fix CI 2025-09-04 14:19:56 +02:00
ldestailleur
96a74c4976 Disable this test where result is not predicable 2025-09-04 14:13:13 +02:00
ldestailleur
25e761bfa5 Avoid phpstan error 2025-09-04 14:08:11 +02:00
ldestailleur
8089334670 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-04 14:01:27 +02:00
ldestailleur
05f3111134 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-04 13:51:56 +02:00
ldestailleur
5ae358d5b5 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-09-04 13:49:07 +02:00
ldestailleur
258fe1124b Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-09-04 13:38:03 +02:00
kkhelifa-opendsi
a69ba88857 FIX: Correct the calculation of the amount of the current period between the period provided (#35083) 2025-09-04 13:27:49 +02:00
bohdanpotuzhnyi
c6b62915f6 support RFC5789 (patch) (#35213) 2025-09-04 13:26:47 +02:00
Sylvain Legrand
b05be5e1df Fix discount applied 2 times on contract (#35219)
on update line the discount was apply 2 times !
no problem on insert line.

Already solved on v22
2025-09-04 12:01:26 +02:00
ldestailleur
a165bf56ad Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-03 19:23:09 +02:00
ldestailleur
6cb1eaef92 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-03 19:22:53 +02:00
ldestailleur
68e239efe4 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-03 19:21:14 +02:00
ldestailleur
0d599fae44 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-09-03 19:20:05 +02:00
ldestailleur
e3abe90ee0 FIX Restore decimal quantity for stock correction/transfer 2025-09-03 19:19:49 +02:00
kkhelifa-opendsi
247c38923f FIX: Add security test for show terminal selection if no terminal selected when invoice.php is call (#34717)
* FIX: Add security test for show terminal selection if no terminal selected when invoice.php is call

* Modification to take into account the value saved in the cookie

* Update invoice.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-03 16:36:18 +02:00
Benjamin Chanudet
355021adb8 FIX #35181 Cancelled purchase orders now shown as such in Project Overview (#35186)
* exclude "cancelled" purchase orders from total

* show cancelled purchase order as cancelled

* show cancelled order by default, as the visibility button is "cancelled shown" by default
2025-09-03 14:51:50 +02:00
ldestailleur
c2cd2bcaf9 Fix warning 2025-09-03 14:41:23 +02:00
boudet jean pascal
9a0e0a53b1 fix bug div added without value (#35178)
Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-03 00:04:54 +02:00
ldestailleur
0d70325cc5 Fix CI warning 2025-09-02 23:58:47 +02:00
ldestailleur
3385a09dab FIX color of late warning for nb of bank account reconciliation lines 2025-09-02 23:40:18 +02:00
ldestailleur
4ae58db7c0 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-02 23:21:20 +02:00
ldestailleur
3a97767b62 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-02 23:21:09 +02:00
ldestailleur
9dacc2cad1 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-02 23:19:02 +02:00
ldestailleur
4123e70f0f FIX #35142 FIX #35143 2025-09-02 23:18:51 +02:00
atm-jonathan
99195bf935 Fix load extrafields list task (#35135)
* load extrafieds task

* load extrafieds task

* restore commentaire

---------

Co-authored-by: Jonathan <x@x.x>
2025-09-02 22:56:39 +02:00
Frédéric FRANCE
ab1e5c403f fix CI v22 (#35173) 2025-09-02 22:51:49 +02:00
ldestailleur
4030a7141f Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-02 22:48:53 +02:00
ldestailleur
e415fb7efa Fix CI 2025-09-02 22:48:34 +02:00
ldestailleur
3696a543e7 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-02 22:37:29 +02:00
ldestailleur
5a8aff9e79 Sec: Update doc to trigger alert of vulnerability fix in commit
bb0974add9
2025-09-02 22:37:08 +02:00
ldestailleur
0350e2687c FIX fallback of "from" email when sending email in member module 2025-09-02 13:47:01 +02:00
ldestailleur
5e38d0134e Trans 2025-09-02 12:51:51 +02:00
ldestailleur
dc00877d94 Fix position in changelog 2025-09-02 12:08:27 +02:00
ldestailleur
ee38ff0aaf Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-02 12:02:40 +02:00
ldestailleur
55d177883f Doc 2025-09-02 12:00:46 +02:00
ldestailleur
557e830aae Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-02 11:58:45 +02:00
ldestailleur
a1b99da514 Prepare 21.0.4 2025-09-02 11:58:35 +02:00
ldestailleur
0315ad9381 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-02 03:52:35 +02:00
ldestailleur
6727d0c361 FIX we saw links to object on private not just after a save. 2025-09-02 03:51:08 +02:00
Benjamin Chanudet
53aae1a4b8 FIX #35147 SQL Error on Beluga Export when ExpenseReport is enabled (#35149)
* Fix SQL error when ExpenseReport module is enabled (#35147)

* fix date filtering that prevents data to be displayed

* add date and amount for expense reports

* Update pdf_beluga.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-01 20:33:12 +02:00
lvessiller-opendsi
e818bf732d FIX extra field list depend on parent list when editing a card (#35165) 2025-09-01 19:55:00 +02:00
lvessiller-opendsi
2d55195982 FIX missing quick edit for extrafields (baclport commit 4fc66c6) (#35160) 2025-09-01 19:50:48 +02:00
Sébastien NASSIET
3a27b44f95 FIX #35154 - Massaction createbills in reception list don't mind about order and/or thirdparty currency (#35156)
* FIX#35154

Massaction createbills in reception list don't mind about order and/or thirdparty currency

* FIX#35154

* FIX#35154

* Delete white space line 406

* Correcting typing error
2025-09-01 19:49:50 +02:00
sonikf
b1fe717d1a fix #34872 (#35150)
* Remove fk_product check brakes addition of free product lines

* Handle potential null for detail_children array
2025-09-01 19:31:39 +02:00
ldestailleur
dd09cb5f69 Fix CI 2025-09-01 19:29:28 +02:00
Alexandre SPANGARO
5788438864 FIX Missing sentence part (#35144) 2025-09-01 19:21:22 +02:00
ldestailleur
4e89f046d1 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-01 16:47:39 +02:00
ldestailleur
bb0974add9 FIX Security when using feature Advanced Target of emailing (hidden in
v21, default in v22+). Possible SQL injection by users with permissions
to make mass emailing. Reported by Simon Perdrisat.
2025-09-01 16:38:01 +02:00
ldestailleur
1e98b14a75 FIX default doc template on supplier proposal 2025-09-01 12:12:48 +02:00
ldestailleur
9be9f6d0e6 FIX changin status on proposal need a refresh of page to be visible 2025-09-01 12:07:01 +02:00
ldestailleur
399ad121eb Fix default order in list of supplier proposals 2025-09-01 11:35:37 +02:00
ldestailleur
e9879b2b10 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-01 11:10:54 +02:00
ldestailleur
c1fb41e5d9 FIX setup of default doc template for supplier proposal when none. 2025-09-01 11:10:36 +02:00
Regis Houssin
2840ebeedf FIX wrong country code (#35152) 2025-08-31 11:53:35 +02:00
Romain
6d441f89a4 FIX: #33911 active services are reported as expired on the homepage (#35125) 2025-08-30 15:49:25 +02:00
ldestailleur
6e3de32c36 FIX error when using a code too large in dictionary 2025-08-29 17:44:18 +02:00
ldestailleur
83dcc8fb54 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-28 23:04:49 +02:00
ldestailleur
5abb379f63 Fix message 2025-08-28 23:03:39 +02:00
ldestailleur
6a4c7398a7 Fix message 2025-08-28 23:02:35 +02:00
William Mead
83898f9454 Fixed intervention line duration add (#35117) 2025-08-28 17:29:04 +02:00
ldestailleur
088856ad50 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-28 16:40:14 +02:00
ldestailleur
c91f5caac4 Prepare 21.0.3 2025-08-28 16:37:13 +02:00
ldestailleur
8631c1722f FIX #35115 2025-08-28 15:20:59 +02:00
ldestailleur
f7a3d295cc Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-08-28 14:04:47 +02:00
ldestailleur
8c582358f4 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-28 14:01:41 +02:00
ldestailleur
c1d76182b8 FIX #34981 2025-08-28 14:01:16 +02:00
Alexandre SPANGARO
c120446561 FIX Treasury accountancy - Accounting errors for members (#35097)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-08-28 04:03:58 +02:00
Sylvain Legrand
4f684df12f Fix supplier invoice API (#35100)
* Fix supplier invoice API

We can't modify mode_reglement_id from API on supplier invoice !

* Update fournisseur.facture.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-08-28 03:05:05 +02:00
Laurent Destailleur
883686f5f9 CSS 2025-08-28 03:01:45 +02:00
lvessiller-opendsi
adbbf9e3b2 FIX set global mysoc and load langs in API access (#35041)
* FIX set global mysoc and load langs in API access

* FIX reset mysoc and langs only if entity of API has changed
2025-08-28 02:50:38 +02:00
Laurent Destailleur
35bfe71b79 FIX #35098 2025-08-28 02:37:27 +02:00
ldestailleur
13e24a7097 Fix css 2025-08-27 21:06:23 +02:00
ldestailleur
f5ec334c30 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-27 20:58:49 +02:00
ldestailleur
1938bbf63b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-08-27 19:30:16 +02:00
ldestailleur
5fe7b972c7 Update changelog 2025-08-27 19:30:05 +02:00
Marc de Lima Lucio
1f29c7758c FIX: accountancy general ledger: bad handling of hook return (#34029)
* FIX: accountancy general ledger: bad handling of hook return

* FIX: accountancy balance: bad handling of hook return
2025-08-27 11:30:26 +02:00
kkhelifa-opendsi
07512d1dad FIX - Fix missing token for disable custom group category for compta report (page /htdocs/accountancy/admin/categories_list.php) (#35084) 2025-08-27 03:06:19 +02:00
ldestailleur
d8c2e61e43 Fix error on captcha when function GD does not exists 2025-08-27 02:50:11 +02:00
ldestailleur
7deaf2db94 Label 2025-08-27 01:42:18 +02:00
ldestailleur
8179a02221 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-27 01:39:33 +02:00
ldestailleur
5f2fd17f62 Fix hide info 2025-08-27 01:39:15 +02:00
Laurent Destailleur
0af854e355 Log 2025-08-26 05:46:26 +02:00
Laurent Destailleur
ca835cb92d Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-26 05:21:20 +02:00
Laurent Destailleur
0d58e1ce05 Fix CSS 2025-08-26 05:20:31 +02:00
Benjamin Chanudet
d81f8e539d FIX #34857 Structured communication number checksum is now always correct (#35081)
* FIX #34857 Structured communication number now works correctly

* make sure we follow Dolibarr code chart

* fix last CI warning
2025-08-26 05:16:32 +02:00
Pichinov-Jose
21b194999f FIX Update card_group.php : missing letter in Fistname (#35077) 2025-08-26 05:03:34 +02:00
Laurent Destailleur
e610c7ed06 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-26 04:25:00 +02:00
Laurent Destailleur
4d6b05954d Try fix #35080 2025-08-26 04:24:32 +02:00
ldestailleur
40e014d487 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-25 21:53:13 +02:00
ldestailleur
0f036f4f6e Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-08-25 21:52:43 +02:00
ldestailleur
f710eaa2a4 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-08-25 21:51:28 +02:00
ldestailleur
edf07d40b3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-08-25 21:51:10 +02:00
ldestailleur
7c30968ed1 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-24 22:16:14 +02:00
ldestailleur
a21e896dbe Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-08-24 22:10:12 +02:00
ldestailleur
36a69fdfe3 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-08-24 22:09:41 +02:00
ldestailleur
583c4b3270 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-08-24 22:09:30 +02:00
ldestailleur
381c6fbecf Fix CI 2025-08-24 22:05:46 +02:00
ldestailleur
e6255edc26 Fix warning 2025-08-24 21:50:41 +02:00
Charlène Benke
4ed8630c3f Change permission checks from 'expensereport' to 'holiday' (#35062)
error on class holiday
2025-08-24 20:23:11 +02:00
ldestailleur
4c0972ef26 FIX link to stripe dashboard in stripe payment 2025-08-24 16:44:10 +02:00
ldestailleur
00881030a3 FIX link to stripe dashboard in stripe payment 2025-08-24 16:44:05 +02:00
Regis Houssin
672cd7e263 FIX #35053 (#35054)
* FIX #35053

* FIX avoid php warning
2025-08-22 22:35:21 +02:00
Regis Houssin
595582b1d0 FIX user socid is fk_soc (#35046) 2025-08-22 22:33:08 +02:00
ldestailleur
8ac72c7435 Fix move dir 2025-08-22 16:29:26 +02:00
ldestailleur
9fbd0b33d3 Label of column 2025-08-22 16:21:54 +02:00
ldestailleur
c1affb4e43 Fix apstats 2025-08-22 16:10:38 +02:00
ldestailleur
b9a2c81bfe Removed useless exclude 2025-08-22 15:31:11 +02:00
ldestailleur
7c756a35b3 Note 2025-08-22 14:59:15 +02:00
ldestailleur
377d240415 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-22 05:22:10 +02:00
ldestailleur
ed9b2fcabc Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-08-22 05:21:05 +02:00
ldestailleur
dd8d243fda Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-08-22 05:20:57 +02:00
Benjamin Chanudet
a8d4067af2 FIX #35011 Computed extrafield on tasks list now display correct values (#35038)
The functions assigns value to `$obj` on line 976, but doesn't assign value to `$object`, that is then assigned to `$objectoffield` in line 75 of `extrafields_list_print_fields.tpl.php`. Also `$objectoffield` is the recommended value to use for computed extrafields, according to the docs.
But assigning `$object` is not enough, because `$objectoffield` at this moment is not grabbed from the global scope, so the value stays local and `dol_eval()` doesn't find it. So it also needs to grab the variable from the global scope to affect it correctly.
The changed function, `projectLinesa()` is called only twice in the project: by itself recursively to go through all subtasks, and on the page where I detected the bug initially, `tasks.php`, so the impact should be minimal.
2025-08-22 05:18:25 +02:00
Laurent Destailleur
28fe94b6a1 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-22 03:10:56 +02:00
Laurent Destailleur
5d7381e156 Fix CSS 2025-08-22 03:10:07 +02:00
hermans
c929bf5964 Update some ID Language translation (#35021)
Co-authored-by: hermans <hermans@users.noreply.github.com>
2025-08-21 23:28:53 +02:00
Frédéric FRANCE
f626e4e85f fix Undefined variable $outputlangs (#35029) 2025-08-21 15:52:41 +02:00
Frédéric FRANCE
1a5e41c917 fix resource agenda (#35028)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-08-21 15:46:17 +02:00
ldestailleur
44ca0a7aff Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-21 15:40:32 +02:00
ldestailleur
165272d0e1 Fix CI 2025-08-21 15:39:06 +02:00
ldestailleur
c389d40148 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-21 15:06:56 +02:00
ldestailleur
9fc2382d23 FIX bad test making blank page 2025-08-21 15:03:09 +02:00
ldestailleur
de3597394c Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-21 11:09:22 +02:00
ldestailleur
dd0679db44 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-21 11:09:10 +02:00
ldestailleur
7878d81e33 FIX #34986 2025-08-21 11:02:48 +02:00
Frédéric FRANCE
1a9d42d49c fix agenda with AGENDA_ALL_CALENDARS (#35020) 2025-08-21 09:43:16 +02:00
Laurent Destailleur
ab3642d8fb Fix test 2025-08-21 00:03:02 +02:00
ldestailleur
23fe2c7f47 FIX Option low memory mode in backup was broken 2025-08-20 20:11:45 +02:00
ldestailleur
efcd392bb8 FIX Option low memory mode in backup was broken 2025-08-20 20:11:33 +02:00
ldestailleur
ac1ad4e904 CSS 2025-08-20 19:45:41 +02:00
ldestailleur
770cc4c1ff Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-20 19:43:21 +02:00
ldestailleur
4e90457cd6 CSS 2025-08-20 19:43:08 +02:00
lvessiller-opendsi
3362a6b06d FIX The combo of custom groups has disappeared (backport v19) (#35016) 2025-08-20 19:03:18 +02:00
Frédéric FRANCE
751dfd561e fix parameters (#35012) 2025-08-20 18:56:14 +02:00
ldestailleur
fe0acbe6e6 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-20 18:50:14 +02:00
ldestailleur
dabc704ba6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-20 18:50:07 +02:00
ldestailleur
c33a72a4d7 Trans 2025-08-20 18:49:27 +02:00
ldestailleur
7cdb8a230f CSS 2025-08-20 18:44:26 +02:00
ldestailleur
30a47b174c Fix trans 2025-08-20 18:25:04 +02:00
ldestailleur
514c4ca72b Duplicate help 2025-08-20 17:59:50 +02:00
ldestailleur
9b365c97b8 Fix when help is shown 2025-08-20 17:57:08 +02:00
ldestailleur
79d933c2e7 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-20 17:51:31 +02:00
ldestailleur
70bbb36d22 Fix trans 2025-08-20 17:51:02 +02:00
ldestailleur
0512428c53 Help missing 2025-08-20 17:47:24 +02:00
ldestailleur
23acc5ad7c Fix spellcheck 2025-08-20 17:36:37 +02:00
ldestailleur
dea330b52d FIX ##35005 FIX #35006 SQL error when using external user 2025-08-20 17:14:03 +02:00
ldestailleur
924204ac29 LEFT JOIN syntax 2025-08-20 17:09:43 +02:00
ldestailleur
ec1658b95a FIX #35008 2025-08-20 17:04:25 +02:00
ldestailleur
cd43d46006 Prepare 22.0.1 2025-08-20 16:58:11 +02:00
ldestailleur
2944e19391 Prepare 22.0.1 2025-08-20 16:54:41 +02:00
ldestailleur
45cff5ad90 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-20 16:51:39 +02:00
ldestailleur
263626b2fd Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-20 16:51:05 +02:00
ldestailleur
e351f7bcd5 FIX a Fatal error when a trigger files is not correctly named. 2025-08-20 16:26:29 +02:00
ldestailleur
f722602402 Fix comparison on version to show the warning to upgrade database 2025-08-20 16:02:46 +02:00
ldestailleur
0d4df1e762 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-08-19 11:52:09 +02:00
ldestailleur
c34f3c07fd css 2025-08-19 11:51:53 +02:00
sonikf
8682fe81af fix typo (#34999) 2025-08-19 11:43:47 +02:00
hermans
63924e2f94 Fix facture haader title on dolibar-21 (#34993)
* Fix facture haader title on dolibar-21

* fix error - No space found after comma in argument list

---------

Co-authored-by: hermans <hermans@users.noreply.github.com>
2025-08-19 11:41:03 +02:00
ldestailleur
9c9e5de7c8 FIX trigger mailmanspip when un/linking categories 2025-08-17 03:45:18 +02:00
ldestailleur
677e5a7cb9 Fix css and missing replyto into the banner 2025-08-16 21:59:41 +02:00
ldestailleur
f2e5ce6bf5 Trans 2025-08-16 21:13:42 +02:00
ldestailleur
3a6b0f5853 css 2025-08-16 21:10:29 +02:00
ldestailleur
e54ff79f42 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-15 17:35:04 +02:00
ldestailleur
cafd255b0c Fix warning 2025-08-15 17:34:54 +02:00
Francis Appels
765a576bae FIX: Create public ticket if email need exist. (#34965) 2025-08-15 17:30:09 +02:00
hermans
1fb37db6f6 Bug Fix for issue 34898, default warehause and obj->endbrowid not exist on receipt.class (#34959)
* bug fix for: https://github.com/Dolibarr/dolibarr/issues/34939

* Bug fix for: Dolibarr Issue #34939

* Revert "bug fix for: https://github.com/Dolibarr/dolibarr/issues/34939"

This reverts commit bd4c1ccc41.

* Revert "Bug fix for: Dolibarr Issue #34939"

This reverts commit 8e46f863b9.

* Bug fix for issue https://github.com/Dolibarr/dolibarr/issues/34898

* fix bug on reception setClosed: ->edbrowid is not exist

* Fix missing variable for obj->endbrowid in etDraft,valid,setClosed

* fix white space

* remove white space
2025-08-15 17:26:39 +02:00
ldestailleur
aee08051c8 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-15 15:54:35 +02:00
ldestailleur
d7b7149425 Fix trans 2025-08-15 15:48:41 +02:00
Frédéric FRANCE
90a45830a1 fix v22 (#34957)
* fix v22

* Update extrafields_view.tpl.php
2025-08-14 19:27:52 +02:00
HENRY Florian
e3953f684b fix: with MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS and multicompany image are not find on send mail (#34946) 2025-08-14 19:03:37 +02:00
ldestailleur
b1e99a9811 Fix bad return code 2025-08-14 17:33:44 +02:00
ldestailleur
feeaf19e6d Debug the signature feature (broken) for shipment 2025-08-14 16:24:53 +02:00
hermans
7f64095048 Bug fix on fourniseur commande kanban view (#34945)
* bug fix for: https://github.com/Dolibarr/dolibarr/issues/34939

* Bug fix for: Dolibarr Issue #34939

* Revert "bug fix for: https://github.com/Dolibarr/dolibarr/issues/34939"

This reverts commit bd4c1ccc41.

* Revert "Bug fix for: Dolibarr Issue #34939"

This reverts commit 8e46f863b9.
2025-08-14 13:52:32 +02:00
Francis Appels
90bc3d74e7 FIX mailing destination list title (#34929)
* Fix mailing destination list title

* Some more fix on checkbox column

* $conf->main_checkbox_left_column is available in V21.0.3

* Right selector has less option the left selector.

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-08-14 13:50:53 +02:00
Francis Appels
3c174ef95c Fix webportal search by date (#34934)
* Webportal fix search by date

* Webportal formlist - add sortList to parameters hook printFieldListTitle

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-08-14 01:49:49 +02:00
seyfcom
dec921a29f fix undefine $line with php 8.1 (#34938)
Co-authored-by: Audio Media Assist sarl <licences@a-m-a.ch>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-08-14 01:38:01 +02:00
ldestailleur
c337f5943b Fix translation files 2025-08-14 01:37:06 +02:00
ldestailleur
2c2f085b5c FIX #34936 2025-08-14 00:49:56 +02:00
Frédéric FRANCE
ccafcd6f91 fix CI v22 (#34935)
* fix CI v22

* Update admin.lang
2025-08-14 00:32:56 +02:00
ldestailleur
7c710a91d7 Sync transifex 2025-08-14 00:24:14 +02:00
ldestailleur
0804ebe08a Fix type 2025-08-14 00:14:04 +02:00
ldestailleur
300928b2c8 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-13 19:53:27 +02:00
ldestailleur
6d564c0e43 Fix use same encoding for all strings in email ack of payment. 2025-08-13 19:53:16 +02:00
ldestailleur
447f9f1ea6 Fix use same encoding for all strings in email ack of payment. 2025-08-13 19:51:27 +02:00
ldestailleur
b016944824 Fix status colors 2025-08-12 18:10:55 +02:00
ldestailleur
66e420bc9d FIX Can edit status of tasks 2025-08-12 18:01:34 +02:00
ldestailleur
7572a8966d Trans 2025-08-12 13:46:32 +02:00
ldestailleur
44a3d9d544 Sync transifex 2025-08-12 13:37:33 +02:00
ldestailleur
21a2e051bf Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-12 13:31:26 +02:00
ldestailleur
733cbff07a Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-12 13:31:21 +02:00
ldestailleur
e545d224db Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-08-12 13:29:33 +02:00
ldestailleur
a9c07569fb FIX Logo on company is no more visible. 2025-08-12 13:28:56 +02:00
ldestailleur
2fc3101388 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-08-12 04:14:12 +02:00
ldestailleur
1da6ead1e9 Try to FIX #34880 FIX #34910 differently because in higher version the
retained var is totalpaid and not sumpayed.
2025-08-12 04:14:02 +02:00
Laurent Destailleur
a89bfc09cb Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-12 02:03:44 +02:00
Laurent Destailleur
05d0edd994 Fix html tag balance 2025-08-12 02:03:07 +02:00
ldestailleur
4dac3ac7d1 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-11 12:28:55 +02:00
ldestailleur
f27f265271 CSS 2025-08-11 12:28:46 +02:00
Laurent Destailleur
d4469f34e0 Fix error message 2025-08-11 00:26:19 +02:00
Laurent Destailleur
6d66e46cef Fix must show "no line message" if nothing found 2025-08-10 20:45:34 +02:00
ldestailleur
f667d5a5a6 Fix missing token 2025-08-10 16:11:16 +02:00
ldestailleur
2ab75ef240 Fix CI 2025-08-10 03:23:46 +02:00
ldestailleur
3313e34797 Fix deprecated var 2025-08-09 17:31:27 +02:00
ldestailleur
117548cc31 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-09 16:24:05 +02:00
ldestailleur
d194130ee1 Add missing trigger 2025-08-09 16:21:06 +02:00
Regis Houssin
9666a96d8c FIX #34893 (#34897)
* FIX #34893

* FIX change error code to USERNOTALLOWEDTOCHANGEPASS
2025-08-09 15:19:02 +02:00
Frédéric FRANCE
403d8cc38a fix CI v22 (#34902)
* fix CI v22

* Update test.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-08-09 14:55:11 +02:00
ldestailleur
f786f30c26 Doc 2025-08-09 14:54:54 +02:00
ldestailleur
b13b1a7666 Doc duplicate line 2025-08-09 14:52:47 +02:00
ldestailleur
c1944d9224 Fix CI warning 2025-08-09 14:18:14 +02:00
ldestailleur
4f0c24aedc Fix warning 2025-08-09 14:14:59 +02:00
ldestailleur
a23e79f081 Fix warning 2025-08-09 14:12:23 +02:00
ldestailleur
27e96b88b3 Fix warning 2025-08-09 14:11:29 +02:00
ldestailleur
1ddf739183 Fix CI 2025-08-09 13:56:11 +02:00
ldestailleur
f33cc75ead Fix CI 2025-08-09 13:52:31 +02:00
ldestailleur
bbc3c061c0 Fix CI 2025-08-09 13:29:53 +02:00
ldestailleur
92a2c2a2e0 Fix CI 2025-08-09 13:27:23 +02:00
ldestailleur
04241d4f83 Fix trans 2025-08-09 13:21:49 +02:00
ldestailleur
5cec27525e Fix CI 2025-08-09 13:18:29 +02:00
ldestailleur
e33ae1afef Fix look and feel v22 (must use formconsumeproduce for action form) 2025-08-09 13:14:48 +02:00
ldestailleur
9cbeff83a4 FIX Test on mandatory product or thirdparty barcode 2025-08-09 11:46:41 +02:00
ldestailleur
53ee283828 Solve hang on setup page when the dns_get_record call is blocked by the
firewall.
2025-08-08 23:11:56 +02:00
ldestailleur
a0b3a9b0da Fix missing load lang 2025-08-08 12:55:18 +02:00
ldestailleur
0707ff5130 FIX bad consistency on test on permission to disable service 2025-08-08 12:15:46 +02:00
ldestailleur
b34d7ec086 FIX Missing a column on group permissions 2025-08-08 12:15:41 +02:00
ldestailleur
9a66d14c80 Fix remove non expected column 2025-08-08 01:28:02 +02:00
ldestailleur
c2f5830cd5 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-07 20:02:26 +02:00
Florian Mortgat
0e7770dc71 FIX: extrafields of type "int" not displayed on projet/tasks.php (#34896)
+ fix warning "Undefined variable $object"
2025-08-07 20:01:06 +02:00
Florian Mortgat
2c073b37c0 FIX DA026536: missing <br> in automatic e-mail (#34895)
* FIX DA026536: missing <br> in automatic e-mail

* Update ticket.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-08-07 19:51:24 +02:00
ldestailleur
944c47c876 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-07 19:31:18 +02:00
ldestailleur
15681e8bd5 Duplicate lines 2025-08-07 16:18:46 +02:00
ldestailleur
ec669eef2a Duplicate lines 2025-08-07 16:18:45 +02:00
ldestailleur
990462fb9a Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-08-07 16:18:25 +02:00
ldestailleur
30e262fd2d Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-08-07 16:17:24 +02:00
ldestailleur
c064540d4b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-08-07 16:17:11 +02:00
ldestailleur
18109e8ba5 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-08-07 16:15:25 +02:00
ldestailleur
364cd0042c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-08-07 16:15:18 +02:00
ldestailleur
1b59bcfadb Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-08-07 16:14:17 +02:00
ldestailleur
347bf3e4d6 Merge branch '16.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0 2025-08-07 16:14:00 +02:00
HENRY Florian
5024aee975 fix: with MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS and multicompany image are not find on send mail (#34894) 2025-08-07 14:42:20 +02:00
ldestailleur
eb14f15a5c Fix undef var in CLI context 2025-08-07 13:58:03 +02:00
Joachim Kueter
da56360404 Fix for issue #34891 - wrong Skonto/Escompte calculation (#34892)
When foreign currency is involved, the wrong total was used, mixing two currencies when calculating the sum.
2025-08-07 12:25:59 +02:00
ldestailleur
9bd8fe4e46 Update currency 2025-08-07 12:22:42 +02:00
Maxime Kohlhaas
b3a2257638 Fix : contract line activation error when duration not defined (#34813)
* Fix : contract line activation error when duration not defined

* Fix of fix

* Update card.php

---------

Co-authored-by: x <x@x.x>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-08-06 21:22:47 +02:00
ldestailleur
6b25d7d69c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-06 20:22:26 +02:00
ldestailleur
7e4c46c838 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-08-06 20:22:00 +02:00
ldestailleur
a15eb33719 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-08-06 20:21:50 +02:00
HENRY Florian
91e88af806 fix: backport fix PR #34833 for next version (#34884) 2025-08-06 19:40:20 +02:00
ldestailleur
1d61cd75f2 Fix CI 2025-08-06 19:39:58 +02:00
ldestailleur
da4b339641 Fix CI 2025-08-06 12:47:10 +02:00
ldestailleur
73a67e0ab2 Fix warnings 2025-08-06 12:45:49 +02:00
ldestailleur
d0aa0df4f6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-06 12:37:00 +02:00
Regis Houssin
618e455ca3 FIX avoid php warning with "$forceFullTextIndexation" (#34881)
* FIX avoid php warning, "$forceFullTextIndexation" not used in
"dol_add_file_process()" function, maybe deprecated ?

* FIX missing $forceFullTextIndexation parameter

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-08-06 12:33:08 +02:00
Marc
1dbe6e579a FIX #34843 (#34875)
* FIX #34564

* FIX #34843

* Fix code formating

* Fix php-stan

* Code improvement

* Correcting formating

* Last correction (i hope!)
2025-08-06 12:12:09 +02:00
ldestailleur
26a020fae6 Fix CI 2025-08-06 12:10:08 +02:00
ldestailleur
aa376fe333 Try fix to solve pb with xml tag with MAIN_RESTRICTHTML_ONLY_VALID_HTML 2025-08-06 11:55:44 +02:00
ldestailleur
3dbf9ad759 FIX Filter on the balance of leave 2025-08-05 13:06:26 +02:00
ldestailleur
20d2bda9ae Fix holiday trans 2025-08-05 12:31:31 +02:00
ldestailleur
8cfc3d1306 Fix MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY 2025-08-05 12:20:46 +02:00
ldestailleur
af615ec603 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-05 12:20:17 +02:00
ldestailleur
9f8b3c863e Fix css 2025-08-05 03:04:22 +02:00
ldestailleur
ead55c3457 Fix left column of edit/select checkbox column 2025-08-05 03:00:35 +02:00
ldestailleur
f1d341238d Clean dev dir 2025-08-05 02:45:24 +02:00
ldestailleur
53683a6a3a FIX several minor troubles with modulebuilder 2025-08-05 02:44:52 +02:00
ldestailleur
22de4342ad FIX array for arrayofkeyval is lost in module builder edit of property 2025-08-05 01:04:58 +02:00
ldestailleur
ecf73afe86 FIX array for arrayofkeyval is lost in module builder edit of property 2025-08-05 01:04:22 +02:00
ldestailleur
86f5db7aa9 Fix better comaptibilty for extrafield email/mail 2025-08-05 00:45:00 +02:00
ldestailleur
eab3227ea0 Fix title missing in click tooltip 2025-08-05 00:08:56 +02:00
ldestailleur
59f20d914b Fix avoid to overwrite an alreayd pushed tag 2025-08-04 18:27:33 +02:00
ldestailleur
49b9a6d19f Fix upgrade to v22 2025-08-04 15:08:35 +02:00
ldestailleur
386a140370 Fix rpm packages 2025-08-02 18:10:08 +02:00
ldestailleur
0e05b3842e Fix package 2025-08-02 18:07:17 +02:00
ldestailleur
3ef2bc1467 Fix package 22.0 2025-08-02 18:04:19 +02:00
ldestailleur
301333efcf Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-02 17:46:38 +02:00
ldestailleur
65d97e84a4 Doc 2025-08-02 17:46:29 +02:00
Marc de Lima Lucio
24652ec722 FIX: asset: could not select invoice in disposal pop-in (#34725) 2025-08-02 00:50:07 +02:00
sonikf
2b0d3d9f67 Enable option to show vat analysis (#34061) 2025-08-02 00:47:42 +02:00
Laurent Destailleur
b748bf1fc0 Fix warning 2025-08-01 19:49:07 +02:00
Maxime Kohlhaas
c0ad262944 FIX : main checkbox left column was before global conf (#34858) 2025-08-01 19:41:37 +02:00
Laurent Destailleur
a6c4ee7d7d Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-01 17:20:43 +02:00
Laurent Destailleur
25a1cd807c Fix warning 2025-08-01 17:20:18 +02:00
ldestailleur
20c9506400 Sync transifex 2025-08-01 16:18:33 +02:00
ldestailleur
0544b3cf6f SQL 2025-08-01 14:49:48 +02:00
ldestailleur
5b4ff9e464 Rename var 2025-08-01 14:13:33 +02:00
ldestailleur
c3106986f4 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-08-01 13:49:13 +02:00
ldestailleur
a75572db5c Fix preview of image in document tab of thirdparty. 2025-08-01 13:49:01 +02:00
ldestailleur
c1a6dd8b8f Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-01 13:46:45 +02:00
ldestailleur
bf51bb6bef Doc 2025-08-01 13:46:33 +02:00
Laurent Destailleur
d8e1560275 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-01 00:13:19 +02:00
Laurent Destailleur
032db7e5cd Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-31 23:54:43 +02:00
Laurent Destailleur
19af522109 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-31 23:54:30 +02:00
Laurent Destailleur
ad7807d045 Merge remote-tracking branch 'origin/19.0' into 20.0 2025-07-31 23:40:06 +02:00
Laurent Destailleur
8dc50b4c5a Merge remote-tracking branch 'origin/18.0' into 19.0 2025-07-31 23:16:27 +02:00
Laurent Destailleur
b226894e36 Merge remote-tracking branch 'origin/17.0' into 18.0 2025-07-31 23:14:31 +02:00
Laurent Destailleur
3b0a4c9fa9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2025-07-31 23:11:32 +02:00
Laurent Destailleur
0928191fdd Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-07-31 23:01:57 +02:00
VIAL-GOUTEYRON Quentin
154a25f8cb Enhance working days calculation to incorporate half-day adjustments and optimize public holiday checks (#34552)
* "Enhance working days calculation to incorporate half-day adjustments and optimize public holiday checks"

* "Add test cases for num_open_day() to validate half-day and weekend boundary scenarios"

* "Update DateLibTest to include Saturday and Sunday as non-working days in test setup"
2025-07-31 22:59:29 +02:00
boudet jean pascal
3405028f4e Added the list suffix to the initialization of the hook in mo_movement.php to align with the existing naming conventions used in other Dolibarr lists. (#34835)
Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
2025-07-31 22:00:27 +02:00
Frédéric FRANCE
b7c94c1f31 fix download and preview (#34833) 2025-07-31 21:57:52 +02:00
sonikf
59834cb1e2 FIX English names and add missing sepa countries (#34840)
* FIX English names and add missing sepa countries

* Update 21.0.0-22.0.0.sql add missing sepa countries

* Update 21.0.0-22.0.0.sql

* Intra-community VAT rules apply for 'MC' Monaco
2025-07-31 21:54:49 +02:00
William Mead
7266ad4352 Fixed undefined property default_vat_code PHP warning (#34836) 2025-07-31 21:51:29 +02:00
William Mead
f8d55e1cf9 Fixed foreach looping on int returned from fetchAllByFkProductParent method (#34837) 2025-07-31 21:24:41 +02:00
atm-GregM
b34ea62fd9 Fix detail qty if serial batch (#34844) 2025-07-31 21:23:53 +02:00
Laurent Destailleur
c3ae90f191 Fix warning 2025-07-31 21:12:01 +02:00
ldestailleur
fd49eedc5b Debug v22 2025-07-31 16:08:51 +02:00
ldestailleur
8bc4840868 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-31 16:08:03 +02:00
ldestailleur
498574fcb4 Fix picto in modulebuilder 2025-07-31 16:05:31 +02:00
ldestailleur
07dd8e6aec Debug v22 2025-07-31 15:18:28 +02:00
ldestailleur
4b28f1d528 Debug v22 2025-07-31 15:17:00 +02:00
ldestailleur
c866e88e2e Debug v22 2025-07-31 15:07:12 +02:00
ldestailleur
227b00defc Debug v22 2025-07-31 15:04:52 +02:00
ldestailleur
0c02b250d2 Fix trans 2025-07-30 16:48:17 +02:00
ldestailleur
d9e225b904 Trans 2025-07-30 16:47:27 +02:00
ldestailleur
ad0ecb13ca Debug v22 2025-07-30 16:46:45 +02:00
ldestailleur
5899483c7d css 2025-07-30 16:09:10 +02:00
ldestailleur
de0503a5be Debug v22 2025-07-30 15:43:02 +02:00
ldestailleur
dd62edeb8c Debug v22 2025-07-30 15:37:19 +02:00
ldestailleur
befed7f6e4 Debug v22 2025-07-30 15:08:46 +02:00
ldestailleur
687f870c19 Debug v22 2025-07-30 14:43:24 +02:00
ldestailleur
15a8184622 Debug v22 2025-07-30 13:27:52 +02:00
ldestailleur
0357d84c37 Debug v22 2025-07-30 13:02:28 +02:00
ldestailleur
4392ce01fc Debug v22 2025-07-30 12:58:54 +02:00
ldestailleur
63c4acca94 Debug v22 2025-07-30 12:25:32 +02:00
ldestailleur
c77db346c7 Debug v22 2025-07-30 12:18:37 +02:00
Mohamed DAOUD
04672e1d80 fix use delivery date v21 (#34831) 2025-07-29 21:09:46 +02:00
ldestailleur
0a8fd7d0f1 Clean code 2025-07-29 15:47:33 +02:00
ldestailleur
3a303d4a83 Debug v22 2025-07-29 15:40:36 +02:00
ldestailleur
2e9c0ea3e6 Debug v22 2025-07-29 13:37:25 +02:00
ldestailleur
0e3443a084 Debug v22 2025-07-29 13:22:36 +02:00
ldestailleur
546c0ea3d8 Doc for 22.0 2025-07-29 13:02:14 +02:00
ldestailleur
fd5e268783 Finish option API_ENABLE_COUNT_CALLS 2025-07-29 12:45:12 +02:00
ldestailleur
b3b708ac67 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-29 11:28:43 +02:00
ldestailleur
1fc810c501 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-29 11:28:36 +02:00
ldestailleur
0da16f967f Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-29 11:28:09 +02:00
ldestailleur
ce6fc756fa Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-29 11:27:58 +02:00
atm-corentin
5d22b46c68 FIX|Fix #Hide mandatory DLC/DLUO options when disabled in product configuration (#34790)
* Hide DLC/DLUO mandatory options in product form when disabled by configuration

* fix using constant

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-29 02:59:43 +02:00
Laurent Destailleur
1f9ebb05fa Debug v22 2025-07-29 02:57:31 +02:00
Laurent Destailleur
246111732c Debug v22 2025-07-29 02:51:18 +02:00
Laurent Destailleur
60ecf8da6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-07-29 02:41:07 +02:00
Laurent Destailleur
23d0879dde Fix regression on pass encryption in conf 2025-07-29 02:36:19 +02:00
Alexandre SPANGARO
0165045524 Fix travis & uniformize (#34817)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-28 21:32:30 +02:00
ldestailleur
11abac1532 Fix CI 2025-07-28 19:01:18 +02:00
ldestailleur
ae8e509c9f Fix CI 2025-07-28 18:59:12 +02:00
ldestailleur
89f1b2f608 Fix CI 2025-07-28 18:55:03 +02:00
ldestailleur
a8c918a04a Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-28 18:52:34 +02:00
ldestailleur
b07614414c Fix CI 2025-07-28 18:51:29 +02:00
Alexandre SPANGARO
d8d1de1a4b Accountancy - UX - Uniformize option overview of numbering module (#34816)
* Accountancy - UX - Uniformize option overview of numbering module

* Small ajust
2025-07-28 18:39:16 +02:00
ldestailleur
6d0277f2b8 Fix CI 2025-07-28 18:38:14 +02:00
ldestailleur
e6e3486f95 Fix CI 2025-07-28 17:29:51 +02:00
ldestailleur
e7eff817e9 Fix bad position of closing brackets. 2025-07-28 17:19:23 +02:00
ldestailleur
7c6a307a01 Fix CI 2025-07-28 17:18:38 +02:00
ldestailleur
98ce9717e5 Doc 2025-07-28 17:10:25 +02:00
ldestailleur
0fa59d0e9c Fix CI and warning message 2025-07-28 16:17:03 +02:00
ldestailleur
c75663b2de Fix CI 2025-07-28 15:40:54 +02:00
ldestailleur
29f54fd50e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-28 15:27:00 +02:00
ldestailleur
0a40502fae Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-28 15:23:38 +02:00
ldestailleur
0e73159a45 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-07-28 15:22:50 +02:00
ldestailleur
75d7d2d66b Remove hack to track abuse usage with the one of v20 2025-07-28 15:21:12 +02:00
ldestailleur
df7ee5e392 Has been replaced with API_ENABLE_COUNT_CALLS 2025-07-28 15:17:14 +02:00
ldestailleur
a7d5d15c58 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-07-28 15:12:10 +02:00
ldestailleur
c740b8aa7d Fix make var visible 2025-07-28 14:38:03 +02:00
ldestailleur
fe7eda2a4c Move api counter at a better place 2025-07-28 14:31:17 +02:00
ldestailleur
72636dde06 Add API_COUNTER_ENABLED to track pb with api abuse. 2025-07-28 12:18:50 +02:00
ldestailleur
e3f4a66695 Add API_COUNTER_ENABLED to track pb with api abuse. 2025-07-28 12:16:38 +02:00
ldestailleur
3c24c200d1 Add API_COUNTER_ENABLED to track pb with api abuse. 2025-07-28 12:15:07 +02:00
ldestailleur
2e1ae56054 Add API_COUNTER_ENABLED to track pb with api abuse. 2025-07-28 12:13:51 +02:00
ldestailleur
357c1cd609 Fix getDomainFromURL when param is emails. 2025-07-28 01:47:34 +02:00
ldestailleur
55a80e2624 Doc 2025-07-28 01:16:49 +02:00
ldestailleur
a30f135f91 Doc 2025-07-27 14:15:14 +02:00
ldestailleur
21d15c0b05 Doc 2025-07-27 14:14:47 +02:00
ldestailleur
1fea1ceaed Prepare 21.0.3 2025-07-27 14:12:31 +02:00
ldestailleur
030b3d3df5 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-27 13:58:13 +02:00
ldestailleur
3fe997df1b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-27 13:54:24 +02:00
ldestailleur
902089e883 Fix member status not correct on popup 2025-07-27 13:54:02 +02:00
ldestailleur
e2e6c6bedc Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-27 13:54:02 +02:00
ldestailleur
c917599f49 Doc 2025-07-27 13:54:02 +02:00
Arthur Lenoble
6144f65427 FIX : No order displayed in orders box (#34789)
* FIX : No element displayed in the order box

Removing the attribution to 0 for $num which caused to never display any order

* Update box_commandes.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-27 13:54:02 +02:00
ldestailleur
7d42affa8e FIX warning for too many %s 2025-07-27 13:54:02 +02:00
Francis Appels
3b2551920e FIX: Status column in product related supplier orders (#34785) 2025-07-27 13:54:02 +02:00
ldestailleur
8e5efbb3ae css 2025-07-27 13:54:02 +02:00
ldestailleur
6c960ffbaf Fix translation 2025-07-27 13:54:02 +02:00
ldestailleur
50f7222080 FIX update of expense report line 2025-07-27 13:54:02 +02:00
ldestailleur
ee1922115d FIX #34776 2025-07-27 13:54:02 +02:00
ldestailleur
e092364438 FIX #34776 2025-07-27 13:54:02 +02:00
ldestailleur
5e31b370f8 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-27 13:54:02 +02:00
Regis Houssin
63392fd164 FIX wrong file name (#34779)
* FIX wrong file name

* FIX wrong path
2025-07-27 13:54:02 +02:00
ldestailleur
770efaed97 Fix warning 2025-07-27 13:54:02 +02:00
ldestailleur
a6c2f135c6 Prepare 21.0.2 2025-07-27 13:54:02 +02:00
ldestailleur
c2d82e555b Code comment 2025-07-27 13:54:02 +02:00
ldestailleur
8317bf0c29 FIX html title when using custom value 2025-07-27 13:54:02 +02:00
ldestailleur
96b0c58630 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-27 13:54:02 +02:00
ldestailleur
faebfdb464 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-27 13:54:02 +02:00
HENRY Florian
45cc9cb39b fix: advanced target emailling missing case (#34715)
* fix: advanced target emailling missing case

* fix: travis for simple quote SQL

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-27 13:54:02 +02:00
ldestailleur
f3b639f801 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-27 13:54:02 +02:00
ldestailleur
f80ef61bd0 Doc comment 2025-07-27 13:54:02 +02:00
Regis Houssin
e5f5df3820 FIX wrong multicompany filter (#34714)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-27 13:54:02 +02:00
ldestailleur
b03f30c7e2 Sec: Remove functions accepting callable params - Reported by phdwg1410 2025-07-27 13:54:02 +02:00
ldestailleur
3dfe90df2a Fix member status not correct on popup 2025-07-26 15:18:14 +02:00
Maxime Kohlhaas
6a88d31675 Fix : missing langs load on comm card file (#34812)
Co-authored-by: x <x@x.x>
2025-07-26 14:57:23 +02:00
ldestailleur
f0ab17ea83 Debug v22 2025-07-26 13:48:30 +02:00
ldestailleur
1c37761545 Debug v22 2025-07-26 13:13:31 +02:00
ldestailleur
935f947c18 Debug v22 2025-07-26 12:43:55 +02:00
ldestailleur
a7e5510245 Debug v22 2025-07-26 12:17:01 +02:00
ldestailleur
e8de1b62d1 Debug v22 2025-07-26 11:38:27 +02:00
ldestailleur
3c8be27009 Debug v22 2025-07-26 11:18:48 +02:00
ldestailleur
abbb25d6fe Debug v22 - Fix amount before discount in multicurrency mode 2025-07-25 16:47:18 +02:00
ldestailleur
a27ff8b053 Debug v22 2025-07-25 15:41:57 +02:00
ldestailleur
493443182e Debug v22 2025-07-25 03:34:04 +02:00
ldestailleur
d1246060dd Debug v22 2025-07-25 03:29:34 +02:00
ldestailleur
5248d0bba5 Fix default value of currency update 2025-07-25 03:22:53 +02:00
ldestailleur
de76f65fba Fix combo too heavy of information 2025-07-24 14:54:29 +02:00
ldestailleur
4bca0d956c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-23 16:25:19 +02:00
ldestailleur
45bc6b8b2d Doc 2025-07-23 16:25:07 +02:00
Arthur Lenoble
807e011e77 FIX : No order displayed in orders box (#34789)
* FIX : No element displayed in the order box

Removing the attribution to 0 for $num which caused to never display any order

* Update box_commandes.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-23 16:18:55 +02:00
Francis Appels
c273dcb498 FIX: Status column in product related supplier orders (#34785) 2025-07-23 16:17:51 +02:00
Sylvain Legrand
437a07ba3c fix use of MAIN_CHECKBOX_LEFT_COLUMN on stockadate (#34783) 2025-07-23 16:17:30 +02:00
ldestailleur
142a50fcce FIX warning for too many %s 2025-07-23 14:50:24 +02:00
ldestailleur
8ab460a4d7 FIX warning for too many %s 2025-07-23 14:49:14 +02:00
ldestailleur
28f5ddbfcb css 2025-07-23 12:58:50 +02:00
ldestailleur
e61b98e83b Fix translation 2025-07-23 12:35:58 +02:00
Florian Mortgat
f4555c4413 FIX 17.0 SQL syntax error and/or constraint error when calling Facture::update() after a clone (e.g. in a trigger) (#34778)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-23 11:26:49 +02:00
ldestailleur
c796b32f4b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-22 19:40:44 +02:00
ldestailleur
09504c9639 FIX update of expense report line 2025-07-22 19:38:00 +02:00
ldestailleur
e85886cd5c FIX #34776 2025-07-22 19:18:31 +02:00
ldestailleur
73d8f3b1a9 FIX #34776 2025-07-22 19:06:44 +02:00
ldestailleur
b710c85b07 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-22 13:00:31 +02:00
ldestailleur
d04e8e62c9 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-22 12:56:45 +02:00
ldestailleur
e7594f52ff Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-07-22 12:48:35 +02:00
ldestailleur
d202af2593 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-07-22 12:48:14 +02:00
ldestailleur
ed4006b51b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-07-22 12:47:52 +02:00
Florian Mortgat
bc33f7e1a7 FIX 17.0: when you clone an invoice that was created from a template invoice, the clone should not be linked to the template invoice (#34777) 2025-07-22 12:10:41 +02:00
ldestailleur
3c1b5846c9 Fix travis file 2025-07-22 12:08:51 +02:00
Regis Houssin
fe5fad3092 FIX wrong file name (#34779)
* FIX wrong file name

* FIX wrong path
2025-07-22 12:07:46 +02:00
ldestailleur
ca0538a79d Fix warning 2025-07-22 12:07:28 +02:00
ldestailleur
f6e9280ac4 Fix emailcollector 2025-07-22 03:43:41 +02:00
ldestailleur
4274c8102e Fix missing update of replyto 2025-07-22 01:54:25 +02:00
ldestailleur
a0d504ad67 Debug v22 - FIX Message-ID not set with SMTPs 2025-07-22 01:37:30 +02:00
ldestailleur
691245512b Debug v22 - FIX Message-ID not set with SMTPs 2025-07-22 01:37:25 +02:00
ldestailleur
66dfc3f183 Fix reply to in ticket emails 2025-07-22 00:57:38 +02:00
ldestailleur
e5c582f18f Debug v22 2025-07-21 23:26:56 +02:00
ldestailleur
c269ad9332 FIX Sending ticket email must have different from and replyto to avoid
to be set as SPAM
2025-07-21 23:20:08 +02:00
ldestailleur
754387ed2b Doc 2025-07-21 22:22:55 +02:00
ldestailleur
03910664c4 Debug v22 2025-07-21 22:09:10 +02:00
ldestailleur
1d6e198be2 Debug v22 - Invert option that add link to backoffice interface link
when it should remain private. It also makes often email marked as SPAM.
2025-07-21 21:20:00 +02:00
ldestailleur
5804520b96 Debug v22 - FIX date of created ticket. 2025-07-21 20:12:51 +02:00
ldestailleur
80e5f7fe66 Fix tooltip 2025-07-21 18:58:25 +02:00
ldestailleur
e1f253ac63 Debug v22 2025-07-21 18:38:49 +02:00
ldestailleur
3c6744638b Debug v22 2025-07-21 18:36:13 +02:00
ldestailleur
7dd642faab Missing field $fields 2025-07-21 18:15:43 +02:00
ldestailleur
cf329df785 Debug v22 2025-07-21 18:02:50 +02:00
ldestailleur
8cb68b3b94 css 2025-07-21 16:37:41 +02:00
ldestailleur
90439d3cfb Debug v22 2025-07-21 16:07:37 +02:00
ldestailleur
fd66570bdb Debug v22 2025-07-21 16:01:09 +02:00
ldestailleur
ff62ee2643 Debug v22 2025-07-21 15:56:25 +02:00
ldestailleur
910b1bf494 Debug v22 2025-07-21 15:50:27 +02:00
ldestailleur
5765c06d5f Debug v22 2025-07-21 15:17:46 +02:00
ldestailleur
dc2bc00820 Debug v22 2025-07-21 15:03:29 +02:00
ldestailleur
5cfebe1e90 Debug v22 2025-07-21 14:48:17 +02:00
ldestailleur
6964a34697 Debug v22 2025-07-21 14:30:58 +02:00
ldestailleur
2e47121024 Debug v22 2025-07-21 14:25:48 +02:00
ldestailleur
a800af3b91 Debug v22 2025-07-21 10:47:45 +02:00
ldestailleur
75e78f8a77 Log 2025-07-20 21:03:26 +02:00
ldestailleur
1542ec6389 Debug v22 2025-07-20 20:19:13 +02:00
ldestailleur
b31d36fd98 Debug v22 2025-07-20 20:16:56 +02:00
ldestailleur
fed70e7217 Update social networks 2025-07-20 19:43:30 +02:00
ldestailleur
33eb50ab93 Prepare 21.0.2 2025-07-20 18:55:11 +02:00
ldestailleur
2a419b4f65 Debug v22 2025-07-20 18:21:15 +02:00
sonikf
2353a0c111 fix and keep consistency of translation strings (#34770)
* fix translation

* retain translation consistency

* fix translation

* fix typo

* fix typo

* fix trans

* fix lang

* fix typo

* remove duplicate

* Update index.php

* Update index.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-20 15:57:52 +02:00
ldestailleur
1df7abc63e Debug 2025-07-20 15:47:37 +02:00
ldestailleur
09b833f197 Name must be in english 2025-07-20 11:58:49 +02:00
ldestailleur
4dff14f992 Fix GHSA-67wj-35pj-c446 2025-07-19 19:08:38 +02:00
ldestailleur
41098ca8d5 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-19 18:20:05 +02:00
ldestailleur
a7191abb11 Better log 2025-07-19 18:19:56 +02:00
ldestailleur
55ed1de694 Debug v22. Try to report error on screen for more case - #34463 2025-07-19 18:14:06 +02:00
Alexandre SPANGARO
6eefa39279 UX - Accountancy - Balance - Modify export to CSV button (#34768)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-19 18:05:18 +02:00
ldestailleur
9dfeedd6d3 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-19 18:01:19 +02:00
ldestailleur
85f49c2272 Fix syntax 2025-07-19 18:01:10 +02:00
ldestailleur
abb740aa3c Fix syntax 2025-07-19 18:00:22 +02:00
ldestailleur
daae9593d6 Fix warnings 2025-07-19 17:48:42 +02:00
ldestailleur
989611a81e Code comment 2025-07-19 16:35:06 +02:00
ldestailleur
5f70ad29a2 FIX html title when using custom value 2025-07-19 15:43:40 +02:00
ldestailleur
60547fda94 Debug v22 2025-07-19 14:17:59 +02:00
ldestailleur
3770c82015 Debug look and feel v21 2025-07-19 02:35:33 +02:00
atm-adrien
6641e00cd6 FIX : Correct rank when adding line on order (#34764)
* FIX : Correct rank when adding line on order

* FIX : Delete TODO
2025-07-19 00:29:55 +02:00
ldestailleur
e4ba59a509 Fix warning 2025-07-18 19:50:22 +02:00
ldestailleur
0928a3c6e1 Debug v22 2025-07-18 03:13:41 +02:00
ldestailleur
5883d0b4da Link to barcode init 2025-07-18 02:27:00 +02:00
ldestailleur
b3eb894de1 Doc 2025-07-18 01:47:57 +02:00
ldestailleur
4802d0979c Doc 2025-07-18 01:45:30 +02:00
ldestailleur
3e5b23f0b1 Debug v22 2025-07-18 00:44:46 +02:00
ldestailleur
7b7d8e8fd4 Fix missing trans 2025-07-18 00:33:40 +02:00
ldestailleur
ee6adcf306 Trans 2025-07-17 23:44:22 +02:00
ldestailleur
1d6fa2d80f Trans 2025-07-17 23:38:36 +02:00
F-Node-Karlsruhe
34634cd814 fix purchase order refernece key in pdf generation (#34757)
* fix refernece key in pdf generation

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>

* Update pdf.lib.php

---------

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-17 23:19:55 +02:00
ldestailleur
49a834b08c Fix warning 2025-07-17 21:48:31 +02:00
ldestailleur
a9c48a3e4d Debug v22 2025-07-17 21:04:59 +02:00
ldestailleur
2b0deccae5 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-17 19:31:16 +02:00
ldestailleur
1e5733d124 Update makepack 2025-07-17 19:30:58 +02:00
ldestailleur
7d26242fdd Fix link 2025-07-17 19:30:58 +02:00
ldestailleur
7c8598cc2d Sync transifex 2025-07-17 19:30:58 +02:00
ldestailleur
fd10fea1fa Debug v22 - Fix bad trans and setup for Cash acocunting. 2025-07-17 19:30:58 +02:00
ldestailleur
176c7d178d Debug v22 2025-07-17 19:30:58 +02:00
ldestailleur
f0f5006ce2 Debug v22 2025-07-17 19:30:58 +02:00
ldestailleur
270caf0dcb Debug v22 2025-07-17 19:30:58 +02:00
ldestailleur
423b302a2b Debug v22 2025-07-17 19:30:58 +02:00
ldestailleur
54ba7c2672 FIX mass action "Merge PDF" with high number of objects. 2025-07-17 19:30:58 +02:00
ldestailleur
ae18318072 Fix warning 2025-07-17 19:30:58 +02:00
ldestailleur
8738c4e6f7 Trans 2025-07-17 19:30:58 +02:00
ldestailleur
590f04ce04 Debug v22 2025-07-17 19:30:58 +02:00
ldestailleur
a533b23a1d Clean code 2025-07-17 19:30:58 +02:00
ldestailleur
95744663cb Trans 2025-07-17 19:30:58 +02:00
ldestailleur
c0a0acf129 FIX #34746 2025-07-17 19:30:58 +02:00
ldestailleur
a145b3b44d Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-17 19:30:58 +02:00
ldestailleur
4b7ea3d0de Trans 2025-07-17 19:30:58 +02:00
ldestailleur
edf45ef25d Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-17 19:30:58 +02:00
ldestailleur
78689fd180 Better fix for #34702 2025-07-17 19:30:58 +02:00
ldestailleur
b410bf0731 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-17 19:30:58 +02:00
HENRY Florian
5d88aea4b9 fix: advanced target emailling missing case (#34715)
* fix: advanced target emailling missing case

* fix: travis for simple quote SQL

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-17 19:30:58 +02:00
ldestailleur
1515adf313 Revert "FIX when using THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT and direct link New prospect, New Customer or New Supplier (#34702)"
This reverts commit 870979362e.
2025-07-17 19:30:58 +02:00
ldestailleur
5396578a75 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-17 19:30:58 +02:00
Alain Rihs
db3a5cfbef FIX when using THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT and direct link New prospect, New Customer or New Supplier (#34702)
* Update card.php

#FIX when using THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT and direct link New prospect, New Customer or New Supplier

* Fix name of option for supplier

* Update functions.lib.php (#34718)

Add __MYCOMPANY_URL__ & __MYCOMPANY_PHONEMOBILE__ in getCommonSubstitutionArray

* Fix bad value  fourn paiement process (#34722)

* Fix bad value  fourn paiement process

* best fix

* fix takepos console error (#34709)

* fix console error

* exit early

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Update card.php

* Fix CI

* Clean code

* Comment

* Update card.php

"if (getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT')) {":
this part of code is wrong when we click on "New customer", Customer AND Prospect are selected. New test on line 1452 cover this case. So when type is C, variable object->client should be 1.
And I corrected the new code with parenthesis.

* Update card.php

distraction error in the new code

---------

Co-authored-by: ldestailleur <eldy@destailleur.fr>
Co-authored-by: Deefaze <6393617+Deefaze@users.noreply.github.com>
Co-authored-by: Lucas Marcouiller <45882981+Hystepik@users.noreply.github.com>
Co-authored-by: Francis Appels <francis.appels@yahoo.com>
2025-07-17 19:30:58 +02:00
ldestailleur
27a97d68a2 Doc comment 2025-07-17 19:30:58 +02:00
Regis Houssin
d280c807b6 FIX wrong multicompany filter (#34714)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-17 19:30:58 +02:00
ldestailleur
61dcd176e0 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-17 19:30:58 +02:00
ldestailleur
a4aa00c498 Sec: Remove all functions that accept callable params - CVE-2024-40137 2025-07-17 19:30:58 +02:00
ldestailleur
043a2fd9e2 Update makepack 2025-07-17 19:02:44 +02:00
ldestailleur
3f1796c83b Fix link 2025-07-17 18:58:29 +02:00
ldestailleur
fe5acac757 Sync transifex 2025-07-17 18:57:22 +02:00
ldestailleur
ca995180a3 Debug v22 - Fix bad trans and setup for Cash acocunting. 2025-07-17 18:31:40 +02:00
ldestailleur
31a66e2ce2 Debug v22 2025-07-17 18:12:46 +02:00
ldestailleur
2858eb6f9a Debug v22 2025-07-17 16:51:28 +02:00
ldestailleur
b8ca0f6d1a Debug v22 2025-07-17 16:13:33 +02:00
ldestailleur
4b706bfdd8 Debug v22 2025-07-17 15:34:01 +02:00
ldestailleur
a61d4db632 FIX mass action "Merge PDF" with high number of objects. 2025-07-17 14:11:22 +02:00
ldestailleur
e1dd3f6e35 Fix warning 2025-07-17 12:11:51 +02:00
ldestailleur
f9d37c2021 Trans 2025-07-17 11:24:16 +02:00
ldestailleur
fe4604b477 Debug v22 2025-07-17 02:06:37 +02:00
ldestailleur
6bbbcf7b86 Clean code 2025-07-16 09:24:09 +02:00
ldestailleur
a852b0f3f4 Trans 2025-07-16 09:04:44 +02:00
ldestailleur
057c28775c FIX #34746 2025-07-15 21:51:50 +02:00
ldestailleur
fe96d826ef Avoid duplicate apt install 2025-07-15 21:49:28 +02:00
ldestailleur
52bf642601 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-15 18:44:05 +02:00
ldestailleur
9ed1527e0c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-15 18:36:49 +02:00
ldestailleur
bb09797599 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-15 18:36:39 +02:00
ldestailleur
bc82fba711 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-07-15 18:31:15 +02:00
ldestailleur
2d48131a91 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-07-15 18:15:55 +02:00
ldestailleur
df60ce695c Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-07-15 18:09:34 +02:00
ldestailleur
18dd243182 Trans 2025-07-15 16:05:46 +02:00
ldestailleur
0f53cf3cf8 Better fix for #34702 2025-07-15 16:00:53 +02:00
ldestailleur
414b98e36f Revert "FIX when using THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT and direct link New prospect, New Customer or New Supplier (#34702)"
This reverts commit 870979362e.
2025-07-15 15:57:05 +02:00
Alain Rihs
870979362e FIX when using THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT and direct link New prospect, New Customer or New Supplier (#34702)
* Update card.php

#FIX when using THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT and direct link New prospect, New Customer or New Supplier

* Fix name of option for supplier

* Update functions.lib.php (#34718)

Add __MYCOMPANY_URL__ & __MYCOMPANY_PHONEMOBILE__ in getCommonSubstitutionArray

* Fix bad value  fourn paiement process (#34722)

* Fix bad value  fourn paiement process

* best fix

* fix takepos console error (#34709)

* fix console error

* exit early

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Update card.php

* Fix CI

* Clean code

* Comment

* Update card.php

"if (getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT')) {":
this part of code is wrong when we click on "New customer", Customer AND Prospect are selected. New test on line 1452 cover this case. So when type is C, variable object->client should be 1.
And I corrected the new code with parenthesis.

* Update card.php

distraction error in the new code

---------

Co-authored-by: ldestailleur <eldy@destailleur.fr>
Co-authored-by: Deefaze <6393617+Deefaze@users.noreply.github.com>
Co-authored-by: Lucas Marcouiller <45882981+Hystepik@users.noreply.github.com>
Co-authored-by: Francis Appels <francis.appels@yahoo.com>
2025-07-15 15:54:52 +02:00
HENRY Florian
69f82e5cb6 fix: advanced target emailling missing case (#34715)
* fix: advanced target emailling missing case

* fix: travis for simple quote SQL

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-15 15:40:25 +02:00
ldestailleur
85782ca3f6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-15 15:21:59 +02:00
ldestailleur
6f15da3537 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-15 14:55:51 +02:00
ldestailleur
11535787df Doc comment 2025-07-15 14:55:40 +02:00
Regis Houssin
d63e36d8fb FIX wrong multicompany filter (#34714)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-15 14:55:09 +02:00
ldestailleur
cb447b608b Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-15 12:54:10 +02:00
Alexandre SPANGARO
e52ddc0181 Fix display on page treasury accounting (#34741)
* Fix name of option for supplier

* Update functions.lib.php (#34718)

Add __MYCOMPANY_URL__ & __MYCOMPANY_PHONEMOBILE__ in getCommonSubstitutionArray

* Fix bad value  fourn paiement process (#34722)

* Fix bad value  fourn paiement process

* best fix

* fix takepos console error (#34709)

* fix console error

* exit early

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Fix CI

* Clean code

* Comment

* PHPStan > Update baseline (#34734)

Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>

* FIX: we should ensure Commande::$lines array contains OrderLine objects (#34727)

* Uniformize position of button with other page & remove useless column

* Remove useless column

* FIX Fiscal year - Translation error on status

* Revert "FIX Fiscal year - Translation error on status"

This reverts commit a6f96ac0a9.

---------

Co-authored-by: ldestailleur <eldy@destailleur.fr>
Co-authored-by: Deefaze <6393617+Deefaze@users.noreply.github.com>
Co-authored-by: Lucas Marcouiller <45882981+Hystepik@users.noreply.github.com>
Co-authored-by: Francis Appels <francis.appels@yahoo.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
Co-authored-by: Noé Cendrier <81741011+altairis-noe@users.noreply.github.com>
2025-07-15 11:43:29 +02:00
Alexandre SPANGARO
6ff0ef4990 FIX Fiscal year - Translation error on status (#34743) 2025-07-15 11:41:44 +02:00
sonikf
92ce005080 fix translation for non latin languages (#34744)
* fix translation for non latin languages

* fix translation for non latin languages

* fix translation for non latin languages
2025-07-15 11:39:42 +02:00
ldestailleur
b38ebb236a Doc 2025-07-15 06:59:31 +02:00
ldestailleur
74b37cdd50 Debug v22 2025-07-15 06:29:22 +02:00
Noé Cendrier
4fd04e7dc2 FIX: we should ensure Commande::$lines array contains OrderLine objects (#34727) 2025-07-15 06:20:23 +02:00
ThomasNgr-OpenDSI
abc7f824d7 FIX accountancy closure: if subledger_label is not found, PHP8.2 throws an error. (#34736) 2025-07-15 06:14:53 +02:00
Lucas Marcouiller
659f758d61 Fix table webhook history (#34737)
* Fix name of option for supplier

* Update functions.lib.php (#34718)

Add __MYCOMPANY_URL__ & __MYCOMPANY_PHONEMOBILE__ in getCommonSubstitutionArray

* Fix bad value  fourn paiement process (#34722)

* Fix bad value  fourn paiement process

* best fix

* fix takepos console error (#34709)

* fix console error

* exit early

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Fix CI

* Clean code

* Fix table wenhook history

---------

Co-authored-by: ldestailleur <eldy@destailleur.fr>
Co-authored-by: Deefaze <6393617+Deefaze@users.noreply.github.com>
Co-authored-by: Francis Appels <francis.appels@yahoo.com>
2025-07-15 06:13:10 +02:00
ldestailleur
87370eb0ba Sec: Remove all functions that accept callable params. 2025-07-15 05:42:06 +02:00
ldestailleur
d1d221a10c Debug v22 2025-07-11 14:12:53 +02:00
ldestailleur
6bc3036b18 Removed option forcesandbox 2025-07-10 19:47:58 +02:00
ldestailleur
3a28ed8d46 Debug v22 2025-07-10 18:58:04 +02:00
ldestailleur
a8241aeb1d Debug v22 2025-07-10 18:28:20 +02:00
ldestailleur
7e11d54339 Debug v22 2025-07-10 18:07:53 +02:00
ldestailleur
7423fbb443 Fix CI 2025-07-10 17:50:34 +02:00
ldestailleur
2c35e73e4f Prepare v22 2025-07-10 16:55:32 +02:00
ldestailleur
0622da0aea Prepare v22 2025-07-10 16:34:55 +02:00
ldestailleur
b3baf74c0d Debug v22 2025-07-10 16:34:06 +02:00
ldestailleur
12dd3ca799 Prepare 22.0 final 2025-07-10 15:21:26 +02:00
ldestailleur
34af5f28c2 Prepare 21.0.2 2025-07-10 15:19:48 +02:00
ldestailleur
67494f497f Fix warning 2025-07-10 15:16:53 +02:00
ldestailleur
5b1f6cd6ce Fix waring in deprecated service 2025-07-10 15:14:12 +02:00
Lucas Marcouiller
761107a919 Fix bad value fourn paiement process (#34722)
* Fix bad value  fourn paiement process

* best fix
2025-07-10 14:55:09 +02:00
Deefaze
15cdde5a05 Update functions.lib.php (#34718)
Add __MYCOMPANY_URL__ & __MYCOMPANY_PHONEMOBILE__ in getCommonSubstitutionArray
2025-07-10 14:55:05 +02:00
ldestailleur
84db848491 Fix name of option for supplier 2025-07-10 14:54:59 +02:00
ldestailleur
8088f4a30e Debug v22 2025-07-09 19:02:50 +02:00
ldestailleur
1c2b5e885f Doc 2025-07-09 18:57:09 +02:00
ldestailleur
718fa87e3e Debug v22 2025-07-09 18:50:53 +02:00
ldestailleur
0e88c8ffbc Support HTTP_EXPOSED_CREDENTIAL_CHECK and use a better log to parse for
security analysis.
2025-07-09 18:20:48 +02:00
ldestailleur
daa4968077 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-09 17:57:48 +02:00
ldestailleur
03fffe6e10 Typo doc 2025-07-09 17:54:15 +02:00
ldestailleur
3b5e07dca9 Merge branch '17.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0 2025-07-09 15:27:37 +02:00
ldestailleur
8927d1260a Fix travis 2025-07-09 15:27:28 +02:00
Laurent Destailleur
d6d0acf159 Fix warning 2025-07-08 16:01:45 +02:00
Laurent Destailleur
eee6104288 Fix phan 2025-07-08 15:49:31 +02:00
Laurent Destailleur
fabcb1cf17 Fix CI 2025-07-08 15:44:37 +02:00
Artem Chernitsov
0efea5cca3 fix calendar holiday link (#34711) 2025-07-08 15:41:44 +02:00
Laurent Destailleur
edd5ddbb92 Fix CI 2025-07-08 15:34:24 +02:00
Laurent Destailleur
3f10bd2b7e Fix warning 2025-07-08 15:32:27 +02:00
github-actions[bot]
2a2322067b PHPStan > Update baseline (#34713)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-07-08 14:48:06 +02:00
Mohamed DAOUD
0a8efe53b1 enhance payment checks (#34712) 2025-07-08 14:14:29 +03:00
Laurent Destailleur
77ce4ebc39 Debug v22 2025-07-08 00:56:55 +02:00
Laurent Destailleur
6e871343fa CSS 2025-07-08 00:15:42 +02:00
Laurent Destailleur
86208b9be2 Debug v22 2025-07-07 23:57:35 +02:00
Laurent Destailleur
226a50e1f6 More logs 2025-07-07 23:53:51 +02:00
Laurent Destailleur
421802cc87 Doc 2025-07-07 23:40:20 +02:00
Laurent Destailleur
34f02f0061 Doc 2025-07-07 23:27:39 +02:00
Laurent Destailleur
163aafa552 Fix doxygen 2025-07-07 23:12:17 +02:00
Laurent Destailleur
01535bc945 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-07 22:56:18 +02:00
Laurent Destailleur
8910f0a174 Doc 2025-07-07 22:55:14 +02:00
Laurent Destailleur
8c0f2a089b Debug v22 2025-07-07 22:54:59 +02:00
github-actions[bot]
dac95c340b PHPStan > Update baseline (#34701)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-07-07 19:13:28 +03:00
Charlène Benke
9e9893ac72 fix typo documentation error on api stockmovement (#34703) 2025-07-07 19:12:47 +03:00
Laurent Destailleur
1e7d7f67fc Debug v22 2025-07-06 22:50:27 +02:00
Laurent Destailleur
6378726514 Fix warning 2025-07-06 18:28:23 +02:00
Laurent Destailleur
feba6a4579 Close #34623 2025-07-06 18:19:20 +02:00
Laurent Destailleur
072b30f5f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-06 18:02:23 +02:00
Laurent Destailleur
a23ad6e91b Fix label of fieldand tooltip 2025-07-06 18:00:46 +02:00
HENRY Florian
ee294917e1 fix: bad date management on update in time spent list if column is not displayed (#34511)
* fix: if column date is missing in tasktime, line update failed with Data mandatory

* fix: if column date is missing in tasktime list, line update failed with Data mandatory

* fix: remove badd php comment

* Update time.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-06 13:51:42 +03:00
Frédéric FRANCE
38203fd694 add substitutions for year of previous or next month (#34691)
* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-06 13:45:11 +03:00
Laurent Destailleur
dda0849a46 Clean code 2025-07-05 22:58:39 +02:00
Laurent Destailleur
ebf4548616 Clean code 2025-07-05 22:52:27 +02:00
Laurent Destailleur
5af8569805 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-05 22:49:43 +02:00
Laurent Destailleur
f047007c19 Clean code 2025-07-05 22:48:36 +02:00
F-Node-Karlsruhe
1956776415 Allow email claim in oidc (#34669)
* allow email claim in oidc

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>

* switch to allow mail address in login

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>

* revert back to first draft

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>

---------

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-05 20:11:47 +03:00
Laurent Destailleur
bf470c4b5d Fix CI 2025-07-05 18:40:14 +02:00
Laurent Destailleur
7d02de2abf Fix CI 2025-07-05 16:04:56 +02:00
Laurent Destailleur
d05a9bbc28 Debug v22 2025-07-05 13:38:17 +02:00
Laurent Destailleur
0923600aee Fix CI 2025-07-05 13:12:17 +02:00
Laurent Destailleur
1380b94fb0 Fix CI 2025-07-05 13:02:17 +02:00
Laurent Destailleur
4f679f06d7 Fix CI 2025-07-05 12:41:00 +02:00
Laurent Destailleur
6748d3a14b Fix CI 2025-07-05 12:31:08 +02:00
Laurent Destailleur
84879c15e9 Fix CI 2025-07-05 12:09:45 +02:00
Laurent Destailleur
b70943db59 Fix typo 2025-07-05 11:45:25 +02:00
Laurent Destailleur
ce91aed92c Fix warning 2025-07-05 11:36:56 +02:00
Laurent Destailleur
6b68f5aad0 Fix CI 2025-07-05 11:33:46 +02:00
Laurent Destailleur
fba47cba19 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-07-05 10:53:05 +02:00
Laurent Destailleur
4cbc1e012d Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-05 10:51:22 +02:00
Lucas Marcouiller
7572b33f6f Fix clean code + phan warnings (#34688)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-05 10:49:56 +02:00
Laurent Destailleur
beac067e55 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-05 10:46:39 +02:00
Laurent Destailleur
5634483720 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-05 10:46:06 +02:00
Laurent Destailleur
af6076352c Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-07-05 10:44:49 +02:00
Laurent Destailleur
704173f4a6 FIX #34591 FIX #34692 2025-07-05 10:32:59 +02:00
Laurent Destailleur
75593e84b2 FIX #34591 FIX #34692 2025-07-05 10:21:25 +02:00
Laurent Destailleur
dff214402e Fix warning 2025-07-05 01:21:45 +02:00
Laurent Destailleur
53cf9f0bf1 Doc 2025-07-05 00:40:19 +02:00
Laurent Destailleur
e7592d6ea9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-05 00:14:58 +02:00
Laurent Destailleur
fe19745458 Add warning to avoid confusion. 2025-07-05 00:14:23 +02:00
Laurent Destailleur
7b8601d485 Update card.php 2025-07-04 20:29:29 +03:00
Frédéric FRANCE
31517fdc9c situation_counter is nullable (#34693)
* situation_counter is nullable

* Update phpstan-baseline.neon
2025-07-04 20:07:03 +03:00
Lucas Marcouiller
f4efa58022 Fix #17816 match compta/paiement.php payment method for credit note invoices (#34696) 2025-07-04 20:06:35 +03:00
Noé Cendrier
6608e972ab FIX: Trigger should be the same for same action (#34698) 2025-07-04 20:05:34 +03:00
atm-corentin
6c6846ed6e fix fatal when u try to add a newline on expensereport object we try to do a explode on Translate object (#34697) 2025-07-04 20:00:31 +03:00
Alain Rihs
8772306b60 Update card.php (#34677)
Since the improvement of the Prospect/Client/Supplier selection, the THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT variable is no longer taken into account. This code restores this functionality when creating a new third party.
2025-07-04 09:56:07 +03:00
Mohamed DAOUD
b506f03c62 Improve error messages returned by getURLContent (#34689)
* enhance getURLContent error messages

* fix CI
2025-07-04 09:54:01 +03:00
Eric - CAP-REL
737dc7726e remove dpatch and add debhelper+po-debconf (#34685) 2025-07-04 09:36:44 +03:00
Eric - CAP-REL
af095c0e11 check if rpmbuild/sources dir exists (#34687) 2025-07-04 09:35:44 +03:00
github-actions[bot]
d065f25e2b PHPStan > Update baseline (#34679)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-07-03 13:09:13 +03:00
Laurent Destailleur
5161b631d5 Doc 2025-07-03 01:32:07 +02:00
Laurent Destailleur
641c6d8b24 Debug v22 2025-07-03 01:12:16 +02:00
Laurent Destailleur
bf6c9110ca Debug v22 2025-07-03 01:03:18 +02:00
Laurent Destailleur
20c327b1d3 Debug v22 2025-07-03 00:50:04 +02:00
Laurent Destailleur
a2d42ebb08 Debug v22 2025-07-03 00:08:51 +02:00
Laurent Destailleur
723a018759 Debug v22 2025-07-01 22:46:00 +02:00
Laurent Destailleur
167ef49fae Debug v22 2025-07-01 22:26:16 +02:00
Laurent Destailleur
d7f1f1231b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-01 21:28:56 +02:00
Laurent Destailleur
19a9be927e Fix Add a protection when 2 users are allowed (should not happen) 2025-07-01 21:08:44 +02:00
MDW
8c1d90519c qual: Update phan baseline (#34670)
# qual: Update phan baselin

Several phan notices were fixed.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-01 20:43:03 +02:00
Jyhere
787bd1d278 CHANGE: ternary simplification (#34675) 2025-07-01 20:34:09 +02:00
Laurent Destailleur
24e3f31ba1 Fix CI 2025-07-01 20:32:31 +02:00
Laurent Destailleur
60feb166c0 Fix CI 2025-07-01 16:35:26 +02:00
Laurent Destailleur
ac892efb42 Fix CI 2025-07-01 16:22:21 +02:00
Laurent Destailleur
e2c2f73e9c Fix CI 2025-07-01 15:39:16 +02:00
Laurent Destailleur
2941cf1c19 Fix CI 2025-07-01 15:29:15 +02:00
Frédéric FRANCE
453b289346 fix ajax product with multiprices (#34672) 2025-07-01 16:13:57 +03:00
Laurent Destailleur
e5aae4d7e3 Debug v22 2025-06-30 17:39:38 +02:00
Laurent Destailleur
495c45fde0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-30 16:26:46 +02:00
Charlène Benke
c0b4af32be FIX some error on donation list (#34666)
* fix some error on donation list

* Update list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-30 17:25:44 +03:00
Laurent Destailleur
8c8a45a191 Doc 2025-06-30 15:49:20 +02:00
Laurent Destailleur
fae0093b51 Debug v22 2025-06-30 15:47:49 +02:00
Laurent Destailleur
f974c49fcc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-30 15:14:31 +02:00
Laurent Destailleur
00ff8d490a Debug v22 2025-06-30 15:14:09 +02:00
github-actions[bot]
1d37671c67 PHPStan > Update baseline (#34664)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-30 15:35:03 +03:00
atm-lena
5253346fca Delete entity filter in user fetch (#34348)
* Delete entity filter in user fetch

* Fetch without entity if fetch by id

---------

Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-30 14:21:03 +02:00
Charlène Benke
95027c5dfd php error on takepos admin (#34660) 2025-06-29 12:45:52 +02:00
Alexandre SPANGARO
621b91097a Translate term Incoterm (#34661) 2025-06-29 12:45:29 +02:00
Alexandre SPANGARO
0d00a27a1c QUAL Use GetDolGlobalString (#34662)
* Typo comment

* Use getGlobalString
2025-06-29 12:43:14 +02:00
ldestailleur
38b752f367 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 18:57:10 +02:00
ldestailleur
27479f41c5 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-28 18:56:46 +02:00
ldestailleur
29c953bd37 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-28 18:56:26 +02:00
ldestailleur
9d30492846 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-28 18:55:40 +02:00
ldestailleur
2bef534e60 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-28 18:55:06 +02:00
ldestailleur
c0161ccead Fix CI 2025-06-28 18:54:53 +02:00
ldestailleur
1be67fee52 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-28 18:54:33 +02:00
ldestailleur
4a88509cdf Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-28 18:54:19 +02:00
ldestailleur
a4b1700bae Merge branch '16.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0 2025-06-28 18:53:25 +02:00
ldestailleur
f5cb64afaa Fix CI 2025-06-28 18:53:12 +02:00
ldestailleur
2cbb6d9e1e Trans 2025-06-28 18:38:59 +02:00
ldestailleur
320364b364 Trans 2025-06-28 18:38:03 +02:00
ldestailleur
202f152a13 Trans 2025-06-28 18:36:00 +02:00
ldestailleur
bb0be51ad5 Better demo link 2025-06-28 18:24:26 +02:00
Marc de Lima Lucio
4841a8d2ce FIX: pre-send mail mass action: keep __EMAIL__ substitution (#34522)
* FIX: pre-send mail mass action: keep __EMAIL__ substitution

* FIX: comment

* test github workflows

* test github workflow for 18

* test v18 pr workflow

* FIX: massaction email tpl: keep preset

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-28 17:58:07 +02:00
ldestailleur
e82e451248 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 17:56:39 +02:00
ldestailleur
9d2cb0d078 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-28 17:56:12 +02:00
ldestailleur
74898efb5b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-28 17:55:53 +02:00
ldestailleur
919d9635ab Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-28 17:55:26 +02:00
ldestailleur
52a5d4ca0a Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-28 17:55:04 +02:00
ldestailleur
cb0d39ff6e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-28 17:54:58 +02:00
ldestailleur
a5c51589d3 Merge branch '16.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0 2025-06-28 17:54:41 +02:00
ldestailleur
b4501511c8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2025-06-28 17:54:22 +02:00
ldestailleur
e18c5b9d68 Fix CI 2025-06-28 17:40:01 +02:00
Vincent Maury
b940f2eae3 Fix bug in product->get_sousproduits_arbo (#34561)
* Update product.class.php

depending on php version used, when var $this->sousprods not correctly declared it'snot filled

* Update product.class.php

sousprods prop now initialized when declared

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-28 17:34:12 +02:00
ldestailleur
1c118b998c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 17:28:49 +02:00
ldestailleur
7402866c35 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 17:28:40 +02:00
ldestailleur
91283f3569 Merge 2025-06-28 17:24:03 +02:00
ldestailleur
7a54d65e8a Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-28 17:22:00 +02:00
ldestailleur
d268fc42c2 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-28 17:20:08 +02:00
ldestailleur
e6ff31abf1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-28 17:19:04 +02:00
ldestailleur
d31bad82a1 Merge branch '16.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0 2025-06-28 17:14:50 +02:00
ldestailleur
bc0b0bebd3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2025-06-28 17:09:51 +02:00
ldestailleur
031acacdab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2025-06-28 17:04:21 +02:00
Lucas Marcouiller
cde9632622 Fix some phan warnings (#34650)
* Fix some phan warnings

* Update defaultvalues.php

* Update hookmanager.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-28 16:46:52 +02:00
POTIER Mathieu
18725aec6b [FIX] loop interrupt if an error occurs in sendEmailsRemindersOnInvoiceDueDate (#34657) 2025-06-28 16:45:52 +02:00
ldestailleur
0e8bc21748 Doc 2025-06-28 16:45:31 +02:00
ldestailleur
f1f6822578 Debug v22 2025-06-28 16:38:54 +02:00
ldestailleur
f7bd8339cb Debug v22 2025-06-28 16:35:41 +02:00
github-actions[bot]
30577d1672 PHPStan > Update baseline (#34658)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-28 15:24:38 +02:00
ldestailleur
7013499dfa Try fix CI 2025-06-28 14:40:48 +02:00
ldestailleur
e75551b9d0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 13:30:41 +02:00
ldestailleur
4721a84cec Fix warnings 2025-06-28 13:30:32 +02:00
dev2a
910279ea37 Fix Check delete task which return 0 on error (#34655) 2025-06-28 13:20:01 +02:00
ldestailleur
d1ddf4314e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 13:18:15 +02:00
ldestailleur
1dd0afe027 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-28 13:17:37 +02:00
ldestailleur
51f246b4ac Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-28 13:17:30 +02:00
ldestailleur
1a4b2fcf4f Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-28 13:17:06 +02:00
ldestailleur
109d30fbea Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-28 13:16:59 +02:00
ldestailleur
d2e9c01796 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-28 13:16:30 +02:00
ldestailleur
75c3456743 FIX #34654 2025-06-28 13:14:11 +02:00
ldestailleur
c6a5bf3836 Fix CI 2025-06-27 21:30:37 +02:00
ldestailleur
48c16c7438 Fix CI 2025-06-27 21:07:58 +02:00
ldestailleur
da5c0749e9 Fix warning 2025-06-27 16:57:00 +02:00
ldestailleur
1a5d71319e Fix check on entity is a different security check than check on external
user so code must not be nested.
2025-06-27 16:43:16 +02:00
ldestailleur
358daa3ca0 Clean doc and code 2025-06-27 13:39:50 +02:00
ldestailleur
f97e3b6bbe Debug v22 2025-06-27 13:05:56 +02:00
ldestailleur
f7c837743d Fix excludeloan by default on project profit. 2025-06-27 12:57:55 +02:00
ldestailleur
74e8a9e8df css 2025-06-27 03:07:07 +02:00
ldestailleur
e3c6c0f22a Debug v22 look and feel 2025-06-27 02:52:51 +02:00
ldestailleur
eab96158f4 Fix doc 2025-06-27 01:05:12 +02:00
ldestailleur
7909b0f17a Close #34627 2025-06-27 00:52:48 +02:00
ldestailleur
51253c1ee4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-27 00:33:49 +02:00
Florian Mortgat
094dd3a9d1 FIX 21.0: $height and $width can be ints, but also 'auto' (#34636)
* FIX 21.0: $height and $width can be ints, but also 'auto' (which is commonly used), so check for this special value before typecasting

* Update html.form.class.php

* Update html.form.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-27 00:30:00 +02:00
Quentin-Seekness
b91b46d898 Filter on search_project lost on next pages (#34646)
The filter on the p.title of the command list doesn't work if you switch result pages. It's simply not kept in the next page url.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-27 00:28:36 +02:00
ldestailleur
2c10e2c093 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-27 00:27:29 +02:00
ldestailleur
321a9938d0 Update doc 2025-06-27 00:27:18 +02:00
Ferran Marcet
267c77ec22 New: Add note private on order export (#34642)
* New: Mail template for contacts

* New: Mail template for contacts

* New: Mail template for contacts

* New: Andorra's Accounting Plan

* New: Add function to make substitutions on Takepos receipt

* New: Add function to make substitutions on Takepos receipt

* New: Add note private on order export

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-27 00:26:42 +02:00
ldestailleur
497d774a21 Fix the selectForFormsList was not using correctly the
ismultientitymanaged. Replace a join with and exists.
2025-06-27 00:21:50 +02:00
ldestailleur
3b0363aea4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-26 20:00:34 +02:00
ldestailleur
bf7ec83640 Debug v28 2025-06-26 20:00:24 +02:00
FlorianKronos
24cfab1cdb Update withdrawals.lang (#34645)
Correction orthographique de Payment en Paiement
2025-06-26 19:36:12 +02:00
ldestailleur
e64f3e3f13 Fix regression 2025-06-26 19:35:40 +02:00
ldestailleur
5a8427d8e2 Trans 2025-06-26 14:33:20 +02:00
ldestailleur
e1218ab816 Update doc 2025-06-26 12:29:01 +02:00
ldestailleur
35a4aacc42 Complete the makepack-howto.md 2025-06-26 12:26:21 +02:00
ldestailleur
a557294b19 Clean package 2025-06-26 12:07:54 +02:00
ldestailleur
6b0d5474a4 Debug v22 2025-06-26 02:01:15 +02:00
ldestailleur
f172e594e8 Doc 2025-06-26 01:44:21 +02:00
ldestailleur
d4b2a20d3a Doc 2025-06-26 01:43:41 +02:00
ldestailleur
4db4fa153c Debug v22 2025-06-26 01:37:45 +02:00
ldestailleur
aca2ab77d1 Debug v22 2025-06-26 01:32:43 +02:00
ldestailleur
16fb1c681e Add debug info 2025-06-26 01:31:52 +02:00
ldestailleur
fe287a150c Debug v22 2025-06-26 01:20:51 +02:00
ldestailleur
76bdc64d35 Debug v22 2025-06-26 01:15:10 +02:00
ldestailleur
c76fc3892e Fix linkg 2025-06-26 01:08:26 +02:00
ldestailleur
098beb6338 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-25 22:48:54 +02:00
Elyn
f46f68fef8 Standardize product ref and name column length (#34622)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-25 22:45:06 +02:00
ldestailleur
0df073f5c8 Fix click on checkbox 2025-06-25 21:52:24 +02:00
ldestailleur
ce1403d318 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-25 21:36:46 +02:00
ldestailleur
6af890f7f2 Fix CI 2025-06-25 21:36:36 +02:00
apsolauv
d3b691d495 Fix the previous PR FixNegativeCreditNote for specific workflow deposit --> payed --> delete discount --> mark as credit (#34637)
Co-authored-by: Alex SOLAUV <test@test.com>
2025-06-25 19:58:55 +02:00
ldestailleur
68b97390b3 Fix CI 2025-06-25 19:57:28 +02:00
ldestailleur
06a7a6dfcf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-25 19:44:47 +02:00
ldestailleur
b47d0827fa Trans 2025-06-25 19:33:20 +02:00
HENRY Florian
dc852ba93f FIX: if filter is set on export for Duree type filed, then there is SQL error (#34616) 2025-06-25 19:27:49 +02:00
HENRY Florian
3280be4583 fix: remove php warning (#34614)
* fix php warning

* fix php warning

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-25 19:26:58 +02:00
Charlène Benke
642f045fd2 add api document feature on interventional (#34609)
add get feature 
update upload feature (fichinter not reconized, we need ficheinter instread)
2025-06-25 19:25:57 +02:00
Charlène Benke
d5ddc46d72 fix signed confirm if no status is selected (#34608) 2025-06-25 19:25:31 +02:00
Marc
57a256791f FIX #34618 (#34621)
Update api_salaries.class.php
Replace POST with PUT
2025-06-25 19:21:54 +02:00
atm-irvine
82abb0e8ed fix(bookkeeping): doc_ref too long (#34628) 2025-06-25 19:19:16 +02:00
ldestailleur
4f892b02e4 Better slide on div 2025-06-25 19:07:07 +02:00
ldestailleur
2df53594a8 Debug look and feel v23 2025-06-25 16:12:19 +02:00
ldestailleur
cf98767c8c CSS 2025-06-25 16:05:58 +02:00
ldestailleur
1b2aa7616b Fix warnings 2025-06-25 15:25:55 +02:00
ldestailleur
38aa9cbacc Debug v22 2025-06-25 13:09:56 +02:00
ldestailleur
a379867121 Fix warnings 2025-06-25 12:40:16 +02:00
ldestailleur
8c88eab05c Debug v22 - Removed conflict code with old dolopenpopup architecture 2025-06-25 12:29:11 +02:00
ldestailleur
d828828bef CSS 2025-06-25 12:15:17 +02:00
ldestailleur
7b5fa6f98d Debug v22 2025-06-24 19:37:56 +02:00
ldestailleur
44043ea008 Clean code - Debug v22 2025-06-24 19:33:50 +02:00
ldestailleur
2b35cd21b2 Clean code 2025-06-24 18:53:24 +02:00
ldestailleur
d02aabd906 Doc 2025-06-24 18:48:48 +02:00
ldestailleur
bd4489d1b2 Fix duplicate paramapikey 2025-06-24 18:39:38 +02:00
ldestailleur
765caf894b Debug v22 2025-06-24 17:55:11 +02:00
ldestailleur
37f7b7fa02 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-24 17:19:57 +02:00
ldestailleur
5ab1933280 Trans 2025-06-24 17:19:40 +02:00
Frédéric FRANCE
bb1d0a7347 fix missing translation (#34613) 2025-06-24 16:03:45 +02:00
HENRY Florian
e3f2e1bd55 fix: negative quantity in reception are allowed and must be managed on revert stock mvt (#34615) 2025-06-24 16:02:07 +02:00
ldestailleur
6bd37636f5 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-24 14:07:45 +02:00
ldestailleur
42c7868fdb Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-24 14:07:25 +02:00
ldestailleur
3914e9d3dd Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-24 14:07:17 +02:00
ldestailleur
b132fb50f1 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-24 14:06:48 +02:00
ldestailleur
9a63af82de Fix pb in merge 2025-06-24 14:06:27 +02:00
ldestailleur
c0db33caf2 Having LTS in v18 and not in v19, v20... lets think that only v18 is LTS
and LTS is propagated during merge. Better to keep the mention into
Changelog only or into doc.
2025-06-24 14:04:21 +02:00
ldestailleur
b2820ebfb7 Fix version 2025-06-24 14:02:52 +02:00
ldestailleur
a438d725a5 Debug v22 2025-06-24 11:08:34 +02:00
ldestailleur
81a358b5f0 Debug v22 2025-06-24 11:01:30 +02:00
ldestailleur
a0d56ba870 Debug v20 2025-06-24 10:58:29 +02:00
ldestailleur
caf2a0775f Trans 2025-06-24 10:39:03 +02:00
ldestailleur
c38ed96c09 css 2025-06-23 19:38:04 +02:00
ldestailleur
eb3a1f2698 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-23 18:36:28 +02:00
Mohamed DAOUD
22597ed441 fix colored icon setting (#34512) 2025-06-23 18:36:12 +02:00
ldestailleur
309f16f561 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-23 18:29:23 +02:00
Alexandre Janniaux
efd95ad107 Qual commonobject: line_max: factor conditonals together (#34600)
* commonobject: line_max: factor conditonals together

The SQL request is shared, except for the additional filter.

* Update commonobject.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-23 18:28:13 +02:00
Frédéric FRANCE
d77dfc56f9 add date in ajax tooltip of propal (#34606) 2025-06-23 18:21:47 +02:00
ldestailleur
70173993a3 Fix CI 2025-06-23 18:21:37 +02:00
MDW
b52b16a947 qual: update phan baseline (#34603) 2025-06-23 18:17:22 +02:00
ldestailleur
b1b5e7d0c4 The archive file must contains a signature 2025-06-23 18:16:25 +02:00
ldestailleur
6f2df4a3c6 Fix typo 2025-06-23 16:45:35 +02:00
ldestailleur
a140402635 CSS 2025-06-23 16:43:56 +02:00
ldestailleur
7b08242064 Prepare script for blocked log control 2025-06-23 15:50:28 +02:00
ldestailleur
e623a13cf2 Add sql file 2025-06-23 14:37:38 +02:00
ldestailleur
740b5aff03 WIP Define the unalterable scope for Loi finance 2025-06-23 14:31:11 +02:00
ldestailleur
115afbbb76 Add critical info into unalterable log to help debug
FIX: Must be able to filter on signature.
2025-06-23 14:04:36 +02:00
ldestailleur
ec5275e1d9 Fix picto download/upload 2025-06-23 03:36:27 +02:00
ldestailleur
f406b9e211 Debug v22 2025-06-23 01:04:24 +02:00
ldestailleur
14a196b5c6 Debug v22 2025-06-23 00:08:14 +02:00
ldestailleur
c02a9d816b Debug v22 2025-06-23 00:04:20 +02:00
ldestailleur
4a0cf5a2f9 Debug v22 2025-06-22 23:35:22 +02:00
ldestailleur
040393abe5 Debug v22 2025-06-22 22:50:56 +02:00
ldestailleur
795f277f44 Fix warning 2025-06-22 22:31:01 +02:00
HENRY Florian
bfa389daea fix: Bad contact URL link on Task list on project (#34431)
* fix: Bad contact URL link on Task list on project

* Update project.lib.php

* fix stan

* Update project.lib.php

* Update project.lib.php

* Update project.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-22 20:13:01 +02:00
ldestailleur
c13f736ab4 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-22 17:29:56 +02:00
ldestailleur
8159249209 Fix changelog 2025-06-22 17:26:59 +02:00
ldestailleur
4e2a76c807 Fix duplicate 2025-06-22 17:26:32 +02:00
ldestailleur
f9c86eb4c9 Fix log 2025-06-22 17:25:47 +02:00
ldestailleur
17a0ec87fe Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-22 17:25:29 +02:00
ldestailleur
a239395352 Fix remove the flag 2025-06-22 17:23:53 +02:00
ldestailleur
e809273ec3 Fix comment 2025-06-22 17:22:58 +02:00
ldestailleur
743ca4bb03 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-22 17:19:41 +02:00
ldestailleur
5042c0959e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-22 17:16:51 +02:00
ldestailleur
68a373b6c2 Fiw warning 2025-06-22 13:22:01 +02:00
ldestailleur
23004a7999 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-22 13:00:55 +02:00
Pichi1966
9f76298e58 FIX BankTransfer information in line.php (#34425)
* Prepare 18.0.7

* FIX BankTransfer information in line.php

FIX BankTransfer information in line.php

This is too fix a wrong information in line.php.
The mention of WithDrawalsReceipts instead of BankTransfers is wrong information

* Suppress Tab in line.php

---------

Co-authored-by: VESSILLER <lvessiller@open-dsi.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-22 12:57:33 +02:00
Pichi1966
f1ecb023ff FIX BankTransfer link in rejets.php (#34424)
* Prepare 18.0.7

* FIX BankTransfer link in rejets.php

FIX BankTransfer link in rejets.php
This is to fix a wrong action link in rejets.php.
The link was sending to a WithDrawals screen creating confusion.

---------

Co-authored-by: VESSILLER <lvessiller@open-dsi.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-22 12:57:09 +02:00
Marc de Lima Lucio
f3ae9f53f7 FIX: product multiprices: fatal error on vat update on php 8.2 (#34444)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-22 12:54:42 +02:00
lvessiller-opendsi
ce1243140f FIX js warning (Backport commit 84d982c) (#34555)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-22 12:49:52 +02:00
apsolauv
b851a70402 Added the possibility of making negative credit notes. Use case: several VATs in the invoice with a negative product, then creation of a credit note and charging to account. (#34529)
Co-authored-by: Alex SOLAUV <test@test.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-22 12:43:52 +02:00
ldestailleur
c6da032c9a Fix merge 2025-06-22 12:42:44 +02:00
ldestailleur
0e6919c269 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-22 12:41:44 +02:00
ldestailleur
60e595ff24 FIX #34442 2025-06-22 12:41:32 +02:00
Charlène Benke
bec0e9983f create invoice and order categorie table when we enable it (#34450)
* create invoice and order categorie table if not enabled

* Update modFacture.class.php

* Update modCommande.class.php

* Update modCategorie.class.php

* Update modCommande.class.php

* Update modFacture.class.php

* Update modCategorie.class.php

* Update modCommande.class.php

* Update modFacture.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-22 12:13:16 +02:00
William Mead
64ab2cc512 NEW expense report API approve (#34508)
* Added expense report approve route

* Fixed permission

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-22 03:00:19 +02:00
ldestailleur
34b3096b21 Merge #34508 2025-06-22 02:59:28 +02:00
ldestailleur
8215aedfff Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-22 02:57:35 +02:00
ldestailleur
1ba0da0dd6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-06-22 02:57:26 +02:00
William Mead
329f95eaa4 Added expense report deny route (#34509)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-22 02:56:22 +02:00
Charlène Benke
10c9c41526 COMPANY_ELEPHANT_DATE_START_ENABLE Checkbox not save (#34516)
* COMPANY_ELEPHANT_DATE_START_ENABLE Checkbox not save

* Update mod_codeclient_elephant.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-21 16:50:45 +02:00
ldestailleur
b006062bc9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-21 16:50:28 +02:00
ldestailleur
1c3687b292 Fix CI 2025-06-21 16:50:14 +02:00
Marc de Lima Lucio
79afbab095 FIX: email collector: php 8 warning (#34496)
* FIX: email collector: php 8 warning

* FIX: email collector: php 8 warning, part 2

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-21 16:18:40 +02:00
apsolauv
88e78d1667 Fix return type and error type getSumCreditNotesUsed (#34527)
Co-authored-by: Alex SOLAUV <test@test.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-21 16:16:47 +02:00
Maxime Kohlhaas
ec989f7f6f Fix : wrong URL construction (#34531) 2025-06-21 16:10:52 +02:00
kkhelifa-opendsi
79a6825e6f FIX - Add others allowed tags (table, tr, td) for the prices history table displayed in the link url of the supplier product in supplier product prices list (#34532)
* FIX - Add others allowed tags (table, tr, td) for the prices history table displayed in the link url of the supplier product in supplier product prices list

* Fix

* Fix
2025-06-21 16:10:26 +02:00
HENRY Florian
931384db35 fix: manage correctly external module object link with myobject@mymodule element type (#34530)
* fix: manage correctly external module object link with myobject@mymodule element type

* add more doc in template module builder

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-21 16:09:54 +02:00
ldestailleur
dc641d7380 Debug v22 2025-06-21 15:29:54 +02:00
Maxime Kohlhaas
4f3a0177c6 Fix : in messaging view, the event status was missing (#34533) 2025-06-21 15:18:27 +02:00
ldestailleur
aa56fb6491 Doc 2025-06-21 14:54:53 +02:00
Vincent Maury
f073963e15 Fix 34336 no mail sent to validator after sending for approval (#34562) 2025-06-21 14:42:27 +02:00
ldestailleur
cf8beb8505 Fix error return 2025-06-21 14:39:53 +02:00
Alexandre Janniaux
1a3430f40a commonobject: updateLineDown: use early return on query failure (#34598)
Simplify the code by early returning on query failure, which removes
almost every indentation level of the function.

It also highlights some important flaws here, since there is a return
without value (void return type) between the two queries if an error
happened, which would indicate the first query failed and nothing was
registered, but also an error check leading to printing an error message
if the second query fails, without actually reverting the first one, and
since there is no error code, there's no way to trigger a db->rollback()
from the caller code for this reason.
2025-06-21 14:36:07 +02:00
Marc
52c827c2bb FIX #34541 (#34597) 2025-06-21 14:35:20 +02:00
Alexandre Janniaux
1113ae6dc1 Qual: Commonobject reverse happy path (#34599)
* commonobject: getRangOfLine: reverse happy and error path

* commonobject: getIdOfLine: reverse error and happy path
2025-06-21 14:35:01 +02:00
github-actions[bot]
5ea28763e5 PHPStan > Update baseline (#34601)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-21 14:34:28 +02:00
William Mead
e35e1d76e1 QUAL Updated agenda events API PHPDoc (#34558)
* Fixed mandatory fields

* Updated PHPDoc. Added contributor details.

* Updated PHPDoc

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-20 20:13:10 +02:00
ldestailleur
9b7fee42e3 Clean code 2025-06-20 16:45:49 +02:00
ldestailleur
b8de0358c0 Fix use of distinct. 2025-06-20 16:42:22 +02:00
HENRY Florian
7384959f38 FIX: filter agenda on user and ressource SQL error (#34580) 2025-06-20 16:25:00 +02:00
ldestailleur
3a04ba15c7 Fix trans 2025-06-20 16:21:08 +02:00
Marc
32051ee77d FIX #34564 (#34590) 2025-06-20 16:19:17 +02:00
ldestailleur
955fc158ee Fix CI 2025-06-20 16:17:54 +02:00
ldestailleur
7ed2cddd4b Fix CI 2025-06-20 16:16:04 +02:00
Frédéric FRANCE
7c0604047e fix missing translation (#34587)
* fix missing translation

* fix missing translation
2025-06-20 15:48:58 +02:00
Marc de Lima Lucio
96eddc1729 NEW: dev tools: add github webhook handler to auto-assign pull requests (#34579)
* NEW: dev tools: add github webhook handle to auto-assign pull requests

* FIX: ci

* FIX: comment

* FIX: ci

* FIX: forgotten param + ci

* FIX: ci

* FIX: ci
2025-06-20 15:45:31 +02:00
Günter Lukas
603f46a173 Fix #34593 (#34594)
* Fix #34593

* Fix whitespace

* Fix phpstan error

* undi fix in dolibarrtriggers.class.php

* Fix #34593
2025-06-20 15:43:39 +02:00
ldestailleur
446efdc432 Clean dead code 2025-06-20 14:00:29 +02:00
ldestailleur
2a85b73fa2 Add MULTICURRENCY_SHOW_ALSO_MAIN_CURRENCY_ON_PDF for legal requirement
that need both currencies on PDF
2025-06-20 14:00:14 +02:00
ldestailleur
81bd0f3389 Debug v22 2025-06-20 12:56:16 +02:00
ldestailleur
703d4358a5 Debug v22 2025-06-20 12:34:10 +02:00
ldestailleur
a23580f785 Fix code of event 2025-06-20 12:23:53 +02:00
ldestailleur
351b3b4dd3 Debug v22 2025-06-20 11:56:10 +02:00
ldestailleur
e6ff3280f6 Debug v22 2025-06-20 11:55:14 +02:00
ldestailleur
739cbe063b Fix missing 2025-06-19 16:47:12 +02:00
ldestailleur
bbd091d7df Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-19 15:58:33 +02:00
ldestailleur
2cfa986ad5 Doc 2025-06-19 15:58:23 +02:00
ldestailleur
ec8a87a3cb Doc 2025-06-19 15:49:26 +02:00
github-actions[bot]
b2b3100ed3 PHPStan > Update baseline (#34584)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-19 14:59:26 +02:00
lvessiller-opendsi
c263fccb5f Prepare 18.0.7 (#34575)
* Prepare 18.0.7

* Changelog for 18.0.7 LTS
2025-06-19 14:58:38 +02:00
ldestailleur
8c99c91015 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-19 12:51:00 +02:00
ldestailleur
b8695702dd Fix DOC 2025-06-19 12:50:49 +02:00
ldestailleur
62abfe7cb0 Clean code 2025-06-19 12:50:41 +02:00
Frédéric FRANCE
a089aa2409 fix missing translation (#34578) 2025-06-19 12:41:29 +02:00
ldestailleur
9c2da8b9b6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-19 11:31:44 +02:00
ldestailleur
a78e63dbf0 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-19 11:13:59 +02:00
ldestailleur
ec098b2632 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-19 10:59:07 +02:00
ldestailleur
c3f11fd0a7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-19 10:52:07 +02:00
ldestailleur
719de0aef3 Disable not working github actions 2025-06-19 10:51:51 +02:00
ldestailleur
8a00ba81d0 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-19 10:49:00 +02:00
ldestailleur
0da1e6b464 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-19 10:48:18 +02:00
ldestailleur
4cc3be24d3 Doc 2025-06-19 10:46:15 +02:00
Eric - CAP-REL
b1109f6803 add env var for non-origin repository (#34577) 2025-06-19 10:44:18 +02:00
HENRY Florian
68a33a8759 fix: SubTotal module version for 22 is still experimental (even if actually it's working like a charm on the customer scope) (#34573) 2025-06-19 10:40:06 +02:00
ldestailleur
247847cd14 Fix warnings 2025-06-19 10:39:19 +02:00
Alexandre Janniaux
0770e79749 commonobject: updateLineUp: use early return on query failure (#34570)
Simplify the code by early returning on query failure, which removes
almost every indentation level of the function.

It also highlights some important flaws here, since there is a return
without value (void return type) between the two queries if an error
happened, which would indicate the first query failed and nothing was
registered, but also an error check leading to printing an error message
if the second query fails, without actually reverting the first one, and
since there is no error code, there's no way to trigger a db->rollback()
from the caller code for this reason.
2025-06-19 10:12:55 +02:00
Alexandre Janniaux
1da9aab8d4 commonobject: updateRangOfLine: de-indent happy path (#34569)
There's no need for the else{} block when the if block early returns,
and it helps highlighting the happy path. Note that this kind of change
only make sense when one of the block is an error, not a choice between
two possibilities.
2025-06-19 10:11:12 +02:00
Frédéric FRANCE
bf2d6f1f1e fix CI (#34553)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-19 10:10:42 +02:00
ldestailleur
0a0f96bda6 Fix CI 2025-06-18 19:13:53 +02:00
ldestailleur
01b630a221 Fix CI 2025-06-18 18:21:57 +02:00
ldestailleur
0ae1f2fb9d Fix CI 2025-06-18 16:53:20 +02:00
ldestailleur
65bb64e9cd Fix CI 2025-06-18 16:24:37 +02:00
ldestailleur
9d89c206df Debug v22 2025-06-18 16:14:33 +02:00
ldestailleur
1e57bc5af9 Fix CI 2025-06-18 16:09:34 +02:00
ldestailleur
06a5b4947d Fix CI 2025-06-18 15:59:28 +02:00
ldestailleur
e036520cb0 Debug v22 2025-06-18 15:10:58 +02:00
ldestailleur
fda1499eee Fix CI 2025-06-18 14:28:36 +02:00
ldestailleur
f5a982b5fa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-18 14:25:05 +02:00
ldestailleur
8ef8891581 Debug v22 2025-06-18 14:24:51 +02:00
Alexandre SPANGARO
4548a6fffb FIX Product batch series - Title, help url et picto (#34560)
* Fix title / help url

* Fix help / title on note of product batch series

* Fix help / title on document of product batch series

* Fix wrong picto on document of product batch series

* Missing language file

* Fix linkback

* Update productlot_note.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-18 14:22:03 +02:00
Marc de Lima Lucio
57c751f319 FIX: expense report card: mail notifications not sent (#34556) 2025-06-18 14:20:17 +02:00
Alexandre Janniaux
f04a390cb5 commonobject: getChildrenOfLine: early return on query error (#34547)
This makes the code more readable by deindenting two whole levels on the
happy path.
2025-06-18 14:19:37 +02:00
atm-irvine
96e1017d14 fix: document.php set default entity value (#34557) 2025-06-18 14:18:24 +02:00
ldestailleur
3d3cf00cef Debug v22 2025-06-18 12:50:30 +02:00
ldestailleur
4dd843aac4 Debug v22 2025-06-18 12:47:34 +02:00
ldestailleur
86f0057c68 Doc 2025-06-18 11:32:38 +02:00
ldestailleur
c147cf1fb2 Debug v22 2025-06-18 11:03:15 +02:00
ldestailleur
6644d9539c Debug v22 kanban grouped 2025-06-17 19:33:46 +02:00
ldestailleur
3c88a63172 Debug v22 2025-06-17 15:14:08 +02:00
ldestailleur
89da4b454b Debug v22 2025-06-17 11:44:50 +02:00
ldestailleur
e7d098c8e9 Debug v22 2025-06-17 01:55:18 +02:00
ldestailleur
320328d7ec Debug v22 2025-06-17 01:49:34 +02:00
ldestailleur
7f817c5b25 Debug v22 2025-06-17 01:37:26 +02:00
ldestailleur
8208b1d40f Debug v22 2025-06-17 01:13:09 +02:00
ldestailleur
9c9708c9e6 Debug v22 2025-06-16 23:55:52 +02:00
ldestailleur
5e4f167815 Debug v22 - missing module_source in view mode of card 2025-06-16 23:49:56 +02:00
ldestailleur
169f3ab237 Complete FIX #34336 2025-06-16 23:36:51 +02:00
ldestailleur
253c93f7c1 Debug v22 2025-06-16 23:33:11 +02:00
ldestailleur
6d4a68b227 Debug v22 2025-06-16 22:50:21 +02:00
ldestailleur
4725cb6b31 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-16 21:59:39 +02:00
ldestailleur
af26c002aa Fix missing license file content 2025-06-16 21:59:30 +02:00
github-actions[bot]
55a8d9ff26 PHPStan > Update baseline (#34536)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-16 20:23:29 +02:00
Charlène Benke
79b690e009 warning error on calendar setting (#34538)
harmonizing code
2025-06-16 20:19:04 +02:00
Vincent Maury
73332482bb Fix 34336 no mail sent to validator after sending for approval (#34544) 2025-06-16 20:16:07 +02:00
Clément
030df976ab FIX Bug filters (#34546) 2025-06-16 20:12:38 +02:00
Noé Cendrier
d1f3f9eddd FIX: PHP 8 Error 500 (#34545)
* FIX: PHP 8 Error 500

* Update product.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-16 20:09:00 +02:00
ldestailleur
e15c9ad99b Fix css 2025-06-15 17:35:00 +02:00
ldestailleur
810657de31 Fix css 2025-06-15 17:24:49 +02:00
ldestailleur
4223714600 Fix warning 2025-06-15 17:24:08 +02:00
Laurent Destailleur
6ffc217f49 Debug v22 2025-06-15 03:12:15 +02:00
Vincent Maury
6bef6254f8 Fix issue #34245 town missing in bank transfer XML (#34517)
* Fix issue #34245 town missing in bank transfer XML

* Update bonprelevement.class.php

* Update bonprelevement.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-15 03:10:37 +02:00
Pichi1966
4bb42de5d6 FIX BankTransfer link in list.php (#34513)
FIX BankTransfer link in list.php

This is to fix a wrong action link in list.php.
The link was sending to a WithDraw screen creating confusion.
2025-06-15 03:03:42 +02:00
atm-lena
50f9ec8b52 Invoice List : add tag filter (#34521)
* Invoice List : add tag filter

* Invoice List : Add operator to invoice filter

* Add tag filter in order list

* Clean code

---------

Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-15 03:02:13 +02:00
Maxime Kohlhaas
41878921a7 Fix : better display of titles and subtotals on pdf cyan (#34525)
* Fix : better display of titles and subtotals on pdf cyan

* Fix : better display of titles and subtotals on pdf eratosthene and sponge
2025-06-15 02:55:48 +02:00
Laurent Destailleur
c4179887c8 Fix #34518 2025-06-15 02:49:29 +02:00
Laurent Destailleur
20fd33d101 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-06-15 02:15:13 +02:00
Laurent Destailleur
4b178ba3e0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-15 01:27:26 +02:00
Laurent Destailleur
3f8b6cd338 Update script 2025-06-15 01:27:01 +02:00
Laurent Destailleur
f31270df2a Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-15 00:50:35 +02:00
Laurent Destailleur
d50a938d12 Doc 2025-06-15 00:50:25 +02:00
atm-lena
c6d001348d FIX Warning Var Not Defined (#34510)
* FIX Warning Var Not Defined

* Update recruitmentjobposition_card.php

---------

Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-15 00:34:34 +02:00
Marc de Lima Lucio
7a8e926935 FIX: interventions: sql error when signed_status not set (#34515) 2025-06-15 00:32:23 +02:00
Marc de Lima Lucio
478a8a4d52 FIX: try to fix v18 github action workflow (#34439)
* FIX: try to fix v18 github action workflow

* FIX: try to fix v18 github action workflow, part 2

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-15 00:30:44 +02:00
Laurent Destailleur
fa135a216b Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-15 00:23:45 +02:00
Laurent Destailleur
79779b1d2f Doc 2025-06-15 00:23:13 +02:00
Laurent Destailleur
1e4e5daa07 Code comment 2025-06-15 00:04:30 +02:00
Marc de Lima Lucio
456adc1e95 FIX: receptions: crash from api because of classes not found (#34523) 2025-06-14 23:59:21 +02:00
Laurent Destailleur
ffd2ec7bef Debug v22 2025-06-14 17:41:10 +02:00
Laurent Destailleur
e122854905 Debug v22 2025-06-14 16:39:29 +02:00
Laurent Destailleur
13f483d7a9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2025-06-14 16:03:56 +02:00
Laurent Destailleur
8d7a5e9945 Debug v22 2025-06-14 15:59:13 +02:00
Laurent Destailleur
0a4013bfc4 Fix CI 2025-06-14 15:11:19 +02:00
John BOTELLA
308bed0742 fix link icon display mode (#34506)
Co-authored-by: John BOTELLA <29435477+john-botella@users.noreply.github.com>
2025-06-14 15:06:01 +02:00
github-actions[bot]
3145f76182 PHPStan > Update baseline (#34503)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-14 15:05:21 +02:00
Marc de Lima Lucio
17edce5972 FIX: online propal sign: double header with logo when custom logo set (#34504)
* FIX: online propal sign: double header with logo when custom logo get

* Update company.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-14 15:05:05 +02:00
Laurent Destailleur
d1d56fc12b Fix CI 2025-06-14 15:03:13 +02:00
Marc de Lima Lucio
1d89b3204b UIUX: code in doc would generate a fatal error (#34500) 2025-06-14 14:18:43 +02:00
Marc de Lima Lucio
06dc4f5426 FIX: event info tab: php 8.1 warning (#34458)
* FIX: event info tab: php 8.1 warning

* Update info.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-14 11:59:03 +02:00
Marc de Lima Lucio
467c772504 FIX: common fields: php warning with select input field (#34495) 2025-06-14 11:58:25 +02:00
IC-Nicolas
6474c7fbdd FIX display error (#34494)
* FIX display error

* FIX CI
2025-06-14 11:57:58 +02:00
William Mead
9ca51a52b7 NEW expense report API validate (#34499)
* Added expense report API validate

* Cleaned code

* Cleaned code
2025-06-14 11:54:00 +02:00
Laurent Destailleur
75b9a98f0b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-14 02:24:25 +02:00
Laurent Destailleur
b8400d1b21 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-14 02:15:23 +02:00
Laurent Destailleur
1bd6757e62 Fix CI 2025-06-14 02:15:10 +02:00
Marc de Lima Lucio
1c52426b90 FIX: expensereport: php warning when generating pdf with multilangs (#34492) 2025-06-14 02:09:01 +02:00
Laurent Destailleur
407f4d758c Debug v22 2025-06-14 02:05:49 +02:00
Laurent Destailleur
67a2d6218c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-14 01:46:27 +02:00
Nicolas Domenech
6b2050d34d #34417 [GroupByKanban] add: fix drag and drop for lead (#34493) 2025-06-14 01:45:50 +02:00
Laurent Destailleur
909c8588d2 Fix CI 2025-06-14 01:44:52 +02:00
William Mead
bc8cb5a1e1 FIX #33030 (#34460)
* FIX #33030

* Update propal.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-14 01:36:00 +02:00
HENRY Florian
c23d673780 fix: on product update, with product/card.php batck and stock management linked (#34459)
* fix: on product update, with product/card.php batck and stock management linked

* fix: on product update, with product/card.php batck and stock management linked
2025-06-14 01:31:49 +02:00
Maxime Kohlhaas
871e914aa1 Fix : wrong module name for customer/supplier tag new page (#34477) 2025-06-14 01:29:47 +02:00
Laurent Destailleur
0cded4027e Clean code 2025-06-14 01:24:22 +02:00
Laurent Destailleur
01b2706431 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-14 01:23:10 +02:00
Laurent Destailleur
464dbe40fa Merge revert 2025-06-14 01:22:23 +02:00
HENRY Florian
f253a9017e fix: accountancy/admin/subaccount.php (#34478) 2025-06-14 01:14:48 +02:00
Laurent Destailleur
c34622a124 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-14 01:13:54 +02:00
Laurent Destailleur
cf865c9902 Fix warning 2025-06-14 01:13:31 +02:00
atm-lena
731111b011 prelevement.php warning : var no defined (#34461)
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
2025-06-14 01:12:56 +02:00
Marc de Lima Lucio
67e50d6264 FIX: accountancy bank journal: multiple php 8.1 warnings (#34468)
* FIX: social contribution payment: correct error reporting (#34002)

* FIX: social contribution payment: correct error reporting

* FIX: social contribution payment: correclty handle return of adding payment to bank

* FIX element must be visible to set focus on select input when using default values (#34406)

* Fix travis

* FIX: accountancy bank journal: multiple php 8.1 warnings

---------

Co-authored-by: lvessiller-opendsi <lvessiller@open-dsi.fr>
Co-authored-by: Laurent Destailleur <eldy@users.sourceforge.net>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-14 01:09:24 +02:00
evarisk-kilyan
dbf1e581a8 #34417 [GroupByKanban] add: drag and drop with saveinplace (#34456)
* #34417 [GroupByKanban] add: drag and drop with saveinplace

* #34417 [LibHead] fix: whitespaces

* #34417 [ProjectClass] fix: GETPOST and PHP inside JS
2025-06-14 00:33:33 +02:00
Marc de Lima Lucio
bc18656fd5 FIX: files lib: multiple php 8.1 warnings (#34462) 2025-06-14 00:27:36 +02:00
William Mead
142440badf QUAL Updated users API PHPDoc (#34438)
* Updated PHPDoc

* Updated PHPDoc

* Updated PHPDoc

* Update api_users.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-14 00:04:14 +02:00
HENRY Florian
ccd97bfc23 fix: FATAL when valid BOM subtotals_completesubstitutionarray_lines want to use SUBTOTAL_SPECIAL_CODE that are not defined for BOM (#34464)
* fix: when valid BOM subtotals_completesubstitutionarray_lines try to use SUBTOTAL_SPECIAL_CODE taht are not define for BOM

* chore: remove debug
2025-06-13 23:58:37 +02:00
Marc de Lima Lucio
c77c4efcb8 FIX: accountancy lettering: php8.1 warning (#34469) 2025-06-13 23:57:37 +02:00
Marc de Lima Lucio
10f41b23d4 FIX: manufacturing orders: missing extraparams field (#34471) 2025-06-13 23:57:11 +02:00
HENRY Florian
74414a2d22 fix: correct management of qty to consume for non stockable item (#34472) 2025-06-13 23:56:41 +02:00
atm-lena
7152705e70 Task Clone : no translation (#34470)
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
2025-06-13 23:53:55 +02:00
Mohamed DAOUD
d6a52a29ec fix affect a task to an event (#34474) 2025-06-13 23:53:01 +02:00
Marc de Lima Lucio
cada04442b FIX: manufacturing orders: php 8.1 warnings on agenda tab (#34475) 2025-06-13 23:49:11 +02:00
HENRY Florian
a708780477 fix: phpwarning Vinci (OF) PDF (#34466) 2025-06-13 23:48:28 +02:00
Benjamin Falière
4bd11f64d7 FIX (#34448)
Co-authored-by: Benjamin Falière <benjamin.faliere@altairis.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-13 23:45:18 +02:00
Marc de Lima Lucio
9c45f42e4f FIX: product translation: redirect after successful action (#34403)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-13 17:25:33 +02:00
Charlène Benke
3f9c3869c3 php warning on category list if supplier disabled (#34412)
* php warning on category list if supplier disabled

* Update functions.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-13 17:24:15 +02:00
Charlène Benke
1c605f1d7d webPortal custom Theme not well implemented (#34433)
* webPortal Theme not well implemented

* Update header_login.tpl.php

* Update global.css.php

* Update header_login.tpl.php

* Update webPortalTheme.class.php

* Update login.css

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-13 17:23:36 +02:00
HENRY Florian
181f8367a7 fix: php warning in BOM admin and modulebuilder template (#34437) 2025-06-13 17:19:30 +02:00
Marc de Lima Lucio
c9f743983a FIX: accountancy expensereport journal: php 8.1 warning (#34457) 2025-06-13 17:11:40 +02:00
Marc de Lima Lucio
ed3612b942 FIX: expensereport payment list: php warning (#34453)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-13 16:30:58 +02:00
Laurent Destailleur
2091b65547 Fix CI 2025-06-13 16:30:42 +02:00
Laurent Destailleur
2187a5c8a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-13 16:28:43 +02:00
Laurent Destailleur
144854769a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-06-13 16:27:57 +02:00
Laurent Destailleur
7e473f822d Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-13 16:25:06 +02:00
Laurent Destailleur
cf1c5bc370 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-13 16:24:52 +02:00
Laurent Destailleur
d66cd9027a Remove warning 2025-06-13 16:22:57 +02:00
HENRY Florian
e17b36b0c7 fix: warning Form IA and settings (#34426)
* fix: warning Form IA and settings

* fix: warning Form IA and settings

* Update html.formmail.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-13 16:13:02 +02:00
Maxime Kohlhaas
cbc2cf5063 Fix : thirdparty type was not set on creation form (#34451) 2025-06-13 16:12:30 +02:00
atm-lena
2c38daa86a FIX Issue 34445 (#34449)
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
2025-06-13 16:06:52 +02:00
Mohamed DAOUD
577320b191 fix bookcal add (#34447) 2025-06-13 16:03:28 +02:00
Laurent Destailleur
fb5148c0c2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-13 15:51:39 +02:00
Laurent Destailleur
58ae48c520 Doc 2025-06-13 15:49:34 +02:00
Laurent Destailleur
1497541129 Fix travis 2025-06-13 15:30:30 +02:00
Laurent Destailleur
da7e597436 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-13 15:27:04 +02:00
Laurent Destailleur
b47fbccfe3 Fix travis 2025-06-13 15:26:48 +02:00
HENRY Florian
5d2ac22cbd fix: php 8 warning on expense report validation when multi-lang (#34443)
* fix: edge cas

* fix: expense report generation can failed with multilang setting

* fix: expense report generation can failed with multilang setting
2025-06-13 15:20:54 +02:00
moreauftheobald
cdd401f58e FIX: Warning on external modules Pages: Unknown array key. (#34418)
* FIX: Warning on external modules Pages: Unknown array key.

* FIX: Warning on external modules Pages: Unknown array key. WIP

* FIX: Warning on external modules Pages: Unknown array key. WIP

* Update externalModules.class.php

---------

Co-authored-by: Theobald <f.moreau@theobald-groupe.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-13 15:09:54 +02:00
Vincent Maury
a68bd9c1a3 Update functions.lib.php (#34436) 2025-06-13 12:22:49 +02:00
Marc de Lima Lucio
215a365bf9 QUAL: github pull request template: add warning about target branch in case of bugfix (#34427) 2025-06-13 12:01:55 +02:00
Chloe-Moreau-2009
a59c3a759b replace getpost by getpostdate (#34428)
Co-authored-by: Theobald <f.moreau@theobald-groupe.com>
2025-06-13 12:01:07 +02:00
HENRY Florian
f7145389d6 fix: warning use undeclared varialble (#34435) 2025-06-13 11:57:55 +02:00
William Mead
6d8c9f629f QUAL Updated proposals API PHPDoc (#34434)
* Updated PHPDoc

* Updated PHPDoc

* Updated PHPDoc

* Updated PHPDoc
2025-06-13 11:47:11 +02:00
William Mead
cff522928c Updated PHPDoc (#34429) 2025-06-13 11:44:10 +02:00
Laurent Destailleur
843047490c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-13 03:22:23 +02:00
Laurent Destailleur
bfd2359fd8 Debug v22 2025-06-13 03:21:40 +02:00
github-actions[bot]
ede7784c1c PHPStan > Update baseline (#34408)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-13 00:22:55 +02:00
HENRY Florian
4086554c19 fix: min version php 8.4 for version 22 on check page (#34419) 2025-06-13 00:22:38 +02:00
atm-jonathan
621fb30b37 FIX encoding issues with underscores in mb_convert_encoding functionality (#34411)
Co-authored-by: x <x@x.x>
2025-06-13 00:19:29 +02:00
Alexandre SPANGARO
d9ab84d087 FIX Accountancy - Problem with constant ACCOUNTANCY_COMBO_FOR_AUX (#34414)
* FIX Accountancy - Problem with constant ACCOUNTANCY_COMBO_FOR_AUX

* Fix placeholder
2025-06-13 00:17:03 +02:00
HENRY Florian
d03d4d100f fix: remove php warning (#34420) 2025-06-13 00:14:45 +02:00
Laurent Destailleur
ad02c1885c Sync transifex 2025-06-13 00:12:21 +02:00
Laurent Destailleur
f27d5a1be9 Sync transifex 2025-06-12 16:11:49 +02:00
Lucas Marcouiller
10fbaf0c33 Fix bad display of type vet select + database save (#34384)
* Fix bad display of type vet select + database save

* Fix CI

* Fix by removing empty value

* remove unused condition
2025-06-12 12:49:54 +02:00
lvessiller-opendsi
878474f1d1 FIX element must be visible to set focus on select input when using default values (#34406) 2025-06-12 12:23:55 +02:00
VIAL-GOUTEYRON Quentin
956d545b41 fix missing last_main_doc (#34405) 2025-06-12 12:17:29 +02:00
ldestailleur
42cccdd02b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2025-06-12 07:14:46 +02:00
ldestailleur
ebfc1874f3 Fix responsive 2025-06-12 07:14:30 +02:00
Clément
e654ab9091 QUAL Hide errors counter (#34391) 2025-06-11 22:25:21 +02:00
Marc de Lima Lucio
0afd5cc7e3 FIX: social contribution payment: correct error reporting (#34002)
* FIX: social contribution payment: correct error reporting

* FIX: social contribution payment: correclty handle return of adding payment to bank
2025-06-11 21:22:37 +02:00
ldestailleur
fdd02a0ebe Fix CI 2025-06-11 18:17:56 +02:00
ldestailleur
175b79db3f Fix CI 2025-06-11 18:07:33 +02:00
ldestailleur
7ad71279a7 Fix CI 2025-06-11 17:33:07 +02:00
ldestailleur
0229e015ac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-11 17:16:08 +02:00
ldestailleur
45c7c7f9bc Fix variable not defined 2025-06-11 17:15:58 +02:00
David Beniamine
5a9b8e2237 Fix several issues with user and groups sync to LDAP (#34396) 2025-06-11 17:13:57 +02:00
Charlène Benke
113542991a $lastmodified could be not well initialised (#34392) 2025-06-11 17:12:56 +02:00
ldestailleur
14a689c4a7 Debug v22 2025-06-11 15:08:52 +02:00
ldestailleur
a6ee29522a Debug v22 2025-06-11 12:58:40 +02:00
ldestailleur
9e26f5a98e Debug v22 2025-06-11 12:45:15 +02:00
Laurent Destailleur
a993ef3b00 Debug v22 2025-06-11 03:56:29 +02:00
Laurent Destailleur
333a32ba97 CSS 2025-06-11 03:30:34 +02:00
ldestailleur
07d77126b2 Debug v22 2025-06-10 19:14:58 +02:00
ldestailleur
5c0f15b197 Debug v22 2025-06-10 18:44:53 +02:00
ldestailleur
84fd8d0cdc Fix CI 2025-06-10 18:33:56 +02:00
ldestailleur
a80a2ab6df css 2025-06-10 18:31:51 +02:00
ldestailleur
b61046bfa4 css 2025-06-10 18:20:59 +02:00
ldestailleur
15400c79b2 CSS 2025-06-10 18:18:36 +02:00
ldestailleur
c24cd1e30b Debug v22 2025-06-10 18:12:07 +02:00
ldestailleur
26c776940a Debug v22 2025-06-10 17:47:44 +02:00
ldestailleur
5df59e1e3f Debug v22 2025-06-10 17:29:16 +02:00
ldestailleur
94bd772a27 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-10 16:42:23 +02:00
ldestailleur
16e9a403d0 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-10 16:42:16 +02:00
ldestailleur
fb802a4b2b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-10 16:40:44 +02:00
Charlène Benke
cf967185d5 Add getConfs call to get all const in one call (#34385)
* Add getConfs call to get all const in one call

* Update api_setup.class.php

* Update api_setup.class.php
2025-06-10 16:25:24 +02:00
ldestailleur
eb64e6c4c1 Doc 2025-06-10 16:22:12 +02:00
ldestailleur
1688a9bf71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-10 16:18:53 +02:00
ldestailleur
27139ea688 Doc 2025-06-10 16:18:42 +02:00
ldestailleur
ef2f248bd8 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-10 16:08:41 +02:00
ldestailleur
b64407f04d Fix travis file 2025-06-10 16:06:47 +02:00
Alexandre SPANGARO
aa779a4729 FIX Accountancy - Colspan problem on list with no record (#34387)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-10 15:57:12 +02:00
ldestailleur
f9cbe6c2a0 Fix CI 2025-06-10 15:55:09 +02:00
ldestailleur
18bfa0e637 Try to fix CI 2025-06-10 15:34:16 +02:00
ldestailleur
debc895bb0 Try fix CI 2025-06-10 15:27:34 +02:00
ldestailleur
32e0ac0975 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-10 15:14:51 +02:00
ldestailleur
aceb01adbe Try to use jammy 2025-06-10 15:14:37 +02:00
warnerbryce
966cb82894 FIX : Correct Operator GETPOST for search Categories in Thirdparty list (#34381) 2025-06-10 14:48:24 +02:00
github-actions[bot]
b9683888e6 PHPStan > Update baseline (#34382)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-10 14:41:22 +02:00
Alexandre SPANGARO
baafec4053 FIX Accountancy - Missing column invoice_label into supplier list already binded (#34386) 2025-06-10 14:41:03 +02:00
ldestailleur
6ad53e2431 Fix CI 2025-06-10 14:39:49 +02:00
ldestailleur
267b65cd9b Fix CI 2025-06-10 14:38:13 +02:00
ldestailleur
3329395e68 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-10 14:28:07 +02:00
ldestailleur
e620b4d17a Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-10 14:27:48 +02:00
HENRY Florian
796ff36b32 fix: bad merge commit (#34390)
* fix: bad merge commit

* Update fournisseur.facture.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-10 14:25:58 +02:00
Lucas Marcouiller
1fbd763b8a Fix fatal error in v21 (#34389) 2025-06-10 14:24:26 +02:00
Laurent Destailleur
b572d7a7e2 Introduce options MAIN_INFO_SETUP_FOR_COUNTRY_XX to show warnings for
law of specific countries.
2025-06-10 03:38:46 +02:00
Laurent Destailleur
c631650818 Debug v22 2025-06-10 03:12:38 +02:00
Laurent Destailleur
b1812b1080 Debug v22 2025-06-10 02:24:08 +02:00
Laurent Destailleur
2d6939ba78 Debug v22 2025-06-09 19:20:25 +02:00
Laurent Destailleur
221c27c091 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-09 18:15:59 +02:00
Laurent Destailleur
326c75dc51 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-09 17:58:54 +02:00
Laurent Destailleur
473ddbc53a Merge remote-tracking branch 'origin/19.0' into 20.0 2025-06-09 17:42:02 +02:00
Laurent Destailleur
c444fe3c1f Merge remote-tracking branch 'origin/18.0' into 19.0 2025-06-09 17:25:03 +02:00
Laurent Destailleur
0950e80ce7 FIX Disallow special char in name of oauth entries 2025-06-09 17:12:38 +02:00
Laurent Destailleur
e69e6ad1d9 Fix missing delete of tenant 2025-06-09 16:41:29 +02:00
William Mead
1aaa29ad9e Fixed expense report permission. Added contributor details. (#34368) 2025-06-08 14:37:23 +02:00
Sébastien NASSIET
58bd0ed0f6 Use DOL_DATA_ROOT instead of DOL_DOCUMENT_ROOT for upload_dir_tmp in CMailFile (#34367) 2025-06-08 14:29:36 +02:00
Ferran Marcet
d82f9f4927 New: Add function to make substitutions on Takepos receipt (#34369)
* New: Mail template for contacts

* New: Mail template for contacts

* New: Mail template for contacts

* New: Andorra's Accounting Plan

* New: Add function to make substitutions on Takepos receipt

* New: Add function to make substitutions on Takepos receipt

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-08 14:28:19 +02:00
Florent Poinsaut
a93e892bd2 Fix extrafield in Salary (#34370) 2025-06-08 14:27:45 +02:00
noec764
4096b00bd5 FIX: Too heavy sql query (#34371)
Co-authored-by: Noé <noe@scopen.fr>
2025-06-08 14:26:44 +02:00
ldestailleur
b6bad48e96 Fix CI 2025-06-08 14:17:05 +02:00
ldestailleur
188b62abe2 Clean code 2025-06-08 13:33:53 +02:00
ldestailleur
9cc83f44de Debug v22 2025-06-08 13:23:46 +02:00
ldestailleur
1cff3a0f36 Debug v22 2025-06-07 21:24:26 +02:00
ldestailleur
eee2df38d4 Debug v20 2025-06-07 20:18:13 +02:00
ldestailleur
1ee9e83265 CSS 2025-06-07 19:56:59 +02:00
ldestailleur
a6b4ed59a9 Debug v22 2025-06-07 14:35:41 +02:00
ldestailleur
24efd80bbc Debug v22 2025-06-07 14:31:53 +02:00
ldestailleur
11f9f032d9 Debug v22 2025-06-07 14:15:56 +02:00
ldestailleur
2b147c8e94 Trans 2025-06-07 13:55:23 +02:00
ldestailleur
9b1fa240b8 Debug v22 2025-06-07 12:55:07 +02:00
ldestailleur
e9f3fcfb9c Fix allow iframe in WAF for website 2025-06-07 12:44:42 +02:00
ldestailleur
767ba09703 Fix WAF 2025-06-07 12:23:44 +02:00
ldestailleur
d5e73a6f96 Add constant NOSCANIFRAMEFORINJECTION in WAF. 2025-06-07 12:08:17 +02:00
ldestailleur
06f8b39f17 Debug v22 2025-06-07 00:55:25 +02:00
ldestailleur
3b3b7647bf Typo 2025-06-07 00:33:15 +02:00
ldestailleur
0b02b48304 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-06 02:10:00 +02:00
ldestailleur
67161c3980 Debug v22 2025-06-06 02:09:42 +02:00
Marc de Lima Lucio
dcc4334768 FIX: warnings when printing start/end date on line tpl (#34359) 2025-06-05 18:34:56 +02:00
HENRY Florian
7f477d356d fix: bad display Obj Ref product Reception (#34356) 2025-06-05 18:30:47 +02:00
Marc de Lima Lucio
f137074a98 FIX: cash control report: php warning (#34358) 2025-06-05 18:30:06 +02:00
Marc de Lima Lucio
f8f31daa16 FIX: accountancy fec export: remove dol_print_date warning (#34363) 2025-06-05 18:29:33 +02:00
Marc de Lima Lucio
35528a5885 FIX: prevent log warning with online signature url (#34361) 2025-06-05 18:29:12 +02:00
github-actions[bot]
6401faf7d4 PHPStan > Update baseline (#34362)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-05 18:27:48 +02:00
ldestailleur
04f1176d50 Debug v22 2025-06-05 17:47:40 +02:00
ldestailleur
24e6183b43 Debug v22 2025-06-05 16:29:14 +02:00
ldestailleur
bfba47cd98 CSS 2025-06-05 16:12:20 +02:00
ldestailleur
578316a92d Debug v22 2025-06-05 16:02:31 +02:00
ldestailleur
9e5769b8b7 Make the feature "Kanban Grouped By" on opportunities visible by default 2025-06-05 15:49:53 +02:00
ldestailleur
cab064083c Debug v22 2025-06-05 14:35:52 +02:00
ldestailleur
9dd46c1ded Trans and css 2025-06-05 13:59:41 +02:00
Laurent Destailleur
8cce12884e CSS 2025-06-05 01:07:07 +02:00
Laurent Destailleur
619107da8e Debug v22 2025-06-04 22:54:30 +02:00
Laurent Destailleur
408b42d712 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-04 22:47:41 +02:00
Laurent Destailleur
370b9bfd65 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-04 22:45:37 +02:00
Laurent Destailleur
f4fc5e179c Fix add a protection against very long loop 2025-06-04 22:30:14 +02:00
ldestailleur
3c44558a6c Comment on graph status 2025-06-04 19:59:17 +02:00
ldestailleur
714bbbf0ae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-06-04 19:16:58 +02:00
ldestailleur
23e26d51a9 Debug v22 2025-06-04 19:16:26 +02:00
ldestailleur
dabd857cdc Debug v22 2025-06-04 19:15:15 +02:00
ldestailleur
d713406667 Debug v22 2025-06-04 18:47:10 +02:00
ldestailleur
b8205a18d8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-04 18:29:11 +02:00
ldestailleur
64807075b5 Doc 2025-06-04 18:28:59 +02:00
Marc de Lima Lucio
d5250eadeb FIX: pgsql: cast string_agg arguments (#34210)
* FIX local taxes text in object line view mode (#34103)

* FIX: product suplier tab: last modif date column was wrongly dependant of module barcode (#34170)

* FIX: product suplier tab: last modif date column was wrongly dependant of module barcode

* FIX: product suplier tab: last modif date column was wrongly dependant of module barcode, part 2

* FIX: pgsql: cast string_agg arguments

* FIX: pgsql group concat conversion: modify tests as a consequence

---------

Co-authored-by: lvessiller-opendsi <lvessiller@open-dsi.fr>
2025-06-04 18:24:19 +02:00
Francis Appels
c7940446d4 Fix devision by zero with option customer packaging. (#34351)
value of product package property (for both customer and supplier) should be float type.
property define not needed on product fournisseur, alread defined on product.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-04 18:23:12 +02:00
Lucas Marcouiller
5de4dadd73 fix flowjs-server to have specific upoload dir in tempdir (#34309)
* fix flowjs-server to have specific upoload dir in tempdir

* fix add file sanitize  for uploadnamedir

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-04 16:20:04 +02:00
ldestailleur
81ea4aaa8c Try to fix CI 2025-06-04 16:18:03 +02:00
ldestailleur
02b9dfed38 Fix CI 2025-06-04 16:06:11 +02:00
ldestailleur
6d16d2298c Try fix ci 2025-06-04 15:58:01 +02:00
ldestailleur
e72401a6ec Code comment 2025-06-04 15:44:49 +02:00
ldestailleur
c5191775e7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-04 15:23:10 +02:00
ldestailleur
5f77aadb28 Fix CI 2025-06-04 15:22:49 +02:00
Lucas Marcouiller
fc667082ee Fix bad use of getDolGlobalInt to get a string in ticket.class.php (#34353)
* Fix bad use of getDolGlobalInt to get a string in ticket.class.php

* fix
2025-06-04 15:22:22 +02:00
ldestailleur
22e2087b9e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-04 15:10:42 +02:00
ldestailleur
659600ea4e Fix CI 2025-06-04 15:10:31 +02:00
MDW
32cec00447 Qual: Update phan baseline (#34302)
# Qual: Update phan baseline

Update baseline wrt fixed notices.
2025-06-04 14:43:40 +02:00
Charlène Benke
9577731b3a qual/fix : rewriting query generating error in certains case (#34305)
* Update facturestats.class.php

* Update expeditionstats.class.php

* Update fichinterstats.class.php

* Update expeditionstats.class.php

* Update facturestats.class.php
2025-06-04 14:36:53 +02:00
kkhelifa-opendsi
115a430652 FIX: Fix delete ecm file into database when delete a contract (#34310) 2025-06-04 14:31:23 +02:00
HENRY Florian
8853bfd51a fix: ref_client GETPOST facture/card.php should be alpha (#34311)
* fix: ref_client GETPOST facture/card.php should be alpha

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-04 14:09:03 +02:00
Mohamed DAOUD
f190a5925e FIX #34047 __AMOUNT_REMAIN_FORMATTED__ variable shows full invoice amount (#34314)
* fix AMOUNT_REMAIN_FORMATTED

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-04 14:06:45 +02:00
ldestailleur
ae06fde2c5 Doc 2025-06-04 14:04:43 +02:00
Romain
d21a5b166f Fix: #33911 active services are reported as expired on the homepage (#34317) 2025-06-04 14:00:50 +02:00
Quentin-Seekness
9396d8a6eb Correct Icon on supplier order export's title (#34332)
Just using the right icon for this export
2025-06-04 13:39:38 +02:00
github-actions[bot]
88c77bf6c4 PHPStan > Update baseline (#34316)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-04 13:39:06 +02:00
ldestailleur
12b5f66aa8 Fix management of forced CC for ticket 2025-06-04 12:40:14 +02:00
ldestailleur
0137197de7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-04 11:26:15 +02:00
Lucas Marcouiller
7bb0efe391 Fix email collector losing track (#34321)
* fix email collector loosing track when sending email from ticket

* add trads

* Fix Ci
2025-06-04 11:25:56 +02:00
ldestailleur
dd40029cc2 Fix warning 2025-06-04 11:25:24 +02:00
kkhelifa-opendsi
6059b0e6f5 FIX: Fix natural search with negative numbers (#34322) 2025-06-04 11:20:03 +02:00
Alexandre SPANGARO
f1d82ddad1 FIX #34313 Accountancy - Export with sources no longer works (#34324) 2025-06-04 11:18:57 +02:00
dum77
81bdb3ae98 FIX : Fixes a bug where using a decimal value for packaging could cause a division by zero (#34326)
* Use fmod instead of % with line->packaging, to avoid fatal error if packaging decimal

Ensure packaging is numeric, positive, then use fmod instead of %, to prevent error with decimal packaging values (resulting in division by zero), for ajusting  quantity

* Update edit rules

* Update edit rules
2025-06-04 11:17:46 +02:00
sonikf
89c1a741a7 backport #b0b2442 to v. 21 also apply fix for invoices (#34325)
* backport #b0b2442 to v. 21

* backport #b0b2442 to v. 21

* fix shipment contact same as in #b0b2442

* fix shipment contact same as in #b0b2442

* fix shipment contact same as in #b0b2442
2025-06-04 11:15:44 +02:00
dum77
d4fe691f54 FIX: Allow decimal qty reception (#34328)
* Use fmod instead of % with line->packaging, to avoid fatal error if packaging decimal

Ensure packaging is numeric, positive, then use fmod instead of %, to prevent error with decimal packaging values (resulting in division by zero), for ajusting  quantity

* Update edit rules

* Update edit rules

* After saving, it's better

* ```
No code changes made
```

* Just modify reception/card.php
2025-06-04 11:12:45 +02:00
ldestailleur
6b75c869fb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-04 11:12:17 +02:00
ldestailleur
13bdf7b533 Clean code 2025-06-04 11:12:07 +02:00
ptibogxiv
ce455f1236 NEW More options in api_documents.class.php (#34329)
* More options in api_documents.class.php

add pagination et filter by mime content type

* Update api_documents.class.php

* Update api_documents.class.php

* Update api_documents.class.php
2025-06-04 11:10:59 +02:00
Christophe Battarel
e35d93ea76 FIX : bad value for company ref crashes canvas feature (#34331)
* FIX : bad value fo company ref crashes canvas feature

* fix technical id for company

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2025-06-04 11:09:43 +02:00
Christophe Battarel
59a0c23009 fix name instead of nom in company canvas (#34333)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2025-06-04 11:00:17 +02:00
Christophe Battarel
3c28692ddb fix backtopage when using canvas (#34334)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2025-06-04 10:59:55 +02:00
ldestailleur
7ed8450d8a Fix CI 2025-06-04 10:59:27 +02:00
ldestailleur
bdc79182c5 Fix CI 2025-06-04 10:56:26 +02:00
ldestailleur
68ad637430 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-04 10:53:32 +02:00
ldestailleur
5ecda910af Fix CI 2025-06-04 10:53:04 +02:00
ldestailleur
b5a871bf99 Close #34344 2025-06-04 10:48:29 +02:00
HENRY Florian
58797fe361 fix: forgeSQLFromUniversalSearchCriteria Filter error - Bad syntax of the search string: (te.client in (1,2,3)) in comm/card.php (#34335) 2025-06-04 10:43:17 +02:00
William Mead
0d0db24c5c QUAL Updated expense reports API PHPDoc (#34341)
* Updated PHPDoc

* Updated PHPDoc
2025-06-04 10:37:25 +02:00
Frédéric FRANCE
d39dcbb64b fix CI (#34349) 2025-06-04 10:27:40 +02:00
William Mead
ca645c2694 Fixed missing mandatory date fields (#34337) 2025-06-03 17:06:04 +02:00
Günter Lukas
eaf0ec2e30 Fix #34346 - SQL Error (#34347)
* Fix #34346 - SQL Error

* Update commonobject.class.php
2025-06-03 17:05:10 +02:00
Marc de Lima Lucio
6202f614a4 FIX: accountancy sales/purchases journal: sql error logged when no invoice in journal (#34339)
* FIX: accountancy sales/purchases journal: sql error logged when no invoice in journal

* FIX: accountancy sales journal: correctly check unbounded lines
2025-06-03 17:04:19 +02:00
lvessiller-opendsi
ce0f46a483 FIX local taxes text in PDF (#34343) 2025-06-03 17:03:15 +02:00
ldestailleur
89ef52dd5a css 2025-06-02 21:20:02 +02:00
ldestailleur
88e75755fa Debug v22 2025-06-02 21:10:45 +02:00
ldestailleur
f3fb48dcde Debug v22 2025-06-02 20:51:21 +02:00
ldestailleur
bc548140af Debug v22 2025-06-02 17:18:24 +02:00
ldestailleur
9135a63867 Debug v22 2025-06-02 17:11:38 +02:00
ldestailleur
7b8223d66a Debug v22 2025-06-02 17:07:25 +02:00
ldestailleur
d543bdcffe Debug v22 2025-06-02 16:59:46 +02:00
ldestailleur
22e7200ecd CSS 2025-06-02 16:38:21 +02:00
ldestailleur
0236ddf003 CSS 2025-06-02 16:36:40 +02:00
ldestailleur
83883654f6 Missing info in list 2025-06-02 15:48:44 +02:00
ldestailleur
d7976f28ba Debug v22 2025-06-02 15:42:44 +02:00
ldestailleur
79b51900b6 Debug v22 2025-06-02 15:24:55 +02:00
ldestailleur
2b3a1b89f5 Debug v22 2025-06-02 15:23:00 +02:00
ldestailleur
89a98ce444 Debug v22 2025-06-02 15:20:09 +02:00
ldestailleur
d3f359ee1b Debug v22 2025-06-02 15:10:51 +02:00
ldestailleur
a6d6fe7edd Debug v22 2025-06-02 15:10:07 +02:00
ldestailleur
6b2ec5f482 Debug v22 2025-06-02 15:07:37 +02:00
ldestailleur
36b00c5951 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-02 14:59:18 +02:00
ldestailleur
14c2db425d Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-02 14:53:12 +02:00
ldestailleur
ca11136092 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-02 14:37:54 +02:00
ldestailleur
11d357b79e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-02 14:31:05 +02:00
ldestailleur
9a8a07e85a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-02 14:27:14 +02:00
ldestailleur
78d261916f Debug v22 2025-06-02 14:22:47 +02:00
Laurent Destailleur
524c951d8f Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-02 00:11:16 +02:00
Laurent Destailleur
a151e3d7b5 Fix url for barcode of profile should use securekey. 2025-06-02 00:10:36 +02:00
ldestailleur
492b442c4a Debug v22 2025-05-31 13:43:40 +02:00
ldestailleur
d0111dc240 Debug v22 2025-05-31 13:33:31 +02:00
ldestailleur
f4a547acf1 CSS 2025-05-31 13:09:53 +02:00
ldestailleur
9888a200e7 Debug v22 2025-05-31 12:39:55 +02:00
ldestailleur
6e2ee971e1 Debug v22 2025-05-30 12:23:13 +02:00
ldestailleur
adaffd6251 Doc 2025-05-30 11:35:19 +02:00
ldestailleur
b3ada81875 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-28 09:57:55 +02:00
ldestailleur
95519edb78 Debug v22 2025-05-28 09:57:46 +02:00
Laurent Destailleur
c35965030c Debug v22 2025-05-28 01:16:02 +02:00
Laurent Destailleur
3c3df0c24d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-28 00:09:40 +02:00
Laurent Destailleur
1b3b123472 Debug v22 2025-05-28 00:09:02 +02:00
John BOTELLA
50ff9b0d11 NEW : Toggle Display of customer Invoices and Credit Notes on Payment Page (#34190)
* NEW : Toggle Display of customer Invoices and Credit Notes on Payment Page

* NEW : Toggle Display of customer Invoices and Credit Notes on Payment Page
2025-05-27 22:29:53 +02:00
Alexandre Janniaux
5daee690a9 hookmanager: early return (#34202)
The line:

        if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks)) {

Needs to be inverted like the following:

        if (!in_array($context, $arrayhooks) && !in_array('all', $arrayhooks)) {

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-27 22:26:58 +02:00
Sami Filali
1d07ed22c0 update "enabled" to 1 for fk_emailcollector fields (#34192) 2025-05-27 21:51:09 +02:00
Marc de Lima Lucio
26bcc944cf FIX: projects: go back to edit view after cloning (#34221)
* FIX: projects: go back to edit view after cloning

* FIX: projects: go back to edit view after cloning
2025-05-27 21:23:16 +02:00
Charlène Benke
51d26108f9 fix typo error (#34186)
contRactid instead of contactid ...

there are some very long weekends sometimes...
2025-05-27 21:18:57 +02:00
sonikf
d2801ac7b4 fix typos (#34188)
* fix typo

* fix typo

* fix typo

* fix typo

* fix typo

* fix typo

* fix typo

* fix typo
2025-05-27 21:18:10 +02:00
Eric - CAP-REL
d2d9590019 Fix to make protection ok when no stock and (#34207)
STOCK_ALLOW_NEGATIVE_TRANSFER on

Co-authored-by: Laurent Destailleur <eldy@users.sourceforge.net>
2025-05-27 21:16:38 +02:00
Frédéric FRANCE
ea6bafde73 clean code (#34196)
* clean code

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-27 21:11:10 +02:00
Alexandre SPANGARO
9e166c263e FIX #34240 Accountancy - Missing button export PDF in tab thirdparty mode (#34249) 2025-05-27 21:05:16 +02:00
splohmer
6c1616c98d Handling of selected customer invoice to create a credit note if not in the list restricted by secret parameter (#34291)
* fix for LIST_OF_QUALIFIED_INVOCIES_LIMIT_DEFINED: handling if selected invoice is not in restricted list

* Update facture.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-27 21:04:13 +02:00
ThomasNgr-OpenDSI
fe4b1ff34d FIX modification de dates de pièces comptables sur plusieurs entités différentes (#34226) 2025-05-27 20:16:41 +02:00
ThomasNgr-OpenDSI
55bbd6ef32 FIX modification de dates de pièces comptables sur plusieurs entités différentes (#34225)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-27 20:16:03 +02:00
Peter Kessen
124ae92f33 Hide Bank Account number and Bank Code when field is empty (#34253)
* Skip empty value cells for bank information

* Save space for bank table when no info is present
2025-05-27 20:11:44 +02:00
github-actions[bot]
b6bb5c0e99 PHPStan > Update baseline (#34256)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-05-27 19:32:28 +02:00
Mohamed DAOUD
e670bfb712 add prodids gabon (#34257) 2025-05-27 19:32:09 +02:00
atm-irvine
97a26b96b0 fix(ticket): on card, id 20 was clearly entered (#34259) 2025-05-27 19:30:09 +02:00
atm-irvine
3ec16bdb64 FIX : Missing ol in no escape tags (#34261) 2025-05-27 19:29:32 +02:00
ptibogxiv
a88f3eb0c4 Fix index.php (#34262)
fix php error
2025-05-27 19:28:49 +02:00
Francis Appels
cd72d947b1 FIX: add payment to bank (#34263) 2025-05-27 19:28:05 +02:00
ptibogxiv
8f5889b987 Fix api_members.class.php (#34272)
Fix  request_data format
2025-05-27 19:27:33 +02:00
Alexandre SPANGARO
0105db185a FIX Accountancy - Mass cloning - problem with date input (#34281) 2025-05-27 19:26:42 +02:00
atm-irvine
0961b02591 FIX : Tmparray string not array (#34287) 2025-05-27 19:17:40 +02:00
atm-irvine
85d3678948 FIX : Remove useless amp; after & (#34288) 2025-05-27 19:16:39 +02:00
Charlène Benke
b4070adb39 fix typo (#34290)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-27 19:15:40 +02:00
Quentin-Seekness
024f266089 Allow insertion of value equals to 0 with int type (#34294)
The issue is that right now we can't insert a value of 0 as an int extrafields (unless the filed is mandatory, wich is not always the case)
2025-05-27 18:55:28 +02:00
Laurent Destailleur
393537d1e4 FIX portal module, prepare to replace duplication of code 2025-05-27 18:47:19 +02:00
Laurent Destailleur
6b9e81026e Lang 2025-05-27 17:37:17 +02:00
Laurent Destailleur
9dfc560b5c Trans 2025-05-27 16:56:08 +02:00
Laurent Destailleur
f9f15a75d6 Fix CI 2025-05-27 16:31:51 +02:00
atm-irvine
de4990a0fd Fix fatal error by validating array key type before using in empty() (#34295) 2025-05-27 16:04:25 +02:00
HENRY Florian
4e95aab6b5 fix: On Clone Invoice, ref_customer is not clean (#34296) 2025-05-27 15:58:28 +02:00
William Mead
4fb79ba8a1 FIX API expense report line comments (v18+) (#34297)
* Fixed API expense report line comments

* Added contributor details
2025-05-27 15:57:48 +02:00
ldestailleur
094a05b9a5 Debug v22 2025-05-27 14:48:25 +02:00
ldestailleur
3aaf0ad6f7 Debug v22 2025-05-26 22:17:53 +02:00
ldestailleur
f6e2525c6c Add log 2025-05-26 21:38:47 +02:00
ldestailleur
1f056c4102 Better rule for redirect to paymentok/ko. 2025-05-26 21:26:44 +02:00
ldestailleur
57d337696c Better rule for redirect to paymentok/ko. 2025-05-26 21:15:54 +02:00
ldestailleur
7365f3e530 Debug v22 2025-05-26 17:50:41 +02:00
ldestailleur
c025ae1c83 Clean code 2025-05-26 17:24:27 +02:00
ldestailleur
a114767ea1 css 2025-05-26 14:32:19 +02:00
ldestailleur
d6905ef6e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-26 14:06:21 +02:00
ldestailleur
04cf30b06e Doc 2025-05-26 14:05:54 +02:00
ldestailleur
19e7bea04a FIX warning in dictionnary for payment codes 2025-05-26 14:02:17 +02:00
Alexandre SPANGARO
a8137faa2b FIX Accountancy - Mass cloning - Complete sql_insert (#34285) 2025-05-26 11:09:55 +02:00
Laurent Destailleur
5771b6bd1f Trans 2025-05-25 20:24:33 +02:00
Laurent Destailleur
27371b639d Fix js protection 2025-05-25 20:13:14 +02:00
Laurent Destailleur
2e8aac35b7 FIX mass assignement of sale representative 2025-05-25 20:12:08 +02:00
Frédéric FRANCE
c08ce9eeca fix categories list (#34194) 2025-05-22 22:11:05 +02:00
Laurent Destailleur
fe25cc8428 FIX #34206 2025-05-22 22:04:30 +02:00
Marc de Lima Lucio
a42593db0d FIX: asset depreciation: php warnings (#34219) 2025-05-22 21:17:58 +02:00
Laurent Destailleur
f0b9776a03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-22 21:15:14 +02:00
Laurent Destailleur
916f50e699 css 2025-05-22 21:14:44 +02:00
ThomasNgr-OpenDSI
4c3d99612a Fix : require_once functions2.lib.php in mod_bookkeeping_argon.php (#34224) 2025-05-22 20:39:42 +02:00
Laurent Destailleur
efccb22bc7 Fix doc 2025-05-22 20:37:57 +02:00
Laurent Destailleur
9550a35ef6 Debug v21 2025-05-22 19:54:40 +02:00
Marc de Lima Lucio
cfc766ebbe FIX: accountancy general ledger: last total not shown if last account group shown has only one entry (#34251) 2025-05-22 19:29:49 +02:00
Laurent Destailleur
28d1dc6a74 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-22 18:57:55 +02:00
Laurent Destailleur
27a0c984a9 Fix CI 2025-05-22 18:57:32 +02:00
atm-corentin
09c672661c fix issue when you try to attach of file on form ticket (#34227) 2025-05-22 17:44:10 +02:00
HENRY Florian
51e4ce05c9 FIX: mandatory extrafelds on lines are not checked (#34228)
* FIX: mandatory extrafelds on lines are not checked

* FIX: mandatory extrafelds on lines are not checked
2025-05-22 17:40:41 +02:00
Francis Appels
7851429bd8 Fix warehouse list kanban when multiprices activated. (#34229)
* Fix warehouse list kanban and total when multiprices activated.

* Revert hide total, because is estimated value.

* Improve kanban output
2025-05-22 17:35:46 +02:00
atm-corentin
b47e6abdf5 fix issue when you approve holidays from massaction it does not set date approval (#34231) 2025-05-22 17:33:57 +02:00
Mohamed DAOUD
1bf94c94c6 FIX #34127 Add left actions column in resource List (#34235)
* fix Select columns in Resource List

* fix
2025-05-22 17:32:50 +02:00
Laurent Destailleur
4ccb3296da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-22 17:06:42 +02:00
Laurent Destailleur
b2f148da50 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-22 17:06:21 +02:00
Frédéric FRANCE
3aa1babd6f fix translations (#34230) 2025-05-22 17:02:44 +02:00
Laurent Destailleur
30b8237a52 Fix phpunit 2025-05-22 17:01:13 +02:00
ptibogxiv
3589c35489 Fix productMargins.php (#34233) 2025-05-22 16:38:05 +02:00
ldestailleur
31907f395b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-22 16:32:39 +02:00
ldestailleur
4311786e0c Debug v22 2025-05-22 16:32:07 +02:00
HENRY Florian
26942a6cc9 fix: return line id created by insert line Propal class (#34246)
* fix: return line id created by insert line Propal class

* fix: return line id created by insert line Propal class
2025-05-22 15:56:56 +02:00
Lucas Marcouiller
a0a0e2d0a4 fix #34182 regretion on api thridparty fetch (#34238) 2025-05-22 15:55:46 +02:00
atm-irvine
9c66aa29c6 fix(document): use propale instead of propal (#34248) 2025-05-22 15:45:20 +02:00
github-actions[bot]
db858032bc PHPStan > Update baseline (#34247)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-05-22 15:44:58 +02:00
ldestailleur
b9783cbf05 Doc 2025-05-22 12:33:55 +02:00
Alexandre SPANGARO
24c4d77cfb NEW Accountancy - Add actions on entries (Cloning, Assigning, returning) (#34179)
* NEW Accountancy - Cloning on entry

* NEW Accountancy - Massaction on entry

* NEW Accountancy - Massaction on entry

* NEW Accountancy - Massaction on entries

* Fix constant

* Fix language key

* Fix CI

* Fix typo

* Fix typo

* FIX CI

* FIX CI

* FIX CI date problem

* FIX CI

* FIX GETPOST in class

* Move massaction delete at last action in select

* FIX CI

* FIX CI

* FIX CI

* FIX all GETPOST

* FIX CI

* FIX CI

* FIX CI

* FIX CI

* FIX CI

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-22 12:33:33 +02:00
ldestailleur
d0970d78ca Fix CI 2025-05-22 12:32:39 +02:00
Charlène Benke
97c2d3dc58 NEW add totalization on ticket graph (#34204)
* add totalization on ticket graph

* Update index.php
2025-05-20 22:44:07 +02:00
Marc de Lima Lucio
819c3fd08a FIX: accountancy: bad filter on custom account groups (#34205) 2025-05-20 22:42:34 +02:00
atm-GregM
d4a1248d9a NEW add drag and drop on supplier proposal (#34208)
* add drag and drop on supplier proposal

* add drag and drop on supplier proposal

---------

Co-authored-by: x <x@x.x>
2025-05-20 22:34:36 +02:00
Mohamed DAOUD
d359a4d7a5 FIX #34046 No traceability when generating Intervention from Task Time (#34209)
* fix generating Intervention from Task Time

* remove comment

* fix CI

* FIX CI
2025-05-20 22:34:11 +02:00
Noé Cendrier
62c02a6b72 FIX: ensure dir exists before trying to move something in it (#34211)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-20 22:12:21 +02:00
Laurent Destailleur
c724800a05 Fix permission on conf.php file 2025-05-20 22:01:00 +02:00
Laurent Destailleur
a4657bbbf8 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-05-20 21:59:28 +02:00
Laurent Destailleur
08868566da Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-05-20 21:59:02 +02:00
Laurent Destailleur
368817f06a Fix CI 2025-05-20 21:53:20 +02:00
atm-lucas
4c6955017f Adding mapping to module rights (#34212) 2025-05-20 21:47:08 +02:00
Laurent Destailleur
63da993f6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-20 21:33:01 +02:00
Laurent Destailleur
5d42d2ad99 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-20 21:32:45 +02:00
Laurent Destailleur
3cf6a57261 Fix permission on conf.php file 2025-05-20 21:29:22 +02:00
Laurent Destailleur
47b9226469 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-05-20 20:53:40 +02:00
Laurent Destailleur
532dc32d20 FIX #33774 #34214 2025-05-20 20:50:48 +02:00
Marc de Lima Lucio
aa93bf3f31 FIX: pgsql: boolean fields correctly defined in creation but not in migration (#34215) 2025-05-20 20:36:51 +02:00
Mohamed DAOUD
5ee6fe4dcc fix checkbox position in list view (#34216) 2025-05-20 20:34:02 +02:00
HENRY Florian
de40214a09 fix: multi filter journal in accountancy/bookkeeping/list.php and in export (#34217)
* fix: filter journal IN

* fix: filter journal IN
2025-05-20 20:33:31 +02:00
Marc de Lima Lucio
491ecaccfe FIX: asset depreciation: division by zero (#34218) 2025-05-20 20:32:08 +02:00
Laurent Destailleur
6a09e5d9aa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-20 01:10:24 +02:00
Laurent Destailleur
7c2fa3e8a1 Fix CI 2025-05-20 01:09:52 +02:00
Anthony Geourjon
97ae924653 FIX : usage of public member registration form (Multiadmin context) (#34151)
* Fix usage of public member registration form

* Update new.php

* Update new.php

* Update new.php

* Update new.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-19 16:42:49 +02:00
Laurent Destailleur
0f4bf91fcd Fix default value of dol_move 2025-05-19 09:45:31 +02:00
Laurent Destailleur
d62ecff59b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2025-05-19 07:14:03 +02:00
Expresion
dc9e073c1e FIX|fix Webportal remain to pay column (#34159)
* fix ramin to pay column

* Update html.formlistwebportal.class.php

* Update html.formlistwebportal.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-17 16:19:27 +02:00
ldestailleur
026a5c9e8e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-17 14:50:08 +02:00
ldestailleur
c2539ae415 Fix CI 2025-05-17 14:49:57 +02:00
William Mead
5ccfbdf767 Added since version tag. Cleaned PHPDoc. (#34165)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-17 14:38:58 +02:00
Clément
e28b2cd16c QUAL harmonization between statistical sections (#34169)
* QUAL harmonization between statistical sections

* Update index.php

* Update index.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-17 14:38:31 +02:00
Mohamed DAOUD
1ba5736ac7 fix website conf page (#34175)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-17 14:16:46 +02:00
Mohamed DAOUD
db61432d03 enhance association website (#34177)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-17 14:16:33 +02:00
Marc de Lima Lucio
3b3f3fa29b FIX: product suplier tab: last modif date column was wrongly dependant of module barcode (#34170)
* FIX: product suplier tab: last modif date column was wrongly dependant of module barcode

* FIX: product suplier tab: last modif date column was wrongly dependant of module barcode, part 2
2025-05-17 14:05:42 +02:00
Lucas Marcouiller
8989fed281 Fix javascript log error in dolButtonToOpenInDIalogPopup (#34176)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-17 14:02:29 +02:00
ldestailleur
7bfef435f5 Fix CI 2025-05-17 14:01:11 +02:00
ldestailleur
1370fcc4d4 Fix warning 2025-05-17 14:00:21 +02:00
Laurent Destailleur
7385cf2b54 Trans 2025-05-17 01:28:45 +02:00
Laurent Destailleur
d4353f270f Trans 2025-05-17 00:18:52 +02:00
Laurent Destailleur
3fb666fa19 Trans 2025-05-16 23:28:33 +02:00
Laurent Destailleur
fed208b57d Debug v22 2025-05-16 22:39:08 +02:00
Laurent Destailleur
d540dd0ab7 Finish option CATEGORY_EDIT_IN_POPUP_NOT_IN_MENU 2025-05-16 17:59:39 +02:00
Laurent Destailleur
d5a870869c CSS 2025-05-16 14:30:02 +02:00
ldestailleur
0fee28ee61 Doc 2025-05-16 12:12:42 +02:00
ldestailleur
45eff4fd54 Debug v22 2025-05-16 11:41:27 +02:00
ldestailleur
1842dd616e Debug refresh of website templates 2025-05-16 11:36:29 +02:00
ldestailleur
f820d24c72 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-16 10:25:04 +02:00
ldestailleur
6a1a694b13 Doc 2025-05-16 10:24:55 +02:00
Mohamed DAOUD
ec63a8f9bb new association template (#34164) 2025-05-16 10:22:04 +02:00
ldestailleur
5493a8e949 Fix CI 2025-05-16 10:21:19 +02:00
ldestailleur
bcefd989bd Fix CI 2025-05-15 18:51:14 +02:00
ldestailleur
f285574f66 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-15 18:46:58 +02:00
ldestailleur
a9b470555d Fix option to clone emailing 2025-05-15 18:46:25 +02:00
Norbert Penel
84f293ebe7 FIX right name (#34163)
right name have changed
OLD BUG !!!
report it on dol20 branch also, please
2025-05-15 18:11:36 +02:00
Clément
0de4e225fb QUAL harmonization between statistical sections (#34160)
* QUAL Color harmonization between statistical sections

* Update index.php
2025-05-15 18:10:12 +02:00
github-actions[bot]
888a28b687 PHPStan > Update baseline (#34158)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-05-15 18:05:59 +02:00
ldestailleur
847d016a7f Doc 2025-05-15 13:12:06 +02:00
ldestailleur
54e8128475 Doc 2025-05-15 11:48:04 +02:00
ldestailleur
d3239046bb Doc 2025-05-15 11:37:21 +02:00
ldestailleur
d9bb03e3b7 Update doc 2025-05-15 11:36:07 +02:00
ldestailleur
aab2587eef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-15 10:33:47 +02:00
ldestailleur
ca2ad84482 Doc 2025-05-15 10:28:30 +02:00
ldestailleur
d9a2d5262d Fix CI 2025-05-15 10:23:09 +02:00
Frédéric FRANCE
801ea9dc5a fix translation (#34154) 2025-05-15 10:13:24 +02:00
Laurent Destailleur
88c4669d19 FIX missing thumbs when uploading image files with API 2025-05-15 02:51:45 +02:00
Laurent Destailleur
2f959048ae Rename var 2025-05-15 01:07:34 +02:00
Laurent Destailleur
f2ed714cad NEW: Can edit the module_source and pos_source field. 2025-05-15 00:47:12 +02:00
Laurent Destailleur
d35e62959d Fix responsive 2025-05-14 22:09:36 +02:00
Laurent Destailleur
b949cc3534 CSS 2025-05-14 22:03:39 +02:00
Laurent Destailleur
cd134f7d9c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-14 21:34:02 +02:00
Laurent Destailleur
63adf1284a FIX Purge of barcode generates SQL error 2025-05-14 21:32:49 +02:00
Frédéric FRANCE
296970ca64 fix translation (#34153) 2025-05-14 18:07:59 +02:00
Eduardo Pulpillo
55a22cc4fe Update the file users.lang replacing "Dolibarr login" by external user login (#34099)
* Update companies.lang Replace label "Dolibarr login" by "External user login" in the contact form

Replace label "Dolibarr login" by "External user login" in the contact form. Replace the text for better white labeling and better readability

* Update companies.lang

* Update companies.lang

* Update companies.lang

* Update companies.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-14 17:19:31 +02:00
Charlène Benke
1e0bd0f41f php warning (#34122)
* php warning

* Update fileconf.php

* Update fileconf.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-14 16:58:52 +02:00
William Mead
6d07c6336c Fixed get. Improved error message. (#34150) 2025-05-14 16:57:44 +02:00
Mohamed DAOUD
967162e36e fix add contact for conferenceorbooth (#34148) 2025-05-14 16:56:43 +02:00
ptibogxiv
88f555ed5e New manage User notifications by API (#34098)
* New manage User notifications by API

* Update api_users.class.php

* Update api_users.class.php

* Update api_users.class.php

* Update api_users.class.php

* Update api_users.class.php

* Update api_users.class.php

* Update api_users.class.php

* fix variable $fk_user notify.class.php

* Update api_users.class.php

* Update api_users.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-14 16:54:33 +02:00
ldestailleur
10d5a8ebd4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-14 14:40:35 +02:00
ldestailleur
c8e5fc9b73 Trans 2025-05-14 14:40:20 +02:00
ldestailleur
ca7cad45b6 Fix duplicate 2025-05-14 14:38:12 +02:00
Florian Mortgat
4f14d26b9f Reset the global $extrafields when a cron job needs to run in a different entity (#34130)
* Reset the global `$extrafields` when a cron job needs to run in a different entity than the previous one. If not, extrafield definitions won't be reloaded, causing potentially severe bugs

* FIX (phan) case of class ExtraFields

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-14 14:33:25 +02:00
github-actions[bot]
5ecaeb2861 PHPStan > Update baseline (#34147)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-05-14 14:31:43 +02:00
Mohamed DAOUD
6c0d947831 Update html.form.class.php (#34128) 2025-05-14 13:08:54 +02:00
ldestailleur
acf01beb0b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-14 13:06:31 +02:00
ldestailleur
4b98a686f8 Fix warning 2025-05-14 13:05:23 +02:00
github-actions[bot]
37b4e77b63 PHPStan > Update baseline (#34126)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-05-14 13:01:21 +02:00
Mohamed DAOUD
227724a99d show extrafields into job application public page (#34132) 2025-05-14 12:57:26 +02:00
Lucas Marcouiller
935051d803 Fix bad replace to empty string on GETPOST (#34129) 2025-05-14 12:53:21 +02:00
mikygee
d717d3a2a8 FIX bug #34137 & remplace by et (#34139)
Co-authored-by: Charlie Root <root@expevelidv751.expertinet.net>
2025-05-14 12:51:57 +02:00
Charlène Benke
176a99b945 wrong conf category param (#34141) 2025-05-14 12:51:15 +02:00
Charlène Benke
4a58d0c640 allow empty mode (choice 0) on api call (#34142) 2025-05-14 12:50:45 +02:00
Clément
7307774f14 FIX BUG (#34143)
* FIX BUG

* Update fournisseur.commande.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-14 12:49:25 +02:00
Clément
f5a48dca21 Fix missing translations (#34145)
* Fix missing translations

* Update sendings.lang
2025-05-14 12:47:46 +02:00
ldestailleur
a7104c34eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-14 10:23:29 +02:00
ldestailleur
bdd5bc0b86 Doc 2025-05-14 10:23:17 +02:00
Jyhere
a3323d5ca9 NEW : accountancy pdf exports (#34056)
* NEW: journal, ledger, balance pdf exports in accountancy lists

* NEW: add coords system to avoid getting vertical lines on title lines
-FIX: totals line bugs

* FIX:  removed, missing translation added

* FIX: precommit errors in accountancy pdfs

* FIX : PHPDoc inverted parameterss

* FIX: wrong string operator

* FIX: yet another cs error

* FIX: phpstan errors

* FIX: phpstan errors

* FIX: multidimensionnalarray phpdoc definition

* FIX: array phpstan error, I hope

* FIX: array def for phpstan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-14 09:40:32 +02:00
ldestailleur
8e334cd6a4 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-13 13:34:49 +02:00
ldestailleur
914469fde1 Fix CI 2025-05-13 13:33:40 +02:00
HENRY Florian
fb67acbc7b NEW: add common substitution __PREVIOUS_MONTH_TEXT__ (#34121) 2025-05-13 13:29:24 +02:00
William Mead
394ef6329d Fix SwaggerUI (#34124) 2025-05-13 11:49:26 +02:00
ldestailleur
b9e0150dad Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-13 11:28:45 +02:00
ldestailleur
87c02d32ad Doc 2025-05-13 11:28:35 +02:00
Frédéric FRANCE
e1de1edbe6 fix picto (#34123)
* fix picto

* Update societe.class.php
2025-05-13 10:53:35 +02:00
ldestailleur
20f7898bec Fix test of minimum price 2025-05-13 10:49:36 +02:00
Lenin Rivas
ad10c2581d FIX price_min_ttc (#34120)
* FIX price_min_ttc

* FIX price_min_ttc

* FIX price_min_ttc

* FIX price_min_ttc
2025-05-13 10:36:16 +02:00
Frédéric FRANCE
c1f8d7ff4a fix translation existing twice (#34102)
* fix translation existing twice

* fix translation existing twice

* fix

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-12 20:25:02 +02:00
ldestailleur
9b84a7c3e4 Fix CI 2025-05-12 20:24:10 +02:00
ldestailleur
683e0804d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-12 20:14:44 +02:00
ldestailleur
44baf2ac52 Doc 2025-05-12 20:14:27 +02:00
Arthur Lenoble
77a5147f6c Option to show stock in products combo in supplier orders (#34106)
Add the constant SUPPLIER_SHOW_STOCK_IN_PRODUCTS_COMBO to show the current stock of the product in the products combo in a supplier order like it's already possible in a customer order
2025-05-12 20:12:30 +02:00
lvessiller-opendsi
efb9327896 FIX local taxes text in object line view mode (#34103) 2025-05-12 20:09:16 +02:00
William Mead
22298c1f83 NEW pagination data for interventions API get (#34113)
* Added get interventions pagination data

* Fixed PHPDoc

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-12 20:06:38 +02:00
ldestailleur
64e1364c7f Doc 2025-05-12 20:01:49 +02:00
ldestailleur
465d7435fb Log 2025-05-12 19:48:56 +02:00
Alexandre SPANGARO
b116a7ab08 FIX Various payment - List - Can't see payment with subledger account (#34101)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-12 19:46:05 +02:00
Delthair
1192ce5791 #33951 Non-blocking minimum sale price in the proposals (#34104)
#33951 Non-blocking minimum sale price in the proposals 
the price base type was not in the $price_base_type variable and therefore none of the checks were done so it was possible to have a price below the min price
2025-05-12 19:45:21 +02:00
Arthur Lenoble
b791e20407 Add constant to show stock in products combo (#34107)
Same constant added to use the same constant in both calls of the function select_produits_fournisseur_list()
2025-05-12 19:44:19 +02:00
Lucas Marcouiller
991e6f383a Fix ai feature to edit/set extrafield with ai following step 3 (#34111)
* Fix ai  feature to edit/set extrafield with ai following step 3

* fix formlayoutai page

* fix CI
2025-05-12 19:41:46 +02:00
Jyhere
a9727760cf NEW: add hooks on societe consumption page (#34112)
* NEW: add hooks on societe consumption page

Add all necessary hooks to modify query and add more columns on the societe consumption page

* FIX : redefine $parameters array between each hook call

* FIX: php cs errors
2025-05-12 19:39:31 +02:00
ldestailleur
13ee6e6c7d Fix trans 2025-05-12 19:39:16 +02:00
ldestailleur
fe831a315b Fix CI 2025-05-12 19:33:57 +02:00
ldestailleur
da87582b70 Prepare v22 2025-05-12 16:35:51 +02:00
ldestailleur
81498e2e41 Start v22 beta 2025-05-12 14:13:29 +02:00
ldestailleur
7cf8d6cff7 Clean code - removed not used options 2025-05-12 14:08:31 +02:00
ldestailleur
a47fb5a07c Look and feel v22 2025-05-12 13:42:38 +02:00
ldestailleur
d95e7cdc66 Debug v22 2025-05-12 13:01:47 +02:00
ldestailleur
86e625be0e Debug v22 2025-05-12 10:59:01 +02:00
ldestailleur
8eff3e5a81 Add option CATEGORY_EDIT_IN_POPUP_NOT_IN_MENU 2025-05-12 10:19:29 +02:00
ldestailleur
ecef952643 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-12 09:27:58 +02:00
ldestailleur
247366c33c Clean code 2025-05-12 09:27:48 +02:00
ldestailleur
2f22fd90ac Fix responsive 2025-05-12 09:18:35 +02:00
ldestailleur
73d369d8e9 Fix warnings 2025-05-12 09:18:09 +02:00
Laurent Destailleur
6c39a9657c NEW Show country flag in list of chart of account 2025-05-12 02:30:30 +02:00
Laurent Destailleur
186c1bd036 NEW Add a delay to be sure that any Stripe action from webhooks are
executed after interactive actions
2025-05-12 01:51:50 +02:00
Laurent Destailleur
da982d1106 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-12 01:44:04 +02:00
Laurent Destailleur
ceeb5b7a50 Clean code 2025-05-12 01:38:55 +02:00
Laurent Destailleur
7dd95914e8 Clean code 2025-05-12 00:02:59 +02:00
ldestailleur
4cb77b1778 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-11 12:32:53 +02:00
ldestailleur
f0ad845711 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-11 12:32:45 +02:00
ldestailleur
a11e7db31c FIX Can set default value of the nature of member 2025-05-11 12:31:55 +02:00
ldestailleur
5eaa46225e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-05-11 12:26:48 +02:00
ldestailleur
a9a2ff560a FIX Can set the default value of nature of thirdparty 2025-05-11 12:26:36 +02:00
ldestailleur
b1ea2c38af Debug v22 2025-05-11 12:13:29 +02:00
ldestailleur
a1bb0de6f4 Debug v22 2025-05-11 12:13:28 +02:00
Laurent Destailleur
dae2597a90 Fix CI 2025-05-11 00:14:25 +02:00
Frédéric FRANCE
3e2de0d385 fix input (#34092) 2025-05-10 23:55:25 +02:00
ldestailleur
3a9a41c63e Fix asset 2025-05-10 21:04:30 +02:00
ldestailleur
62e305f7fa Debug the asset module. Can't delete. 2025-05-10 21:03:27 +02:00
ldestailleur
354a314843 Debug v22 2025-05-10 18:46:55 +02:00
ldestailleur
243d73c49b Fix regression 2025-05-10 18:30:38 +02:00
ldestailleur
15672801c2 Doc 2025-05-10 18:21:55 +02:00
ldestailleur
e99bd8398c css 2025-05-10 18:07:10 +02:00
ldestailleur
45d4e3faaa Better tooltips. 2025-05-10 16:29:32 +02:00
ldestailleur
ac357c1059 Debug v22 2025-05-10 14:51:05 +02:00
ldestailleur
9d83780a3a CSS 2025-05-10 14:39:04 +02:00
ldestailleur
82709ea1c4 CSS 2025-05-10 14:26:53 +02:00
ldestailleur
a831929184 Look and feel v22 2025-05-10 14:06:51 +02:00
ldestailleur
a674676ded Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-10 13:33:53 +02:00
ldestailleur
d76848351c Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-05-10 13:30:36 +02:00
ldestailleur
ae94c71a10 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-05-10 13:25:31 +02:00
ldestailleur
629533494a Fix error management 2025-05-10 13:08:49 +02:00
ldestailleur
445f089556 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-05-10 12:53:37 +02:00
ldestailleur
d3d8f02433 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-05-10 12:42:51 +02:00
ldestailleur
b0501b1c35 Fix renering of status of invoice in takepos. Fix use short label. 2025-05-10 12:42:29 +02:00
ldestailleur
2536f7bd62 Fix Show invoice ref when invoice is closed in takepos 2025-05-10 11:30:55 +02:00
Yannis Hoareau
1301cd36a1 NEW Subtotal module (#33502)
* Changes to follow mvc logic

* Reworked admin page and form to add lines

* Reworked adding line logic

* Adding options when editing subtotal lines

* Fix translations

* Fixed errors/displays and started pdf

* Color for subtotals pdf lines

* FIX display of subtotal totht

* Added pdf azur for propal

* Fix duplicate translation

* Added subtotal support for facture pdf

* Added subtotal support for commande pdf

* Improve UI/translations

* Restored old pdf

* Info to warn user for unsupported pdf

* Added title lines VAT rate and discount support

This is meant for future feature wich is block mass changing vat rate
and discount percentage

* Working on block apply vat and discount

* Added buttons for block actions

* Handle editing vat and discount for subtotal lines

* Editing vat and discount for subtotal lines bloc working

* Added possibility to move by block

* Updated adding and updating a subtotal line

* Improved vat and discount block update

* Improvement for block vat/discount and line edition

Editing a title line edits the corresponding subtotal line

* Improvement for moving by block

* Bad tile or st line placement managing

* Improved bad title or st line placement managing

* Adding subtotal line improved

Adding a subtotal line adds it right under its corresponding title

* Improved deleting subtotal line

Added possibility to choose if you want to delete the corresponding
subtotal line when deleting a title line

* Preventing too high level titles to be created

* Create and update line errors managing

* Improved bad title or st line placement managing

* Improved st line creation

* improve headers

* fix bad block placement managing

* fix adding st line not working if duplicates titles

* fix translations

* Fix block update

* FIX special chars bug

If special char like " ' " was used in title it could be converted to
special char entity.

* Prepare for pdf options

Pdf options like page break befor title should be shown as a picto if activated on a subtotal line on a document

* Added option managing

* Improved subtotal options and PDF integration

* Code refactor

* Action name/Error managment/PDF refreshing

When adding or updating a subtotal line

* Reformat

* Reworked subtotal options database managment

* Changed access to special code

* Remove unecessary call to php trait

* Changed definition of subtotals special code constant

* Reworked align on PDF

* Removed unecessary function and improved error managment

* Typo fix and removed treated todos

* Post typo changed for to better match subtotals names

* Disabled edit if status is not draft

* Changed way subtotals options are stored

* Added view managing when creating a document form an other

* Improved creating document from an other

Can check subtotals lines with table head checkbox and removed highlight
class for better UI.

* Make include of subtotals tpl more clear

* Manage centered or justified case

If user chose to center or justify, we don't change nothing

* Improved pdf

* Removed unecessary code block

* optimisation

* Code sniffer fix

* Code sniffer fix

* Code sniffer fix

* Code sniffer fix

* Code sniffer fix and added missing translation

* Fix php code sniffer

* Reload page when setup saved on subtotals admin page

* Fix php code sniffer

* pjan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* php warning fix

* php warning fix

* php phan fix

* php phan fix

* php phan fix

* Fix bug admin page not loading because of const not defined

* php phan fix

* php phan fix

* FIX subtotals admin page display

* php phan fix

* FIX php phan

* Fix bugs and langs

* Fix bug pdf align

* Replace include by require

* Add headers to avoid refreshing and adding unwanted lines

* Fix phan

* Add GETPOST check for security

* Fix phan

* Fix phan

* Fix phan

* Subtotal option when creating a document from another

* Fix phan

* Add field subtotal options for subtotal lines

* Fix phan

* Fix phan

* Fix phan

* Update to follow mvc

* Fix php phan

* Fix php phan

* Fix phpstan/phan

* Fix phpstan

* Fix phpstan

* Fix phpstan

* Fix phpstan

* Fix phpstan

* Update to switch to extraparams

* Update to switch to extraparams

* Retrieve extraparams from db to objectline

* Modified last things to switch to extraparams

* Cleaning unnecessary code lines

* Fix php-stan

* Section subtotal in extraparams to differentiate if needed for further devs

* Fix phan

* Keep extraparams when creating from another object

* Change default value to false when creating a subtotal line

* Fix clone would not keep extraparams in new object

* Fix dark subtotal line background color

Fix when a subtotal background color is too dark and edit pencil or
delete trash could not be seen

* Fix typo

* Fix typo

* Added subtotals for facturerec

* Fix precommit

* Added extraparams when creating rec from fac and other way

* Fix phan

* Fix objectline null

* Desactivating block vat / discount update for facturerec

* reformating code

* Added expeditions for subtotal

* Save extraparams for shipping lines

* Display of subtotals lines in shipments

* Display when creating facture from shipments

* Improve display of lines and invoice creation from shipments

* Fix error if missing line rang

* Deleted duplicate

* Added deletion of subtotal line in shipping documents

* Not including subtotal lines if there is no product line in between

* Update get subtotal lines in shipment docs to disable

* Delete possibility to edit subtotal lines in shipments

* Handle pdf for shipment

* Handle conf stock or shipment supporting services

* Fix precommit

* Fix duplicate name creating bug

* Fix bug where id could be changed by the line id and would create bug

* Deleted subtotal lines when STOCK_SUPPORTS_SERVICES is enabled and block would only have service lines

* Disable shipments in admin modules

Shimpements subtotals lines are only created from commands

* Fixing phan and stan

* Deleted unused template and phan fix

* Fix phan

* Fix phan

* Fix phan

* FIX: phan

* Fix template bug

If document was not in subtotal scope and would use a template used by
subtotal it would create an error.

* Fix php-stan

* Fix bad display when modules and confs were activated

* Fix php codesniffer

* Excluding subtotal lines when mass updating

* Fix shipments service lines exluded + showing subtotal line with specific configs

* Fix line display with situation invoices + bug block line update

* Added ODT managment

This works with invoices but has not been tested with other documents

* Fix bug when editing VAT/discount by block

* Fix error raised when subtotal line added

Subtotal line had no fk_product and raised the error but we want this
line to have no fk product

* Fix precommit

* Added ODT template for documents that uses subtotals

This template can be usefull to understand how to create an odt template
using subtotals module

* Fix phan

* Fix phan

* fix: buttons showing in bad document status

* clean: unwanted commited files

* add: table examples to use with subtotals on ODT templates

* fix: Unwanted print of value when creating a document from another

* feat: renaming for better understanding

* feat: Improved templates for documents related to subtotals

---------

Co-authored-by: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-10 02:44:31 +02:00
Laurent Destailleur
c6b7b3fe3e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-10 00:55:04 +02:00
Laurent Destailleur
016cc298be Fix CI 2025-05-10 00:54:25 +02:00
Mohamed DAOUD
317ddec570 Enhance website config page (#34082)
* enhance website config page

* fix
2025-05-10 00:05:36 +02:00
Laurent Destailleur
db50d918b0 Trans 2025-05-10 00:02:30 +02:00
Eduardo Pulpillo
acc02b3c74 Update users.lang replacing "Dolibarr account" by "External User account" for better white labeling and better readabiility (#34085)
Replace the text for better white labeling and better readability
2025-05-09 23:57:22 +02:00
Laurent Destailleur
e4305ad221 Fix CI 2025-05-09 23:54:44 +02:00
HENRY Florian
9fa7d0c774 new: add hidden const to not add URL link in teicket response whatever public enabeld or not (#34080) 2025-05-09 23:49:06 +02:00
Frédéric FRANCE
b343a7b910 fix input with PRODUCT_USE_UNITS at create step (#34081)
* fix input with PRODUCT_USE_UNITS at create step

* Update card.php

* Update card.php
2025-05-09 23:48:07 +02:00
Noé Cendrier
bd3118375e FIX: fetch main_last_doc for supplier orders (#34079) 2025-05-09 23:46:41 +02:00
Mohamed DAOUD
a10a9a60c7 add some trans keys (#34078) 2025-05-09 23:46:18 +02:00
Frédéric FRANCE
223f0c2763 fix translation (#34086) 2025-05-09 23:46:07 +02:00
ldestailleur
a827287afd NEW Show code of stripe hooks supported in setup page 2025-05-09 16:25:15 +02:00
ldestailleur
8f7142ad76 NEW Use the PhpZipProxy handler to generate ODT files. 2025-05-09 15:47:08 +02:00
ldestailleur
3bf7cc01fd Code comment 2025-05-09 15:39:07 +02:00
ldestailleur
68029a71ef NEW autofix mysqldump command for backup when path is wrong 2025-05-09 11:13:49 +02:00
ldestailleur
46ac3d5b12 FIX Backport fix of substition of thirdparty info in notification 2025-05-07 14:53:51 +02:00
ldestailleur
912fe653b9 Look and feel v21 2025-05-07 13:57:40 +02:00
ldestailleur
e536d2e550 Fix missing property in tooltip 2025-05-07 13:11:09 +02:00
ldestailleur
1ec8036cc6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-05-07 11:32:25 +02:00
ldestailleur
b555aed819 The API to create a website account /idthirdparty/accounts/site is now
POST (instead of PUT) and to update is PUT (instead of PATCH).
2025-05-07 11:28:30 +02:00
William Mead
384a4f3984 QUAL Updated third party API PHPDoc (#34077)
* Updated and cleaned PHPDoc. Added contributor details.

* Updated and cleaned PHPDoc

* Cleaned PHPDoc

* Cleaned PHPDoc

* Cleaned PHPDoc

* Cleaned PHPDoc

* Cleaned PHPDoc

* Cleaned PHPDoc

* Added contributor details
2025-05-07 11:20:14 +02:00
Frédéric FRANCE
f48d3d6e41 fix unexisting picto (#34076)
* fix unexisting picto

* fix unexisting picto
2025-05-07 11:18:37 +02:00
atm-irvine
dea5209fef fix: removed useless redefined var in cabyprodserv (#34068) 2025-05-07 03:29:54 +02:00
sonikf
7322b9cd93 NEW Add option to create simple shipment of non origin. SQL part (#34071)
* NEW Add description

* NEW Add description in llx_expeditiondet
2025-05-06 22:12:43 +02:00
Frédéric FRANCE
32fdfa771c fix CI (#34072)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-06 22:08:23 +02:00
ldestailleur
b7754d5dc6 CSS 2025-05-06 21:43:52 +02:00
ldestailleur
75ad941797 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-06 21:23:45 +02:00
ldestailleur
43be2676ea Fix CI 2025-05-06 21:23:38 +02:00
github-actions[bot]
5701fe7fce PHPStan > Update baseline (#34070)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-05-06 21:22:19 +02:00
ldestailleur
095905670a Remove BlockUI js plugin. Replaced with few js/css lines. 2025-05-06 19:15:13 +02:00
ldestailleur
52acd2cfac Clean code 2025-05-06 15:20:14 +02:00
ldestailleur
084bc9af3c Use the getValidPayment to detect payment modules 2025-05-06 14:32:48 +02:00
ldestailleur
6a22102155 Use the getValidPayment to detect payment modules 2025-05-06 14:26:30 +02:00
ldestailleur
50b722905f CSS 2025-05-06 13:26:51 +02:00
ldestailleur
c320b52e09 Debug v22 2025-05-06 13:15:07 +02:00
ldestailleur
a841a0ba1e Debug v22 2025-05-06 13:02:08 +02:00
ldestailleur
0136a794c9 Add a new page type "Setup" for website module. 2025-05-06 12:52:31 +02:00
ldestailleur
2e3b4fc1b3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-06 12:32:48 +02:00
ldestailleur
0189f7e1bd Fix trans 2025-05-06 12:30:51 +02:00
Jon Bendtsen
474cb2e54e NEW: endpoints DELETE event atteendee by ID or REF (#33986)
* pricate function _fetch that fetches the attendee data based on either (row)id or referece

* NEW: endpoints DELETE event atteendee by ID or REF

* fix missing }

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-06 12:28:48 +02:00
Laurent Destailleur (aka Eldy)
b85bfc40f4 Fix phpunit 2025-05-06 11:59:08 +02:00
lvessiller-opendsi
cc78023a44 FIX allow double colon and string obfuscation in dol eval for computed extra fields (#34015)
* FIX allow double colon and string obfuscation in dol eval for computed extra fields

* Update functions.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-06 11:50:28 +02:00
ldestailleur
7bb258b5ee Clean examples 2025-05-06 11:44:21 +02:00
ldestailleur
7ccbdd1538 Color of status must match dolibarr standard 2025-05-06 11:26:48 +02:00
ldestailleur
eadc676edf NEW Add option MAIN_ALLOW_DOUBLE_COLON_IN_DOL_EVAL 2025-05-06 11:10:57 +02:00
atm-irvine
24ef9d1c0d fix: missing classfile for facturerec getElementProperties (#34067) 2025-05-06 10:48:02 +02:00
ldestailleur
ce4a537989 Debug v22 2025-05-06 10:47:27 +02:00
ldestailleur
5351276074 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-06 10:15:39 +02:00
Jon Bendtsen
8ecc5f2cb0 NEW: attendee status Used - to ensure that only one attendee gets in on a ticket (#33987)
* pricate function _fetch that fetches the attendee data based on either (row)id or referece

* NEW: attendee status Used - to ensure that only one attendee gets in on a ticket

* Update conferenceorboothattendee.class.php

* Update conferenceorboothattendee.class.php

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-06 10:15:31 +02:00
Mohamed DAOUD
1d3cd37027 enhance set module options (#34063)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-06 09:51:21 +02:00
ldestailleur
31780e091e Debug v22 2025-05-05 21:51:55 +02:00
Alexandre Janniaux
2c03be5014 tests: add BookKeeping test (#34062)
This smoke-test the bookkeeping class to check the queries are working
correctly. This is a good way to smoke-test the postgresql compatibility
and enables more complex tests like the yearly closure later.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-05 21:31:48 +02:00
ldestailleur
542539368f Fix CI 2025-05-05 21:30:32 +02:00
ldestailleur
370365f083 Clean code 2025-05-05 21:19:28 +02:00
Nasredine
c7ea4f3d59 NEW add settodraft to the supplier invoice API (#34064)
* add settodraft to the supplier invoice api

* removing whitespaces
2025-05-05 21:18:21 +02:00
ldestailleur
b10a036a83 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-05 21:13:15 +02:00
ldestailleur
5e67ec6376 Fix CI 2025-05-05 21:13:05 +02:00
Mohamed DAOUD
52c58775b4 some trans keys to prepare template (#34065) 2025-05-05 20:33:38 +02:00
ldestailleur
8664a3c2c8 Fix CI 2025-05-05 20:30:26 +02:00
ldestailleur
a9f2bb6219 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-05 20:24:47 +02:00
ldestailleur
f9985da313 Debug v22 2025-05-05 20:24:02 +02:00
Frédéric FRANCE
153ce2672a fix login translation (#34057) 2025-05-05 20:15:57 +02:00
Frédéric FRANCE
931cdf278b fix cron missing translation (#34058)
* fix cron missing translation

* fix cron missing translation

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-05 20:14:53 +02:00
Frédéric FRANCE
ff3cec75d0 fix translations (#34055) 2025-05-05 20:13:55 +02:00
sonikf
17f6158fb1 fix trans for non latin languages (#34059) 2025-05-05 20:13:19 +02:00
Frédéric FRANCE
76f5a8ac90 fix translation account (#34060)
* fix translation account

* fix translation account
2025-05-05 20:13:03 +02:00
ldestailleur
956d058f30 Look and feel v22 2025-05-05 20:11:48 +02:00
ldestailleur
2ba8e487c4 Add link to go back to types of categories 2025-05-05 19:52:34 +02:00
ldestailleur
61647d82d7 Clean screen 2025-05-05 19:34:26 +02:00
ldestailleur
29e1226992 Debug v22 2025-05-05 18:49:12 +02:00
ldestailleur
e12519025a Debug v22 2025-05-05 18:45:14 +02:00
ldestailleur
f0eaae6a1d Debug v22 2025-05-05 17:09:24 +02:00
ldestailleur
2dd6ccd2d9 Debug v22 2025-05-05 15:24:04 +02:00
ldestailleur
8a39925460 Doc 2025-05-05 15:03:35 +02:00
ldestailleur
40d53621c3 NEW Add/enhance the popup for preview of icons 2025-05-05 14:54:35 +02:00
ldestailleur
d73d760b53 FIX Hour and min were lost when editing a past event. 2025-05-05 14:26:14 +02:00
ldestailleur
75e82572d6 Debug v22 2025-05-05 14:08:38 +02:00
ldestailleur
0e443bd76e Debug star extrafields (set initial highlight in php instead of js) 2025-05-05 13:40:41 +02:00
ldestailleur
90ac6c0207 Clean code to avoid duplicate js code 2025-05-05 13:24:11 +02:00
ldestailleur
995f68489d Debug v22 2025-05-05 13:13:39 +02:00
ldestailleur
0b3811a7e4 Better protection on approval 2025-05-05 12:32:57 +02:00
ldestailleur
aa81500780 Better protection on approval 2025-05-05 12:30:50 +02:00
ldestailleur
390b6719ab FIX Approver must be able to approve even if user not in hierarchy. 2025-05-05 12:22:23 +02:00
ldestailleur
a002899a7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-05 04:36:37 +02:00
ldestailleur
d13cd0f47a Fix CI 2025-05-05 04:36:28 +02:00
ldestailleur
584d37784f FIX #33854 2025-05-05 04:25:17 +02:00
rogue-spectre
900884a94a Close #34038 enable transmitter and bank name to be saved for a donation payment (#34039)
* Update clientfourn.php

correction of a sql request returning a buggy result. 

Instead of the sum of the different donations payments the request returned the number of payment multiplied by the global amount of donation.

* Update payment.php -  Transmitter field and bank name for donation

Add  transmitter and bank names field to donation payment. 
Extra added fields are copy-paste from htdoc/compta/paiment.php

* Update payment.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-05 04:08:36 +02:00
ldestailleur
5760ecc38b Complementary message in actionmsgmore should work on all cases. 2025-05-05 04:07:23 +02:00
ldestailleur
fdd1f3e713 Move position of button 2025-05-05 02:51:23 +02:00
ldestailleur
49d6a9370a Avoid option that break interface alignement and not used in a lot of
case.
2025-05-05 02:48:08 +02:00
ldestailleur
8394f27f32 Trans 2025-05-05 02:30:28 +02:00
ldestailleur
e4e5b1e597 Clean code 2025-05-05 02:22:02 +02:00
Charlène Benke
704910b4b3 NEW Add internal contact of proposal, order and invoice on api call (#34009)
* add internal contact of elements

* Update api_orders.class.php

* Update api_invoices.class.php

* Update api_proposals.class.php

* Update api_orders.class.php

* Fix CI

* Update api_orders.class.php

* Update api_invoices.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-05 02:07:24 +02:00
ldestailleur
d3644b6afa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-05 02:05:04 +02:00
ldestailleur
6d89c2c033 Clean code. Merge/Close #33995 manually. 2025-05-05 02:04:55 +02:00
Jon Bendtsen
7f5c49c504 NEW: endpoints GET event attendee by ID or REF (#33984)
* pricate function _fetch that fetches the attendee data based on either (row)id or referece

* NEW: endpoints GET event atteendee by ID or REF

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-05 00:07:27 +02:00
ldestailleur
2736a4b382 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-05 00:07:09 +02:00
ldestailleur
a74979bc04 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-05-05 00:04:17 +02:00
ldestailleur
71c976cf0e Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-05-05 00:03:56 +02:00
ldestailleur
d85cea32c0 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-05-05 00:03:49 +02:00
ldestailleur
db6fe50106 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-05-05 00:03:22 +02:00
ldestailleur
f70cfeb6d3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-05-05 00:03:09 +02:00
ldestailleur
73d48d8795 Fix warning 2025-05-05 00:00:47 +02:00
ldestailleur
0b7836595c Debug v22 2025-05-04 23:53:34 +02:00
ldestailleur
9189bcc6bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-04 23:43:06 +02:00
ldestailleur
90577b41bd Debug v22 2025-05-04 23:42:52 +02:00
Jon Bendtsen
6eff6532a0 NEW: endpoints PUT (update) event atteendee by ID or REF (#33985)
* pricate function _fetch that fetches the attendee data based on either (row)id or referece

* NEW: endpoints PUT (update) event atteendee by ID or REF

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-04 18:44:40 +02:00
Noé Cendrier
7c29f8201b FIX: do not forget extrafields for BOM in export lines (#34020) 2025-05-04 18:42:45 +02:00
Florian Mortgat
9d0d8f7ec5 Fix/140/t250062/extrafields multicompany data loss (#34022)
* insertExtrafields(): simplify by returning 0 early if array_options is empty

* insertExtrafields(): simplify by using local variables $newValue and $attributeType

* insertExtrafields(): refactor by grouping the empty value cases for geodatabase-type extrafields

* insertExtrafields(): refactor by using a static mapping of geodata types to their ST_* db function on ExtraField class

* FIX: when an object that is shared across multiple entities already has some extrafields from another entity that are not reachable from the current entity, their values are lost

* Compliance with
- phan ( Closure Closure($key) has no declared or inferred parameter type for $key)
- php-stan (Error: Property ExtraFields::$geoDataTypes has no type specified)
2025-05-04 18:42:01 +02:00
github-actions[bot]
8bec4db5e5 PHPStan > Update baseline (#34054)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-05-04 18:40:56 +02:00
Charlène Benke
f5723c7c10 add new category on List for object api (#33990)
* add new category on List for object api

* Update api_categories.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-04 14:04:47 +02:00
Marc de Lima Lucio
9b74628e29 FIX: accountancy balance: keep subtotals when sorting (#34001) 2025-05-04 11:27:19 +02:00
Marc de Lima Lucio
0ef0d339b5 FIX: pgsql: error when creating sequences in migration scripts (#34021)
* FIX: pgsql: error in migration from 15 to 16

* FIX: pgsql: error in migration from 7 to 8
2025-05-04 11:26:34 +02:00
Frédéric FRANCE
b95b074922 fix missing translations (#34025)
* fix missing translations

* fix missing translations

* fix missing translations

* fix missing translations
2025-05-04 11:25:18 +02:00
William Mead
2925bb6481 Cleaned PHPDoc. Added contributor info. (#34026) 2025-05-04 11:24:38 +02:00
Laurent Destailleur
5bf5d23495 Update AbstractClient.php 2025-05-04 11:22:54 +02:00
Marc de Lima Lucio
02588036c2 FIX: oauth: php 8 warnings (#34027)
* FIX: oauth: fix php 8 warnings (backport of 9edfb1d113)

* FIX: oauth: fix php 8 warnings (backport of 9edfb1d113), part 2
2025-05-04 11:20:26 +02:00
Marc de Lima Lucio
8e0d3911e6 FIX: pgsql: case sensitivity in select queries (#34028) 2025-05-04 11:19:59 +02:00
Marc de Lima Lucio
3929ef0bfa FIX: accountancy: warning when account not found in plan (#34030) 2025-05-04 10:50:33 +02:00
Lucas Marcouiller
0ea9108fdd Fix ai prompt function for extrafields to match step 2 todo (#34032)
* Fix ai prompt function to match step 2 todo

* add  doc comment

* fix CI
2025-05-04 10:50:01 +02:00
Frédéric FRANCE
58562f84a6 clean code (#34031) 2025-05-04 10:49:27 +02:00
PsyCrow
0acc8d6b47 Update extrafields_list_search_param.tpl.php (#34033)
Fix to #33863
2025-05-04 10:48:47 +02:00
Frédéric FRANCE
ce84eb8da0 fix missing translation (#34034)
* fix missing translation

* fix missing translation
2025-05-04 10:47:40 +02:00
Ferran Marcet
921f2d8671 New: Andorra's Accounting Plan (#34035)
* New: Mail template for contacts

* New: Mail template for contacts

* New: Mail template for contacts

* New: Andorra's Accounting Plan
2025-05-04 10:47:24 +02:00
Marc de Lima Lucio
9eaa8ad1d3 FIX: accountancy: create new french PCG25-DEV accounting system in upgrade (#34036) 2025-05-04 10:46:56 +02:00
Ferran Marcet
30d8167734 Fix_ The filter does not have the correct syntax (#34049) 2025-05-04 10:45:57 +02:00
Charlène Benke
7537199598 php warning on delete warehouse (#34041) 2025-05-04 10:43:48 +02:00
Charlène Benke
d91030892d php warning, feature not yet implemented (#34042)
moved on another tabs
2025-05-04 10:43:26 +02:00
Thibault Parodi
e77b470cad NEW: Add an API endpoint to get properties of a single line of an order (#34045)
* feat: add api get line properties route

* chore: indent with tabs

* chore: preserve original spaces

* chore: tabs instead of space

* fix: return Object instead of array
2025-05-02 22:44:48 +02:00
Charlène Benke
46c41e437a fields error, thirdparty vs socid (#34043) 2025-05-02 22:43:23 +02:00
Josep Lluís
dfe997fa07 Update paymentmodes.php (#34044)
Fix multicompany signatures on sepamandate
2025-05-02 22:42:15 +02:00
Jyhere
549b712c47 FIX: ajax tooltip warnings (#34048) 2025-05-02 22:41:04 +02:00
Laurent Destailleur
20d56960fd Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-29 16:39:29 +02:00
Charlène Benke
4bfc06e861 NEW add create category project link via api (#34016)
* add create category project link via api

* Update api_categories.class.php
2025-04-29 14:55:56 +02:00
github-actions[bot]
9e98e02f29 PHPStan > Update baseline (#34019)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-04-29 14:51:35 +02:00
John BOTELLA
f2016b9e85 Uiux : new experiment ux intuitive select by ctrl and Shift keys (#33996)
* add ux_doc_id_reco

* fix missing elements in doc

* add table thead tbody tfoot

* New experiment for selection in table

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-29 14:48:58 +02:00
John BOTELLA
1bae2eaa15 Uiux : Fix doc (#33992)
* add ux_doc_id_reco

* fix missing elements in doc

* add table thead tbody tfoot

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-29 14:47:16 +02:00
Frédéric FRANCE
57aa02f0f4 Fix missing translation (#34014)
* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation
2025-04-29 10:53:52 +02:00
Charlène Benke
f597050e11 warning error if element is not a bill (#34011)
* warning error if element is not a bill

* Update consumption.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-29 10:47:38 +02:00
Laurent Destailleur
ebeb73a509 Update paymentok.php 2025-04-29 08:36:42 +02:00
Laurent Destailleur
ce2923f4eb Fix CI 2025-04-29 08:11:36 +02:00
Laurent Destailleur
9d1bf1edff Fix CI 2025-04-29 07:48:15 +02:00
Alejandro E.
a726ef6370 Update adherentstats.class.php to fix the dashboard error (#34000) 2025-04-29 07:09:02 +02:00
Charlène Benke
0fe942983e FIX api fail dictionary/contact_types when use type parameters (#34010)
* api fail dictionary/contact_types when use type parameters

* Update api_setup.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-29 07:07:14 +02:00
William Mead
6ddc9926fa QUAL Updated Contacts API PHPDoc (#34005)
* Updated and cleaned PHPDoc

* Added comment
2025-04-29 06:54:56 +02:00
Mohamed DAOUD
1ae126f179 FIX set donation as received after payment done (#34006)
* fix setpaid don

* enhance
2025-04-29 06:45:32 +02:00
Yannis Hoareau
8ec897bd83 fix: php warning for status field in list of purchase orders (#34003) 2025-04-29 06:44:29 +02:00
Charlène Benke
bc874ebc5c delete category fail (interventional not full implemented) (#33989)
the category for interventional is not full installed, so the table is not created
we need the dolibarr 22 tto implement it
2025-04-29 06:41:30 +02:00
William Mead
c3b35d4da5 Fixed PHPDoc. Added contributor details. (#33988) 2025-04-29 06:40:04 +02:00
Eduardo Pulpillo
35fd24e506 Fix #31047 #23763 mailing.class.php do not retrieve the public and private notes (#33994)
* Fix bug #31047  mailing.class.php do not retrieve the public and private notes

Fix bug #31047 The public and private notes are stored but not retrieved in /comm/mailing/class/mailing.class.php because the fields note_public & note_private are not detailed in the /comm/mailing/class/mailing.class.php class. After this commit it works like a charm.

* Update mailing.class.php

* Update mailing.class.php

* Update mailing.class.php

* Update mailing.class.php

* Update mailing.class.php

* Update mailing.class.php

* Update mailing.class.php
2025-04-29 06:39:07 +02:00
Frédéric FRANCE
d994442f34 fix missing translation (#34004)
* fix missing translation

* fix missing translation
2025-04-29 06:38:10 +02:00
ThomasNgr-OpenDSI
149bb14202 NEW Move right from advance to normal for thirdparty information payment page (#33885)d
Co-authored-by: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-26 21:23:08 +02:00
ldestailleur
9873a98c36 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-26 20:17:39 +02:00
ldestailleur
5507459381 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-26 20:17:08 +02:00
ldestailleur
5b20395afe Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-04-26 20:13:33 +02:00
ldestailleur
7c99a650e3 Show nb of tags per type 2025-04-26 16:15:52 +02:00
ldestailleur
80cdcf4d62 WIP Addapage to edit all categories. 2025-04-26 13:16:07 +02:00
ldestailleur
fbd7d814ff Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-26 12:07:07 +02:00
ldestailleur
87e794589c Modulebuilderization 2025-04-26 12:06:45 +02:00
William Mead
e8bf0e183d NEW reopen for interventions API (#33982)
* Added intervention post reopen API route

* Updated PHPDoc

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-26 04:21:37 +02:00
ldestailleur
c675f7439c Fix title of event no more visible 2025-04-26 04:05:01 +02:00
ldestailleur
cc361b2859 css 2025-04-26 03:42:47 +02:00
ldestailleur
2f893b34f0 Add info of external payment on bank direct debit tab. 2025-04-26 03:35:59 +02:00
ldestailleur
f9f33046bd Doc 2025-04-26 03:12:20 +02:00
ldestailleur
cde72d84a0 Refactoring code for better name and fix star extrafield on thirdparty 2025-04-26 03:00:53 +02:00
ldestailleur
a7227772e9 TODO 2025-04-26 02:31:19 +02:00
Lucas Marcouiller
0f8b0da651 New AI extrafield filler (#33979)
* New ai extrafield filler

* remove comment

* Fix Ci

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-26 01:59:36 +02:00
Jyhere
9b770c8fe9 FIX: list filter for boolean field when using modulebuilder (#33977)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-26 01:59:23 +02:00
ldestailleur
fd928a4d14 Change for #33970 2025-04-26 01:54:30 +02:00
ldestailleur
62d19f4ff9 Change for #33970 2025-04-26 01:52:31 +02:00
ldestailleur
4c70e0035f Fix CI 2025-04-26 01:32:40 +02:00
Vincent de Grandpré
943fa057e3 FIX#33963 - Enabling EmailCollector foreign key field to allow mandatory parameter saving (#33981)
* PHPStan > Update baseline

* FIX#33963 - Enabling foreign key field to allow mandatory parameter saving

* Added author to copyright

---------

Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-04-26 01:22:37 +02:00
Mohamed DAOUD
13222f6102 NEW Add public page for donation module (#33978)
* add donation publique page

* add trans keys

* fix trans

* fix

* Fix CI

* fix CI

* fix CI
2025-04-26 01:20:45 +02:00
Clément
13b080fffc FIX Bug Dynamic id (#33980) 2025-04-26 01:17:09 +02:00
ldestailleur
849409f150 CSS 2025-04-25 20:02:10 +02:00
ldestailleur
8623843a05 FIX DetecHTML on upload file from filemanager fails due to need to lock
(no reason to need to lock file to read it).
2025-04-25 19:58:47 +02:00
ldestailleur
f1e8191e7b FIX DetecHTML on upload file from filemanager fails due to need to lock
(no reason to need to lock file to read it).
2025-04-25 19:54:53 +02:00
ldestailleur
9b3f315c14 Add option MAIN_ALLOW_WYSIWYG_EVEN_ON_UNSECURED_EXTERNAL_HTTP_URL to
allow tests
2025-04-25 19:08:56 +02:00
ldestailleur
cf24f34947 Fix SQL 2025-04-25 17:26:17 +02:00
ldestailleur
804b5299d2 CSS 2025-04-25 16:50:42 +02:00
ldestailleur
efdc4f9a5d Debug v22 2025-04-25 16:43:31 +02:00
ldestailleur
5998b62a64 Debug v22 2025-04-25 16:25:07 +02:00
ldestailleur
9868eadafd CSS 2025-04-25 15:57:41 +02:00
ldestailleur
764ce30e19 CSS 2025-04-25 15:52:25 +02:00
ldestailleur
5d595ed2de CSS 2025-04-25 15:50:28 +02:00
ldestailleur
d2d0be5291 Look and feel v22 2025-04-25 15:45:40 +02:00
ldestailleur
e85db964ca Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-25 14:49:47 +02:00
ldestailleur
d2aa37b814 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-25 14:35:33 +02:00
ldestailleur
f1ff22a516 FIX creating acredit note from the remain to pay was always 0 2025-04-25 14:35:18 +02:00
ldestailleur
eb6bc94d0c Fix syntax error 2025-04-25 13:46:27 +02:00
ldestailleur
46c9fd064d Look and feel v22 2025-04-25 11:44:15 +02:00
Laurent Destailleur
7bfac48695 Show status of mandatory DLC to understand error on creating MO when
status is on.
2025-04-25 06:09:56 +02:00
Laurent Destailleur
822e9789f0 Trans 2025-04-25 05:35:37 +02:00
ldestailleur
bc58523888 NEW Add field usenewcurrencyrate 2025-04-25 04:26:33 +02:00
ldestailleur
d9b944d601 Can edit/vieuw the currency on recurring invoice. 2025-04-25 04:07:58 +02:00
ldestailleur
2aa17f9c3f Fix update of foregin rate on recurring invoices 2025-04-25 03:39:04 +02:00
Laurent Destailleur
084a39e27b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-25 03:13:51 +02:00
Laurent Destailleur
ba4d22dc2a Trans 2025-04-25 03:13:17 +02:00
Laurent Destailleur
6b8600a479 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-25 02:17:33 +02:00
Laurent Destailleur
6411ea4cfc Doc 2025-04-25 02:15:11 +02:00
ThomasNgr-OpenDSI
92feaeafa7 GIFF : standardize accountancy lists (second part) (#33787)
* Use $arrayfields and add ability to hide columns on accountancy lists

* Add column hooks in accountancy lists

* fix travis
2025-04-25 01:50:17 +02:00
Jon Bendtsen
82c2a86073 event attendee class changes preparing for new API endpoints in different PR (#33931)
* check if MAIN_AGENDA_XCAL_EXPORTKEY is set before using it

* suggestion from frederic34

* adding 5 new statuses and their functions

* adding 5 new statuses and their functions

* copy and modified from email template api

* remove some unset because they are present in the database

* all objects are ConferenceOrBoothAttendee's

* load eventattendee API file from eventorganization/ folder

* ref is not required and should perhaps be banned because it is ignored during create + nonexisting apifetch function replaced with call to just fetch + making usre to use the correct class

* variable named paid is unused?

* get all event attendees

* fixing the sql statement

* adjusting function checking access rights

* UNTESTED! multicompany support by leftjoining with the projet table which does have an entity column + adjusting checkAccessRights function to prepare for testing project visibility

* adding more statuses and explaining boarding pass better

* expanding access rights checks with a project id and starting to use that after fetch so we know the project_id

* checking if the user has access to the project specified in fk_project

* phan fix getting  right

* checking if isModEnabled('multicompany')

* will only show rows of projects which is either public or the user is a contact of

* 2 new status changing functions and some protection for the existing status changing functions

* fix pre-commit check

* typo fix = that should be ==

* adding extrafields and linkedobjectids to event attendee

* reducing size of PR to only necessary class changes

* this are used by the API file, so no need to keep in the class PR

* Test CI without not used property

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-25 01:47:58 +02:00
Clément
2c3576c0c2 height tabs (#33965)
* FIX Bug height tabs

* Update global.inc.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-25 01:46:13 +02:00
Mohamed DAOUD
6c96283434 donation ip protection (#33972)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-24 20:07:12 +02:00
ThomasNgr-OpenDSI
a56a8e05f0 FIX : set default extrafield value for supplier order (#33971)
* fill extrafields default values in case THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_SUPPLIER_ORDER applies

* Fix: send param changecompany when changing company on a supplier order creation
2025-04-24 19:19:39 +02:00
Laurent Destailleur
acc7dcdf65 Fix CI 2025-04-24 19:19:02 +02:00
Laurent Destailleur
cbbda62f7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-24 17:17:32 +02:00
Laurent Destailleur
68cb665d8d Clean code 2025-04-24 17:17:05 +02:00
ldestailleur
a9555e55fb Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-24 17:01:46 +02:00
ldestailleur
ed66c5a453 Fix typo 2025-04-24 17:00:25 +02:00
ldestailleur
7df7e73775 Fix css 2025-04-24 16:57:49 +02:00
ldestailleur
6316a8a5f6 Fix css 2025-04-24 16:57:36 +02:00
ldestailleur
e13a090d1f Removed not used property 2025-04-24 16:34:22 +02:00
ldestailleur
9728c3f10a Make popup with picto simplest from modulebuiler or menu editor 2025-04-24 16:22:51 +02:00
Lucas Marcouiller
3591adb00d Fix some errors on website csp form (#33943)
* Fix some errors  on website csp form

* fix CI

* Fix Ci

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-24 15:47:37 +02:00
ThomasNgr-OpenDSI
50fa68a389 New : Introduce const THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_SUPPLIER_ORDER (#33944)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-24 15:47:24 +02:00
ThomasNgr-OpenDSI
730667ed5a NEW : force Extrafields values when constants THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_(ORDER|INVOICE) are set (#33954)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-24 15:46:56 +02:00
Charlène Benke
87eeaa5dcb Add validate and cancel api_knowledgemanagement (#33962)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-24 15:46:01 +02:00
github-actions[bot]
ea827c3806 PHPStan > Update baseline (#33969)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-04-24 15:39:16 +02:00
Günter Lukas
07db71dc33 Fix #33967 (#33968) 2025-04-24 15:39:03 +02:00
Clément
585577d667 FIX Bug (#33964) 2025-04-24 15:37:30 +02:00
ldestailleur
ea59ab8837 Trans 2025-04-24 15:36:00 +02:00
ldestailleur
50d2fa7543 Look and feel v22 2025-04-24 14:37:01 +02:00
ldestailleur
05b3cb75b6 CSS 2025-04-24 14:08:13 +02:00
ldestailleur
83e03fa39b Fix css 2025-04-24 13:44:42 +02:00
ldestailleur
985e7a80f1 css 2025-04-24 12:49:36 +02:00
ldestailleur
17a0352ebe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-24 12:26:39 +02:00
ldestailleur
08de08c563 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-24 12:26:17 +02:00
ldestailleur
0117585c90 FIX do not add a filter on status when doing a global search on project 2025-04-24 12:26:06 +02:00
Jon Bendtsen
9142dbb4d2 FIX BUG: default value not changed when updating an extrafield using API #33949 (#33950)
* FIX BUG: default value not changed when updating an extrafield #33949

Update can now change default value for extrafields and fixes #33949

* Also use $default in updateExtrafields

The previous commit changed postExtrafields, but that is okay, because both needs to be changed

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-24 02:33:32 +02:00
Charlène Benke
6cbab9f12b NEW Add knowledgebase info on box_dolibarr_state_board.php (#33960)
* Add knowledgebase on box_dolibarr_state_board.php

* Update knowledgerecord.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-24 02:32:28 +02:00
Laurent Destailleur
aaf70a5942 Merge import/export in same parent menu. 2025-04-24 02:22:12 +02:00
Noé Cendrier
be3fae0275 FIX: stock control condition in reception delete (#33952) 2025-04-24 01:47:43 +02:00
Jon Bendtsen
cee66f6a15 NEW Adding API endpoints for event attendee handling (#33932)
* check if MAIN_AGENDA_XCAL_EXPORTKEY is set before using it

* suggestion from frederic34

* adding 5 new statuses and their functions

* adding 5 new statuses and their functions

* copy and modified from email template api

* remove some unset because they are present in the database

* all objects are ConferenceOrBoothAttendee's

* load eventattendee API file from eventorganization/ folder

* ref is not required and should perhaps be banned because it is ignored during create + nonexisting apifetch function replaced with call to just fetch + making usre to use the correct class

* variable named paid is unused?

* get all event attendees

* fixing the sql statement

* adjusting function checking access rights

* UNTESTED! multicompany support by leftjoining with the projet table which does have an entity column + adjusting checkAccessRights function to prepare for testing project visibility

* adding more statuses and explaining boarding pass better

* expanding access rights checks with a project id and starting to use that after fetch so we know the project_id

* checking if the user has access to the project specified in fk_project

* phan fix getting  right

* checking if isModEnabled('multicompany')

* will only show rows of projects which is either public or the user is a contact of

* 2 new status changing functions and some protection for the existing status changing functions

* fix pre-commit check

* typo fix = that should be ==

* adding extrafields and linkedobjectids to event attendee

* should be back to develop branch contents so PR can be smaller

* reducing PR size, just GET and POST

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-24 01:34:50 +02:00
Laurent Destailleur
1b48fa4e46 Fix CI 2025-04-24 01:34:28 +02:00
Laurent Destailleur
0239873ac9 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-24 01:27:39 +02:00
Laurent Destailleur
021d2f751f Fix CI 2025-04-24 01:27:06 +02:00
Laurent Destailleur
1e7c045bfe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-24 01:24:10 +02:00
Laurent Destailleur
b10686cb2b Clean code 2025-04-24 01:23:49 +02:00
Mohamed DAOUD
baa08bad7b enhance externalModules page (#33948)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-24 01:14:58 +02:00
Laurent Destailleur
9194e4f12f Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-24 01:12:50 +02:00
Laurent Destailleur
eb99f51a38 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-24 01:12:50 +02:00
Laurent Destailleur
cd3cc8f28b Fix debug log 2025-04-24 01:12:21 +02:00
Laurent Destailleur
c3cadef4ce Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-24 01:02:05 +02:00
Laurent Destailleur
e034b4b0ef Standardize code 2025-04-24 00:51:47 +02:00
Laurent Destailleur
1ea4c01c6f FIX page of bom when only bom module is on 2025-04-24 00:28:34 +02:00
Laurent Destailleur
1435c02986 FIX #33958 2025-04-23 23:45:44 +02:00
Can Arslan
76a89cad00 fix: give user access for file if user has 'all' permission of the module (#33957) 2025-04-23 23:32:23 +02:00
Laurent Destailleur
bb3b0c552f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-23 23:28:14 +02:00
Laurent Destailleur
a4c97c0651 Fix CI 2025-04-23 23:27:45 +02:00
Laurent Destailleur
6fe40bda2a FIX ws detection 2025-04-23 22:24:59 +02:00
Laurent Destailleur
5922cdd875 Debug 2025-04-23 20:32:35 +02:00
Laurent Destailleur
8eb925f838 Fix syntax error 2025-04-23 20:19:34 +02:00
Laurent Destailleur
a749fb154f Log 2025-04-23 20:13:35 +02:00
Laurent Destailleur
ae69c56695 Log 2025-04-23 19:51:19 +02:00
Laurent Destailleur
7f85a2bee9 Log 2025-04-23 19:16:10 +02:00
Laurent Destailleur
88ac148995 Add log 2025-04-23 19:05:03 +02:00
ldestailleur
9ee4771375 FIX error management when creating event with resource already used 2025-04-22 19:39:42 +02:00
ldestailleur
ce11578e05 css 2025-04-22 19:17:30 +02:00
ldestailleur
ccec9286e2 Better explanation 2025-04-22 19:12:25 +02:00
ldestailleur
cc33eac316 Add method to update socket timeout 2025-04-22 16:57:49 +02:00
ldestailleur
6766cd8b5c css 2025-04-22 15:55:48 +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
ldestailleur
29fe7c8dad Remove TODO 2025-04-22 12:47:17 +02:00
ldestailleur
b59712aa5d Remove TODO 2025-04-22 12:47:15 +02:00
ThomasNgr-OpenDSI
3c37f28d50 NEW ticket : display files linked to actioncomm (#32325)
* modify ecmfiles to link ecmfile to actioncomm

* ticket : link files to actioncomm

* display linked files in actioncomm cards

* Various fix (pre-commit, phpstan, usw.)
2025-04-22 12:44:57 +02:00
HENRY Florian
8221ab0a58 fix: #33095 (#33907) 2025-04-22 11:51:25 +02:00
ThomasNgr-OpenDSI
5e887e8850 Fix : on update of an order line, the TTC price would be used as HT price (#33940)
* Fix : on update of an order line, the TTC price would be used as HT price

* Update commande.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-22 11:48:22 +02:00
Jon Bendtsen
783807af14 Tiniest event attendee API - just the POST endpoint (#33934)
* check if MAIN_AGENDA_XCAL_EXPORTKEY is set before using it

* suggestion from frederic34

* adding 5 new statuses and their functions

* adding 5 new statuses and their functions

* copy and modified from email template api

* remove some unset because they are present in the database

* all objects are ConferenceOrBoothAttendee's

* load eventattendee API file from eventorganization/ folder

* ref is not required and should perhaps be banned because it is ignored during create + nonexisting apifetch function replaced with call to just fetch + making usre to use the correct class

* variable named paid is unused?

* get all event attendees

* fixing the sql statement

* adjusting function checking access rights

* UNTESTED! multicompany support by leftjoining with the projet table which does have an entity column + adjusting checkAccessRights function to prepare for testing project visibility

* adding more statuses and explaining boarding pass better

* expanding access rights checks with a project id and starting to use that after fetch so we know the project_id

* checking if the user has access to the project specified in fk_project

* phan fix getting  right

* checking if isModEnabled('multicompany')

* will only show rows of projects which is either public or the user is a contact of

* 2 new status changing functions and some protection for the existing status changing functions

* fix pre-commit check

* typo fix = that should be ==

* adding extrafields and linkedobjectids to event attendee

* should be back to develop branch contents so PR can be smaller

* reducing PR size, just GET and POST

* smallest commit, just the post and functions needed by post

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-22 11:45:50 +02:00
github-actions[bot]
615b81005f PHPStan > Update baseline (#33936)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-04-22 11:44:43 +02:00
Charlène Benke
af07c504a8 if localtaxes_type is empty no array return (#33938) 2025-04-22 11:44:30 +02:00
Charlène Benke
c896638d6d if datec sended (by api), we not initialize it (#33937)
* if datec sended (by api), we not initialize it

* Update ticket.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-22 11:44:04 +02:00
Laurent Destailleur
5e064f32e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-04-22 03:57:47 +02:00
Laurent Destailleur
99b1bcf4d0 Debug v22 on param sessionkey 2025-04-22 03:09:36 +02:00
Laurent Destailleur
0c2dcefcfb Fix log 2025-04-22 02:19:27 +02:00
Laurent Destailleur
aab39489f2 Fix add protection to avoid bypass in paymentok 2025-04-22 02:02:20 +02:00
Laurent Destailleur
656a4f36e3 Fix add protection to avoid bypass in paymentok 2025-04-22 01:42:28 +02:00
Laurent Destailleur
8b4561bc3c Fix transactions 2025-04-22 00:21:46 +02:00
Laurent Destailleur
03c2da65fe Add log to help debug payment 2025-04-21 23:58:26 +02:00
Laurent Destailleur
cebfdbd69a Add log to help debug payment 2025-04-21 23:33:30 +02:00
Laurent Destailleur
e1da8b9dce Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-21 22:59:41 +02:00
Laurent Destailleur
23a4933326 More info for tracking payment bug 2025-04-21 22:59:25 +02:00
Laurent Destailleur
4a76256f1b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-21 19:35:50 +02:00
Laurent Destailleur
2f16a642cb Doc 2025-04-21 19:35:10 +02:00
Laurent Destailleur
4b7f850979 Use dolEncrypt for pass encryption 2025-04-21 18:48:48 +02:00
ldestailleur
70418f942a Better repsonsive for tabs 2025-04-21 15:10:48 +02:00
ldestailleur
83a6a2b244 Debug v22 2025-04-21 14:57:41 +02:00
ldestailleur
7db8252225 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-21 13:52:25 +02:00
ldestailleur
ae5750f099 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-21 13:48:05 +02:00
ldestailleur
aa6fd6de5a Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-04-21 13:45:36 +02:00
ldestailleur
bfc8cb4708 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-04-21 13:44:16 +02:00
ldestailleur
0339ee6f1f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-04-21 13:44:08 +02:00
ldestailleur
19b322178c Debug v22 2025-04-21 13:42:28 +02:00
ldestailleur
da437d6ff2 Space 2025-04-21 13:38:22 +02:00
ldestailleur
42d226734c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-21 13:36:04 +02:00
ldestailleur
b8589efd92 Fix spellcheck 2025-04-21 13:35:48 +02:00
ldestailleur
958e65e982 Debug v22 2025-04-21 13:31:47 +02:00
ldestailleur
4aa03bb12a CSS 2025-04-21 13:24:31 +02:00
ldestailleur
cd027c3072 CSS 2025-04-21 13:21:15 +02:00
ldestailleur
219bf821e6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-21 12:17:02 +02:00
ldestailleur
f1dd6b4a69 Debug v22 - Picto in menu 2025-04-21 12:16:47 +02:00
MDW
69e3d4b5df UIUX: Interpret first token as thousands separator 21.500,00 (when French, ...). (#33832)
* Qual: Add testcase for price2num to convert '21.500,00' in FR

* NEW: Accept numbers like 1.213,00 in locales with whitespace/empty thousands separator

# NEW: Accept numbers like 1.213,00 in locales with whitespace/empty thousands separator

- Graceful handling of comma and dot as decimal points and thousands separators in the `price2num` function.
- Improved the `getNonEmptyString` function to include proper indentation and spacing (automatic).

* Add testcases for price2num

* en_US tests for invalid prices, add doc for price2num regex

* Restore lost test to validate compatibility

* Update FunctionsLibTest.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-21 11:57:13 +02:00
ldestailleur
e013e1c1b4 Fix CI 2025-04-21 11:56:36 +02:00
ldestailleur
776c78c696 Enhance menu editor 2025-04-21 11:52:40 +02:00
ldestailleur
d3edfc67ad Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-21 11:36:23 +02:00
ldestailleur
95d80fd5e8 Debug v22 2025-04-21 11:34:20 +02:00
ldestailleur
16b4592235 Fix fatal error 2025-04-21 11:19:06 +02:00
William Mead
61df34acd6 Fixed public ticket layout for Safari (#33933) 2025-04-21 10:42:51 +02:00
William Mead
333007c004 FIX intervention API get contacts ids (#33919)
* Fixed PHPDoc

* Added an array of contact ids to get and index methods

* Adjusted contact_type parameter to empty by default

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-20 19:00:04 +02:00
ptibogxiv
f1fbb98acd Fix api_setup.class.php (#33930) 2025-04-20 18:55:35 +02:00
ptibogxiv
2483cf4146 fix ccountry.class.php (#33929)
* fix ccountry.class.php

* Update ccountry.class.php
2025-04-20 18:54:55 +02:00
ldestailleur
48bb878df5 Debug v22 2025-04-20 18:35:42 +02:00
ldestailleur
5aa2209bc2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-20 18:05:18 +02:00
ldestailleur
6ed5e7e175 Try some fixes 2025-04-20 13:36:11 +02:00
MDW
b731d14d6e Qual: update phan baseline.txt (#33926)
* Qual: update phan baseline.txt

# Qual: update phan baseline.txt

- Updated the phan baseline:
  Removed entries for 'htdocs/commande/card.php',
'htdocs/core/class/commonsocialnetworks.class.php', 'htdocs/fourn/facture/paiement.php',
and 'htdocs/public/project/index.php'
- Corrected phan notice in 'htdocs/core/class/commoninvoice.class.php' - new since last baseline update.

* Suppose object has CommonSocialNetworks trait (for phan)
2025-04-20 13:21:48 +02:00
Clément
3eb9775b0c FIX Bug (#33923) 2025-04-20 13:21:21 +02:00
ldestailleur
c521262f5f Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-20 12:39:08 +02:00
ldestailleur
5b8de3560d Fix cast var in sql 2025-04-20 12:38:48 +02:00
ldestailleur
5158e565b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-20 12:26:44 +02:00
github-actions[bot]
45d06857d6 PHPStan > Update baseline (#33925)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-04-20 00:50:26 +02:00
Frédéric FRANCE
0fbd8e737e align size of phone fields with socpeople size (#33813)
* align size of phone fields with socpeople size

* add migration
2025-04-20 00:49:54 +02:00
ldestailleur
e82e716ea1 CSS 2025-04-19 12:30:55 +02:00
Frédéric FRANCE
ce7269aa07 fix missing translation (#33921)
* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation
2025-04-19 11:46:57 +02:00
Frédéric FRANCE
f5b11b78da fix typo (#33920) 2025-04-19 11:46:22 +02:00
Clément
2c3c763871 UIUX Improved ergonomics through UI design (#33868)
* Improved ergonomics through UI design

In IT conventions, the Cancel button is on the left and the Create button on the right. On Dolibarr, it's currently the other way round, which is rather counter-intuitive when you reflexively click. Correction to improve the GUI while respecting cultural norms.

* Update html.form.class.php with const

* Update html.form.class.php

* Update html.form.class.php

* Update html.form.class.php

* Update html.form.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-19 02:58:39 +02:00
Alexandre SPANGARO
162876df7b Asset - wrong status for disposal (#33898)
* Review of module asset

* Review of module asset
2025-04-19 02:56:31 +02:00
Laurent Destailleur
6ef600e991 WIP option WEBSITE_EXPORT_SQL_ON_SEVERAL_LINES 2025-04-19 02:43:44 +02:00
Laurent Destailleur
e5fbcd66b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-19 01:16:05 +02:00
Laurent Destailleur
16d7b3c21a Fix export 2025-04-19 01:15:24 +02:00
stefkpl
9fd9454928 NEW: add phone_mobile to export of thirdparty (#33893)
* fix: add phone_mobile to societe table import

* Update modSociete.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-18 20:14:07 +02:00
Mohamed DAOUD
06cbf7e50e enhance website payment v21 (#33915) 2025-04-18 20:02:57 +02:00
Francis Appels
55530fa588 Fix intervention update sql error (#33916) 2025-04-18 20:01:58 +02:00
ldestailleur
c55138f314 Fix CI 2025-04-18 19:56:28 +02:00
ldestailleur
fe57065929 FIX CI 2025-04-18 17:22:09 +02:00
ldestailleur
88278014d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-18 16:12:01 +02:00
ldestailleur
879858b6f0 Fix CI 2025-04-18 16:11:51 +02:00
Mohamed DAOUD
71143444e7 enhance website payment (#33912) 2025-04-18 15:53:33 +02:00
ldestailleur
90919d2b26 Look and feel v22 2025-04-18 15:50:06 +02:00
ldestailleur
2456072a84 Clean code 2025-04-18 15:21:07 +02:00
ldestailleur
6c27aa5842 CSS 2025-04-18 15:13:58 +02:00
ldestailleur
045d834cde CSS 2025-04-18 15:11:21 +02:00
Benjamin Falière
5837c46f5a FIX: partial result on timespent list (#33855)
Co-authored-by: Benjamin Falière <benjamin.faliere@altairis.fr>
2025-04-18 15:00:27 +02:00
ldestailleur
5a94d8898d Trans 2025-04-18 14:53:59 +02:00
ldestailleur
304fcfb648 Fix CI 2025-04-18 14:51:28 +02:00
ldestailleur
fe5606368b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-18 14:48:36 +02:00
ldestailleur
0cacc393b5 Fix CI 2025-04-18 14:48:26 +02:00
Etienne BENDER
531003887f fix(supplier_proposal): enforce class name in getElementProperties() (#33887) 2025-04-18 14:21:16 +02:00
ldestailleur
ed29a424d8 Fix CI 2025-04-18 14:17:39 +02:00
ldestailleur
524437e277 FIX #33884 2025-04-18 14:16:27 +02:00
Frédéric FRANCE
5d777bbf59 clean code (#33882)
* clean code

* clean code

* clean code

* Update mailtemplate.php
2025-04-18 13:38:03 +02:00
Mohamed DAOUD
0fae8e5b0b NEW Some trans keys to prepare a new website template (#33886)
* some trans keys

* Update website.lang

* Update website.lang
2025-04-18 13:37:14 +02:00
lvessiller-opendsi
2179900d34 FIX cannot create a reject line on prelevement line (#33888) 2025-04-18 13:36:53 +02:00
ldestailleur
941ccf5ec7 Debug v22 2025-04-18 13:33:55 +02:00
ldestailleur
c55bbd8fa8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-18 13:12:36 +02:00
ldestailleur
bdb82ef856 Complete #33894 2025-04-18 13:12:20 +02:00
Lucas Marcouiller
de99ce3647 Fix webhook_history database (#33889)
* Fix webhook_history database

* add error meesage
2025-04-18 12:58:04 +02:00
Frédéric FRANCE
7a73b0f771 fix CI (#33892) 2025-04-18 12:57:38 +02:00
Laurent Destailleur
6f6a5f6f4d Look and feel v22 2025-04-17 19:58:48 +02:00
Laurent Destailleur
353c9210dc Trans 2025-04-17 19:06:55 +02:00
Laurent Destailleur
932c3e66da Clean page content 2025-04-17 18:56:32 +02:00
Laurent Destailleur
072594fb91 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-17 17:49:41 +02:00
Laurent Destailleur
af31230980 CSS 2025-04-17 17:49:18 +02:00
Florian Mortgat
2250e26c3c FIX critical regression: $invoice->array_options() emptied by call to $invoice->fetch_lines() causing data loss (#33891) 2025-04-17 13:27:24 +02:00
Laurent Destailleur
a40aec6029 Debug v22 2025-04-17 03:56:54 +02:00
ldestailleur
2b721ba245 WIP mail layout 2025-04-17 01:31:06 +02:00
ldestailleur
9f3281cf1d WIP mail layout 2025-04-17 00:56:22 +02:00
ldestailleur
2a7b9a2466 WIP mail layout 2025-04-17 00:27:52 +02:00
ldestailleur
97475f74dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-16 22:12:50 +02:00
ldestailleur
94697e64e4 Debug email layouts 2025-04-16 22:12:37 +02:00
lvessiller-opendsi
c85cc3061b NEW shipment kits with dispatcher v2 (#33750)
* NEW shipment kits with dispatcher v2

* Show stock of virtual product on select warehouse when dispatching a shipment

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-16 21:11:58 +02:00
Frédéric FRANCE
de763b4b43 clean code of order (#33880)
* clean code of order

* clean code of order

* clean code of order

* clean code of order
2025-04-16 21:09:45 +02:00
ldestailleur
da460c079e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-16 21:08:22 +02:00
ldestailleur
b7c0a734ed Fix CI 2025-04-16 21:08:11 +02:00
Regis Houssin
483112810e FIX avoid sql error when a comment is after without comma (#33758)
* FIX avoid sql error when a comment is after without comma

* FIX syntax error

* Update admin.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-16 20:00:13 +02:00
Frédéric FRANCE
255300a29e test fix phan (#33879)
* test fix phan

* test fix phan

* test fix phan

* test fix phan

* test fix phan
2025-04-16 19:55:44 +02:00
ldestailleur
50345daea9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-16 19:10:18 +02:00
ldestailleur
6746b37fc4 Add field CCI 2025-04-16 19:09:30 +02:00
github-actions[bot]
d236e52d5c PHPStan > Update baseline (#33873)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-16 19:00:01 +02:00
ldestailleur
f4d7ddaaf4 Add more phpunit tests 2025-04-16 18:54:43 +02:00
ldestailleur
57268af48e Add more phpunit tests 2025-04-16 18:42:20 +02:00
ldestailleur
c1649c04b4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-04-16 18:28:45 +02:00
ldestailleur
a4dcfc00ec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-16 17:58:20 +02:00
ldestailleur
0b4bc03236 Update migration file 2025-04-16 17:58:13 +02:00
Lucas Marcouiller
b8e7fcdb4d New webhook history database structure (#33852)
* New webhook history database structure

* fix CI

* remove unwanted files

* Update llx_webhook_history-webhook.sql

* Update llx_webhook_history-webhook.key.sql

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-16 17:55:12 +02:00
Can Arslan
6ed077e446 fix: typo (#33877) 2025-04-16 17:48:17 +02:00
Frédéric FRANCE
859346150b fix phpstan (#33869) 2025-04-16 17:33:22 +02:00
Frédéric FRANCE
beb0956d60 add image type in CMailFile.class.php (#33872) 2025-04-16 17:32:59 +02:00
ldestailleur
6f6556f43d Fix look and feel 2025-04-16 16:18:33 +02:00
ldestailleur
8d12515a7b Debug v22 2025-04-16 16:14:51 +02:00
ldestailleur
3f31c74642 Debug v22 2025-04-16 15:50:37 +02:00
Jon Bendtsen
772337d162 redoing PR Api objectlinks #33738 (#33781)
* redoing PR Api objectlinks #33738

* loading objectlinks api from main api folder

* bringing $FIELDS up to develop branch standard

* trying to tell phan the expected array types

* phan return and input type specifications

* trying to fix 'Method ObjectLink::_makeobject() should return int but return statement is missing.'

* trying to return an ObjecTLink

* get returns an ObjectLink object

* making sure that function _makeobject always has an return

* making sure deleteByValues always has a return statement

* remove empty line

* making sure getByValues always has a return value

* trying to fix phan for _validate

* no < around objectlink

* trying to fix some phan and phan-stan errors

* public variable target should be fk_target

* making TRIGGER_PREFIX more like in core/class/commonobject.class.php

* trying to save and use the notrigger value

* typecast objectlink fk_source and fk_target to string in the hope that they are later made correctly to int

* whitespace to trigger a build of my branch

* back to being int - because that is what they are

* trying to typecast

* trying to help PHPStan to validate fk_source and fk_target

* trying to use  the same way as  are used

* splitting  over multiple lines

* Fix: update ObjectLink return type in API methods

### FIX: Update ObjectLink return type in API methods

- Updated the return type of several methods from `ObjectLink` to `Object` to reflect a return type compatible with Luracast/Restler

* fix: refactor field setting in ObjectLinks class

# Fix: Refactor field setting in ObjectLinks class

- Removed the static `$INTFIELDS` array and moved its logic to a new private
method `_setObjectLinkField`.
- Updated `create`, `getByValues`, and `deleteByValues` methods to use
`_setObjectLinkField` for setting fields.
- Cleaned up the code by removing redundant field validation and type casting
logic.

* noting that relation type can both be string and null

* escaping strings before parsing them to the database

* -> not global

* trying to fix phpstan errors by flipping so the string part is first

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: MDW <mdeweerd@users.noreply.github.com>
2025-04-16 14:49:39 +02:00
Jon Bendtsen
dcdc19d099 GUI: adjust field length in extrafields forms for add and edit (#33867)
Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
2025-04-16 11:18:38 +02:00
Alexandre SPANGARO
c35f798bdc FIX #33546 Asset SQL error on disposal popup to select invoice (#33865) 2025-04-16 11:15:06 +02:00
Frédéric FRANCE
6164a9c9cc fix CI (#33866)
* fix CI

* Update facture.class.php
2025-04-16 11:10:38 +02:00
Charlène Benke
93de32e153 add fichinter put call for update data (#33836)
* add fichinter put call for update data

* Update api_interventions.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-16 01:05:03 +02:00
Jon Bendtsen
2aa6e65c6f adding different filename check for when member codes are the advanced kind. Fix #32447 (#33862)
Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
2025-04-16 01:04:33 +02:00
lvessiller-opendsi
4963639d67 NEW input reason for customer invoice (#33599)
* NEW input reason for customer invoice

* Fix CI error

* Fix format fk_input_reason in array of fileds

* Add invoices in translate key of source dictionary
2025-04-16 01:02:26 +02:00
Laurent Destailleur
0008ebe773 Fix CI 2025-04-16 00:19:24 +02:00
Laurent Destailleur
b38779ec99 Fix CI 2025-04-15 23:35:54 +02:00
Laurent Destailleur
c4bcb083c6 Fix CI 2025-04-15 22:55:21 +02:00
Laurent Destailleur
e3a09b00d5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-15 22:40:33 +02:00
Laurent Destailleur
8f78df531c Fix CI 2025-04-15 22:38:35 +02:00
ldestailleur
608b1dc0f4 Clean code 2025-04-15 20:33:39 +02:00
ldestailleur
86564e0c03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-04-15 20:28:52 +02:00
ldestailleur
b9dd27e264 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-15 20:25:24 +02:00
ldestailleur
3d8704ae63 Prepare code for a better implementation of #33857 2025-04-15 20:24:34 +02:00
Frédéric FRANCE
ca693dcc93 fix CI (#33860) 2025-04-15 19:11:19 +02:00
ldestailleur
fd9f12710e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-15 19:10:33 +02:00
ldestailleur
c373c67f2e Debug v22 2025-04-15 19:07:37 +02:00
John BOTELLA
08a35bbcff NEW : Toggle Display of Supplier Invoices and Credit Notes on Payment Page (#33856)
* New supplier paiments display all invoices mode

* fix param

* fix php stan

* add display mode dinstinction for css selector
2025-04-15 18:17:36 +02:00
Alexandre SPANGARO
93478d3216 NEW Order - Add drag & drop file (#33848) 2025-04-15 18:00:24 +02:00
ThomasNgr-OpenDSI
ca530a115c Use $arrayfields and add ability to hide columns on accountancy lists (#33785) 2025-04-15 17:44:10 +02:00
Alexandre SPANGARO
fd5cf10490 General admin of accountancy module (#33833)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-15 17:24:43 +02:00
Charlène Benke
4d1e071247 allow fichinter date update by api call (#33835)
* allow fichinter date update by api call

* Update fichinter.class.php

* Update fichinter.class.php

* Update fichinter.class.php

* Update fichinter.class.php

* Update fichinter.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-15 17:22:34 +02:00
Alexandre SPANGARO
ab0ce1d645 Review of module asset (#33847)
* Fixed Asset - Update translation of the module

* Fix asset create name

* Fix ref field

* Update module Asset

* Fix CI

* Fix CI

* Fix comment
2025-04-15 17:21:45 +02:00
John BOTELLA
1d71d28033 Fix php warning (#33849) 2025-04-15 17:20:47 +02:00
Frédéric FRANCE
67962812d1 fix CI branch 21.0 (#33851) 2025-04-15 17:19:27 +02:00
ldestailleur
f0bd86c8a4 Debug v22 link with dolistore 2025-04-15 16:55:35 +02:00
ldestailleur
bb61fd0537 Debug v22 CSS for RTL languages 2025-04-15 15:25:55 +02:00
ldestailleur
e26744d625 Move code for showEyeForField into a dedicated function. 2025-04-15 13:38:59 +02:00
ldestailleur
708a6fa527 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-15 12:27:32 +02:00
ldestailleur
ec495bd882 Clean dead code 2025-04-15 12:24:50 +02:00
Laurent Destailleur
3085c0762f Fix remove print 2025-04-15 02:51:00 +02:00
Laurent Destailleur
b27c3b692e FIX #33843 More complete fix. 2025-04-15 02:42:48 +02:00
Laurent Destailleur
be42c745a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-14 22:05:46 +02:00
Laurent Destailleur
e19f1dc371 Doc 2025-04-14 21:57:55 +02:00
lvessiller-opendsi
f19cce51f7 FIX compute pending amount on debit request when using bank transfer mass action from supplier invoice list (#33843) 2025-04-14 21:56:34 +02:00
Eric - CAP-REL
dfe8433b6b NEW: add setasnumber for forms (#33845)
* add setasnumber

* fix bad attribute from dev time

* more generic solution
2025-04-14 21:08:53 +02:00
Frédéric FRANCE
b1e518da27 fix missing translation (#33844)
* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation
2025-04-14 21:06:56 +02:00
Frédéric FRANCE
a7206ed0f6 fix CI branch 21. (#33846) 2025-04-14 21:06:29 +02:00
Laurent Destailleur
a72067675d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-14 20:24:40 +02:00
Laurent Destailleur
b0b2442298 Fix #33793 2025-04-14 20:24:21 +02:00
Laurent Destailleur
357615c938 Fix name of field 2025-04-14 20:20:38 +02:00
Eric - CAP-REL
a89a917adc PERF: hidden var to limit list of invoices for credit note list (#33839)
* PERF: hidden var to limit list of invoices for credit note list

* Update facture.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-14 20:12:19 +02:00
Yannis Hoareau
e62f9cce4a Fix bug where invoice situation invoices could not be created (#33842) 2025-04-14 20:01:35 +02:00
Frédéric FRANCE
2c3cb5806d fix CI (#33827)
* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* try to fix

* fix
2025-04-14 19:37:33 +02:00
Laurent Destailleur
99c6a0e307 Progress on #33833 2025-04-14 19:32:35 +02:00
lvessiller-opendsi
d7758f9ae6 FIX bank payment rejection on SEPA (backport commit 100a657) (#33838) 2025-04-14 19:25:41 +02:00
Alexandre SPANGARO
c52b76cb2e FIX Order error translation (#33834) 2025-04-14 19:24:42 +02:00
Laurent Destailleur
cebc82cf4f Trans 2025-04-14 19:19:28 +02:00
Laurent Destailleur
e12d4deba2 CSS v22 2025-04-14 19:05:45 +02:00
ldestailleur
56908a8764 Clean CSS 2025-04-14 17:13:09 +02:00
ldestailleur
6a1bc2f68a CSS 2025-04-14 15:21:12 +02:00
ldestailleur
79e3a2eddf Debug v22 2025-04-14 15:04:26 +02:00
ldestailleur
f18efe4e89 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-14 13:59:11 +02:00
ldestailleur
6185825f75 Debug warning 2025-04-14 13:58:54 +02:00
ldestailleur
dc2a6694c7 Comment 2025-04-14 10:33:03 +02:00
ldestailleur
4ee210236a Fix detect security fixes in git log 2025-04-14 09:27:20 +02:00
ldestailleur
d9e89e611e Fix warning 2025-04-14 09:13:37 +02:00
ldestailleur
482053ee1e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-14 09:13:15 +02:00
Laurent Destailleur
957199ef4c Debug v22 2025-04-13 21:49:57 +02:00
Laurent Destailleur
54af0a152a Debug v22 2025-04-13 21:32:28 +02:00
Laurent Destailleur
5d6942db9d css 2025-04-13 19:54:17 +02:00
Laurent Destailleur
ce15dc25c8 FIX HTML broken by the trunc. 2025-04-13 19:50:22 +02:00
Laurent Destailleur
aaa100d132 FIX HTML broken by the trunc. 2025-04-13 19:46:52 +02:00
ldestailleur
4a1101e4e1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-13 14:36:08 +02:00
Laurent Destailleur
2ccfb2dfb6 CSS 2025-04-12 20:11:11 +02:00
Laurent Destailleur
4493dc005a Clean code 2025-04-12 19:47:32 +02:00
ldestailleur
76c3e8f500 var not used 2025-04-12 17:03:16 +02:00
ldestailleur
a328789541 FIX CI 2025-04-12 17:02:24 +02:00
ldestailleur
3920ad13f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-12 16:59:18 +02:00
ldestailleur
0b8324fc89 FIX #33784 2025-04-12 16:58:50 +02:00
Florian Mortgat
0031210040 NEW hidden conf for api contrat putLine endpoint to only return the line (#33809)
* NEW: hidden conf for endpoint PUT {id}/lines/{lineid} to return only the modified line and remove more attributes from the object

* Fixing pre-commit error

* FIX: cherry-picked commit (designed for v17.0) was incompatible with v22
Feature: hiden conf 'API_CONTRAT_PUTLINE_OUTPUT_LINE_ONLY'
- use $lineid ($id is the ID of the contract)
- instantiate ContratLigne (the attribute $this->contractLine no longer exists)
- more attributes to be unset
2025-04-12 16:41:34 +02:00
Frédéric FRANCE
ace876bf9c fix CI (#33822) 2025-04-12 16:26:46 +02:00
ldestailleur
0ff4e7bb2b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-12 16:26:16 +02:00
ldestailleur
5ebb7547a4 FIX #33817 2025-04-12 16:25:35 +02:00
Frédéric FRANCE
2b468e6b0f enhance dol_print_ip (#33819)
* enhance dol_print_ip

* fix cache

* fix CI
2025-04-12 16:19:45 +02:00
ldestailleur
4d80dc9d69 Debug v22 2025-04-12 16:18:40 +02:00
ldestailleur
ec7ecd9f08 Debug v22 2025-04-12 16:16:34 +02:00
ldestailleur
16d894cc7d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-12 13:48:21 +02:00
ldestailleur
0dda216da1 CSS 2025-04-12 13:48:09 +02:00
Laurent Destailleur
e55ec24393 Debug v22 2025-04-12 03:40:25 +02:00
Laurent Destailleur
76f33c4ed2 Debug v22 2025-04-12 03:35:44 +02:00
ldestailleur
c9b60da4e8 Clean var 2025-04-11 23:56:51 +02:00
ldestailleur
ba6d55691c Look and feel v22 2025-04-11 23:53:30 +02:00
ldestailleur
1fcacf2f98 Fix filter on agenda list 2025-04-11 23:42:44 +02:00
ldestailleur
b14d28c983 Fix filter on agenda list 2025-04-11 23:42:18 +02:00
ldestailleur
eadf6182e1 Try to debug the transfer in treasury mode. Move into DEBUG level.
Still some tests to do...
2025-04-11 20:12:16 +02:00
ldestailleur
a18284b829 Debug v22 2025-04-11 17:36:05 +02:00
ldestailleur
96792f5e08 CSS 2025-04-11 17:32:01 +02:00
ldestailleur
fbe7493497 Trans 2025-04-11 14:53:51 +02:00
ldestailleur
955a8dab83 Debug v22 2025-04-11 14:20:42 +02:00
ldestailleur
26613998eb Debug v22 2025-04-11 13:57:07 +02:00
ldestailleur
7c46eeebb9 CSS 2025-04-11 13:18:24 +02:00
ldestailleur
b87223250f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-11 12:49:01 +02:00
ldestailleur
1671ff5e1f Fix complete darkmode for theme MD 2025-04-11 12:48:51 +02:00
ldestailleur
201522a98f QUAL Remove CSS -webkit-border-radius and -webkit-box-shadow 2025-04-11 12:16:43 +02:00
Laurent Destailleur
38d4ccbd2d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-04-11 02:35:52 +02:00
Laurent Destailleur
d9bf76fe55 Fix example 2025-04-11 02:23:55 +02:00
ldestailleur
88b46a2d0e CSS 2025-04-10 23:43:16 +02:00
ldestailleur
2e980ae83a Enable option MAIN_FEATURE_TO_SHOW_TOP_MENU_URL_IN_FRAME 2025-04-10 21:46:46 +02:00
ldestailleur
74f0df409c Look and feel v22 2025-04-10 21:38:05 +02:00
ldestailleur
38ac83410e CSS 2025-04-10 21:33:17 +02:00
ldestailleur
6da74b90ce Debug v22 2025-04-10 21:25:45 +02:00
ldestailleur
50b6281041 FIX #33353 2025-04-10 21:20:37 +02:00
ldestailleur
dfe69ef1f5 Debug v22 2025-04-10 20:42:43 +02:00
ldestailleur
5bbce37a10 Debug v22 2025-04-10 20:16:08 +02:00
ldestailleur
518eb643bd Debug v22 2025-04-10 19:23:58 +02:00
ldestailleur
7a3bd99a6a Debug ref numbering of bank transaction feature 2025-04-10 19:18:54 +02:00
ldestailleur
ee0c465421 Doc 2025-04-10 16:27:44 +02:00
ldestailleur
b84bc626d9 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-10 14:34:59 +02:00
ldestailleur
aba002a778 Fix filter on status 2025-04-10 14:29:36 +02:00
ldestailleur
5e3313bf13 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-10 14:24:21 +02:00
ldestailleur
e276def96d Revert "add param nocreateEcmFile (#33770)"
This reverts commit 0bd93fa05a.
2025-04-10 14:19:49 +02:00
ldestailleur
6c6aa70d0b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-04-10 14:18:02 +02:00
ldestailleur
15c799b324 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-04-10 14:17:56 +02:00
ldestailleur
407eb0214c Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-04-10 14:17:35 +02:00
ldestailleur
8524a2f938 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-04-10 14:17:28 +02:00
ldestailleur
8434e6567f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-04-10 14:17:05 +02:00
ldestailleur
2c38bea2b0 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-04-10 14:16:58 +02:00
ldestailleur
096b59913d Merge branch '16.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0 2025-04-10 14:16:34 +02:00
ldestailleur
d38b9e6248 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2025-04-10 14:16:11 +02:00
ldestailleur
f256deb54b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2025-04-10 14:15:48 +02:00
ldestailleur
bad881b2a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-04-10 14:06:45 +02:00
ldestailleur
a28bdecfff Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-10 13:06:25 +02:00
ldestailleur
b0918ffd78 Debug makepack 2025-04-10 13:06:13 +02:00
omogenot
5d55d75c8e FIX Extend late search option for open and awaiting supplier orders (#33810)
* Create two alert levels

Make search_status be 1,2 for regular late orders and 3,4 for order to be received late state.

* Fix url late target

On main screen, choosing late awaiting orders does not lead to a list of awaiting orders that are in alert.

* Missing space
2025-04-10 12:50:24 +02:00
ldestailleur
76ea967ba9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-10 12:48:22 +02:00
ldestailleur
f13282c5c9 Fix report security fix 2025-04-10 12:48:12 +02:00
ldestailleur
89e898e4bf Fix CSS 2025-04-10 12:37:51 +02:00
ldestailleur
bc507d213c Fix regression after filtering param "oncontent" 2025-04-10 11:48:14 +02:00
ldestailleur
65ec473bd4 Doc 2025-04-10 11:40:37 +02:00
ldestailleur
e15fe43721 Add a key un URL to allow better protection 2025-04-10 11:39:13 +02:00
Charlène Benke
68956cf7d2 proposal on box product not displayed (#33802) 2025-04-09 23:06:11 +02:00
Frédéric FRANCE
1eb27d5bd5 clean code (#33805) 2025-04-09 23:05:17 +02:00
atm-irvine
a6a07aebc3 # NEW|New delays conf for supplier proposals (#33800)
* feat: delays conf for supplier proposals

* Update conf.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-09 23:04:47 +02:00
ldestailleur
8bdd6dff07 Debug v22 2025-04-09 23:03:22 +02:00
ldestailleur
b528affcf1 Fix CI 2025-04-09 19:42:45 +02:00
ldestailleur
c792cd7bb4 Fix CI 2025-04-09 19:32:24 +02:00
ldestailleur
754eba266d Fix CI 2025-04-09 19:12:34 +02:00
Marc de Lima Lucio
cbae456978 FIX: prelevement order list: handle case of use by banktransfer module (#33801) 2025-04-09 19:08:59 +02:00
ldestailleur
8cc5bc3e7e NEW The closing reason of invoice appear on tooltip of invoice status 2025-04-09 19:07:31 +02:00
ldestailleur
9550106ded FIX to have the remain to pay in invoice listsame than on card 2025-04-09 18:08:08 +02:00
ldestailleur
8bd65ee4c5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-09 17:41:44 +02:00
ldestailleur
4ba1f204fd Fix need refresh to see status updated 2025-04-09 17:41:33 +02:00
ldestailleur
e6fdf698b3 Fix trans 2025-04-09 17:21:59 +02:00
Eric - CAP-REL
be1948e1eb better fields definition with full objects reference (#33798) 2025-04-09 16:36:42 +02:00
ThomasNgr-OpenDSI
3191b1323b Add link to lines for a particular month in accountancy/expensereport/index.php accordingly to other reports (#33783) 2025-04-09 16:17:36 +02:00
ldestailleur
064322d402 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-09 16:15:58 +02:00
ldestailleur
8dd369c814 Look and feel 2025-04-09 16:15:48 +02:00
David Beniamine
b96c3d0df3 Take into account subcategories shown to get product offset (#33788) 2025-04-09 16:01:48 +02:00
Vaadasch
e469131327 Add hook before each generated invoice by createRecurringInvoices (#33780)
* Add hook before each generated invoice by createRecurringInvoices

* Update new hook to respect parameters constraints

* Add global action

* Move "global $action" at the beginning of the function

* Update facture-rec.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Arnaud Serrut <arnaud.serrut@gmail.com>
2025-04-09 16:00:17 +02:00
Frédéric FRANCE
d0cf13e73c add missing translation (#33782)
* add missing translation

* fix missing translation

* fix missing translation

* fix missing translation
2025-04-09 15:56:34 +02:00
David Beniamine
846dc771ef Takepos check only for openned cash fence (#33789)
* Check only for openned cash fence

* Also show close button
2025-04-09 15:51:31 +02:00
Lucas Marcouiller
2424943670 New AI style rephraser for mail form (#33797)
* New AI style rephraser

* prevent regretion

* fix Ci
2025-04-09 15:47:09 +02:00
github-actions[bot]
0bb8c4fe11 PHPStan > Update baseline (#33795)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-04-09 15:45:03 +02:00
ThomasNgr-OpenDSI
7fa3474ecd FIX : constant PAYMENTBYBANKTRANSFER_ADDDAYS was never saved (#33799) 2025-04-09 15:44:51 +02:00
ldestailleur
eb4e5a4685 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-09 15:40:02 +02:00
ldestailleur
cfef4c758c Add more fail2ban examples 2025-04-09 15:04:57 +02:00
ldestailleur
964ee3e2b8 FIX Do not allow to force amount for online payment of order 2025-04-09 14:47:37 +02:00
ldestailleur
d826358d58 Log 2025-04-09 13:56:05 +02:00
ldestailleur
0757f6048f Doc 2025-04-09 13:39:28 +02:00
ldestailleur
8ef33a848d Doc 2025-04-09 13:28:33 +02:00
ldestailleur
f2cef3a8d1 Doc 2025-04-09 12:35:35 +02:00
ldestailleur
9ab63b3491 Doc 2025-04-09 12:32:53 +02:00
ldestailleur
74eccf279d Fix regression 2025-04-09 12:08:52 +02:00
ldestailleur
c09f7a235c Fix type 2025-04-09 11:56:21 +02:00
ldestailleur
380fd37430 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-04-09 11:14:22 +02:00
ldestailleur
f1a6ae1b57 FIX #33727 Sec 2025-04-09 11:11:54 +02:00
ldestailleur
93b7494ef5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-09 11:04:13 +02:00
ldestailleur
9a80025dd5 FIX #33727 Sec 2025-04-09 11:03:48 +02:00
Etienne BENDER
285950a684 feat(contract): add new printObjectLinesBlock hook (#33771)
* feat(contract): add new printObjectLinesBlock hook

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-09 00:25:28 +02:00
ldestailleur
7f621558fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-09 00:10:59 +02:00
atm-irvine
9f89417391 New/group fetch and fetch optionals (#33257)
* feat(facture): group classic fetch and fetch optionals depending on conf

* feat(facture): group new fetch optionals

* feat(facture): group new fetch optionals for lines

* chore: phan fixes

* feat(factureligne): grouped fetch and fetch optionals

* Fix regression in missing $conf

* Update factureligne.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-09 00:10:02 +02:00
ldestailleur
f93cc19be8 Debug v22 2025-04-09 00:08:40 +02:00
ldestailleur
b3c82155eb Fix CI 2025-04-08 23:56:13 +02:00
ldestailleur
dd713c2c43 Fix CI 2025-04-08 23:48:33 +02:00
ldestailleur
c09b9214c5 Fix CI 2025-04-08 23:28:50 +02:00
ldestailleur
f9355dd04b enhance AI 2025-04-08 23:18:23 +02:00
ldestailleur
4f9e17e95a Fix CI 2025-04-08 22:33:15 +02:00
ldestailleur
6b11ed0187 Fix CI 2025-04-08 21:50:04 +02:00
ldestailleur
01ee611d72 Fix CI 2025-04-08 20:57:39 +02:00
ldestailleur
e7d54cf643 Fix CI 2025-04-08 20:37:49 +02:00
ldestailleur
510ffb4fce Fix CI 2025-04-08 20:00:41 +02:00
ldestailleur
941673cbcb Try to fix CI 2025-04-08 19:57:27 +02:00
ldestailleur
7579d9c01a Debug v22 2025-04-08 19:41:03 +02:00
ldestailleur
3aa9169cf0 Fix CI 2025-04-08 19:35:07 +02:00
ldestailleur
9c9099f06b Fix CI 2025-04-08 19:19:33 +02:00
ldestailleur
aa6d3199a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-08 18:18:25 +02:00
ldestailleur
7d8607cce5 NEW Module external website is deprecated. Replaced with menu editor. 2025-04-08 18:18:05 +02:00
Vaadasch
facb31000d FIX $object not initialised in extrafields_list_print for propals (#33753)
* FIX object->id not initialise for propal / objectoffield

* Update extrafields_list_print_fields.tpl.php

* Update extrafields_list_print_fields.tpl.php

* Update list.php

* Update list.php

* Update list.php

---------

Co-authored-by: Arnaud Serrut <arnaud.serrut@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-08 15:28:41 +02:00
atm-jonathan
0bd93fa05a add param nocreateEcmFile (#33770)
Co-authored-by: x <x@x.x>
2025-04-08 15:24:28 +02:00
Yannis Hoareau
ebdf69ca69 Fix extrafields warning (#33761) 2025-04-08 15:22:48 +02:00
Vaadasch
87c3576a86 BUG duration minutes (#33767)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-08 15:21:38 +02:00
ldestailleur
611cc510d7 Fix CI 2025-04-08 14:12:08 +02:00
ldestailleur
79e7615592 Fix CI 2025-04-08 14:08:58 +02:00
Benjamin Falière
58b081fc9d FIX: select supplier when creating object from project (#33766)
Related to #33765

Co-authored-by: Benjamin Falière <benjamin.faliere@altairis.fr>
2025-04-08 14:00:25 +02:00
ldestailleur
ce25da2337 Fix CI 2025-04-08 13:53:10 +02:00
ldestailleur
5cc439da79 Fix CI 2025-04-08 13:51:35 +02:00
ldestailleur
24ab1f9d6b Trans 2025-04-08 13:47:44 +02:00
ldestailleur
b936fa979c Add constant MAIN_PDF_SHOW_SOURCE_PHONE_MOBILE 2025-04-08 13:28:59 +02:00
ldestailleur
742c9bec1e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-04-08 13:15:06 +02:00
ldestailleur
54eb9f21e8 Clean code. Public pages must use the common header 2025-04-08 13:14:37 +02:00
ldestailleur
0e7e59a17a Clean code. Public pages must use the common header 2025-04-08 12:49:19 +02:00
ldestailleur
6a6d7e5b5a Debug v22 2025-04-08 12:02:07 +02:00
ldestailleur
1bb7edea8b Enhance AI features 2025-04-08 11:42:46 +02:00
ldestailleur
ffaaf473e3 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-08 10:59:38 +02:00
ldestailleur
8a7941624b Fix url in popup message 2025-04-08 10:59:17 +02:00
ldestailleur
86cf3fe8dd FIX backport of replaceement of thirdparty information on notification 2025-04-08 10:45:20 +02:00
ldestailleur
9f7f1dbeff Enhance AI features. 2025-04-07 21:44:26 +02:00
ldestailleur
08700647e6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-07 20:29:48 +02:00
ldestailleur
936e35a767 Enhance AI setup. 2025-04-07 20:29:38 +02:00
Anthony Berton
664ea5f8c1 FIX - const for affect warehouse (#33751)
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-07 18:29:42 +02:00
Regis Houssin
59bc259804 FIX a comment without after a comma create a sql error (#33752)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-07 17:01:03 +02:00
ldestailleur
be21aa7c6d FIX CI 2025-04-07 17:00:18 +02:00
ldestailleur
151cf1cea3 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-07 16:45:55 +02:00
ldestailleur
a16df33bf3 Fix CI 2025-04-07 16:45:44 +02:00
ldestailleur
16e05c08a7 Fix CI 2025-04-07 16:40:15 +02:00
ldestailleur
91e0b52630 Fix CI 2025-04-07 16:38:37 +02:00
Frédéric FRANCE
ac3364138d fix sql (#33754)
if ref or ref_ext doen't exists in object (by example ref with llx_societe) sql will fails

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-07 16:37:08 +02:00
Frédéric FRANCE
8de3b94356 fix syntax (#33756) 2025-04-07 16:35:29 +02:00
Mohamed DAOUD
3a05efdb5b Add try catch (#33755) 2025-04-07 16:34:51 +02:00
ldestailleur
ba6a971cb5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-07 15:58:18 +02:00
ldestailleur
75d0f2ea6c FIX #33547 2025-04-07 15:58:06 +02:00
Frédéric FRANCE
a427277958 fix phpstan (#33709)
* fix phpstan

* remove debug

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-07 15:48:16 +02:00
ldestailleur
6af8298736 Fix related to #33449 2025-04-07 15:46:10 +02:00
ldestailleur
75eb798322 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-07 15:11:15 +02:00
ldestailleur
fa5c98824f Fix related to #33449 2025-04-07 15:10:51 +02:00
Frédéric FRANCE
36aa025f3e fix CI (#33743)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-07 14:55:17 +02:00
Frédéric FRANCE
8f348cbd6b fix CI (#33744) 2025-04-07 14:11:53 +02:00
ldestailleur
61982bf42b Fix CI 2025-04-07 14:11:37 +02:00
ldestailleur
a8d3fd8db2 Fix CI 2025-04-07 14:05:02 +02:00
ldestailleur
534aec349c Fix CI 2025-04-07 14:01:39 +02:00
ldestailleur
53b2e257fc Remove one choice 2025-04-07 13:59:36 +02:00
ldestailleur
782f28cac6 Clean code 2025-04-07 13:30:25 +02:00
ldestailleur
9ac7be87a2 Fix CI 2025-04-07 13:14:18 +02:00
ldestailleur
2f4f82b013 Fix CI 2025-04-07 13:10:32 +02:00
ldestailleur
d77898ff3d FIX #33742 2025-04-07 12:53:19 +02:00
ldestailleur
8ad1bf580f CSS 2025-04-07 12:48:17 +02:00
ldestailleur
7e1ef5ee45 Fix warning 2025-04-07 12:41:13 +02:00
ldestailleur
7df240c25b Fix CI 2025-04-07 12:28:05 +02:00
ldestailleur
30da60c955 Fix CI 2025-04-07 12:23:17 +02:00
ldestailleur
fee67ce8c7 Fix CI 2025-04-07 12:12:40 +02:00
ldestailleur
aae6433e02 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-07 11:51:52 +02:00
ldestailleur
33f1a644d5 Fix CI 2025-04-07 11:51:42 +02:00
Laurent Destailleur
25d7c47ce3 WIP Enhance menu editor with showtopmenuinframe 2025-04-07 05:47:47 +02:00
Laurent Destailleur
8a26f0d6a3 Add link to list of picto into setup page 2025-04-07 05:30:34 +02:00
Laurent Destailleur
75a33ef276 FIX Edition of target of menu entries 2025-04-07 05:11:51 +02:00
Laurent Destailleur
174b0b746a FIX Edition of target of menu entries 2025-04-07 05:11:10 +02:00
Laurent Destailleur
a40f1c2b89 Fix password show accidentenly 2025-04-07 04:15:50 +02:00
ldestailleur
59a20762c7 WIP add extrafield param aiprompt 2025-04-06 20:59:14 +02:00
ldestailleur
cb9dce6195 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-06 20:54:26 +02:00
ldestailleur
78909490c2 CSS 2025-04-06 20:54:16 +02:00
ThomasNgr-OpenDSI
b431b1bc90 FIX sales representatives can affect contacts from thirdparties they are not allowed to see (#33353)
* introduce method User::getAffectedThirdparties()

* Forbid to display thirdparties on contact tab is user has no right to see them

* add control in add_contacts

* fix precommit

* fix phan, phpstan

* fix travis + fix using wrong table

* Forbid to display thirdparties on contact tab is user has no right to see them (more secure way)

* try to fix TRAVIS

* more efficient way to check user is allowed to ad a socpeople

* remove dead code
2025-04-06 19:51:30 +02:00
JC Prieto
f4e43e3566 FIX: Update import_xlsx.modules.php (#33439)
* Update import_xlsx.modules.php

$keyfield must be always 'rowid' because we compare with $lastinsertid

* Update import_csv.modules.php

* Update import_csv.modules.php

I correct edition

* Update import_xlsx.modules.php

I correct edition

* Update import_csv.modules.php

* Update import_csv.modules.php

* Update import_xlsx.modules.php

* Update import_csv.modules.php

* Update import_xlsx.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-06 19:45:35 +02:00
ldestailleur
c5830378ca Code comment 2025-04-06 19:19:37 +02:00
ldestailleur
9582894136 Add constant SECURITY_WAF_ALLOW_QUOTES_IN_GET in WAF 2025-04-06 18:56:59 +02:00
ldestailleur
ffc5d2d326 Fix WAF 2025-04-06 18:40:18 +02:00
ldestailleur
b8c8735f57 Enhance WAF 2025-04-06 13:44:28 +02:00
ldestailleur
2f5eb74524 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-04-05 19:09:51 +02:00
ldestailleur
43716e856e Bad order of code 2025-04-05 19:09:40 +02:00
ldestailleur
c24f269fb6 css 2025-04-05 18:24:06 +02:00
ldestailleur
54534044c7 Debug v22 2025-04-05 16:52:02 +02:00
ldestailleur
731c5e7985 Debug v22 2025-04-05 16:45:10 +02:00
ldestailleur
ca5585ed88 Debug v22 2025-04-05 16:42:55 +02:00
ldestailleur
dce4edf425 Introduce position for sub-modules 2025-04-05 16:41:45 +02:00
ldestailleur
2a082d37a5 Introduce position for sub-modules 2025-04-05 16:34:19 +02:00
ldestailleur
91f519b6fb Debug v22 2025-04-05 16:30:22 +02:00
ldestailleur
7b759f439e Depreciate module mod_facture_terre that is duplicate with mars. 2025-04-05 16:10:07 +02:00
ldestailleur
8c74643e5f PERF Optimization to get next ref when there is reset on first month. 2025-04-05 15:29:41 +02:00
ldestailleur
cd5a645acc Fix move default number to neon, argon has critical bug to fix first. 2025-04-05 14:09:47 +02:00
ldestailleur
d97ebb9a33 Fix trouble in migrationon. Fix pb with large database 2025-04-05 13:37:21 +02:00
ldestailleur
c7ec63b702 Look and feel v22 2025-04-05 12:55:04 +02:00
ldestailleur
ed651a450f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-04-04 18:24:27 +02:00
ldestailleur
1f2bde4f65 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-04 18:22:56 +02:00
ldestailleur
4fd81b79be Fix CI 2025-04-04 18:22:47 +02:00
Lucas Marcouiller
dce77a84b1 Fix add percent to Summarize feature (#33731)
* Fix add percent to Summarize feature

* fix
2025-04-04 18:16:29 +02:00
Frédéric FRANCE
8b1d8d7d19 add parameters (#33729) 2025-04-04 18:15:41 +02:00
William Mead
2ea30b0150 Removed redundant 'centpercent' class from ticket layouts to fix Safari rendering issues on macOS (#33728) 2025-04-04 18:15:21 +02:00
atm-adrien
36b90df84c NEW : Add the possibility to merge PDF from the product list (#33723) 2025-04-04 18:14:26 +02:00
Frédéric FRANCE
275a994110 do not force reload extrafields if not needed (#33716)
* Update extrafields.class.php

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-04 15:32:42 +02:00
atm-irvine
a51e430e58 fix(evaluation): on list, removed getNomUrl for label column (#33711) 2025-04-04 15:30:07 +02:00
Frédéric FRANCE
5494affea9 Update card.php (#33725) 2025-04-04 15:29:41 +02:00
github-actions[bot]
8b8bb4242b PHPStan > Update baseline (#33726)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-04-04 15:17:39 +02:00
Frédéric FRANCE
47c1346699 add missing translation (#33724)
* add missing translation

* add missing translation

* add missing translation
2025-04-04 15:17:26 +02:00
Jyhere
16cd7c5b17 FIX: add missing createFrom hook when creating a supplier invoice (#33708)
* FIX: add missing createFrom hook when creating a supplier invoice

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-04 15:16:21 +02:00
ldestailleur
ef95c311a7 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-03 21:09:46 +02:00
ldestailleur
3aa4bc0eca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-03 21:05:01 +02:00
ldestailleur
174d6497b3 Signed-off-by: ldestailleur <eldy@destailleur.fr> 2025-04-03 21:04:35 +02:00
ldestailleur
7935ccdb75 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-04-03 21:02:15 +02:00
ldestailleur
4a88509ea0 Fix protection against bad % operator 2025-04-03 21:02:04 +02:00
ldestailleur
080fdacf1f Fix protection for sprintf on bad % specifier 2025-04-03 21:00:00 +02:00
Mohamed DAOUD
4d48415218 Fix error management (#33719) 2025-04-03 20:33:34 +02:00
kkhelifa-opendsi
b712abad83 NEW: Add parameters for the hook selectProductsListWhere (#33718) 2025-04-03 20:32:55 +02:00
Frédéric FRANCE
1361fe414a fix CI (#33721)
* Update treasuryjournal.php

* Update treasuryjournal.php
2025-04-03 20:30:25 +02:00
ldestailleur
94703556eb Debug v22 2025-04-03 20:29:41 +02:00
ldestailleur
2af9cd5aab Fix possible sql injection 2025-04-03 19:50:54 +02:00
ldestailleur
42a3b4c136 Doc 2025-04-03 17:50:50 +02:00
Lucas Marcouiller
712c4a111f New add sumarize function to mail Ai Enhancements (#33710)
* New add sumarize function to mail Ai Enhancements

* fix translation

* fix CI
2025-04-03 17:34:09 +02:00
Alexandre SPANGARO
94d4b608d8 IHM options - Button for block not need reload of page (#33705) 2025-04-03 17:16:26 +02:00
Alexandre SPANGARO
d5b67dc35c Module KnowledgeManagement - Add translation of permission (#33704) 2025-04-03 17:14:49 +02:00
Christophe Battarel
5864af4d4c fix permission def (#33712)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2025-04-03 17:13:54 +02:00
atm-irvine
d5eaa1d281 fix(user): wrong assigned user on agenda, and wrong backtopage (#33717) 2025-04-03 17:13:27 +02:00
atm-irvine
87b254e0fd Fix pdf einstein automatic calculation (#33713)
* fix(pdf-einstein): let automatic calculation for pos

* removed ;
2025-04-03 17:12:28 +02:00
ldestailleur
1aac6e3c34 Clean code by using the ACCOUNTING_MODE var for both modules 2025-04-03 16:41:41 +02:00
lvessiller-opendsi
738fbc1b25 NEW #32706 - Treasury accountancy (#33701)
* NEW #32706 - Treasury accountancy

* Fix CI errors

* Fix CI errors

* Format code for CI integration

* Format code for precommit error

* Resolve CI errors

* Resolve CI errors
2025-04-03 16:08:35 +02:00
John BOTELLA
038008dd69 Fix curl error (#33653) 2025-04-03 16:00:38 +02:00
Frédéric FRANCE
61a11f927d align phpstan version on ci (#33707)
* align phpstan version on ci

* Update functions.lib.php
2025-04-03 15:59:49 +02:00
Anthony Berton
311c194a5b FIX - Template sql modulebuilder (#33703)
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-03 15:59:30 +02:00
ldestailleur
ab742e7bd8 NEW Support of monthly or weekly recurring events 2025-04-03 14:58:41 +02:00
ldestailleur
9a54786884 Factorize code for tooltip of actioncomm 2025-04-03 14:23:16 +02:00
ldestailleur
10c0fba6b0 WIP Recurring events 2025-04-03 13:59:46 +02:00
ldestailleur
18cc530d40 Remove useless colspan 2025-04-03 13:34:06 +02:00
ldestailleur
a0079c802b WIP Recurring events 2025-04-03 13:31:21 +02:00
ldestailleur
9b67bd52a2 css 2025-04-03 13:17:36 +02:00
ldestailleur
7096eff264 FIX tooltip info on recuring invoice must be into tthe tooltip 2025-04-03 13:11:23 +02:00
ldestailleur
d06fdc068e FIX tooltip info on recuring invoice must be into tthe tooltip 2025-04-03 13:10:25 +02:00
ldestailleur
f78eea2661 Fix click on label of checkbox busy resource 2025-04-03 13:05:02 +02:00
ldestailleur
b3f3da4a79 Look and feel v22 2025-04-03 13:04:23 +02:00
ldestailleur
191f6ba00e NEW Look and feel - Checkboxes and radio buttons are larger 2025-04-03 13:00:19 +02:00
ldestailleur
865198309a Fix click on label of checkbox busy resource 2025-04-03 12:53:18 +02:00
ldestailleur
c4c3906297 Enhance recurring events 2025-04-03 12:19:11 +02:00
ldestailleur
c0d3e87746 Debug v22 2025-04-03 12:09:48 +02:00
ldestailleur
f159d82b02 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-03 12:00:57 +02:00
ldestailleur
869bc1a3f5 Fix phan 2025-04-03 12:00:46 +02:00
lvessiller-opendsi
bae01a9872 NEW const PREVIEW_PICTO_ON_LEFT_OF_NAME for icon to preview documents (#33519)
* NEW const PREVIEW_ON_LEFT for icon to preview documents

* Rename const to PREVIEW_PICTO_ON_LEFT_OF_NAME
2025-04-03 11:28:14 +02:00
ldestailleur
17125e5a5e Fix warnings 2025-04-02 23:55:21 +02:00
ldestailleur
ebe60801c4 Enhance code for recurring events 2025-04-02 23:51:03 +02:00
ldestailleur
60a16da101 Set mx nb of process for phpstan apstats 2025-04-02 22:46:15 +02:00
ldestailleur
2020e902e0 Fix php conf file 2025-04-02 22:31:27 +02:00
ldestailleur
e057d87333 Fix mem 2025-04-02 22:26:26 +02:00
ldestailleur
00fe16ddfe css 2025-04-02 19:51:20 +02:00
ldestailleur
4cd556730f Use semantic button instead of a href 2025-04-02 19:33:55 +02:00
Marc de Lima Lucio
392d33ce02 NEW: login page: button to toggle the visibility of the password (#33698)
* NEW: login page: add a password toggler

* FIX: codesniffer
2025-04-02 19:24:09 +02:00
ldestailleur
2f7b69a522 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-02 19:20:44 +02:00
ldestailleur
546969e77a Try a better fix for #33699 2025-04-02 19:20:18 +02:00
Christophe Battarel
2c6c3a90d2 manage read_supplier_prices permission also on stock movement list (#33700)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2025-04-02 19:13:24 +02:00
ldestailleur
6c9922ca36 Fix mem 2025-04-02 18:53:54 +02:00
ldestailleur
b466b7ab5a NEW The link "In accountancy" is now clicable to reach bookkeeping 2025-04-02 18:51:51 +02:00
ldestailleur
ca6c3db534 Trans 2025-04-02 15:36:40 +02:00
ldestailleur
1c84b79369 Fix conf file 2025-04-02 15:07:44 +02:00
ldestailleur
a1f19dd6da Fix link 2025-04-02 14:23:36 +02:00
ldestailleur
c23d5be678 Clean code 2025-04-02 13:23:05 +02:00
ldestailleur
f9e4e20ab7 Clean code 2025-04-02 12:46:40 +02:00
Florian Mortgat
78dee78508 FIX v22 warnings and remove seemingly useless code (#33622) 2025-04-02 12:43:37 +02:00
Marc de Lima Lucio
363b05d314 FIX: warehouse list: broken status filter (#33667) 2025-04-02 12:30:53 +02:00
atm-irvine
822f5dfa88 feat(pdf): new conf to remove break before country in pdf (#33696) 2025-04-02 12:29:47 +02:00
ldestailleur
217ae3691a Fix phpunit
Signed-off-by: ldestailleur <eldy@destailleur.fr>
2025-04-02 12:26:25 +02:00
atm-jonathan
d72d69e55c NEW add home box mrp (#33549)
* add box Mo

* tests ok

* comparaison dates

* before Wysy

* after wysy

* Update mo.class.php

* Update mo.class.php

* Update conf.class.php

* retour PR

* add parenthesis

* Update mo_list.php

---------

Co-authored-by: x <x@x.x>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-02 12:22:59 +02:00
MDW
6fe1effa5e Qual: Fix PhanTypeMismatchArgumentNullable notices (#33684) 2025-04-02 11:35:53 +02:00
omogenot
083a3908bd Move reassort hooks before the last 3 columns (#33695)
Move the user hooks in the reassort table so that the new columns shall show before the 'movement', 'tobuy','to sell' columns for aesthetics presentation.
Not doing so makes the table look odd when adding custom columns.
2025-04-02 11:35:33 +02:00
ldestailleur
5e616669b6 Propagate fix #33689 to other objects 2025-04-02 11:34:12 +02:00
MDW
5cc0bd0a3f Fix #33689 - missing rename (#33693)
# Fix #33689 - missing rename

Assignment to $result in code before fixing phan notice
seem be an error, but in fact the assignment is useless
and the code only expects a potential exception.
2025-04-02 11:31:10 +02:00
George Stavropoulos
b3d7e1242a Security fix company.php (#33694)
Security fix: 

Changed AADE webservice key fields (MYDATA_AADE_KEY, AADE_WEBSERVICE_KEY) input type from text to password to prevent Shoulder Surfing. (This applies to the // AADE webservices credentials, applicable only for Greece section).
2025-04-02 11:28:12 +02:00
Frédéric FRANCE
51624f8a50 deprecate statut (#33691)
* deprecate statut

* Update fichinter.class.php

* clean code

* clean code

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-02 11:27:17 +02:00
VIAL-GOUTEYRON Quentin
3ad05c2dde FIX: Incorrect entity used when downloading a document generated in another entity (#33565)
* FIX : Wrong entity to download document

* MODIFICATION : Remplacement de l'ID d'entité par l'objet dans les fonctions de gestion des fichiers pour une meilleure cohérence.

* Update files.lib.php

* Update files.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-01 23:13:31 +02:00
ldestailleur
91fa444129 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-01 22:42:32 +02:00
ldestailleur
352e35a38b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-01 22:40:07 +02:00
ldestailleur
e1273a410a FIX for #33403 and #33404 2025-04-01 22:37:23 +02:00
ldestailleur
b333f656c9 Replace option with param 2025-04-01 22:32:31 +02:00
kkhelifa-opendsi
0029e14fb6 NEW: Add globale MAIN_DISABLE_PDF_AUTO_DOWNLOAD_AFTER_CONVERT_FROM_ODT for disable the auto download after auto convert odt to pdf (#33511) 2025-04-01 22:30:03 +02:00
Etienne BENDER
d73df8d931 Add hook printObjectLinesList in CommonObject::printObjectLines() (#33641)
* Add hook printObjectLinesList in CommonObject::printObjectLines()

* Update commonobject.class.php

* Update commonobject.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-01 22:24:35 +02:00
ldestailleur
ffa7413cda Clean code 2025-04-01 22:14:56 +02:00
omogenot
73eb4e606a NEW : Rounding unit price - line discount before applying quantity - option MAIN_APPLY_DISCOUNT_ON_UNIT_PRICE_THEN_ROUND_BEFORE_MULTIPLICATION_BY_QTY (#33690)
* Rounding unit price - line discount before applying quantity

On some systems, the line total price is calculated based on the discount applied on the unit price first, giving a new rounded unit price, and then multiplied by the quantity. Whereas the current way Dolibarr acts is to apply the discount on the subtotal (unit price * quantity).
Using an extra OTHER SETUP constant 'MAIN_ROUND_UNIT_PRICE_BEFORE_QTY', we can choose between the two ways.

* Update price.lib.php

* Update price.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-01 21:36:52 +02:00
Jon Bendtsen
27dc84fe3b NEW Can link member subscription/contribution with proposal, order and invoice (#33647)
* linking member subscription contribution <-> proposal, order and invoice
This can both be done manually from an existing proposal/order/invoice to a subscription created without creating an invoice. I use this when we sell memberships as part of registration for our membership classes.

The link will also be shown on the invoice that can be created as part of the subscription contribution creation.

These links show up in the json from the API on proposals, orders and invoices. The subscription does not show anything. It is currently unknown if the API can do this link or it will have to be done manually in the GUI.

* Update html.form.class.php

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-01 21:36:35 +02:00
ldestailleur
65fb217432 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-01 21:34:25 +02:00
ldestailleur
a9568c448c Look and feel v22 2025-04-01 21:32:56 +02:00
ldestailleur
8e88532c3e Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-01 21:07:20 +02:00
Frédéric FRANCE
387e3b1da7 shipping can manage its contacts (#33680)
* shipping can manage its contacts

* shipping can manage its contacts

* fix

* add contacts from origin

* clean code

* apply changes

* apply changes
2025-04-01 20:47:40 +02:00
ldestailleur
514e367d94 Rename constant 2025-04-01 20:46:31 +02:00
ldestailleur
21b5eb7b82 Debug migrate using the database flag 2025-04-01 20:45:46 +02:00
ldestailleur
de75d13c7a Use a database flag 2025-04-01 20:36:55 +02:00
atm-GregM
a1c31310a2 Add Massactions Validate/Cancel/RegeneratePDF/MergePDF/EditStartDate/EditeEndDate on Mo List (#33548)
* Add Massaction Mo List

* add langs en_US

* fix for precommit

* langs

* langs+

* int param

* space

* Update mo_list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-01 20:35:34 +02:00
Marc de Lima Lucio
5832f1807c FIX: invoice export models are incorrect after 20.0 migration (#33688)
* FIX: shift export models at upgrade

* FIX: 20.0 invoice export model mogrations: place lock in root of data dir
2025-04-01 20:29:06 +02:00
ldestailleur
e9b880707a Clean code 2025-04-01 20:13:54 +02:00
ldestailleur
f7d034a71c NEW Option MAIN_SECURITY_MAXFILESIZE_DOWNLOADED become official 2025-04-01 19:56:50 +02:00
ldestailleur
0780695ba4 Try CI fix 2025-04-01 19:29:24 +02:00
ldestailleur
f5a61d9dc4 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-01 19:26:49 +02:00
ldestailleur
105347003c Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-01 19:24:06 +02:00
Laurent Destailleur (aka Eldy)
62fba4f84d Add missing try catch 2025-04-01 19:23:47 +02:00
ldestailleur
7d0581b046 FIX Add a try catch to avoid fatal error on bad translation string
format
2025-04-01 19:05:59 +02:00
ldestailleur
16c76a6505 FIX The payment mode for salary on credit transfer must be credit
transfer
2025-04-01 18:50:12 +02:00
ldestailleur
17dfec8ee4 FIX Edit of payment mode from the bank transfer tab of salary 2025-04-01 18:44:45 +02:00
ldestailleur
4e9060b9d9 Fix translation 2025-04-01 18:22:59 +02:00
ldestailleur
493bfdc207 Clean code 2025-04-01 18:12:04 +02:00
ldestailleur
5d51d0679b Share not allowed extension into the method getExecutableContent() 2025-04-01 17:53:33 +02:00
ldestailleur
3edadbd8b8 Add option MAIN_DISALLOW_STRING_OBFUSCATION_IN_DOL_EVAL. Close #33612 2025-04-01 16:23:50 +02:00
ldestailleur
15f2f4f223 Clean code 2025-04-01 15:21:43 +02:00
ldestailleur
8efa60f4b0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-04-01 13:53:52 +02:00
ldestailleur
e00b0f1381 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-01 13:40:52 +02:00
ldestailleur
b3cbf93c5b Fix warning 2025-04-01 13:40:36 +02:00
Frédéric FRANCE
65388c0743 clean code (#33683)
* clean code

* Update expedition.class.php
2025-04-01 13:26:54 +02:00
ldestailleur
cc8c7b8329 Fix possible remote code execution using dol_concatdesc in dol_eval. To
allow concat char, you can use
MAIN_ALLOW_UNSECURED_SPECIAL_CHARS_IN_DOL_EVAL='.'
2025-04-01 13:25:10 +02:00
ldestailleur
95befadad9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-01 12:31:42 +02:00
ldestailleur
bcf0ef0bc0 Test switch in dol_eval function() 2025-04-01 12:31:27 +02:00
ldestailleur
5e990ff7de Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-01 11:58:46 +02:00
ldestailleur
f34949fe14 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-04-01 11:49:18 +02:00
ldestailleur
2100f3ba43 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-04-01 11:49:07 +02:00
ldestailleur
84674e7bad Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-04-01 11:45:21 +02:00
ldestailleur
4c523cf3e5 Update doc 2025-04-01 11:45:11 +02:00
Marc de Lima Lucio
733fbecd45 FIX: tcpdf: prevent error with 'data:' URLs (backport of https://github.com/tecnickcom/TCPDF/pull/552) (#33682) 2025-04-01 11:40:02 +02:00
Yannis Hoareau
dfd9e63a63 Fix supplier proposal list fatal error (#33679)
* Removed unnecessary tests

* Fix fatal error class projet not found

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-01 11:31:07 +02:00
Frédéric FRANCE
15fce79455 remove duplicate code (#33681)
* remove duplicate code

* Update card.php
2025-04-01 11:10:54 +02:00
ldestailleur
f824e03b87 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-01 11:09:43 +02:00
ldestailleur
2bff9835d3 Try to fix CI 2025-04-01 11:09:31 +02:00
John BOTELLA
63bf68f846 Fix : php warning (#33664)
* Fix php warning

* Update html.formsetup.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-01 10:59:46 +02:00
PsyCrow
3d066c4631 FIX #33424 Create cronjob security key not posible (#33677)
* FIX #33424 Create cronjob security key not posible

FIX Create cronjob security key not posible because constant CRON_DISABLE_KEY_CHANGE does not exist

* Update cron.php

using getDolGlobalInt() is better than using getDolGlobalString because the default value is 0; then the refresh button works fine
2025-04-01 10:58:10 +02:00
PsyCrow
a6f2001f43 FIX #33424 Create cronjob security key not posible (#33677)
* FIX #33424 Create cronjob security key not posible

FIX Create cronjob security key not posible because constant CRON_DISABLE_KEY_CHANGE does not exist

* Update cron.php

using getDolGlobalInt() is better than using getDolGlobalString because the default value is 0; then the refresh button works fine
2025-04-01 10:57:46 +02:00
MDW
0aea1709f7 Qual: Add comment on return to avoid 'redundant' notice (#33676) 2025-04-01 10:45:10 +02:00
Jon Bendtsen
8947216b5a API can now show linkedObjectsIds (#33675)
Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
2025-04-01 10:44:37 +02:00
HENRY Florian
202a71ab8f FIX: Sort Stock To Date on PMP (#33678) 2025-04-01 10:42:21 +02:00
ldestailleur
b925cdd0f2 Sync transifex 2025-04-01 10:25:24 +02:00
ldestailleur
bb826b9f93 Add more phpunit to aclude lang file with a simple % character. 2025-04-01 10:24:19 +02:00
ldestailleur
8db856a90e Fix error with vi_VN 2025-04-01 09:59:08 +02:00
ldestailleur
158e2f070e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-01 09:36:49 +02:00
ldestailleur
1325b249b0 Clean code to fix some phan warnings 2025-04-01 09:36:36 +02:00
Chosto
ccc25e5970 [MC] Fix illegal table.column PostgreSQL UPDATE syntax (#33673) 2025-04-01 01:08:31 +02:00
MDW
929c9e435c Qual: Suppress unneeded phan-force (#33671) 2025-04-01 01:06:50 +02:00
John BOTELLA
80937f3160 Fix transfert stock float (#33669) 2025-03-31 21:58:54 +02:00
atm-irvine
ce0bcdf6cc feat(contract-line): created new endpoint paginated with limit and page (#33222)
* feat(contract-line): created new endpoint paginated with limit and page

* fix(api-contract): added type to php doc

* Update api_contracts.class.php

* fix(contrat): edit getLines endpoint to add pagination

* feat(contract): added pagination and sqlfilters on getLines contract api'

* Update api_contracts.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-31 19:52:36 +02:00
ldestailleur
04b48b7b09 FIX Link to download check receipt. 2025-03-31 19:34:57 +02:00
ldestailleur
1535db72a6 Fix load status 2025-03-31 18:40:38 +02:00
ldestailleur
9ab0fb0022 Fix phan 2025-03-31 18:30:50 +02:00
ldestailleur
1428503c08 Restore phan instruction 2025-03-31 17:04:03 +02:00
ldestailleur
e435f7652b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-31 16:33:31 +02:00
ldestailleur
6c8ae0b2a6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-31 16:28:08 +02:00
Lucas Marcouiller
5a28052daf Fix ai dropdown and ai content generation (#33666)
* Fix ai dropdown and ai content generation

* fix ci
2025-03-31 16:03:45 +02:00
ldestailleur
f543dac233 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-31 16:02:59 +02:00
ldestailleur
aaeb3120c9 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-31 16:02:10 +02:00
ldestailleur
915eb89406 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-03-31 16:00:06 +02:00
ldestailleur
d880c82333 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-31 15:59:46 +02:00
ldestailleur
665814fdf0 Doc 2025-03-31 15:59:28 +02:00
Frédéric FRANCE
eb3032fdce fix missing translation (#33665) 2025-03-31 15:56:57 +02:00
ldestailleur
0bd5371b1d FIX #27976 2025-03-31 15:50:47 +02:00
ldestailleur
90b5e96199 FIX #27976 2025-03-31 15:44:08 +02:00
ldestailleur
0b445fa04a Fix bad link 2025-03-31 14:32:26 +02:00
ldestailleur
e210a18051 Doc 2025-03-31 13:38:36 +02:00
ldestailleur
5d8fdc1d0b Remove global variable 2025-03-31 13:37:21 +02:00
atm-corentin
7cadf5d53e FIX|Fix # fatal trying update desc invoice situation (#33607)
* fix fatal trying to do a sub between an int and a string

* fix trad unknow issue

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-31 13:14:32 +02:00
ldestailleur
b146e32109 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-31 12:40:49 +02:00
ldestailleur
ca1afd6535 Clean code 2025-03-31 12:39:19 +02:00
John BOTELLA
fc34a12e30 UIUX : Giff UX Doc : add experiment ux ajax input feedback (#33661)
* New experiment Tooltip freeze

* fix tooltip ception

* clean

* New giff experimental input feedback

* New giff experimental input feedback

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-31 12:01:00 +02:00
John BOTELLA
d0d4eedc4f Change ux doc link (#33657)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-31 11:59:07 +02:00
John BOTELLA
c2d96f8d68 UIUX : Giff UX Doc add experiment Tooltip freeze (#33655)
* New experiment Tooltip freeze

* fix tooltip ception

* clean

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-31 11:58:55 +02:00
ldestailleur
3fe6132c94 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-03-31 11:52:55 +02:00
ldestailleur
238f684576 Fix extension of debian.tar file 2025-03-31 11:52:47 +02:00
rogue-spectre
bc5b4cff67 Update clientfourn.php (#33663)
correction of a sql request returning a buggy result. 

Instead of the sum of the different donations payments the request returned the number of payment multiplied by the global amount of donation.
2025-03-31 11:44:11 +02:00
rogue-spectre
d74383afce Update clientfourn.php (#33663)
correction of a sql request returning a buggy result. 

Instead of the sum of the different donations payments the request returned the number of payment multiplied by the global amount of donation.
2025-03-31 11:43:18 +02:00
ldestailleur
3eab9d56c7 Fix center 2025-03-31 11:41:00 +02:00
Alexandre SPANGARO
9741fcf4a5 NEW Accountancy - Add filter on chart of accounts (#33656) 2025-03-31 11:39:05 +02:00
John BOTELLA
f21ac2567b Fix : php warning (#33664)
* Fix php warning

* Update html.formsetup.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-31 11:36:53 +02:00
Jyhere
e35c59a4d8 GIFF-Accountancy-2025 - Automatic numbering of accounting entries (#33551)
* NEW: ref with configurable numbering models for Bookkeeping

* FIX: bookkeeping tooltip empty ref depending the list

* FIX: bookkeeping ref numbering missing translations and typo

* NEW: free ref num model for bookkeeping

* Update mod_bookkeeping_argon.php

* FIX: ci

* FIX: replace mistake, removed not necessary ternary

* FIX: phan error and prefix check

* FIX: phan error

* FIX: missing ref column in llx_accounting_bookkeeping_tmp.sql

* CHANGE: use default function getDolGlobalInt(,  = 0)
() param instead of ternary

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-31 11:35:18 +02:00
MDW
dfca22ea45 Fix ci (#33660)
# Fix ci

There are unwanted side-effects with an empty() test in phan.
This alternative implementation avoids that
2025-03-30 20:56:28 +02:00
ldestailleur
f7e0fdc378 Fix phpunit 2025-03-29 17:53:03 +01:00
ldestailleur
72bd56e027 Prepare v21.0.1 2025-03-29 17:45:29 +01:00
ldestailleur
533ca31814 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-29 17:32:45 +01:00
ldestailleur
bc86310277 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-29 17:30:02 +01:00
ldestailleur
05184e7f46 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-03-29 17:28:14 +01:00
Florian Mortgat
c9ecc5dfad Remove deprecated columns price_ht and remise from llx_contratdet (#33616)
* [breaking change] Remove deprecated columns `price_ht` and `remise` from llx_contratdet and corresponding class properties

* FIX: remove references to deleted field `price_ht` from module
descriptor (exports)
2025-03-29 17:25:00 +01:00
Alexandre SPANGARO
ffbcd11b68 NEW Accountancy - Centralized account are highlighted (#33648)
* Complete migration for centralized accounts

* Fix display error on centralized account

* NEW update function select_account for centralized account

* FIX CI
2025-03-29 17:20:00 +01:00
Clément
71479cf393 Add object and action to beforeBodyClose (#33652) 2025-03-29 17:19:37 +01:00
ldestailleur
6398c2ee82 Look and feel v22 2025-03-29 16:46:35 +01:00
ldestailleur
55fab0fbe5 NEW Add page list for categories. 2025-03-29 16:16:44 +01:00
ldestailleur
a6266e01fe Fix label 2025-03-29 15:38:29 +01:00
ldestailleur
1bbdd303d3 Fix position of drowndown when checkbox column is on left 2025-03-29 15:32:25 +01:00
ldestailleur
3ab8e1302d Debug v22 2025-03-29 15:29:09 +01:00
ldestailleur
30801a64e5 Debug v22 2025-03-29 15:20:28 +01:00
ldestailleur
c689cffae3 FIX Position of dropdonw with checkbox column on left 2025-03-29 15:20:09 +01:00
ldestailleur
4ba3f0d90e Clean and standardize code for Categories 2025-03-29 15:03:36 +01:00
ldestailleur
ea5bc7bd95 Clean code 2025-03-29 14:11:33 +01:00
ldestailleur
586398481a Look and feel v22 2025-03-29 13:50:58 +01:00
ldestailleur
fdfdece6a9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-29 13:33:42 +01:00
Vincent Maury
85ca2349d7 When Update CommandeFournisseurLigne rang not updated (#33651)
whan calling CommandeFournisseurLigne->update() , rang isn't updated
Added same thing than in PropalLine->update(), CommandLine->update

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-29 13:33:16 +01:00
ldestailleur
f99631677c NEW Add link to picto help page on module builder 2025-03-29 13:32:59 +01:00
ldestailleur
7c7e4ac744 Fix CI (property dc not defined) 2025-03-29 12:30:27 +01:00
ldestailleur
5c6094aa53 Comment 2025-03-29 12:17:37 +01:00
ldestailleur
f48682da43 Fix menu link 2025-03-29 12:16:56 +01:00
omogenot
2c20bc9412 Add stock card missing hooks (#33649)
Add SQL request From and Where missing hooks to warehouse card list.
2025-03-29 11:58:31 +01:00
Christophe Battarel
36bd2c7a5b Manage supplier prices permission (#33636)
* WIP : manage read_supplier_prices

* WIP : manage read_supplier_prices

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-29 00:43:13 +01:00
Alexandre SPANGARO
67dff53958 Fix some problem on new category/tag (#33632)
* FIX Supplier Invoice category - Wrong function on view/edit card

* FIX Invoice category - Wrong link for manage category

* FiIX Translation problem on category

* FIX wrong cat

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-28 23:18:57 +01:00
Jyhere
476b5d6e40 FIX: useless condition in bankjournal.php (#33639)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-28 23:16:46 +01:00
Lucas Marcouiller
0aa0588f52 New Implements findNearest for societe module (#33643)
* New Implements Find Nearest for societe module

* fix CI

* fix CI
2025-03-28 23:11:01 +01:00
Eric - CAP-REL
e6ebf315ed package: make dir if needed (#33644) 2025-03-28 23:09:50 +01:00
ldestailleur
6171cd8bc1 Update fail2ban files 2025-03-28 22:54:41 +01:00
ldestailleur
dc1ad0eaa8 Update fail2ban files 2025-03-28 22:47:39 +01:00
ldestailleur
4f00b49bab Fix reliability of ip in logs 2025-03-28 21:02:27 +01:00
ldestailleur
cadc4d4acb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-28 16:33:16 +01:00
ldestailleur
9e0d637491 Prepare 3 mode for payments pages 2025-03-28 16:32:54 +01:00
ldestailleur
2945f0d7ae Allow different mode of redirect in website payment 2025-03-28 16:28:00 +01:00
ldestailleur
21ce661927 Add a condition for the redirect 2025-03-28 16:14:14 +01:00
ldestailleur
1b9ff5ee96 FIX Must make different redirect according to frame or not. 2025-03-28 16:02:40 +01:00
Anthony Damhet
007a1368c1 UIUX: Update documentation interface (#33604)
* Set ui tools baseUrl

Set the URL of the UI tools in a variable in the documentation class so that it can be easily reused

* Group index factorization

* Home page and contributing

Update home page and add a page to contribute to this documentation

* Remove blank line

* Remove blank line 2 and indentation

* Add missing translations / remove unused

* remove trailing text

* Remove indentation

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-28 15:17:33 +01:00
Vaadasch
c855778dd4 FIX extrafields.class.php, working filter of sellist and chkbxlst on list.php (#33628)
* FIX extrafields.class.php, working filter of sellist and chkbxlst on list.php

* Update extrafields.class.php, replace indent spaces with tabs
2025-03-28 15:11:12 +01:00
Noé Cendrier
bbfd7a3eda QUAL: doActions should be able to redefine default actions (#33637)
* QUAL: doActions should be able to redefine default actions

* FIX: no blank line in opening if
2025-03-28 15:03:24 +01:00
Jyhere
38e21a1ef6 FIX: missing formObjectOptions hook on payment card (#33629) 2025-03-28 15:01:32 +01:00
Eric - CAP-REL
70e4d1ccd0 build zip & tar package : add more files on exclude list (#33634) 2025-03-28 15:00:37 +01:00
Frédéric FRANCE
81f232c9cc fix CI (#33631)
* fix CI

* Update invoice.php
2025-03-28 15:00:06 +01:00
ldestailleur
6abdb6e254 Try a fix for #33611 2025-03-28 12:09:05 +01:00
ldestailleur
30801214ce Code comment 2025-03-28 12:07:51 +01:00
Eric - CAP-REL
a8a95cba75 debian build package on bookworm (#33635) 2025-03-28 10:19:08 +01:00
ldestailleur
74f85c8622 FIX Report by custom groupe was empty 2025-03-28 04:27:36 +01:00
ldestailleur
7b58b23c97 FIX Redirect in PHP is reliable, not in Javascript ! 2025-03-28 03:25:41 +01:00
ldestailleur
0a1c338666 Add log to help debug 2025-03-28 03:07:34 +01:00
ldestailleur
d1b84388d1 Debug v22 2025-03-28 02:40:17 +01:00
ldestailleur
c18ab6de04 Debug v22 2025-03-28 02:34:25 +01:00
ldestailleur
5aaf644755 Debug v22 2025-03-28 02:25:44 +01:00
ldestailleur
473e88a3e9 FIX syntax error on list of intervention for external users 2025-03-28 00:58:44 +01:00
ldestailleur
94ce8346c0 Fix phpunit 2025-03-27 18:56:13 +01:00
ldestailleur
8e23f51959 NEW Show IP of previous connexion and date of last password change in
the "Connexion" widget.
2025-03-27 18:12:26 +01:00
ldestailleur
0e6f6ca1f8 Debug v22 2025-03-27 17:49:55 +01:00
ldestailleur
3e9ba9f9fc QUAL: Must use img_picto instead of hard coded html 2025-03-27 17:45:04 +01:00
ldestailleur
6a76f55ae3 Clean font awesome picto 2025-03-27 17:33:56 +01:00
ldestailleur
a71c320c8f Exclude more files 2025-03-27 15:02:18 +01:00
Laurent Destailleur (aka Eldy)
1a015cd91e Exclude more files 2025-03-27 15:01:50 +01: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
007fad9d98 FIX picto for unknown mime type 2025-03-27 13:40:26 +01:00
ldestailleur
75d9571d95 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-27 13:37:43 +01:00
ldestailleur
40675ac95f Upgrade to font awesome 5.15 2025-03-27 13:37:19 +01:00
ldestailleur
576ea1fe56 Fix responsive 2025-03-27 10:54:43 +01:00
ldestailleur
a6d542b455 Fix responsive of color picker 2025-03-27 10:48:43 +01:00
atm-corentin
8df6e649b1 FIX|Fix # SQL error when filtering by draft status in list (#33605)
* Fix SQL error when filtering on draft status in list view

* add doc to document the anonymous function

* fix add missing PHPDoc and replace arrow function for Phan compatibility

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-27 10:40:15 +01:00
ldestailleur
3a70dcd3ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-27 10:39:40 +01:00
ldestailleur
df9fea28f1 Complete #33605 by adding phpunit tests 2025-03-27 10:39:08 +01:00
atm-jonathan
0595e2556d NEW_SUBMIT_FOR_ALL_MARK_RESPAWN (#32101)
* reprise ancienne PR

* add variable

* correction foreach

* retour precommit

* delete Blank line

* mass brand tx propal

* clean

* clean

* condition foreach

* clean code

* Fix ci

---------

Co-authored-by: x <x@x.x>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-27 01:03:05 +01:00
ldestailleur
9cbe86f384 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-26 21:03:31 +01:00
ldestailleur
889e5e9e1b Clean code 2025-03-26 21:03:14 +01:00
ldestailleur
33c7378d2d Add phpunit test 2025-03-26 21:01:46 +01:00
Clément
84ceccee32 Disable intervention creation from an order (#33625)
* Disable intervention creation from an order

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-26 20:47:19 +01:00
UT from dolibit
43fe728502 Update setup.php (#33620)
changed:  $arrayofia -> $arrayofai
2025-03-26 20:05:24 +01:00
UT from dolibit
7de2428bc2 Update custom_prompt.php (#33623)
changed:  $arrayofia -> $arrayofai
2025-03-26 20:03:54 +01:00
UT from dolibit
41f29a3ae6 Update ai.lib.php (#33619)
changed:  $arrayofia -> $arrayofai

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-26 20:00:56 +01:00
UT from dolibit
b50020d218 Update README.md (#33618)
add:  Workstations/Workplaces
add:  AI support via API
2025-03-26 19:51:26 +01:00
Frédéric FRANCE
745b140869 fix CI (#33624)
* fix typo

* Update card.php

* Update card.php

* Update card.php

* Update interface_95_modWebhook_WebhookTriggers.class.php

* Update interface_95_modWebhook_WebhookTriggers.class.php
2025-03-26 19:51:02 +01:00
Noé Cendrier
58039d4994 FIX: we must retrieve linked order_supplier and no other object (#33602)
* FIX: we must retrieve linked order_supplier preferably to any other object

* FIX: better sourcetype verification, won’t collapse if order_supplier link is lost

* FIX: typo
2025-03-26 19:29:02 +01:00
ldestailleur
d9753254b1 Look and feel v22 for description/notes into lines 2025-03-26 14:39:42 +01:00
ldestailleur
ec0b487b28 NEW Can filter on public/private notes in list sale orders thirdparties 2025-03-26 14:12:55 +01:00
ldestailleur
14d9b4a9a6 NEW Can filter on field "Refuse emailing" in list of thirdparties. 2025-03-26 13:53:17 +01:00
ldestailleur
2efe17b3c4 Code comment 2025-03-26 13:18:55 +01:00
ldestailleur
6cae3878df Prepare emailing code for unsubcribing emails 2025-03-26 13:01:59 +01:00
ldestailleur
f12e04d4f3 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-26 05:07:04 +01:00
ldestailleur
72ed45b270 Add code to make SMTPs debug 2025-03-26 05:06:41 +01:00
ldestailleur
965b73ffcd Doc 2025-03-26 03:05:51 +01:00
ldestailleur
74a0841ff7 Fix css 2025-03-26 02:04:49 +01:00
ldestailleur
ae59c409f6 Modulebuilderization 2025-03-26 00:56:24 +01:00
ldestailleur
d0bf1ce3d7 Look and feel v22 2025-03-25 22:57:57 +01:00
ldestailleur
fd0889cebb Test 2025-03-25 22:48:19 +01:00
ldestailleur
507262a1a8 Test fix CI 2025-03-25 22:27:52 +01:00
ldestailleur
669e36926d Add log 2025-03-25 22:00:51 +01:00
ldestailleur
b321336562 Test 2025-03-25 21:45:05 +01:00
ldestailleur
7b9b32cb9e Debug pgsql DDLInfoTable 2025-03-25 21:32:28 +01:00
ldestailleur
e028b2325e Test travis 2025-03-25 21:18:50 +01:00
ldestailleur
507e81d819 More logs 2025-03-25 21:11:02 +01:00
ldestailleur
1a4b888f2e Add a test to debug travis error 2025-03-25 20:59:05 +01:00
ldestailleur
d2b6fb83b7 Fix php warning 2025-03-25 20:43:33 +01:00
ldestailleur
7689f12960 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-25 20:30:27 +01:00
ldestailleur
b8977c74ec Reduce warnings 2025-03-25 20:24:14 +01:00
ldestailleur
c95f4a8e6a Fix phpunit 2025-03-25 20:22:02 +01:00
ldestailleur
d7ededc1b2 Fix phpunit 2025-03-25 20:21:03 +01:00
ldestailleur
2d60d8f8da Close #10789 Close #30301 2025-03-25 20:15:25 +01:00
ldestailleur
1ef1c546ee Merge branch 'solution-libre-fix-external-users-cannot-see-projects' into develop 2025-03-25 19:41:30 +01:00
ldestailleur
f8b179c7bf Merge branch 'fix-external-users-cannot-see-projects' of
github.com:solution-libre/dolibarr into
solution-libre-fix-external-users-cannot-see-projects
2025-03-25 19:41:07 +01:00
Christophe Battarel
71acce0afb NEW : add new permissions to read supplier prices (#33598)
* add new permissions to read supplier prices

* Update modProduct.class.php

* Update modProduct.class.php

* Update modService.class.php

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-25 19:33:30 +01:00
ldestailleur
6ea3da0b61 Fix typo 2025-03-25 19:27:27 +01:00
Frédéric FRANCE
740d5ed368 Update phpstan-baseline.neon (#33608) 2025-03-25 19:24:00 +01:00
ldestailleur
635ce3de85 Fix bad directory for sql files 2025-03-25 19:05:49 +01:00
ldestailleur
d33866426c Clean code 2025-03-25 19:04:52 +01:00
ldestailleur
64690564fd Fix bad directory for sql files 2025-03-25 19:04:33 +01:00
ldestailleur
89b3115f04 Remove non official tables 2025-03-25 18:44:38 +01:00
ldestailleur
994b5fe90f Remove not used table 2025-03-25 18:41:45 +01:00
ldestailleur
9f70a961b0 Comment 2025-03-25 18:36:51 +01:00
ldestailleur
7522ee7693 Try fix travis 2025-03-25 18:17:25 +01:00
ldestailleur
4ab6fe34fa Introduce getWarningDelay() 2025-03-25 17:42:54 +01:00
ldestailleur
8d15000050 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-25 17:12:04 +01:00
ldestailleur
6ff05d188a Fix warning 2025-03-25 17:11:55 +01:00
Josep Lluís
f8550ed45d NEW: Add DateMaxPayment option on selectDate (#33601)
* Add DateMaxPayment option on selectDate

Add DateMaxPayment option on selectDate, in customers invoices, as in suppliers invoices

* Update paiement.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-25 16:34:28 +01:00
Yannis Hoareau
1f15c35b15 Removed unnecessary tests (#33603) 2025-03-25 16:29:44 +01:00
Alexandre SPANGARO
1cd2783bd2 NEW Add tags / category on supplier invoice (#33490)
* NEW Add tags / category on supplier invoice

* CI

* Fix condition if constant MAIN_USE_NEW_SUPPLIERMOD is used

* Fix link

* Fix typo

* Fix element type on export

* Fix element type on export
2025-03-25 16:28:51 +01:00
ldestailleur
75a324349a Fix multicompany setup of multicurrency 2025-03-25 16:14:18 +01:00
ldestailleur
59ad7b7e59 Button synchrnize enabled only if setup ok 2025-03-25 16:07:52 +01:00
ldestailleur
c73eec72d5 Disable spellcheck on textarea to define path of dirs 2025-03-25 14:10:53 +01:00
ldestailleur
a8372a2f16 Prepare 21.0.1 2025-03-25 14:02:01 +01:00
ldestailleur
0c09be61a2 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-25 14:01:28 +01:00
ldestailleur
99e898fa64 Fix trans 2025-03-25 13:48:21 +01:00
ldestailleur
facf32c5a9 Clean code 2025-03-25 13:40:42 +01:00
ldestailleur
705eb17310 Clean code 2025-03-25 12:42:51 +01:00
Benjamin Falière
c6d50cf46b NEW(mailing): Allow user to define the number of email sent by batch directly from mailing config page (#32750)
* NEW(mailing): Allow user to define the number of email sent by batch

* FIX: incompatibility with conf.php fie

* DEL: MAILING_LIMIT_SENDBYWEB constant from const.php page

* Define the const for all entities instead of specific entity

* Remove note

---------

Co-authored-by: Benjamin Falière <benjamin.faliere@altairis.fr>
2025-03-25 12:01:14 +01:00
John BOTELLA
b16b462520 New js search filter in icons doc (#33580)
* New js search filter in icons doc

* Fix code wysiwyg editor in Doc and add search input doc

* Fix code wysiwyg editor in Doc and add search input doc

* Fix autofocus

* fix js count

* comment

* comment

* fix php stan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-25 10:57:15 +01:00
atm-irvine
1e9b58dc9d feat(commandeFournisseur): new set reopen function (#33597)
* feat(commandeFournisseur): new set reopen function

* error : db begin instead of db prefix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-24 23:51:24 +01:00
Jyhere
ad5102e5da FIX: products with a single price by qty may have empty price when adding it in a commercial piece (#33509)
* FIX: products with a single price by qty may have empty price when adding it in a commercial piece

* FIX: products with a single price by qty may have empty price when adding it in a commercial piece
2025-03-24 23:34:02 +01:00
Anthony Damhet
a522442d57 UIUX: Documentation for table update (#33593)
* Documentation for table update

Examples and documentation on using tables

* Remove space

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-24 22:22:55 +01:00
Frédéric FRANCE
c753078b36 fix missings translations (#33585)
* fix missings translations

* fix

* fix

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-24 22:01:55 +01:00
ldestailleur
03c4ce1cc3 Fix travis 2025-03-24 21:44:57 +01:00
ldestailleur
bb7ef236c5 Fix travis 2025-03-24 21:43:38 +01:00
ldestailleur
2cb5ec448b Fix travis 2025-03-24 21:42:16 +01:00
ldestailleur
8a89cc3f04 FIX phpunit 2025-03-24 20:52:13 +01:00
ldestailleur
c15f729cc4 Use environment variable instead of hard coded values 2025-03-24 19:24:04 +01:00
ldestailleur
2dc191afe2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-24 18:23:46 +01:00
ldestailleur
1726312fc3 Fix travis 2025-03-24 18:23:31 +01:00
Charlène Benke
936d0eeae1 Add sold amount on api call (V2) (#33589)
* Add sold amount on api call (V2)

other way to implement it

* Update api_bankaccounts.class.php

Use the non deprecated property name.

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-24 16:43:32 +01:00
Mathieu Schiffmann
b9946cef4a NEW #33506 Add a constant to apply a ratio to resize images in ODT templates (#33543)
* CLOSE #33506 add a constant holding the ratio to resize images in ODT templates

A new Dolibarr constant 					MAIN_DOC_ODT_IMAGE_RATIO
is taken in consideration for ODT templates.
This constant holds a number that is multiplied when computing the size of images in ODT templates.
All doc_generic_*_odt_modules.php files have been updated to call the setImage Method with a new parameter $ratio
The method setImage in the file odt.php has been modified to have a new parameter $ratio and use it to compute the image size

* FIX #33506 wrong branch

some other files needed to be changed in the develop branch

* FIX #33506 PR errors fixed

* FIX #33506 codesniffer errors fixed

* QUAL #33506 completed method comment
2025-03-24 16:41:00 +01:00
kkhelifa-opendsi
73e54ae77e FIX: rename and add class for column total_ttc in line template (view and title) (#33590) 2025-03-24 16:39:13 +01:00
lvessiller-opendsi
125b61dfd7 FIX #33595 - Click on add component for virtual product (#33596) 2025-03-24 16:38:28 +01:00
Frédéric FRANCE
eaf2194bd2 fix directory url (#33592)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-24 16:37:26 +01:00
ldestailleur
65536f6f70 Fix phpstan warnings 2025-03-24 16:22:14 +01:00
ldestailleur
af7cb49413 Avoid false positive of phpstan 2025-03-24 15:52:59 +01:00
ldestailleur
764ec36e38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-24 15:42:24 +01:00
ldestailleur
a98c6b309f Ignore phan false positive 2025-03-24 15:42:07 +01:00
kkhelifa-opendsi
963fb2a41c FIX : If the global INVOICE_CAN_NEVER_BE_EDITED disabled the action 'modify' of a invoice, we test in the point of entry of the action and not after we make many useless tests (#33594)
* FIX : If the global INVOICE_CAN_NEVER_BE_EDITED disabled the action 'modify' of a invoice, we test in the point of entry of the action and not after we make many useless tests

* Correction
2025-03-24 15:34:58 +01:00
ldestailleur
8cc029dddf Make code simpler 2025-03-24 15:30:34 +01:00
ldestailleur
216bb4da63 Fix warnings 2025-03-24 15:25:29 +01:00
ldestailleur
966aff2095 Reduce nb of result combinations type fot getURLContent 2025-03-24 15:23:13 +01:00
ldestailleur
92c3ca9eda Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-24 15:16:56 +01:00
ldestailleur
1338ea41e4 Fix phpstan 8.2 2025-03-24 15:16:44 +01:00
Frédéric FRANCE
58c7194569 fix CI (#33591)
* Update phpstan.yml

* Update phpstan.yml
2025-03-24 15:12:16 +01:00
ldestailleur
9b36b6e965 Fix typo 2025-03-24 14:43:40 +01:00
ldestailleur
c6dc48d12d Debug v22 2025-03-24 14:41:22 +01:00
ldestailleur
cbb9f5aa0c Replace hard coded value with var 2025-03-24 14:41:02 +01:00
ldestailleur
3c7895171b Enhance script to allow use of DESTIASSOLOGIN and DESTISFLOGIN 2025-03-24 14:37:45 +01:00
ldestailleur
7201222753 Test of a security fix backport. 2025-03-24 13:58:17 +01:00
ldestailleur
7ce20a5ff3 FIX blank page on smartphone for bank SEPA direct transfer page 2025-03-24 13:01:08 +01:00
ldestailleur
ad36e0f33f FIX blank page on smartphone for bank SEPA direct transfer page 2025-03-24 13:00:35 +01:00
ldestailleur
2e3c4d57a6 Fix includes 2025-03-24 12:56:11 +01:00
ldestailleur
e1351bdd18 FIX Translation of column in list of invoice 2025-03-24 12:54:32 +01:00
ldestailleur
911bfa2883 FIX Translation of column in list of invoice 2025-03-24 12:49:46 +01:00
ldestailleur
920c84a056 NEW No auto open keyboard on smartphone when opening list of columns 2025-03-24 12:48:38 +01:00
ldestailleur
5096063676 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-24 01:29:48 +01:00
ldestailleur
e6ae89938e Fix warning 2025-03-24 01:29:38 +01:00
Alexandre SPANGARO
12721e5337 NEW Accountancy - Add column on chart of accounts to enable or not centralized account (#33577) 2025-03-24 01:28:09 +01:00
ldestailleur
13d1cc06d7 Fix warning 2025-03-24 01:24:40 +01:00
itkuchlbauer
5464159418 add exportFile parameter to accountancyexport hook (#33583) 2025-03-24 01:22:56 +01:00
lvessiller-opendsi
f9e42e82d5 FIX #33563 - Discount amount count twice when create a discount from a deposit invoice (#33564) 2025-03-24 01:22:16 +01:00
lvessiller-opendsi
5ffcca92a6 NEW input reason for customer invoice (SQL) (#33569) 2025-03-24 01:20:50 +01:00
Anthony Damhet
9055a90a84 Change Git Template for UI/UX #33561 (#33562)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-24 01:15:45 +01:00
ldestailleur
f44a730430 Fix remove debug test 2025-03-24 01:15:35 +01:00
Frédéric FRANCE
487d6476ce fix CI (#33581)
* fix CI

* clean phpstan baseline
2025-03-24 01:08:08 +01:00
ldestailleur
f4310e465f Clean code of menu 2025-03-23 16:18:38 +01:00
ldestailleur
fd243a00f6 Look and feel 2025-03-22 16:42:16 +01:00
ldestailleur
eb885d89af Code comment 2025-03-22 14:05:48 +01:00
ldestailleur
299192d258 Method Categoie->getObjectsInCateg() is deprecated. Try by using instead
getListForItem().
2025-03-22 12:32:46 +01:00
ldestailleur
5b9a8ca4a0 Better error management 2025-03-21 14:47:35 +01:00
ldestailleur
c947faeff1 NEW Update of currency supports also apilayer (not only currencylayer) 2025-03-21 14:40:56 +01:00
Laurent Destailleur
7011d01bde NEW Web pages of websites are protected by the WAF 2025-03-21 13:01:23 +01:00
Laurent Destailleur
71516d2f7a Doc 2025-03-21 12:31:39 +01:00
Laurent Destailleur
120605b8ea Clean phpstan baseline 2025-03-21 12:16:22 +01:00
Laurent Destailleur
d9ab7c58d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-21 12:13:59 +01:00
Laurent Destailleur
8616e23e31 Move the WAF code into a dedicated include file 2025-03-21 12:11:23 +01:00
Alexandre Janniaux
7edba256e8 migration: 21→22: fix wrong type for value in llx_const #33554 (#33555)
llx_const.value is a string and using it as an int triggers the following
errors when using a PostgreSQL database.

        Erreur DB_ERROR_42883 (Req 83): INSERT INTO llx_const (name, entity, value, type, visible, note) SELECT DISTINCT 'STOCK_DISALLOW_NEGATIVE_TRANSFER', entity, 1, 'chaine', 0, '' FROM llx_const c1 WHERE NOT EXISTS (SELECT rowid FROM llx_const c2 WHERE c2.name = 'STOCK_ALLOW_NEGATIVE_TRANSFER' AND c2.value = 1 AND c2.entity = c1.entity);ERROR: 42883: operator does not exist: text = integer LINE 1: ...me = 'STOCK_ALLOW_NEGATIVE_TRANSFER' AND c2.value = 1 AND c2... ^ HINT: No operator matches the given name and argument types. You might need to add explicit type casts. LOCATION: op_error, parse_oper.c:635
        --
        Erreur DB_ERROR_42883 (Req 84): UPDATE llx_const SET name = 'STOCK_DISALLOW_NEGATIVE_TRANSFER', value = 1 WHERE name = 'STOCK_ALLOW_NEGATIVE_TRANSFER' AND value = 0;ERROR: 42883: operator does not exist: text = integer LINE 1: ... WHERE name = 'STOCK_ALLOW_NEGATIVE_TRANSFER' AND value = 0; ^ HINT: No operator matches the given name and argument types. You might need to add explicit type casts. LOCATION: op_error, parse_oper.c:635
        Erreur DB_ERROR_42883 (Req 85): DELETE FROM llx_const WHERE name = 'STOCK_ALLOW_NEGATIVE_TRANSFER' AND value = 1;ERROR: 42883: operator does not exist: text = integer LINE 1: ... WHERE name = 'STOCK_ALLOW_NEGATIVE_TRANSFER' AND value = 1; ^ HINT: No operator matches the given name and argument types. You might need to add explicit type casts. LOCATION: op_error, parse_oper.c:635

Fixes #33554
2025-03-21 00:37:22 +01:00
Nicolas Domenech
3d1276fa41 Fix: PHP8 warning on showOutputField for various type (#33556) 2025-03-21 00:36:35 +01:00
ldestailleur
ff1131d921 Look and feel v22 2025-03-21 00:33:57 +01:00
ldestailleur
dbd080d82f Look and feel v22 2025-03-21 00:32:03 +01:00
ldestailleur
65496604b4 Debug ai v22 2025-03-20 23:54:24 +01:00
Lucas Marcouiller
5f211c64ec New ai feature dropdown + translate (#33545)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-20 19:32:01 +01:00
ldestailleur
6ce72f78df Fix CI 2025-03-20 18:51:29 +01:00
ldestailleur
aa78344615 Fix trans 2025-03-20 18:39:54 +01:00
Christophe Battarel
7eb6a9e455 fix buy price (#33552)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2025-03-20 18:33:57 +01:00
John BOTELLA
92baf3faa9 Fix : MAIN_SEARCH_PRODUCT_BY_FOURN_REF search critera (#33550) 2025-03-20 18:32:49 +01:00
ldestailleur
410738085a Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-20 13:55:35 +01:00
ldestailleur
ae13ad70ae FIX Responsive 2025-03-20 13:55:19 +01:00
ldestailleur
2426a50cba Fix CSS and td balance 2025-03-20 13:31:52 +01:00
ldestailleur
db7a2ce4d5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-20 12:01:43 +01:00
ldestailleur
9a851ce488 Debug v22 2025-03-20 12:01:29 +01:00
ldestailleur
bb3989c9a7 NEW The signature is on the good page even if another module add pages 2025-03-20 12:01:18 +01:00
ldestailleur
c3f46bd2e0 Fix accent on tooltip 2025-03-20 09:53:01 +01:00
Alexandre Janniaux
f7c9d4ecfc migration: 19.0→20.0: rename llx_commande_fournisseur_dispatch sequences #31228 (#33542)
Fix an issue after upgrading to 20.0.x with the backend saying that the
sequences llx_expeditiondet_batch_rowid_seq doesn't exist.

The table was somehow renamed, and migration fixed for PostgreSQL in
the following commits:

- 3670ba75ba: rename the table to match
  the intent of the table.
- 9913778da0: using VPGSQL comments to use
  a different RENAME function for PostgreSQL.
- d73d27466b: Using RENAME TO which is
  compatible with both PostgreSQL and MySQL.

But the sequence was still a leftover after those migrations.

Co-authored-by: Alexis Thietard
Co-authored-by: Geoffrey Mellar

Fixes #31228
2025-03-20 08:56:47 +01:00
Pierre Ardoin
841a109cdb FIX Sort and search Ref Project column was missing (#33539)
* FIX Sort and search Ref Project column was missing

* Remove White space
2025-03-20 08:55:58 +01:00
Laurent Destailleur
8c5ae9fa0e Fix duplicate calendar of bookcal module in aganda view 2025-03-20 03:39:11 +01:00
Laurent Destailleur
ff3f39c18a Fix duplicate entry of bookcal calendar selection in agenda view. 2025-03-20 03:36:12 +01:00
Laurent Destailleur
278ae6c597 Fix fatal error when var is array 2025-03-20 03:34:23 +01:00
Laurent Destailleur
f7145ea4d3 Fix POS has some product unvisible when using smartphone 2025-03-20 02:52:12 +01:00
Laurent Destailleur
88c41d4970 Remove verbose log 2025-03-20 02:49:35 +01:00
Laurent Destailleur
776ce2d029 Fix name of funcion 2025-03-20 02:47:37 +01:00
Laurent Destailleur
dad235f6d9 Fix POS has some product unvisible when using smartphone 2025-03-20 02:45:36 +01:00
Laurent Destailleur
996dacbd50 Fix POS has some product unvisible when using smartphone 2025-03-20 02:39:21 +01:00
Laurent Destailleur
54e3f2932d Fix function name 2025-03-19 23:34:14 +01:00
Pierre Ardoin
c8f38ef97c Add hidden option SUPPLIER_PROPOSAL_AUTOADD_USER_CONTACT (#33524)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-19 19:18:16 +01:00
ldestailleur
f92f159b78 Doc 2025-03-19 18:28:26 +01:00
ldestailleur
fd18506c86 Debug v22 Try to make code simpler. 2025-03-19 18:16:54 +01:00
ldestailleur
a9dc0a63e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 18:12:15 +01:00
ThomasNgr-OpenDSI
643564d45c add advanced right to reopen a propal (#33416)
* add advanced right to reopen a propal

* use NOT insetad of empty() for getDolGlobalBool()

* fix travis
2025-03-19 18:12:02 +01:00
ldestailleur
d65e525f97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 18:07:02 +01:00
ldestailleur
4ab64b0576 Fix sql 2025-03-19 18:06:49 +01:00
omogenot
070072e660 Add extra import contact key fields (#33528)
During company contact import, to distinguish between two contacts with same name, use extra key fields such as Zip code or email, so that a new contact with same name can be inserted.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-19 18:02:45 +01:00
Clément
9d25e2cd58 Hook doAction on statistics pages (#33532)
* Hook doAction on statistics pages

* Hook doAction on statistics pages

* Update index.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-19 18:02:28 +01:00
ldestailleur
36e694e158 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 18:00:38 +01:00
ldestailleur
c58e3a3b0d Fix ignore phpstan 2025-03-19 18:00:28 +01:00
Clément
47d001d2ff FIX Bug Reception stats (#33531)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-19 17:50:22 +01:00
ldestailleur
5555009d7b Condition is cleaner, even if same. 2025-03-19 17:48:05 +01:00
ldestailleur
0bb37047be Condition is cleaner, even if same. 2025-03-19 17:47:42 +01:00
ldestailleur
05b132be2c Clean dir of github actions 2025-03-19 17:41:31 +01:00
ldestailleur
59233693c1 Fix phan 2025-03-19 17:28:28 +01:00
kkhelifa-opendsi
8a6ebfeb3f FIX: Fix case when INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION for sell journal (#33518) 2025-03-19 17:25:50 +01:00
Sandro Santilli
d935407ac3 Add mastodon icon and pixelfed record in social networks (#33525)
See GH-33378

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-19 17:18:50 +01:00
ldestailleur
330f2bd76b Complete #33525 2025-03-19 17:18:31 +01:00
ldestailleur
b964068f03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 17:17:07 +01:00
ldestailleur
a9234d6e92 Trans 2025-03-19 17:16:53 +01:00
Frédéric FRANCE
44c0c6ed2f List db sessions (#33410)
* list sessions in db

* list sessions in db

* list sessions in db

* list sessions in db

* list sessions in db

* list sessions in db

* list sessions in db

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* clean sessions

* clean sessions

* fix
2025-03-19 16:22:09 +01:00
ldestailleur
9b2913e144 Fix false positive 2025-03-19 16:19:27 +01:00
ldestailleur
ef159f919e Backport fix in v20 #33536 2025-03-19 16:10:25 +01:00
ldestailleur
c471f6b900 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-03-19 16:04:50 +01:00
ldestailleur
a8529cf1a2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 16:04:21 +01:00
HENRY Florian
8f2ad4bf87 NEW: Add Shared links on links in attachements (#33459)
* NEW: add share option for URL link in attachement

* NEW: fix #33456

* NEW: shared link on links

* NEW: shared link on links

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-19 16:04:11 +01:00
ldestailleur
58509095ba Trans 2025-03-19 16:01:25 +01:00
ldestailleur
065ac4571f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 15:54:36 +01:00
ldestailleur
435a03845f Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 15:54:23 +01:00
Frédéric FRANCE
fded6d7855 fix CI branch 21 (#33535) 2025-03-19 15:53:00 +01:00
Vaadasch
6e381671ff FIX: PRODUIT_AUTOFILL_DESC works even if line_desc is empty. Removing MAIN_NO_CONCAT_DESCRIPTION (#33489)
La variable MAIN_NO_CONCAT_DESCRIPTION est redondante avec PRODUIT_AUTOFILL_DESC.
Cette redondance créée une difficulté de compréhension et des effets de bord, principalement lorsqu'un utilisateur souhaite mettre une description à vide.

# Confirmation de la redondance de MAIN_NO_CONCAT_DESCRIPTION
Pour confirmation : Ajout de lignes de débug pour constatation.
Lignes 1116 à 1122 de DOL_ROOT/core/class/conf.class.php
```php
			print "<p>Before : PRODUIT_AUTOFILL_DESC = " . $this->global->PRODUIT_AUTOFILL_DESC . " ; MAIN_NO_CONCAT_DESCRIPTION = ".$this->global->MAIN_NO_CONCAT_DESCRIPTION . "</p>";
            if (!empty($this->global->PRODUIT_AUTOFILL_DESC)) {
                $this->global->MAIN_NO_CONCAT_DESCRIPTION = 1;
            } else {
                unset($this->global->MAIN_NO_CONCAT_DESCRIPTION);
            }
            print "<p>After : PRODUIT_AUTOFILL_DESC = " . $this->global->PRODUIT_AUTOFILL_DESC . " ; MAIN_NO_CONCAT_DESCRIPTION = ".$this->global->MAIN_NO_CONCAT_DESCRIPTION . "</p>";
```
Application d'une valeur à MAIN_NO_CONCAT_DESCRIPTION = 4 depuis l'interface Configuration -> Divers.
Modification de la variable PRODUIT_AUTOFILL_DESC par l'interface d'admin du module Produit :
```
Before : PRODUIT_AUTOFILL_DESC = 0 ; MAIN_NO_CONCAT_DESCRIPTION = 4
After : PRODUIT_AUTOFILL_DESC = 0 ; MAIN_NO_CONCAT_DESCRIPTION =
```
```
Before : PRODUIT_AUTOFILL_DESC = 1 ; MAIN_NO_CONCAT_DESCRIPTION = 4
After : PRODUIT_AUTOFILL_DESC = 1 ; MAIN_NO_CONCAT_DESCRIPTION = 1
```
```
Before : PRODUIT_AUTOFILL_DESC = 2 ; MAIN_NO_CONCAT_DESCRIPTION = 4
After : PRODUIT_AUTOFILL_DESC = 2 ; MAIN_NO_CONCAT_DESCRIPTION = 1
```

# Conservation de la valeur dans conf.class.php
Pour des raisons de compatibilités, je pense qu'il vaut mieux laisser la partie de conf.class.php pour définir la valeur si jamais il y a des modules tiers qui l'utilisent.

En dehors de cet usage de rétrocompatibilité, je suis passé sur tous les autres fichiers pour la retirer. Je modifierai le wiki pour l'en retirer aussi une fois la PR intégrée.

# Modification des card.php
## Modification de $product_desc en $line_desc.
L'utilisation de $product_desc laissait supposer que le contenu de cette variable était récupérée de la description renseignée dans le produit, or elle est en réalité récupérée du formulaire envoyé.
Je l'ai donc modifiée pour correspondre davantage à la réalité.
## Comportement
Dans le cas où PRODUIT_AUTOFILL_DESC == 0, on concatene la $line_desc avec la description issue du produit, récupérée préalablement par $desc

Co-authored-by: Arnaud Serrut <arnaud.serrut@gmail.com>
2025-03-19 15:50:07 +01:00
ldestailleur
9e7341ed1b Complete #33489 2025-03-19 15:46:39 +01:00
ldestailleur
4a1d31d2b9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 15:25:13 +01:00
ldestailleur
dc0a23509f Doc 2025-03-19 15:24:55 +01:00
kkhelifa-opendsi
8275627d4e Add "Type" on webhook target card for determine if the trigger is blocking or not (and in the futur possibly asynchrone) (#33499) 2025-03-19 15:24:18 +01:00
MDW
8669993ecf Qual: Fix phan notices (compta/prel..fichinter) (#33485)
* Qual: Fix phan notices (asset..compta/paiement)

* Qual: Fix phan notices (compta/prel..fichinter)
2025-03-19 15:21:48 +01:00
ldestailleur
39c2de721a Fix warnings 2025-03-19 15:17:34 +01:00
ldestailleur
bfcc8449c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 15:15:22 +01:00
ldestailleur
7098a8e611 Fix warnings 2025-03-19 15:14:33 +01:00
kkhelifa-opendsi
935d93266e FIX: Fix download shared document when for exemple the thirdparty is shared and we create the thirdpaty on entity 1 but generate and share a document from entity 2 (#33507) 2025-03-19 14:57:31 +01:00
kkhelifa-opendsi
ce138c1b3e FIX: Always show message if accountancy hidden options are activated to help to resolve some problems (#33512) 2025-03-19 14:52:43 +01:00
MDW
acd82fcc4b Update tool versions in .pre-commit-config (#33494)
* Update tool versions in .pre-commit-config

# Update tool versions in .pre-commit-config

Update tool versions for pre-commit.
codespell is updated in #33493 .
Prettier was upgraded to 3.1.0 - higher versions are
not compatible with the normal pre-commit workflow apparently.

* Ignore notice from sqlfluff

Ignore LT14 - The 'WHERE' keyword should always start a new line.
2025-03-19 14:51:07 +01:00
MDW
c9804cf6be Qual: Update codespell to 2.4.1 + fix spelling (#33493)
# Qual: Update codespell to 2.4.1 + fix spelling

Update codespell version in pre-commit configuration,
fix new codespell notices
2025-03-19 14:50:44 +01:00
Frédéric FRANCE
e804098a4d add missing translations (#33492)
* add missing translations

* add missing translations

* add missing translations

* add missing translations

* add missing translations
2025-03-19 14:50:19 +01:00
Frédéric FRANCE
2bbb215da2 update fontawesome icon for mastodon (#33515)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-19 14:49:39 +01:00
ldestailleur
f8a844bed9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 14:48:39 +01:00
ldestailleur
9a42a9348b Merge branch 'OPEN-DSI-develop_new_webhook_add_type_sql' into develop 2025-03-19 14:48:00 +01:00
ldestailleur
3bec92ccfd Merge branch 'develop_new_webhook_add_type_sql' of
github.com:OPEN-DSI/dolibarr into
OPEN-DSI-develop_new_webhook_add_type_sql
2025-03-19 14:47:34 +01:00
github-actions[bot]
b5aa70c2c2 PHPStan > Update baseline (#33496)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-03-19 14:42:59 +01:00
ldestailleur
a3f3f28362 Fix warnings 2025-03-19 14:42:04 +01:00
ldestailleur
66e14bb708 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 14:28:20 +01:00
ldestailleur
5c1f8b58c4 Merge 2025-03-19 14:23:19 +01:00
ldestailleur
63e46fbc8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 14:19:12 +01:00
ldestailleur
bb719f73cf Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-19 14:19:01 +01:00
ldestailleur
1ab438d62e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-03-19 14:17:37 +01:00
ldestailleur
d0242ad032 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 14:15:23 +01:00
Vincent Quintin
7c3aa76fc8 Fix: Correct search_fk_statut=openall (#33523) 2025-03-19 14:14:33 +01:00
kkhelifa-opendsi
f3b146a1ab FIX: Need missing translation file in result index page of accountancy repport (#33527) 2025-03-19 14:10:44 +01:00
ldestailleur
3e8c5651cd Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-03-19 14:09:48 +01:00
ldestailleur
0a4f1ffc06 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-03-19 14:09:41 +01:00
ldestailleur
723e267b00 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 14:09:30 +01:00
ldestailleur
66a79dba27 Exclude a warning that is nearly all the time a false positive 2025-03-19 14:09:19 +01:00
Yannis Hoareau
611757bb99 Fix bug where id could be changed by the line id and would create bug (#33498) 2025-03-19 14:01:24 +01:00
atm-lucas
42a1cde41a useless product fetch on invoice create (#33505) 2025-03-19 14:00:03 +01:00
Vaadasch
8a8608fa91 Update paiement.class.php add $error++ if invoice not linked (#33500) 2025-03-19 13:55:13 +01:00
Charlène Benke
5fe018cdba NEW ; Add hook on API call (#33501)
* NEW ; Add hook on API call

* Update index.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-19 13:53:17 +01:00
lvessiller-opendsi
9a570dfa0c FIX float posted quantities on dispatch shipment (#33503) 2025-03-19 13:49:29 +01:00
Frédéric FRANCE
869d7af747 comment test not needed (#33504) 2025-03-19 13:48:56 +01:00
ldestailleur
a0ec0002f6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 13:47:25 +01:00
ldestailleur
557cda5161 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-19 13:38:24 +01:00
ldestailleur
aaeff10d31 FIX Css center 2025-03-19 13:38:13 +01:00
ldestailleur
af9b45a186 Trans 2025-03-19 13:32:56 +01:00
ldestailleur
1f822dceb8 NEW Merge surface and volumen in one line on product card. 2025-03-19 13:26:30 +01:00
ldestailleur
d6bfa5e525 Trans 2025-03-19 12:57:36 +01:00
ldestailleur
d3951688bd Debug v22 - stockable_product 2025-03-19 12:54:48 +01:00
ldestailleur
1e08ca4cd3 Debug 2025-03-19 12:44:48 +01:00
ldestailleur
cd6b86751e Look and feel v22 2025-03-19 12:26:08 +01:00
ldestailleur
6192fa8358 Look and feel v22 for the product kit page. 2025-03-19 12:10:14 +01:00
ldestailleur
19e63684c7 Look and feel v22: Smaller label with tooltip for customs code. 2025-03-19 11:45:15 +01:00
ldestailleur
b61bb3252e Doc 2025-03-19 11:32:37 +01:00
ldestailleur
debf628c60 Debug SQL 2025-03-19 11:31:06 +01:00
lvessiller-opendsi
81aca843ba NEW shipment kits with dispatcher v2 (SQL) (#26519)
* NEW shipment kits with dispatcher v2 (SQL)

* Format sql comment

* NEW structure database for virtual products

* Remove expedition det dispatcher tables

* Update from develop

* Remove break line on sql migration file

* Update left join for compatibility with Postgresql

* Fix SQL join first table

* Migration SQL for kits in v22
2025-03-19 11:10:24 +01:00
Laurent Destailleur
f6e58650d2 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-18 21:45:09 +01:00
Laurent Destailleur
462ed9c6a3 Fix look and feel v21 2025-03-18 21:44:55 +01:00
ldestailleur
7313ba2b6b FIX fatal error in notification sending email when error array is empty 2025-03-18 18:15:54 +01:00
ldestailleur
e9e5a39b79 Fix deletion when draft. 2025-03-18 18:10:05 +01:00
ldestailleur
302ab362d5 Fix edit of template with back to page 2025-03-18 17:41:37 +01:00
ldestailleur
1698ac0958 FIX CR on script output 2025-03-18 17:41:16 +01:00
ldestailleur
8fee04e548 Doc 2025-03-18 17:40:56 +01:00
ldestailleur
51d514ce21 FIX Add a new email for notification 2025-03-18 16:53:23 +01:00
ldestailleur
e72299126c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0
Signed-off-by: ldestailleur <eldy@destailleur.fr>
2025-03-18 16:39:04 +01:00
ldestailleur
b085145cc5 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-18 16:37:50 +01:00
ldestailleur
7465d54335 Fix renaming dire must be at end outside of translation. 2025-03-18 16:36:18 +01:00
ldestailleur
cb3b91ad8f Fix travis for latest php 2025-03-18 15:27:43 +01:00
ldestailleur
ae10954b65 NEW Can set aspecific permission on an extrafields 2025-03-18 15:21:20 +01:00
ldestailleur
461cf5616e Clean code. WIP To manage permission on extrafields. 2025-03-18 14:55:37 +01:00
ldestailleur
8631c88a77 Try to use latest php verion 2025-03-18 13:05:24 +01:00
ldestailleur
be8cd3ebf2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-18 12:27:28 +01:00
ldestailleur
0136f8e72e Try upgrade to php 8.4 2025-03-18 12:19:00 +01:00
Laurent Destailleur
0f0c00c56e Test commit with signed-off-by
Signed-off-by: Laurent Destailleur <eldy@users.sourceforge.net>
2025-03-18 01:16:19 +01:00
Laurent Destailleur
142fb7167c Fix CSS 2025-03-17 22:19:05 +01:00
Laurent Destailleur
b6df51dc87 Fix CSS 2025-03-17 22:16:41 +01:00
Laurent Destailleur
75594b4e70 FIX CSS in total 2025-03-17 21:10:56 +01:00
Laurent Destailleur
7ce3f23b21 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-17 20:36:32 +01:00
Laurent Destailleur
5443b7cc11 FIX Bad link to download tax vat document 2025-03-17 20:30:02 +01:00
Laurent Destailleur
57fe705f5c Fix css 2025-03-17 19:50:53 +01:00
Laurent Destailleur
dd5b947cf7 Fix css 2025-03-17 19:49:31 +01:00
Laurent Destailleur
395157d16c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-17 19:46:08 +01:00
Laurent Destailleur
28cc3d36a9 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-17 19:23:45 +01:00
Laurent Destailleur
00fe425b0f Fix css 2025-03-17 19:22:55 +01:00
Kamel Khelifa
20a57550d3 Add type column on webhook target table for determine if the trigger is blocking or not (and in the futur possibly asynchrone) 2025-03-17 14:52:32 +01:00
ldestailleur
cc9658fbb4 Fix address separator 2025-03-17 12:59:30 +01:00
ldestailleur
2858d4e544 Debug message on tooltip of not allowed button. 2025-03-17 11:42:39 +01:00
ldestailleur
23244ddc9d Fix getCallerInfoString() return empty when only one function used 2025-03-17 11:33:06 +01:00
ldestailleur
07d517ec49 FIX text in tooltip on buttons when pb is not a permission problem 2025-03-17 11:05:41 +01:00
ldestailleur
e4cbc6502f Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-17 10:56:20 +01:00
ldestailleur
e863b1f01a Add info to help debug several troubles 2025-03-17 10:55:13 +01:00
Laurent Destailleur
e9928ef7e6 Fix br 2025-03-17 00:32:51 +01:00
Laurent Destailleur
b389cbb59e Fix reponsive and NA that must not be visible 2025-03-17 00:27:40 +01:00
Laurent Destailleur
119716bd82 Fix button "Create shipment" if no permission 2025-03-16 23:56:14 +01:00
ldestailleur
17d5ca6566 Fix timezone pb 2025-03-16 20:49:21 +01:00
dolibarr95
d1ac6e538a Update date.lib.php (#33394)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-16 20:46:10 +01:00
atm-irvine
80d90a96bc feat(expedition): added project ref on expedition PDF (#33442)
* feat(expedition): added project ref on expedition PDF

* feat(expedition): added project ref on expedition PDF

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-16 20:45:26 +01:00
MDW
0cc1aa6d80 Qual: Fix phan notices (asset..compta/paiement) (#33484)
* Qual: Fix phan notices (accountancy, adherents)

* Qual: Fix phan notices (admin)

* Qual: Fix phan notices (asset..compta/paiement)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-16 20:45:04 +01:00
HENRY Florian
9266408dd5 NEW: new option in invoice setup to limit options of deposit invoice (#33468)
* NEW: new option in invoice seup to limit choice of deposit invoice

* Update card.php

* Update card.php

* Update invoice.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-16 20:44:39 +01:00
MDW
2c95fba2ee Qual: Fix phan notices (admin) (#33483)
* Qual: Fix phan notices (accountancy, adherents)

* Qual: Fix phan notices (admin)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-16 20:21:22 +01:00
ldestailleur
6eb65f383d Clean code 2025-03-16 20:15:52 +01:00
ldestailleur
b4bf192e37 Doc 2025-03-16 20:04:52 +01:00
ldestailleur
ef5880d642 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-16 15:35:39 +01:00
ldestailleur
86bebced1b Typo 2025-03-16 15:35:29 +01:00
Alexandre SPANGARO
da9ef8ecde NEW On list, see complete ref customer/supplier with constant MAIN_SHOW_GLOBAL_REF_CUSTOMER_SUPPLIER (#33373)
* NEW On list, see complete ref customer/supplier with constant MAIN_SHOW_GLOBAL_REF_CUSTOMER_SUPPLIER

* Update PR title & css

* CSS

* Case
2025-03-16 15:23:55 +01:00
github-actions[bot]
07d42bde1b PHPStan > Update baseline (#33488)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-03-16 15:21:50 +01:00
MDW
69fdccf2a4 Qual: Fix phan notices (accountancy, adherents) (#33480) 2025-03-16 15:19:54 +01:00
MDW
324f9631d7 FIX: Replace compromised tj-actions/changed-files (#33481)
# FIX: Replace compromised tj-actions/changed-files

See https://www.stepsecurity.io/blog/harden-runner-detection-tj-actions-changed-files-action-is-compromised .

(Backport from develop)
2025-03-15 16:38:56 +01:00
MDW
c3104905b3 Qual: Fix phan notices (html/core) (#33474)
* FIX: Replace compromised tj-actions/changed-files

# FIX: Replace compromised tj-actions/changed-files

See https://www.stepsecurity.io/blog/harden-runner-detection-tj-actions-changed-files-action-is-compromised .

* Add changed php file for test

* Qual: Fix phan notices (html/core)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-15 16:34:35 +01:00
ldestailleur
9c6488d018 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-15 15:47:14 +01:00
ldestailleur
bb5f22264b Fix bad var name 2025-03-15 15:47:01 +01:00
John BOTELLA
c54a7a965c Add link to doc and fix doc (#33470) 2025-03-15 15:44:40 +01:00
Frédéric FRANCE
7767fdeb4f do not init specimen with deprecated properties (#33472) 2025-03-15 15:40:52 +01:00
Frédéric FRANCE
36c4676d99 display invoice model deleted (#33471) 2025-03-15 15:40:33 +01:00
ldestailleur
bf4e94545a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-03-15 15:39:30 +01:00
MDW
4461a9c685 FIX ci: Replace compromised tj-actions/changed-files (#33478)
* FIX: Replace compromised tj-actions/changed-files

# FIX: Replace compromised tj-actions/changed-files

See https://www.stepsecurity.io/blog/harden-runner-detection-tj-actions-changed-files-action-is-compromised .

* Add changed php file for test
2025-03-15 15:33:42 +01:00
ldestailleur
28c131f13c code comment 2025-03-15 15:33:36 +01:00
atm-lena
bf2a2b5eb3 Add hidden conf : NB_REC_FACT_GEN_BY_CALL (#33473)
* Add hidden conf : NB_REC_FACT_GEN_BY_CALL

* Update fournisseur.facture-rec.class.php

---------

Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-15 15:30:09 +01:00
Lenin Rivas
749ac40fa2 FIX Search date facture (#33476) 2025-03-15 15:28:30 +01:00
github-actions[bot]
2306f4bb8d PHPStan > Update baseline (#33477)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-03-15 15:27:44 +01:00
ldestailleur
781db766a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-15 15:05:33 +01:00
ldestailleur
f618ee5029 Look and feel v22 2025-03-15 15:05:02 +01:00
HENRY Florian
4fb4f9644c NEW: fix #33456 (#33458) 2025-03-15 12:06:39 +01:00
Eric - CAP-REL
8073c0e1be FIX : close all services on contract will close all lines (#33466)
* close line : line could be inactive or open

* Update contrat.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-15 12:03:37 +01:00
MDW
9dcf7fa0f5 Qual:Fix phan notices (multiple) (#33465) 2025-03-15 11:26:19 +01:00
ThomasNgr-OpenDSI
3ac78fb6f1 add warning in Changelog for const STOCK_ALLOW_NEGATIVE_TRANSFER (#33463) 2025-03-15 11:25:34 +01:00
Frédéric FRANCE
b7a00127a9 add missing translation (#33461)
* add missing translation

* add missing translation

* add missing translation

* add missing translation

* add missing translation

* add missing translation

* add missing translation

* add missing translation

* add missing translation

* add missing translation

* add missing translation
2025-03-15 11:21:03 +01:00
atm-irvine
e417e0e8f6 fix(insertExtraFields): removed useless fetch product for a SQL request (#33460)
* fix(insertExtraFields): removed useless fetch product for a SQL for better perf

* Returns of PR
2025-03-15 11:20:48 +01:00
Alexandre SPANGARO
1316263236 NEW Invoice - Add constant to prevent modification of an invoice (#33455)
* NEW Invoice - Add constant to prevent modification of an invoice

* CI
2025-03-15 11:13:57 +01:00
ldestailleur
f48536a419 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-15 11:11:20 +01:00
ldestailleur
a31d21d165 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-15 11:10:25 +01:00
ldestailleur
4fa48acb8c Doc 2025-03-15 11:10:16 +01:00
ldestailleur
8082c7bd96 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-15 10:57:53 +01:00
Eric - CAP-REL
bd846da9f5 fix missing alter table for tms auto update timestamp (#33452)
* fix missing alter table for tms auto update timestamp

* add tables renamed since 13.0
2025-03-15 10:56:24 +01:00
Eric - CAP-REL
b256c9aaba fix missing alter table for tms auto update timestamp (#33451)
* fix missing alter table for tms auto update timestamp

* two tables was renamed 13.0 -> 16.0
2025-03-15 10:55:17 +01:00
MDW
2cd6459d10 Qual: Fix phan notices (*card) (#33450) 2025-03-14 17:25:11 +01:00
ldestailleur
624e87bc51 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-14 17:24:52 +01:00
Mohamed DAOUD
83a0faaf41 add phpmax and dolibarrmax (#33448) 2025-03-14 17:15:55 +01:00
Jyhere
5196172a3a FIX : cron tasks error email encoding (#33438)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-14 17:15:11 +01:00
github-actions[bot]
3a4556d230 PHPStan > Update baseline (#33469)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-03-14 17:11:11 +01:00
ldestailleur
3c4c5f1c75 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-14 12:33:40 +01:00
ldestailleur
681b20f09e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-03-14 12:32:56 +01:00
ldestailleur
4897c9de7f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-03-14 12:20:56 +01:00
ldestailleur
2058d572d9 Merge branch '16.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0 2025-03-14 12:17:06 +01:00
ldestailleur
089fab828b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2025-03-14 12:14:10 +01:00
ldestailleur
4f28ec6923 Fix edit setup of stock broken in nojs=1 2025-03-14 12:12:32 +01:00
ldestailleur
fa05dc44ce Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2025-03-14 11:29:14 +01:00
ldestailleur
5b9453e302 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2025-03-14 11:28:33 +01:00
ldestailleur
d81a2d060e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2025-03-14 11:27:49 +01:00
Clément
e4c0ff5e83 Fix #33446 (#33447)
* Fix #33446

* Update html.form.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-14 11:27:07 +01:00
Clément
a4c58bd40b Fix #33446 (#33447)
* Fix #33446

* Update html.form.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-14 11:26:28 +01:00
ldestailleur
4b2b81bb09 Restore label 2025-03-14 11:26:09 +01:00
ldestailleur
580365d8be Keep positif label 2025-03-13 23:24:54 +01:00
Laurent Destailleur
051a902f1f Revert "Revert "Reverse const STOCK_ALLOW_NEGATIVE_TRANSFER to STOCK_DISALLOW…" (#33454)
This reverts commit e943c9c97f.
2025-03-13 23:22:40 +01:00
Laurent Destailleur
e943c9c97f Revert "Reverse const STOCK_ALLOW_NEGATIVE_TRANSFER to STOCK_DISALLOW_NEGATIV…" (#33453)
This reverts commit d93e8e2978.
2025-03-13 23:17:02 +01:00
ThomasNgr-OpenDSI
d93e8e2978 Reverse const STOCK_ALLOW_NEGATIVE_TRANSFER to STOCK_DISALLOW_NEGATIVE_TRANSFER (#33444) 2025-03-13 23:15:04 +01:00
ldestailleur
a85ff77e27 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-13 23:12:42 +01:00
ldestailleur
8449961d9e FIX #33435 Warnings 2025-03-13 23:12:31 +01:00
MDW
ef11cdeb45 Qual: Fix phan notices (pdf_* related) (#33445) 2025-03-13 23:05:15 +01:00
Eric - CAP-REL
8d9dc8c87d translation "by amoun" link (#33440) 2025-03-13 23:04:41 +01:00
Ferran Marcet
82a598d60c Fix: Not loading langs correctly (#33441) 2025-03-13 23:03:26 +01:00
Eric - CAP-REL
97aaff7395 13.0 fix migration missing tms auto update (#33443)
* tms field in llx_product is not updated to default timestamp

* but that's not the only one ...
2025-03-13 23:01:52 +01:00
ldestailleur
abafd8a016 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-13 11:35:34 +01:00
ldestailleur
e9e2ffa936 Look and feel v22 2025-03-13 11:34:55 +01:00
HENRY Florian
7a1fa20959 fix: allow positive line in creditnote invoice if FACTURE_ENABLE_NEGATIVE_LINES and INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN (#33434)
* fix: allow positive line in creditnote invoice if FACTURE_ENABLE_NEGATIVE_LINES and INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN

* fix: allow positive line in creditnote invoice if FACTURE_ENABLE_NEGATIVE_LINES and INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN
2025-03-13 11:18:17 +01:00
atm-GregM
8942380605 #FIX : datenextrun for CRON (#30724)
* FIX : datenextrun for CRON

* FIX : CRON datenextrun

* replace by idate

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-13 11:11:17 +01:00
Jyhere
775c125541 FIX: cleanup (double declaration, unused variable) (#33426)
* FIX: cleanup (double declaration, unused variable)

$isSellerInEEC is not used, $facture_static is declared twice

* FIX: cleanup more unused variables

$code_sell_p_notset and $code_sell_t_notset are not used on accountancy/customer/index.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-13 10:47:23 +01:00
ldestailleur
bf95deef24 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-13 10:46:12 +01:00
ldestailleur
16c7192d98 Clean code 2025-03-13 10:45:40 +01:00
MDW
d362fbfe73 Qual: Fix phan notices (htdocs/fourn) (#33432)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-13 10:43:04 +01:00
ldestailleur
d5384f2777 Fix CI 2025-03-13 10:41:42 +01:00
atm-irvine
d38a985ac3 feat(invoice-rec): new rule_for_lines_dates field - Impl (#33252)
* feat(invoice-rec): new rule_for_lines_dates field - Impl

* fix(html-form-class): added type in phpdoc

* chore: renamed $object to $sourceInvoice for create action

* fix(card-rec): error naming variable $sourceInvoice

* fix phan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-13 10:37:58 +01:00
ldestailleur
c8271e5356 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-13 10:23:58 +01:00
ldestailleur
5540d8c980 Clean code 2025-03-13 10:09:34 +01:00
Jyhere
dc2a08bf07 FIX: bookkeeping/export error when not reconciled option is checked (#33433)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-13 10:00:07 +01:00
ldestailleur
e19b3ffd9e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-13 09:59:19 +01:00
ldestailleur
3404e37aae Fix CI 2025-03-13 09:58:56 +01:00
Frédéric FRANCE
a615275436 add date_creation on llx_session (#33429) 2025-03-12 20:44:47 +01:00
MDW
d64298f6c1 Qual: Fix phan notices (htdocs/compta) (#33427) 2025-03-12 20:41:50 +01:00
Jakub Stříbrný
890b24b17a Add hook when printing button for new card (#33408)
* Add hook for print New Card Button in societe/contact.php

If we use canvas on contact module, we need to add canvas into the URL of the "create" button.

* Add hook for print new card button in societe list

To be able to use contact canvas when clicking on create new contact from thirdparty list.

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-12 20:41:39 +01:00
Mohamed DAOUD
210315fa17 Enhance External Modules Page and Add Pagination (#33414)
* Enhance external modules page

* add trans keys

* fix CI

* Enhance style

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-12 20:40:05 +01:00
MDW
6aa22582eb Qual: Improve db initialisation script (#33417)
# Qual: Improve db initialisation script

Main update: let the prefix depend on the detected version.
Other:
- Include script in checksum to determine if DB needs to be rebuilt.
- Automatically determine all upgrade versions (17.0.0 was missing).

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-12 20:39:54 +01:00
github-actions[bot]
880be18a4d PHPStan > Update baseline (#33409)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-12 20:38:06 +01:00
ldestailleur
b685be67e9 Standardize 2025-03-12 20:09:09 +01:00
warnerbryce
2f36edef3b FIX : PAIEMENT Wrong field displayed for DateChequeReceived (#33390) 2025-03-12 19:29:04 +01:00
Yannis Hoareau
9bf2b187f9 Fix fatal error occuring if fk_parent_line set to false (#33412) 2025-03-12 19:23:56 +01:00
MDW
1d32f66d35 Qual: Fix triggers (#33406)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-12 19:21:51 +01:00
Florian Mortgat
f7fe6c4f1a FIX warnings (#33423)
* FIX warnings

* fix: empty({function call})
2025-03-12 19:15:24 +01:00
Alexandre SPANGARO
a3456bf182 NEW Accountancy - Add centralized account (SQL & migration part) (#33384)
* NEW Accountancy - Add centralized account (SQL & migration part)

* Better request SQL compatible pgsql
2025-03-12 19:14:45 +01:00
ldestailleur
bd0ad59ec8 Fix phpunit 2025-03-12 18:53:36 +01:00
ldestailleur
9eb2f96d38 Clean code 2025-03-12 18:34:17 +01:00
ldestailleur
8d4a3b602d Fix phpunit test export categories 2025-03-12 16:25:56 +01:00
ldestailleur
675fbc2761 FIX Add one more column too much in import 2025-03-12 16:25:40 +01:00
ldestailleur
acf84cec9b Better log 2025-03-12 15:55:11 +01:00
atm-irvine
29adc8d242 fix: thirdparty substitutions var ignored on automatic event (#33393)
* fix: thirdparty substitutions var ignored on automatic event

* avoid fetch_thirdparty if already instance of Societe
2025-03-11 21:43:23 +01:00
atm-corentin
abd95b1681 Fix the update of timespent (#32552) 2025-03-11 20:45:07 +01:00
ldestailleur
0d17d0a478 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-11 17:32:23 +01:00
ldestailleur
2fa9fbdb9a Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-11 17:32:09 +01:00
ldestailleur
2538baa4dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-11 17:31:51 +01:00
ldestailleur
f42b80794f FIX #33405 - Try a better fix including the billed flag 2025-03-11 17:31:41 +01:00
lvessiller-opendsi
98a0dfa1b0 FIX shipment dispatch origin line (#33415) 2025-03-11 17:25:18 +01:00
Alexandre SPANGARO
1d19cbfe1a Fix supplier order tags (#33402) 2025-03-11 17:23:33 +01:00
ldestailleur
89037af953 Fix phpunit 2025-03-11 17:22:39 +01:00
ldestailleur
47af73d891 FIX #33404 - to keep the method findNearest an agnostic method. 2025-03-11 17:19:09 +01:00
sonikf
4bf70b0c2d FIX: #33365 Global search for single shipment (#33401)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 11:41:54 +01:00
ldestailleur
a63d0bf861 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-11 11:13:12 +01:00
ldestailleur
9f655b790c Fix bad var 2025-03-11 10:57:12 +01:00
ldestailleur
f4bee4810e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-11 10:45:36 +01:00
ldestailleur
63dd269dfa SEC FIX Reflected XSS reported by 柏天浩 2025-03-11 10:43:25 +01:00
ldestailleur
a65f699528 FIX Reflected XSS reported by 柏天浩 2025-03-11 10:38:26 +01:00
ldestailleur
620cb5c90a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-11 10:22:05 +01:00
ldestailleur
b45a1c21ee NEW introduce method dolSetCookie 2025-03-11 10:21:45 +01:00
Vincent Maury
68818a451c Fix Deposit percent on new propal (#33395)
When deposit is activated, on new propal deposit percent is'nt proposed, and isn't saved in the propal, causing a display bug in pdf.

I just reported the same modif than in command
2025-03-11 03:27:08 +01:00
Vincent Maury
4d26130212 Fix Deposit percent on new propal (#33395)
When deposit is activated, on new propal deposit percent is'nt proposed, and isn't saved in the propal, causing a display bug in pdf.

I just reported the same modif than in command
2025-03-11 03:26:45 +01:00
Vincent Maury
fcaf26c253 Fk account not saved (#33396)
When bank account is set but there's an error, it's lost

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 03:25:12 +01:00
Vincent Maury
a93ca347c3 Fk account not saved (#33396)
When bank account is set but there's an error, it's lost

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 03:24:52 +01:00
Alexandre SPANGARO
4cb4be3774 NEW Supplier orders - Add tags/categories (#33386)
* NEW Supplier orders - Add tags/categories

* Fix CI

* Fix CI

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 03:20:26 +01:00
ldestailleur
7e40249364 Fix phan 2025-03-11 03:19:09 +01:00
Alexandre SPANGARO
81b5771270 FIX Accountancy simplified - with multiple entities, amount of the entry is multiplied by the number of entities (#33370)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 03:02:50 +01:00
atm-adrien
b9f4ddb021 FIX : Count on supplier invoice list does not match count in DB (#33351) 2025-03-11 03:00:46 +01:00
ldestailleur
6a8e737187 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-11 02:59:52 +01:00
ldestailleur
9a77553e44 Clean code for #33351 - Remove useless distinct, aggregate and join. 2025-03-11 02:59:32 +01:00
Eric - CAP-REL
6f4b2a8905 allow spaces on natural search (#33324)
* allow spaces on natural search like documentation says

* clear comment

* sanitize backport from 19.0

* update sanitize call to be compatible with dolibarr 19.0 backported function
2025-03-11 02:13:06 +01:00
MDW
ee9e89efaa Qual: Fix phan notices (facture/3 + filefunc.inc) (#33383)
* Qual: Fix PhanMismatchType

* Finalize rename of $attrV into $value

* Correct getGlobalString into getGlobalInt

* Do not require some fields in the 'title' definition of $cols

* Qual: Fix phan notices (core/lib)

* Qual: Fix phan (contrat)

* Qual: Fix phan notices (facture/3 + filefunc.in)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 01:59:34 +01:00
MDW
a0f71fbe76 Qual: Fix phan notices (core/lib) (#33379)
* Qual: Fix PhanMismatchType

* Finalize rename of $attrV into $value

* Correct getGlobalString into getGlobalInt

* Do not require some fields in the 'title' definition of $cols

* Qual: Fix phan notices (core/lib)
2025-03-11 01:43:54 +01:00
Frédéric FRANCE
87ccfff7ce update session in db with user id (#33391) 2025-03-11 01:43:36 +01:00
MDW
c0f533865f Fix CI: Do not require some fields in the 'title' definition of $cols (#33399)
* Qual: Fix PhanMismatchType

* Finalize rename of $attrV into $value

* Correct getGlobalString into getGlobalInt

* Do not require some fields in the 'title' definition of $cols
2025-03-11 01:42:49 +01:00
ldestailleur
ec904bd1db Look and feel v22 2025-03-11 01:40:09 +01:00
ldestailleur
9c0276fd38 NEW Can define a different PDF for concatenation for proposal, order and
invoices
2025-03-11 01:35:18 +01:00
ldestailleur
3ee40b748e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-11 00:40:31 +01:00
ldestailleur
a5a82bbb6e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-11 00:40:20 +01:00
ldestailleur
718ef9401a FIX #33360 2025-03-11 00:38:20 +01:00
Frédéric FRANCE
e980b46b0c clean missing translations (#33388) 2025-03-11 00:23:17 +01:00
ldestailleur
141288c1f0 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-10 23:59:19 +01:00
ldestailleur
3de6ed0331 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-10 23:57:15 +01:00
ldestailleur
0b921141b8 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-10 23:56:40 +01:00
ldestailleur
03cbf05f0f FIX Loading of deiveries in shipping card was loading everything 2025-03-10 23:56:04 +01:00
ldestailleur
b129c97363 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-10 23:55:29 +01:00
ldestailleur
ae0da2bf6d Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-10 23:54:10 +01:00
ldestailleur
cfef1b9f53 FIX Loading of deliveries from a shipment was loading everything 2025-03-10 23:53:31 +01:00
ldestailleur
e7c05f744b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-03-10 22:59:51 +01:00
ldestailleur
200fa88e1d FIX Duplicate load of extrafield ->fetch_optionals() 2025-03-10 22:59:35 +01:00
ldestailleur
f7fa2ddf13 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-10 19:48:59 +01:00
ldestailleur
e362f99aa0 Fix serious regression 2025-03-10 19:24:21 +01:00
ldestailleur
f70f623466 Add missing authentication "NONE" into setup. 2025-03-10 18:26:01 +01:00
ldestailleur
a9439d5b99 Add option DELIVERY_PDF_HIDE_SHIPPED and DELIVERY_PDF_HIDE_QTYTOSHIP for
storm template.
2025-03-10 16:28:37 +01:00
ldestailleur
9907a87829 Clean duplicate const 2025-03-10 16:19:45 +01:00
ldestailleur
8bfda88aa8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-10 16:17:39 +01:00
ldestailleur
c9f985f2f9 Clean code 2025-03-10 16:17:29 +01:00
ldestailleur
1bef5ba9b2 Option SHIPPING_PDF_HIDE_QTYTOSHIP supported in merou and espadon
module.
2025-03-10 16:17:18 +01:00
MDW
988fc75ca2 Qual: Fix phan notices (emailcollector, bookkeeping) (#33375)
* Qual: Fix phan notices (mostly propal)

* Fix some const arguments to Form::select_dolusers()

* Update phan baseline

* Qual: Fix phan notices (propal)

* Qual: Fix phan notices (emailcollector, bookkeeping)
2025-03-10 15:47:55 +01:00
Sandro Santilli
d2026b2981 Add mastodon link (#33385)
A per https://pouet.chapril.org/@dolibarr/113569255690960658
2025-03-10 15:47:41 +01:00
github-actions[bot]
9c9d09661c PHPStan > Update baseline (#33380)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-03-10 10:50:24 +01:00
ThomasNgr-OpenDSI
c9a27ae21d NEW : allow stock management by product (#32326)
* Code part

* Code part 2

* Fix : invert a const

* Fix : invert disable/enable stock values

* Fix

* Fix missing column from select inside sql request

* Fix input hidden missing name

* ajout d'un commentaire

* small fixes

* remove unrelated lines

* phpcs

* stickler fix

* pre-commit fixes

* pre-commit fixes

* pre-commit fix

* fix missing translation

* Fix phpstan

* fix winCI

* fix travis

* fix phpstan

* fix travis (hopefully)

* remove useless lines

* relaunch tests

* change stockable_product type from bool to int

* change test in Expeditin::addline() to allow adding a line for product with disabled stock management

* make stock management mandatory for products with batch number

* try to remove PHAN errors

* fix phpstan

* fix phpstan

---------

Co-authored-by: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Co-authored-by: mrozniecki <mrozniecki@easya.solutions>
Co-authored-by: Ulysse Valdenaire <uvaldenaire@easya.solutions>
2025-03-10 10:49:53 +01:00
ldestailleur
6ac206e4e8 Fix regression on auth login. 2025-03-10 01:13:08 +01:00
ldestailleur
45877c8b6d Fix click on alert checkbox in project list 2025-03-10 00:46:07 +01:00
ldestailleur
cffc478b26 FIX Show the default duration of a membership type. 2025-03-10 00:37:54 +01:00
ldestailleur
d670d67668 Disable test when libxml not good. 2025-03-09 23:37:36 +01:00
ldestailleur
8c3b05d607 Clean code 2025-03-09 22:42:59 +01:00
ldestailleur
3658bc20b6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-09 22:29:21 +01:00
ldestailleur
5db341a3e8 Fix phpunit 2025-03-09 22:27:46 +01:00
ldestailleur
1b2522d385 Fix CSS 2025-03-09 22:05:36 +01:00
ldestailleur
64d9b28b70 FIX Blank page on agenda event per user 2025-03-09 21:51:41 +01:00
ldestailleur
f8bdab213c NEW Try to set the tooltip as ajax call by default. 2025-03-09 21:49:30 +01:00
ldestailleur
401ae7b6c3 Fix css on smartphone 2025-03-09 21:42:07 +01:00
ldestailleur
202ffe732e Enhance phpunit tests 2025-03-09 21:26:51 +01:00
ldestailleur
af82f5f1eb Fix set of security option by default 2025-03-08 15:04:57 +01:00
ldestailleur
3e24bbd419 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-08 14:51:36 +01:00
ldestailleur
18a4224e5d Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-08 14:51:04 +01:00
ldestailleur
8e1e242872 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-08 14:41:12 +01:00
ldestailleur
b869e4ba8a Clean code 2025-03-08 14:41:01 +01:00
ldestailleur
02fed7d66f Better implementation for email setup. Close #33356 2025-03-08 14:40:52 +01:00
Lucas Marcouiller
4e99ab02df Fix content website security page (#33363)
* Fix look and feel of website security page and add Wesite card in admin/system/security

* fix error

* fix add gray text on select
2025-03-08 14:22:06 +01:00
github-actions[bot]
c97722c1cc PHPStan > Update baseline (#33368)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-03-08 14:21:33 +01:00
ldestailleur
c3401e5793 Fix typo in test
if class_exists('mysqli')
2025-03-08 14:17:34 +01:00
ldestailleur
8b94a99dd1 Fix contract update method. Add phpunit for TDD. 2025-03-07 16:02:18 +01:00
ldestailleur
ae196154af Fix SQL error 2025-03-07 15:45:20 +01:00
ldestailleur
37056d9420 FIX debug use of hook completeFieldsToSearchAll 2025-03-07 15:22:11 +01:00
ldestailleur
e627c5b096 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-07 15:15:31 +01:00
ldestailleur
a5125bdbd8 FIX Link to country setup on company setup page 2025-03-07 13:38:45 +01:00
ldestailleur
07177fab0a Fix join into implde 2025-03-07 13:15:01 +01:00
ldestailleur
010758a07c Add test on dialog command 2025-03-07 13:12:04 +01:00
ldestailleur
bd537993d1 Fix missing table 2025-03-07 13:11:35 +01:00
ldestailleur
b946439886 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-03-07 12:13:03 +01:00
ldestailleur
2b97ee8d88 Trans 2025-03-07 11:53:15 +01:00
ldestailleur
9e019fba59 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-07 11:34:53 +01:00
ldestailleur
40513d6b08 Better error management 2025-03-07 11:33:41 +01:00
ldestailleur
6ea7f0dfdf Add ucfirst to find module descriptor 2025-03-07 11:26:45 +01:00
Mohamed DAOUD
881b5eb631 FIX #33169 Anyone can cancel vacation requests (#33343)
* fix anyone can cancel

* Fix cancel button visibility based on user permissions

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-07 11:12:00 +01:00
Faisal Azhar
b500efd6ff Update pgsql.class.php - function num_rows (#33358)
to avoid error when $resultset = null or false

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-06 18:14:50 +01:00
ldestailleur
c3c152ea43 Fix ci 2025-03-06 17:19:19 +01:00
ldestailleur
fc07cb07b6 Fix CI 2025-03-06 17:17:12 +01:00
ldestailleur
948f041f46 Fix encoding space for scope must use %20according to OAUTH2 standard 2025-03-06 17:10:53 +01:00
ldestailleur
36bf775842 CSS 2025-03-06 16:49:09 +01:00
ldestailleur
cee3d12305 Clean var 2025-03-06 16:31:26 +01:00
ldestailleur
48e6c70501 Fix urlencode 2025-03-06 16:31:05 +01:00
ldestailleur
89c9347e81 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-06 14:33:07 +01:00
ldestailleur
80d6dda4d5 Doc 2025-03-06 14:32:44 +01:00
dolibarr95
781abe8615 code simplification (#33355)
see https://github.com/Dolibarr/dolibarr/pull/33347
2025-03-06 14:00:17 +01:00
ldestailleur
f29f7035c2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-06 13:53:30 +01:00
ldestailleur
8b40b4611c CSS 2025-03-06 13:53:19 +01:00
ldestailleur
1f0f9cf4a8 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-06 13:38:32 +01:00
ldestailleur
e14b748fa2 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-06 13:38:22 +01:00
EnjoyFelix
8f44b0a974 # FIX The "AfterImportInsert" hook is not triggered during the simulation. #33260 (#33261)
* AfterImport hook in the simulation of the import

* Update import.php

* Update import.php

* Update import.php

---------

Co-authored-by: Elisée Chemin <elisee.chemin@tetras-libre.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-06 13:37:37 +01:00
Laurent Destailleur
7c0d2623c8 Merge pull request #33347 from dolibarr95/patch-77
FIX Variable $includemonday missing
2025-03-06 13:34:10 +01:00
Laurent Destailleur
87e43dcac3 Merge pull request #33354 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-03-06 13:33:35 +01:00
Laurent Destailleur
e852019f31 Merge pull request #33348 from altairisfr/sign_pdf_internal_external
QUAL: Retrieves the name of external or internal PDF
2025-03-06 13:26:15 +01:00
Laurent Destailleur
201424d119 Update date.lib.php 2025-03-06 13:12:34 +01:00
Laurent Destailleur
524ef969e8 Update date.lib.php 2025-03-06 13:12:10 +01:00
ldestailleur
00af0a97e5 Debug v22 2025-03-06 13:08:14 +01:00
Dolibot
558de4424c PHPStan > Update baseline 2025-03-06 12:06:49 +00:00
ldestailleur
23f87e6802 Debug v22 2025-03-06 12:57:21 +01:00
ldestailleur
7aa1046e10 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-06 12:39:14 +01:00
ldestailleur
34ecb66ec6 Debug v22 2025-03-06 12:39:02 +01:00
Laurent Destailleur
1c55388f79 Merge pull request #33307 from YannisHoareau/retrieving-extraparams-for-lines
New Retrieving extraparams for lines
2025-03-06 12:22:10 +01:00
Laurent Destailleur
1810a4fa13 Merge branch 'develop' into retrieving-extraparams-for-lines 2025-03-06 11:34:44 +01:00
ldestailleur
9276042264 Fix CI 2025-03-06 11:34:27 +01:00
Noé Cendrier
583c98f974 Merge pull request #30 from altairis-melina/sign_pdf_internal_external
FIX: Retrieves the name of external or internal PDF
2025-03-06 09:37:16 +01:00
dolibarr95
5d775dcb5d Add $includemonday var
Related to https://www.dolibarr.fr/forum/t/erreur-sur-calcul-de-conges/48690/43?u=dolibarr95
2025-03-06 08:44:39 +01:00
ldestailleur
6bc1f82b8e Look and feel v22 2025-03-06 04:59:59 +01:00
Laurent Destailleur
aad4a2bc7e Merge branch 'develop' into retrieving-extraparams-for-lines 2025-03-06 04:57:15 +01:00
ldestailleur
d20e730c66 Clean code 2025-03-06 04:56:54 +01:00
ldestailleur
7a0e9d4dc1 Accept utf8 chars in the natural_search in mode 3. Close #32930 2025-03-06 04:00:42 +01:00
ldestailleur
996770b8f2 Fix protect use of sanitize to make sql injection 2025-03-06 03:39:47 +01:00
ldestailleur
d42f6dff0e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-06 03:34:56 +01:00
ldestailleur
caead5de9f Fix protect use of sanitize to make sql injection 2025-03-06 03:29:54 +01:00
ldestailleur
72ca805f99 Fix to avoid use of function that will permit sql injection 2025-03-06 02:57:01 +01:00
ldestailleur
ca9763afc1 Fix type int 2025-03-06 02:15:18 +01:00
Laurent Destailleur
bf554f8a11 Merge pull request #33346 from mdeweerd/fix/facture
Qual: Fix phan notices (mostly facture)
2025-03-06 02:14:31 +01:00
Laurent Destailleur
227557b5d4 Merge pull request #33345 from Daoud-mohamed/fix-sendermail-signature
FIX #33206 Custom Email profile signature not applied
2025-03-06 02:11:46 +01:00
ldestailleur
c205358cb2 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-06 02:06:07 +01:00
ldestailleur
8f406d680a FIX Missing ref_ext in group by in list of product 2025-03-06 02:05:44 +01:00
Laurent Destailleur
0e28df3ba0 Merge pull request #33344 from frederic34/patch-11
fix CI
2025-03-06 01:51:04 +01:00
MDW
3f15c5fcb7 Fix phpstan notice 2025-03-05 21:42:17 +01:00
MDW
56e354e112 Qual: Fix phan notices (facture/2) 2025-03-05 21:17:58 +01:00
MDW
cf7b7009ae Fix writeHTMLCell arguments 2025-03-05 21:17:57 +01:00
MDW
941c80d108 Qual: Fix phan notices (facture/1) 2025-03-05 21:17:56 +01:00
Laurent Destailleur
746b7cc23e Merge branch 'develop' into patch-11 2025-03-05 20:56:57 +01:00
Laurent Destailleur
557a0e56ac Merge branch 'develop' into fix-sendermail-signature 2025-03-05 20:55:25 +01:00
ldestailleur
77d2be9087 Fix CI 2025-03-05 20:53:39 +01:00
ldestailleur
4161418381 Clean name of var 2025-03-05 20:51:50 +01:00
Frédéric FRANCE
9a15aeadfc fix 2025-03-05 20:51:39 +01:00
Frédéric FRANCE
a504186323 Merge remote-tracking branch 'upstream/develop' into patch-11 2025-03-05 20:33:30 +01:00
Laurent Destailleur
f413fda6b9 Merge branch 'develop' into fix-sendermail-signature 2025-03-05 20:25:33 +01:00
ldestailleur
66484095e0 Clean code from not used global variable 2025-03-05 20:25:12 +01:00
Frédéric FRANCE
e0cad5adad Merge remote-tracking branch 'origin/patch-11' into patch-11 2025-03-05 20:22:01 +01:00
Laurent Destailleur
36fc58f27c Merge branch 'develop' into fix-sendermail-signature 2025-03-05 20:16:02 +01:00
Frédéric FRANCE
68676d5ac6 no label property on RecruitmentCandidature 2025-03-05 20:00:35 +01:00
Laurent Destailleur
684185d2ac Merge pull request #33336 from frederic34/fix_ci_phpstan_21
fix CI branch 21.0
2025-03-05 19:40:03 +01:00
Laurent Destailleur
04998ec7ec Update actions_sendmails.inc.php 2025-03-05 19:37:47 +01:00
Laurent Destailleur
729e06a95e Update actions_sendmails.inc.php 2025-03-05 19:34:53 +01:00
Laurent Destailleur
93fab3bb4f Update actions_sendmails.inc.php 2025-03-05 19:34:24 +01:00
Laurent Destailleur
c3f3b0a428 Merge branch 'develop' into patch-11 2025-03-05 19:30:29 +01:00
ldestailleur
c135bbfebd Fix warning 2025-03-05 19:29:57 +01:00
Laurent Destailleur
25147b352c Merge branch '21.0' into fix_ci_phpstan_21 2025-03-05 19:20:13 +01:00
ldestailleur
e24ec490a7 Fix bad value of cache delay 2025-03-05 19:15:28 +01:00
ldestailleur
1391c61a64 Remove test, not yet supported in v20 2025-03-05 19:11:34 +01:00
ldestailleur
16418cfda6 Try a fix for migration error on bank line categories with postgres 2025-03-05 19:10:22 +01:00
Frédéric FRANCE
f9f93287ea no label property on RecruitmentCandidature 2025-03-05 18:56:51 +01:00
Frédéric FRANCE
1f9901190c fix CI 2025-03-05 18:36:34 +01:00
Mohamed DAOUD
4cb5939542 fix sendermail signature 2025-03-05 18:34:19 +01:00
Laurent Destailleur
7976188e45 Merge branch '21.0' into fix_ci_phpstan_21 2025-03-05 18:16:59 +01:00
ldestailleur
b058a2c270 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-05 18:15:07 +01:00
ldestailleur
7a995646e1 Fix bad property name 2025-03-05 18:13:20 +01:00
ldestailleur
30dffd6fdd Fix CI warnings 2025-03-05 17:48:41 +01:00
Frédéric FRANCE
ce898cdd4d Merge branch '21.0' into fix_ci_phpstan_21 2025-03-05 16:43:18 +01:00
Laurent Destailleur
952629bb46 Merge pull request #33337 from FHenry/20_fix_php_warning
fix: php warning Attempt to read property piece_num on null in accountancy/class/bookkeeping.class.php on line 373
2025-03-05 16:35:15 +01:00
Laurent Destailleur
955083d6de Update bookkeeping.class.php 2025-03-05 15:34:45 +01:00
Laurent Destailleur
d1263c1256 Update bookkeeping.class.php 2025-03-05 15:34:04 +01:00
Laurent Destailleur
55cb45545e Merge pull request #33299 from thersane-john/fix_20_dogetbutton_tooltip
Fix dolGetButtonAction Tooltip
2025-03-05 15:31:04 +01:00
Jyhere
973a11e1e9 FIX: Warning when getNomUrl is called before top_httphead
If Societe::getNomUrl() is called before top_httphead, this triggers a Cannot modify header warning
2025-03-05 15:10:46 +01:00
Laurent Destailleur
35d0a62085 Merge pull request #33334 from jyhere/patch-27
FIX: Warning when getNomUrl is called before top_httphead
2025-03-05 15:09:52 +01:00
Laurent Destailleur
c3baca7910 Merge pull request #33342 from atm-corentin/FIX_default_VAT_code
FIX|Fix # Set field default vat code because it was not set for Variant product
2025-03-05 15:08:14 +01:00
atm-corentin
6a2616c119 set field default vat code because it was not set for child product 2025-03-05 14:58:21 +01:00
Laurent Destailleur
da8d69e1ab Update functions.lib.php 2025-03-05 14:57:54 +01:00
Laurent Destailleur
e874529873 Merge pull request #33250 from aspangaro/22_catinvoice
NEW Add invoice tags
2025-03-05 14:29:55 +01:00
Laurent Destailleur
43fb67839d Merge pull request #33335 from frederic34/patch-11
enhance formsetup for products
2025-03-05 14:29:11 +01:00
Laurent Destailleur
0e95f70b8d Merge pull request #33329 from am97/fix/18.0/accountancy_code_sort
Fix: sort $aux_account after adding all items
2025-03-05 14:23:46 +01:00
Laurent Destailleur
f64d2829ea Merge pull request #33341 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-03-05 14:21:54 +01:00
Laurent Destailleur
bf45f60de8 Merge pull request #33325 from frederic34/patch-14
fix ajax tooltip
2025-03-05 14:17:11 +01:00
Laurent Destailleur
f5a387138e Merge pull request #33311 from mdeweerd/fix/qual/api
Qual: Fix phan notices in api classes
2025-03-05 14:12:29 +01:00
Frédéric FRANCE
0888fa16ea Merge remote-tracking branch 'upstream/21.0' into fix_ci_phpstan_21 2025-03-05 13:54:23 +01:00
Laurent Destailleur
8dd58e0a18 Merge pull request #33327 from Daoud-mohamed/Fix-external-modules-page
Fix external modules page
2025-03-05 13:48:58 +01:00
Laurent Destailleur
5d338a6b1d Update externalModules.class.php 2025-03-05 13:48:37 +01:00
Laurent Destailleur
ed0d16b04b Merge pull request #33331 from mdeweerd/qual/optimize
Qual: Optimize logo
2025-03-05 13:40:35 +01:00
omogenot
c562c6ebab Add is_numeric condition to check empty values 2025-03-05 13:39:50 +01:00
omogenot
c0c49f53cb Update export_excel2007.modules.php
Fix Excel Export for zero values
2025-03-05 13:39:29 +01:00
Laurent Destailleur
9fd42ab67e Merge pull request #33265 from omogenot/Fix-Excel-Export
Fix Excel Export of zero values
2025-03-05 13:38:46 +01:00
Laurent Destailleur
c98937b8aa Merge pull request #33318 from Quentin-Seekness/patch-22
Add trigger on deleteMvtNum method in bookkeeping.class.php
2025-03-05 13:37:06 +01:00
MDW
04fd52cd70 Update baseline 2025-03-05 13:32:45 +01:00
John BOTELLA
4b640e4cad Add params 2025-03-05 13:29:47 +01:00
MDW
4cc09b5149 Qual: Ignore phpstan notices requiring deeper analysis 2025-03-05 13:22:17 +01:00
MDW
f625f8de60 Qual: Fix api phan notices 2025-03-05 13:22:08 +01:00
MDW
eac44b164a Qual: Fix phpdoc index(), FIELDS 2025-03-05 13:21:05 +01:00
omogenot
f960a6c6a4 Add is_numeric condition to check empty values 2025-03-05 13:16:30 +01:00
Dolibot
647a8c122d PHPStan > Update baseline 2025-03-05 12:10:26 +00:00
Frédéric FRANCE
d4734effc9 fix CI branch 21.0 2025-03-05 13:08:42 +01:00
Laurent Destailleur
41377a9917 Merge pull request #33313 from mdeweerd/phan/big_violators
Fix PhanTypeMismatchArgument in commonobject, commande/card,
2025-03-05 13:05:42 +01:00
ldestailleur
6c9e25677c close #33310 2025-03-05 13:03:35 +01:00
ldestailleur
0ef806e15a Close #33309 2025-03-05 12:58:04 +01:00
ldestailleur
739bda4fc4 Fix remove status for kanban tr (there is only 1 tr for all invoices) 2025-03-05 12:52:02 +01:00
Laurent Destailleur
63278a3c53 Merge pull request #33308 from iouston/patch-13
add status class
2025-03-05 12:47:36 +01:00
ldestailleur
8162a78ce8 Removed deprecated code 2025-03-05 12:42:50 +01:00
MDW
c2c44272fb Qual: Optimize logo 2025-03-05 12:37:57 +01:00
Mohamed DAOUD
6631ec1d41 Merge branch 'develop' into Fix-external-modules-page 2025-03-05 12:23:27 +01:00
Laurent Destailleur
2b9e6fdc03 Merge branch 'develop' into retrieving-extraparams-for-lines 2025-03-05 12:17:02 +01:00
Laurent Destailleur
04d482e8fc Merge pull request #33340 from atm-jonathan/FIX_ERROR_PARAMS_DB_TOO_LONG
Error "StripeCusNotFound" page payment
2025-03-05 12:16:14 +01:00
MDW
4096d0ee2f Qual: Fix phan notices for commande 2025-03-05 12:15:14 +01:00
MDW
b91f457afb Update phan baseline 2025-03-05 12:15:13 +01:00
MDW
acf6b62822 Fix PhanTypeMismatchArgument in commonobject, commande/card, 2025-03-05 12:15:12 +01:00
Laurent Destailleur
f6f9b8379c Merge branch 'develop' into patch-13 2025-03-05 12:08:35 +01:00
ldestailleur
b236eb8799 Fix CI 2025-03-05 12:08:22 +01:00
Mohamed DAOUD
7d669a2d3c Merge branch 'develop' into Fix-external-modules-page 2025-03-05 11:24:13 +01:00
Florian HENRY
ef97849883 fix: php warning Attempt to read property piece_num on null in accountancy/class/bookkeeping.class.php on line 373 2025-03-05 10:50:44 +01:00
Frédéric FRANCE
6ccca59ad5 Update list.php 2025-03-05 10:48:52 +01:00
Frédéric FRANCE
26f966758f fix CI branch 21.0 2025-03-05 10:36:50 +01:00
Frédéric FRANCE
6fe3dfb031 fix CI branch 21.0 2025-03-05 10:29:47 +01:00
Frédéric FRANCE
3ba697892f fix CI branch 21.0 2025-03-05 10:20:03 +01:00
Frédéric FRANCE
73b0a6bda1 enhance formsetup for products 2025-03-05 10:05:05 +01:00
Jyhere
82491e8568 FIX: Warning when getNomUrl is called before top_httphead
If Societe::getNomUrl() is called before top_httphead, this triggers a Cannot modify header warning
2025-03-05 09:30:15 +01:00
Laurent Destailleur
e0c5c0dc7f Merge branch 'develop' into patch-13 2025-03-04 23:42:54 +01:00
ldestailleur
c2fac2598f Fix CI 2025-03-04 23:42:42 +01:00
Laurent Destailleur
66b2f7f15e Merge branch 'develop' into patch-13 2025-03-04 23:36:26 +01:00
ldestailleur
862fffec24 Ignore warning 2025-03-04 23:36:13 +01:00
ldestailleur
15535b5356 Clean code 2025-03-04 23:32:58 +01:00
Laurent Destailleur
8a05e8f09c Merge branch 'develop' into patch-13 2025-03-04 23:23:24 +01:00
ldestailleur
cde6124a5b Fix phpunit 2025-03-04 23:23:04 +01:00
ldestailleur
2a4d385b3d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-04 23:15:00 +01:00
ldestailleur
72ee11ed96 Add option to enable/disable an external source 2025-03-04 23:14:51 +01:00
Laurent Destailleur
3f7329a18e Merge branch 'develop' into patch-13 2025-03-04 22:58:49 +01:00
Laurent Destailleur
dd32c98e9a Merge branch 'develop' into retrieving-extraparams-for-lines 2025-03-04 22:58:40 +01:00
Laurent Destailleur
fe3df5e383 Merge pull request #33320 from frederic34/patch-11
add missing translation
2025-03-04 22:58:06 +01:00
ldestailleur
b8301b52c2 Clean code 2025-03-04 22:56:05 +01:00
ldestailleur
8949560047 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-04 22:42:53 +01:00
ldestailleur
f7cf9225c4 Debug module scanner 2025-03-04 22:42:40 +01:00
ldestailleur
91811b8335 Debug remote sources 2025-03-04 22:00:05 +01:00
ldestailleur
af83081d15 CSS 2025-03-04 21:59:53 +01:00
Laurent Destailleur
121c618d45 Merge pull request #33317 from frederic34/imgpicto_info_black
modify info_black picto
2025-03-04 21:42:50 +01:00
ldestailleur
37888b801d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-04 21:42:16 +01:00
ldestailleur
a1e73ce60b Fix phpunit 2025-03-04 21:42:07 +01:00
Laurent Destailleur
b7d6d0c37f Merge pull request #33314 from atm-irvine/new_completeFieldsToSearchAll_hook_thirdparty_list
NEW hook completeFieldsToSearchAll on thirdparty list
2025-03-04 21:37:23 +01:00
ldestailleur
d9ca6162c8 Missing trans 2025-03-04 21:37:11 +01:00
Laurent Destailleur
f50a0aa7f8 Merge branch 'develop' into retrieving-extraparams-for-lines 2025-03-04 21:35:01 +01:00
Laurent Destailleur
13db8a9827 Merge branch 'develop' into patch-13 2025-03-04 21:34:02 +01:00
ldestailleur
14000c46e7 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-04 21:33:15 +01:00
ldestailleur
bf0a594427 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-04 21:31:50 +01:00
ldestailleur
faf9ae771e Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-04 21:31:23 +01:00
ldestailleur
14ce4060a8 Fix CI 2025-03-04 21:31:08 +01:00
ldestailleur
c2a0446288 Fix var for cachedelay 2025-03-04 21:28:11 +01:00
ldestailleur
86f836b652 Merge backport 2025-03-04 21:27:10 +01:00
ldestailleur
c35550d89c Fix var for cachedelay 2025-03-04 21:23:23 +01:00
ldestailleur
7d8fd29f63 Fix var in log 2025-03-04 21:18:29 +01:00
ldestailleur
bcd1f49bc4 Fix var in log 2025-03-04 21:17:35 +01:00
ldestailleur
04b0b3d855 FIX in dev for #33324 2025-03-04 20:50:54 +01:00
Mohamed DAOUD
e6784e1dd8 fix CI 2025-03-04 18:09:40 +01:00
Mohamed DAOUD
4c749fe5cd Fix Phan 2025-03-04 17:38:07 +01:00
Andrés Maldonado
dd7189b1d0 Fix: sort $aux_account after adding all items
Currently, some items are added to $aux_account, then the array is
sorted, then more items are added. In the end, the list visible in the
UI is not sorted.
2025-03-04 17:28:27 +01:00
x
5c58ab7626 error params createTaxId() $this->db->escape() 2025-03-04 17:25:37 +01:00
Mohamed DAOUD
97aabd486b fix missing translation 2025-03-04 17:01:31 +01:00
Mohamed DAOUD
86cf64936b Fix external modules page 2025-03-04 16:48:26 +01:00
Frédéric FRANCE
af93e6d39f fix ajax tooltip 2025-03-04 16:20:30 +01:00
Frédéric FRANCE
f258fa89ab add missing translation 2025-03-04 11:24:09 +01:00
Laurent Destailleur
709186dfa5 Merge pull request #33319 from EchoLoGeek/20.0
Fix updateline method for INVOICE_USE_SITUATION = 2
2025-03-04 11:12:45 +01:00
Frédéric FRANCE
5e87016c3d modify info_black picto 2025-03-04 11:06:16 +01:00
EchoLoGeek
146bd33e90 Fix updateline method for INVOICE_USE_SITUATION = 2
If there is no progress on a line, percent must not be 100%
2025-03-04 11:00:24 +01:00
Quentin-Seekness
89ff86504b Fix precommit 2025-03-04 10:53:29 +01:00
Quentin-Seekness
09d0f83865 Pre-commit fix 2025-03-04 10:49:36 +01:00
Quentin-Seekness
a59248b8d3 Add trigger on deleteMvtNum method in bookkeeping.class.php
Simply adding a missing trigger on deletion
2025-03-04 10:39:11 +01:00
Frédéric FRANCE
dc596021d2 modify info_black picto 2025-03-04 10:36:24 +01:00
Yannis Hoareau
3e9b2b2f2b Merge branch 'develop' into retrieving-extraparams-for-lines 2025-03-04 08:02:34 +00:00
Irvine Fleith
754de7ff6e feat(thirdparty): created new hook completeFieldsToSearchAll on list to allow completing fieldToSearchAll array 2025-03-04 07:38:10 +01:00
ldestailleur
14bc9d3ab0 Trans 2025-03-03 20:46:12 +01:00
ldestailleur
a3fd9b78d0 Debug v22 2025-03-03 20:10:39 +01:00
iouston
7e142374d2 add status class 2025-03-03 17:45:53 +01:00
yannis
e70fe9c40d Merge branch 'develop' of github.com:Dolibarr/dolibarr into retrieving-extraparams-for-lines 2025-03-03 17:15:30 +01:00
yannis
2418489d1c Fix typo 2025-03-03 17:08:04 +01:00
ldestailleur
fc0cbc582d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-03 17:01:03 +01:00
ldestailleur
f8f9a81f9b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-03 17:00:48 +01:00
yannis
3519174adf Added retrieving extraparams for some object lines 2025-03-03 16:57:32 +01:00
Laurent Destailleur
6fe94c6441 Merge pull request #33305 from frederic34/patch-11
remove duplicate
2025-03-03 16:54:51 +01:00
Laurent Destailleur
3a71de8bfc Merge pull request #33301 from EchoLoGeek/develop
Remain to pay in multicurrency
2025-03-03 16:48:57 +01:00
Frédéric FRANCE
b741ab4cfc remove duplicate 2025-03-03 16:39:27 +01:00
Laurent Destailleur
e78c327031 Merge pull request #33296 from aspangaro/22_hook
NEW Invoice - Document - Add hook on action
2025-03-03 16:33:49 +01:00
Laurent Destailleur
a0776ce2e1 Merge pull request #33297 from aspangaro/22_fix20716
FIX #20716 Upload SVG in editor
2025-03-03 16:33:22 +01:00
Laurent Destailleur
a90f0863de Update company.php 2025-03-03 16:33:03 +01:00
Laurent Destailleur
80139f1a2b Merge pull request #33298 from frederic34/dateofbith_translation
add missing translation
2025-03-03 16:31:08 +01:00
Laurent Destailleur
3045af51e7 Merge pull request #33300 from jyhere/patch-26
FIX: migration file Update 21.0.0-22.0.0.sql syntax error
2025-03-03 16:30:54 +01:00
Laurent Destailleur
b02b4893d6 Merge pull request #33303 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-03-03 16:29:41 +01:00
Laurent Destailleur
b89a58696e Merge pull request #33304 from Daoud-mohamed/fix-get-yaml-file
Fix cache directory check in getRemoteYamlFile method
2025-03-03 16:29:29 +01:00
yannis
cf83c6668e Retrieve extraparams from db to objectline 2025-03-03 16:01:38 +01:00
Mohamed DAOUD
284c2850e5 Fix cache directory check in getRemoteYamlFile method 2025-03-03 15:03:15 +01:00
Frédéric FRANCE
35d6bc8409 add missing translation 2025-03-03 14:40:30 +01:00
Dolibot
cc71865f3c PHPStan > Update baseline 2025-03-03 12:06:49 +00:00
EchoLoGeek
580e422bf5 fix spaces 2025-03-03 11:39:18 +01:00
Jyhere
09a31362da FIX ; 21.0.0-22.0.0.sql sql error in some case
FIX the following error if Dolibarr first installed version was <= 3.5 : 
Cannot drop index 'uk_customer_price_fk_product_fk_soc': needed in a foreign key constraint
2025-03-03 11:27:48 +01:00
EchoLoGeek
31d8a66a1c Remain to pay in multicurrency
If I want to have the remainder to pay in foreign currency, I must deduct it from the amount in multicurrency, not the amount in conf->currency
2025-03-03 11:24:33 +01:00
Jyhere
2003a5c263 FIX: migration file Update 21.0.0-22.0.0.sql syntax error
Fix the following DB errors when updating : 
DB_ERROR_SYNTAX (Req 70): ALTER TABLE llx_product_customer_price DROP CONSTRAINT fk_product_customer_price_fk_product;
DB_ERROR_SYNTAX (Req 71): ALTER TABLE llx_product_customer_price DROP CONSTRAINT fk_product_customer_price_fk_soc;
2025-03-03 10:54:19 +01:00
John BOTELLA
5fad2c3a14 Fix dolGetButton Tooltip 2025-03-03 10:15:25 +01:00
Frédéric FRANCE
3e2d57c19a add missing translation 2025-03-03 10:05:07 +01:00
Frédéric FRANCE
7e03e72790 add missing translation 2025-03-03 10:02:08 +01:00
Alexandre SPANGARO
3c223f82c3 FIX #20716 Upload SVG in editor 2025-03-03 06:49:58 +01:00
Alexandre SPANGARO
c462a03683 Merge branch 'develop' into 22_catinvoice 2025-03-03 06:27:02 +01:00
Alexandre SPANGARO
f4244f4466 NEW Invoice - Document - Add hook on action 2025-03-03 06:24:28 +01:00
ldestailleur
5ebd1921ed NEW Upgrade TCPDI 1.0 into TCPDI 1.1 + custom fixes 2025-03-03 05:11:14 +01:00
ldestailleur
4abab4ee4b Removed $conf 2025-03-03 04:00:42 +01:00
ldestailleur
d8c473a9eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-03 03:46:53 +01:00
ldestailleur
626d0d44db Fix warning 2025-03-03 03:45:14 +01:00
Laurent Destailleur
0dba10fb1e Merge pull request #33294 from frederic34/patch-14
fix CI
2025-03-03 00:50:18 +01:00
Laurent Destailleur
a6940637f6 Merge pull request #33293 from mdeweerd/fix/qual/api
Qual: Fix phan notices in api files
2025-03-03 00:50:06 +01:00
Alexandre SPANGARO
e22f2d5cbf Merge branch 'develop' into 22_catinvoice 2025-03-02 22:21:05 +01:00
Alexandre SPANGARO
87b9305f1a Fix feedback 2025-03-02 22:10:46 +01:00
Frédéric FRANCE
04abf3424c fix CI 2025-03-02 22:02:42 +01:00
MDW
c1533bb4aa Fix ci - TYPE_CREDITNOTE -> TYPE_CREDIT_NOTE 2025-03-02 20:54:16 +01:00
MDW
6b9361d252 Fix phpstan notices 2025-03-02 20:49:48 +01:00
MDW
157cb410ef Update baseline 2025-03-02 20:49:47 +01:00
MDW
035ede5874 Qual: Fix phan notices in API classes 2025-03-02 20:49:46 +01:00
MDW
c02293a880 Qual: Add phpdoc for request_data param 2025-03-02 20:49:45 +01:00
Laurent Destailleur
21e5457e19 Merge pull request #30244 from altairisfr/homemenu
NEW : use specific landing page to home menu entry
2025-03-02 20:42:34 +01:00
ldestailleur
6f3150182a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-02 20:06:00 +01:00
ldestailleur
19ff066f99 Close #32233 2025-03-02 20:05:44 +01:00
Laurent Destailleur
2b9690d485 Update eldy.lib.php 2025-03-02 19:59:22 +01:00
Laurent Destailleur
9a860da1da Update eldy.lib.php 2025-03-02 19:57:12 +01:00
Laurent Destailleur
0b787a97a5 Merge pull request #30530 from kubajznik/profid-societe
FIX add professional id 7-10 to mysoc
2025-03-02 19:44:38 +01:00
ldestailleur
99170f3812 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-02 18:18:13 +01:00
ldestailleur
3c9b446af7 Move cache file into a temporary directory. 2025-03-02 18:17:54 +01:00
Laurent Destailleur
01d7e2d9f7 Merge pull request #33291 from alexandre-janniaux/regexpsql-traceabledb
TraceableDB: add missing regexpsql() wrapper
2025-03-02 17:03:20 +01:00
Laurent Destailleur
88781e0b2d Merge pull request #33289 from aspangaro/22_propalsql
Propal class - Update SQL
2025-03-02 17:02:19 +01:00
Laurent Destailleur
7cf7afcddc Merge pull request #33283 from frederic34/phpstan_collab
fix phpstan
2025-03-02 17:00:34 +01:00
ldestailleur
ac5d5aeb91 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-03-02 15:29:14 +01:00
Alexandre Janniaux
a847099e00 TraceableDB: add missing regexpsql() wrapper
The TraceableDB must also redirect to the underlying database object for
regexpsql queries, otherwise, a DoliDBPgsql DB with the debugbar enabled
would try to use REGEXP() commands which are not supported on
Postgresql.
2025-03-02 15:00:53 +01:00
Alexandre SPANGARO
3931aa7675 Propal class - Update SQL 2025-03-02 08:10:24 +01:00
Frédéric France
b387e37984 fix phan 2025-03-01 21:01:27 +01:00
Frédéric France
fcb3e658f7 fix phan 2025-03-01 20:51:07 +01:00
Frédéric France
45e3a92b0e fix phan 2025-03-01 20:41:58 +01:00
Frédéric France
13b1705503 fix phan 2025-03-01 20:32:33 +01:00
Frédéric France
4b1c971261 Merge remote-tracking branch 'upstream/develop' into phpstan_collab 2025-03-01 20:26:09 +01:00
Frédéric France
9b4dbc2282 fix phan 2025-03-01 20:21:51 +01:00
Frédéric France
d94333fa75 fix phan 2025-03-01 20:09:52 +01:00
Frédéric France
43d9a7d086 fix phan 2025-03-01 20:00:51 +01:00
Frédéric France
598af6576c fix phan 2025-03-01 20:00:34 +01:00
ldestailleur
64b3538f93 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-01 18:20:31 +01:00
ldestailleur
84cbf15642 Fix doc 2025-03-01 18:20:19 +01:00
Frédéric France
ee53c4e004 fix phan 2025-03-01 17:55:47 +01:00
Frédéric France
5869a633e4 Merge remote-tracking branch 'upstream/develop' into phpstan_collab 2025-03-01 17:44:33 +01:00
Frédéric France
7fb0b353df fix phan 2025-03-01 17:20:23 +01:00
Laurent Destailleur
de12a67f98 Merge pull request #33286 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-03-01 17:14:01 +01:00
Laurent Destailleur
cdd0d8332f Merge pull request #33285 from frederic34/patch-11
fix external module cache
2025-03-01 17:13:44 +01:00
Frédéric France
17358bb6e4 fix phan 2025-03-01 16:35:22 +01:00
Frédéric France
0ec7241b2d fix phan 2025-03-01 16:25:22 +01:00
Frédéric France
915c025aef fix phan 2025-03-01 15:42:29 +01:00
Frédéric France
6bef687cfd Merge remote-tracking branch 'upstream/develop' into phpstan_collab 2025-03-01 15:23:50 +01:00
Frédéric France
e9eed123d9 fix phan 2025-03-01 15:23:18 +01:00
Laurent Destailleur
be65ab0650 Merge pull request #33211 from mdeweerd/fix/ci.2025.2.25
Qual: Fix phan notices in functions.lib.php
2025-03-01 14:57:27 +01:00
MDW
0533c28d56 Qual: Fix getLibStatut notices with type hinting 2025-03-01 13:10:45 +01:00
Dolibot
70e37e3cef PHPStan > Update baseline 2025-03-01 12:06:11 +00:00
MDW
c18f84d948 Update phan baseline 2025-03-01 12:05:48 +01:00
Frédéric FRANCE
6f3afe4576 fix external module cache 2025-03-01 11:55:18 +01:00
MDW
586a28f879 Qual: Fix new false positives in hookmanager 2025-03-01 11:48:30 +01:00
MDW
746dc67556 Qual: Allow notices for functions.lib.php 2025-03-01 11:48:29 +01:00
MDW
116913abeb Qual: Fix unmatchedArgment* 2025-03-01 11:48:28 +01:00
MDW
d7c926a08b Qual: PHPdoc for anonymous function 2025-03-01 11:48:27 +01:00
Frédéric France
f7a4ce3b5f fix phpstan 2025-03-01 11:04:07 +01:00
Alexandre SPANGARO
a71ae83f2a Merge branch 'develop' into 22_catinvoice 2025-03-01 10:30:08 +01:00
Frédéric France
5c740cce6d fix phpstan 2025-03-01 10:10:40 +01:00
Frédéric France
fab85fc0ec fix phpstan 2025-03-01 09:35:27 +01:00
Laurent Destailleur
8bec32aff2 Update SECURITY.md 2025-03-01 02:24:55 +01:00
Laurent Destailleur
abb4b23dfc Merge pull request #33141 from Easya-Solutions/qual-setup-disable-stock-calculate-on
QUAL setup disable stock calculate on rules
2025-03-01 00:59:53 +01:00
Laurent Destailleur
95cd3ebdda Merge pull request #33223 from OPEN-DSI/develop_new_customer_price_period_and_discount_sql
NEW: Add management of date begin/end and discount for a customer price (SQL)
2025-03-01 00:48:42 +01:00
Laurent Destailleur
e3b52283af Merge pull request #33225 from OPEN-DSI/develop_new_customer_price_period_and_discount
NEW: Add management of date begin/end and discount for a customer price (Code)
2025-03-01 00:44:26 +01:00
Laurent Destailleur
f89e238223 Merge pull request #33249 from mdeweerd/phan/website
Qual: Fix phan notices (website)
2025-03-01 00:41:03 +01:00
Laurent Destailleur
7830d65858 Merge pull request #33266 from frederic34/2025_02_27_fix_phpstan
fix phpstan
2025-03-01 00:18:27 +01:00
Laurent Destailleur
3badfffd9f Merge pull request #33267 from mdeweerd/fix/phan/dolibarrmodules
Qual: Fix DolibarrModules::_init phpdoc type
2025-03-01 00:17:09 +01:00
Laurent Destailleur
8848234fb1 Merge pull request #33271 from Jonathanbtq/patch-1
New hooks expedition PDF espadon
2025-03-01 00:13:28 +01:00
Laurent Destailleur
9c7c428cc2 Merge pull request #33272 from jyhere/patch-25
FIX : show / edit the use_default column from VAT dict
2025-03-01 00:12:48 +01:00
Laurent Destailleur
6aa1bcfbbb Merge pull request #33280 from mdeweerd/fix/phan/workstation
Qual: Fix phan notices (workstation)
2025-02-28 23:55:38 +01:00
Laurent Destailleur
fa72bb721a Merge pull request #33274 from hregis/fix_dev_avoid_overwrite_user
FIX avoid overwrite the current user object
2025-02-28 16:55:34 +01:00
Laurent Destailleur
9a4fa6e677 Merge pull request #33270 from hregis/fix_dev_missing_sepa_for_fresh_install
FIX missing sepa country + alphabetical order
2025-02-28 16:34:52 +01:00
Laurent Destailleur
05951b8faa Merge pull request #33278 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-02-28 16:28:57 +01:00
Kamel Khelifa
bbfb4e7882 Corrections 2025-02-28 14:39:45 +01:00
MDW
14d68131de Qual: Fix phan notices (workstation) 2025-02-28 14:39:00 +01:00
Dolibot
3dbeeca732 PHPStan > Update baseline 2025-02-28 12:07:07 +00:00
Regis Houssin
b703abfda5 FIX avoid overwrite the current user object 2025-02-28 11:22:30 +01:00
Jyhere
6093eff2a5 FIX : show / edit the use_default column from VAT dict 2025-02-28 11:01:32 +01:00
Jyhere
73b64d0677 FIX : show / edit the use_default column from VAT dict
Allowing user to configure the default vat displayed when creating a product.
2025-02-28 10:58:27 +01:00
JonathanBtq
ee8fe3a324 New hooks expedition PDF espadon
I add the PrintPDFline hook on expedition espadon PDF
2025-02-28 10:57:36 +01:00
Frédéric FRANCE
6dc6522ef5 Merge branch 'develop' into 2025_02_27_fix_phpstan 2025-02-28 10:42:06 +01:00
Kamel Khelifa
682502b2e6 Corrections 2025-02-28 09:49:53 +01:00
Kamel Khelifa
ce1b38e984 Corrections 2025-02-28 09:48:29 +01:00
Kamel Khelifa
6ae3500244 Corrections 2025-02-28 09:36:41 +01:00
Kamel Khelifa
6364b04073 Merge branch 'develop_new_customer_price_period_and_discount_sql' of github.com:OPEN-DSI/dolibarr into develop_new_customer_price_period_and_discount_sql 2025-02-28 09:35:05 +01:00
Kamel Khelifa
ddddb9ab81 Corrections 2025-02-28 09:34:33 +01:00
kkhelifa-opendsi
a3ed540280 Merge branch 'develop' into develop_new_customer_price_period_and_discount_sql 2025-02-28 09:08:39 +01:00
Regis Houssin
18b78a2e5a FIX missing sepa country + alphabetical order 2025-02-28 07:59:13 +01:00
Laurent Destailleur
fbf072e95a Merge pull request #31960 from sonikf/sonikf-patch-salary-clone
NEW: Add also start date fill buttons for salary clone
2025-02-28 04:30:09 +01:00
Laurent Destailleur
30a7e502d4 Merge pull request #33263 from hregis/fix_dev_missing_sepa_for_fresh_install
FIX missing sepa values for fresh install
2025-02-28 04:22:11 +01:00
Frédéric France
0a46096daa fix phpstan 2025-02-27 19:59:44 +01:00
MDW
1608b66742 Qual: Fix DolibarrModules::_init phpdoc type 2025-02-27 18:57:03 +01:00
Frédéric France
31dcb9d99c fix phpstan 2025-02-27 18:49:23 +01:00
Frédéric France
c1803a6e6a fix phpstan 2025-02-27 18:46:46 +01:00
Frédéric France
0d6d28d066 fix phpstan 2025-02-27 18:36:09 +01:00
omogenot
9bc2d08ab1 Update export_excel2007.modules.php
Fix Excel Export for zero values
2025-02-27 17:21:31 +01:00
Regis Houssin
902808b177 FIX missing sepa values for fresh install 2025-02-27 16:31:56 +01:00
ldestailleur
472972a670 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-27 16:17:47 +01:00
ldestailleur
262a87e033 Fix deprecated patch command for rpm 2025-02-27 16:17:38 +01:00
Laurent Destailleur
6b1c37059a Merge pull request #33259 from defrance/patch-487955
php V8 warning : code_compta not in query (renamed)
2025-02-27 15:47:29 +01:00
Laurent Destailleur
91c73cc673 Merge pull request #33256 from altairisfr/fix_msg_customer_packaging
NEW: Success message when add a product line that has packaging
2025-02-27 15:46:36 +01:00
Laurent Destailleur
04643d6516 Merge pull request #33253 from atm-irvine/FIX/REMOVED_USELESS_FETCH_PRODUCT
fix(facture): removed useless fetch product
2025-02-27 15:46:16 +01:00
Laurent Destailleur
426671fc2b Merge branch 'develop' into FIX/REMOVED_USELESS_FETCH_PRODUCT 2025-02-27 15:27:46 +01:00
Laurent Destailleur
1941404e19 Merge branch 'develop' into 22_catinvoice 2025-02-27 15:27:11 +01:00
Laurent Destailleur
7cae746556 Merge branch 'develop' into phan/website 2025-02-27 15:26:40 +01:00
Laurent Destailleur
3b4215e242 Merge pull request #33246 from mdeweerd/fix/phan/webservices
Qual: Fix phan (webservices) + new phan notices
2025-02-27 15:24:20 +01:00
Laurent Destailleur
ae4caa54e1 Merge pull request #33248 from aspangaro/22_dictsepa
NEW Dictionnary - Manage countries of SEPA Area
2025-02-27 15:22:52 +01:00
Laurent Destailleur
6adac3d5c5 Merge pull request #33258 from frederic34/patch-11
fix CI
2025-02-27 15:22:22 +01:00
Frédéric FRANCE
dbcfd2eadb Update pdf_cornas.modules.php 2025-02-27 14:17:30 +01:00
Laurent Destailleur
31cd3d7eb2 Merge branch 'develop' into patch-11 2025-02-27 13:59:55 +01:00
ldestailleur
ed9d616c35 Fix phpstan 2025-02-27 13:59:43 +01:00
Charlène Benke
c253abb6b1 php V8 warning : code_compta not in query (renamed) 2025-02-27 12:14:23 +01:00
Frédéric FRANCE
6be225c373 fix CI 2025-02-27 12:13:01 +01:00
MDW
32bf8c5cd5 Qual: Fix phan notices (website) 2025-02-27 11:40:42 +01:00
Noé Cendrier
08327dd08b Merge pull request #29 from altairis-melina/fix_msg_customer_packaging
FIX: Success message when add a product line that has packaging
2025-02-27 10:31:40 +01:00
Alexandre SPANGARO
7eb0f22084 CI 2025-02-27 10:01:05 +01:00
Alexandre SPANGARO
dfc72d4028 CI 2025-02-27 09:45:19 +01:00
Alexandre SPANGARO
fab5a0693a CI 2025-02-27 09:37:55 +01:00
Alexandre SPANGARO
98461cc957 CI 2025-02-27 09:34:59 +01:00
Alexandre SPANGARO
5a5eb35c0c Translate 2025-02-27 09:15:31 +01:00
Irvine Fleith
bcc830e33c fix(facture): removed useless fetch product 2025-02-27 07:28:55 +01:00
Alexandre SPANGARO
d58fbd8eb4 NEW Add invoice tags 2025-02-27 06:51:00 +01:00
Laurent Destailleur
65a194650b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-27 02:28:28 +01:00
Laurent Destailleur
0b3d3c3a2b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-27 02:06:35 +01:00
Laurent Destailleur
700d5fedc7 Fix var_dump 2025-02-27 00:06:05 +01:00
Laurent Destailleur
690598bf11 FIX Security Path transversal with modulepart=medias 2025-02-27 00:01:59 +01:00
Alexandre SPANGARO
08c98f8e11 Fix td 2025-02-26 23:12:07 +01:00
Alexandre SPANGARO
c14514d9f3 NEW Dictionnary - Manage countries of SEPA Area 2025-02-26 23:07:59 +01:00
MDW
d2328ef852 Qual: Fix webservices + new phan notice 2025-02-26 21:21:15 +01:00
Laurent Destailleur
4d093451ab Merge pull request #33242 from YannisHoareau/extraparams-for-object-lines
NEW : Add extraparams for object lines
2025-02-26 20:09:23 +01:00
Laurent Destailleur
b04a09a779 Merge branch 'develop' into extraparams-for-object-lines 2025-02-26 20:07:53 +01:00
Laurent Destailleur
9c5ce00244 Merge pull request #33245 from frederic34/missing_centimes_translation
add missing translation
2025-02-26 19:49:53 +01:00
Laurent Destailleur
3b3db28880 Merge pull request #33244 from frederic34/phpstan_fix_2025_02-26
fix phpstan
2025-02-26 19:49:37 +01:00
Laurent Destailleur
ae5051b87d Merge pull request #33240 from frederic34/patch-11
fix price for forms
2025-02-26 19:48:59 +01:00
Frédéric FRANCE
29545a3819 add missing translation 2025-02-26 18:49:22 +01:00
Frédéric FRANCE
5d8401ae7c add missing translation 2025-02-26 18:44:16 +01:00
Frédéric FRANCE
61f97b825e fix phpstan 2025-02-26 18:37:51 +01:00
Frédéric FRANCE
eb74942a4f fix phpstan 2025-02-26 18:35:21 +01:00
Frédéric FRANCE
a244c2531f fix phpstan 2025-02-26 18:33:39 +01:00
Laurent Destailleur
d3422ed6d9 Merge pull request #33237 from atm-irvine/new_invoice_rec_billing_term_field_db
feat(invoice-rec): new rule_for_lines_dates field - DB
2025-02-26 17:49:32 +01:00
Laurent Destailleur
a878969879 Merge pull request #33234 from mdeweerd/phan/webportal
Qual: Fix phan notices in webportal
2025-02-26 17:46:36 +01:00
Laurent Destailleur
50b2127d79 Merge pull request #33233 from Daoud-mohamed/manage-community-repository-as-a-source
New Manage dolibarr-community-modules Repository As A Source Of Modules
2025-02-26 17:43:10 +01:00
Laurent Destailleur
71aa7a54d7 Merge pull request #33231 from frederic34/add_missing_translation_takepos
Add missing translation
2025-02-26 17:39:26 +01:00
Laurent Destailleur
f769ea71be Merge pull request #33228 from jonathan-stimactiv/develop
FIX #33226 Bad "Back" link for price expression editor
2025-02-26 17:36:47 +01:00
ldestailleur
f928cda37b Fix param name 2025-02-26 17:32:15 +01:00
Laurent Destailleur
8c2eecd8aa Merge pull request #33224 from jyhere/patch-24
FIX: removeAll type error in actions_sendmails.inc.php
2025-02-26 17:29:12 +01:00
Laurent Destailleur
043233b524 Merge pull request #33221 from rycks/develop_doc_markdown
remove ancestry-path thanks to eldy explaination
2025-02-26 16:37:07 +01:00
Laurent Destailleur
4c20855748 Merge pull request #33219 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-02-26 16:35:20 +01:00
Laurent Destailleur
5aebac07ee Merge pull request #33218 from BenjaminFlr/precommitreadme
ADD MacOS case in pre-commit README.md file
2025-02-26 16:15:20 +01:00
Laurent Destailleur
313e377159 Merge pull request #33217 from frederic34/add_missing_translation
add missing translation
2025-02-26 16:14:49 +01:00
yannis
e6cea6f321 Add extraparams for object lines 2025-02-26 15:12:17 +01:00
Dolibot
8dc2e03c51 PHPStan > Update baseline 2025-02-26 12:07:05 +00:00
Mélina JOUM
fdd642c5cc FIX: Retrieves the name of external or internal PDF 2025-02-26 11:33:07 +01:00
Frédéric FRANCE
496c796565 fix price for forms 2025-02-26 11:00:00 +01:00
Irvine Fleith
e5373e73f7 feat(invoice-rec): new rule_for_lines_dates field - DB 2025-02-26 07:14:01 +01:00
Mohamed DAOUD
215ec05bbf Fix CI 2025-02-25 21:52:08 +01:00
Mohamed DAOUD
f809164fbf Fix CI 2025-02-25 21:39:32 +01:00
Mohamed DAOUD
144ed34d87 Fix CI 2025-02-25 21:14:06 +01:00
Mohamed DAOUD
8b19796b13 Fix CI 2025-02-25 20:23:41 +01:00
Mohamed DAOUD
70540855b9 Fix CI 2025-02-25 20:08:53 +01:00
Mohamed DAOUD
7b8874cf48 fix CI 2025-02-25 19:49:12 +01:00
Mohamed DAOUD
287d138741 fix phan 2025-02-25 19:33:05 +01:00
Mohamed DAOUD
e944fbbd0f fix phan 2025-02-25 19:12:26 +01:00
Mohamed DAOUD
1b89a81463 add trans keys 2025-02-25 18:18:06 +01:00
MDW
e1b94b2552 Qual: Fix phan notices in webportal 2025-02-25 17:54:34 +01:00
Mohamed DAOUD
b2821a4477 add trans keys 2025-02-25 17:45:07 +01:00
Mohamed DAOUD
b91c2f5f76 manage community repository as a source 2025-02-25 17:44:13 +01:00
jonathan-stimactiv
cffd0bd230 Merge branch 'develop' into develop 2025-02-25 17:05:14 +01:00
ldestailleur
05e0462a9a NEW Module WebPortal is moved as stable 2025-02-25 16:51:03 +01:00
ldestailleur
27f926b4c3 Doc 2025-02-25 16:23:08 +01:00
ldestailleur
fbd2b4b5b2 Try to remove some TODO - Better test of oauth return 2025-02-25 16:19:03 +01:00
Frédéric FRANCE
8d35a84951 add missing translation 2025-02-25 16:11:42 +01:00
Frédéric FRANCE
6f5ce488d3 add missing translation 2025-02-25 16:06:31 +01:00
Kamel Khelifa
3d87b400e5 Fix CI-PULL-REQUEST / pre-commit / pre-commit (pull_request) 2025-02-25 16:05:13 +01:00
ldestailleur
62427a09e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-25 16:02:10 +01:00
ldestailleur
76d1ccba59 Doc 2025-02-25 15:59:17 +01:00
Kamel Khelifa
aaae4e7bc6 Fix CI-PULL-REQUEST / pre-commit / pre-commit (pull_request) 2025-02-25 15:55:58 +01:00
jonathan-stimactiv
bf1bc4d262 Fix dynamic price "back" link from price_suppliers tab
Fix dynamic price "back" link from price_suppliers tab
2025-02-25 15:29:22 +01:00
Kamel Khelifa
4d2ad0aadf Fix CI-PULL-REQUEST / pre-commit / pre-commit (pull_request) 2025-02-25 15:25:33 +01:00
Jyhere
da2ec9ae83 FIX: removeAll type error in actions_sendmails.inc.php 2025-02-25 15:15:49 +01:00
Kamel Khelifa
7e4b20917c NEW: Add management of date begin/end and discount for a customer price (SQL) 2025-02-25 15:11:30 +01:00
Kamel Khelifa
7ba21bd23d NEW: Add management of date begin/end and discount for a customer price (Code) 2025-02-25 15:09:05 +01:00
Eric Seigne
66ff923986 remove ancestry-path thanks to eldy explaination 2025-02-25 14:58:51 +01:00
Benjamin Falière
e1d009bc5f ADD MacOS case in pre-commit README.md file 2025-02-25 12:27:15 +01:00
Frédéric FRANCE
b3b279c091 add missing translation 2025-02-25 11:07:59 +01:00
Frédéric FRANCE
270f687ad5 add missing translation 2025-02-25 11:05:15 +01:00
Frédéric FRANCE
df746136f7 add missing translation 2025-02-25 11:03:33 +01:00
Laurent Destailleur
fbac78e6f8 Merge pull request #33183 from mdeweerd/phan/user
Qual: Fix phan notices (user)
2025-02-25 03:12:59 +01:00
Laurent Destailleur
fa6429437a Merge branch 'develop' into phan/user 2025-02-25 02:54:09 +01:00
ldestailleur
34ecda6994 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-25 02:47:26 +01:00
Laurent Destailleur
dde9c1da15 Merge branch 'develop' into phan/user 2025-02-25 02:33:38 +01:00
ldestailleur
b6fb623911 Fix phan 2025-02-25 02:33:20 +01:00
ldestailleur
4300e749a4 Fix phan 2025-02-25 02:14:25 +01:00
ldestailleur
64be5d9065 Ignore phan 2025-02-25 02:11:43 +01:00
Mélina JOUM
d2387dd8bc FIX: Success message when add a product line that has packaging 2025-02-24 17:23:34 +01:00
Laurent Destailleur
d75905867a Merge branch 'develop' into phan/user 2025-02-24 16:56:11 +01:00
ldestailleur
e16b13442f Fix phan 2025-02-24 16:55:51 +01:00
Laurent Destailleur
1759a487f6 Merge branch 'develop' into phan/user 2025-02-24 16:45:44 +01:00
ldestailleur
e1e8a76805 Fix regression after removal of $conf 2025-02-24 16:45:13 +01:00
ldestailleur
8a04e8f2c7 Fix phan 2025-02-24 16:41:45 +01:00
Laurent Destailleur
79e45864f5 Merge branch 'develop' into phan/user 2025-02-24 16:16:49 +01:00
ldestailleur
10fd8b2111 Clean code 2025-02-24 16:16:26 +01:00
Laurent Destailleur
0861f7cbe5 Merge branch 'develop' into phan/user 2025-02-24 16:04:13 +01:00
ldestailleur
373a3b890b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-24 16:03:27 +01:00
Laurent Destailleur
426479799c Update user.class.php 2025-02-24 14:34:09 +01:00
Laurent Destailleur
5a74dfd650 Update user.class.php 2025-02-24 14:32:05 +01:00
Laurent Destailleur
3229a2bd42 Merge pull request #33203 from atm-jonathan/FIX_ERREUR_ADD_CONSTRAINT_V22
Fix ERROR ADD CONSTRAINT SCRIPT INSTALL V22
2025-02-24 14:25:20 +01:00
ldestailleur
0c3c728427 FIX bad var name 2025-02-24 14:25:12 +01:00
Laurent Destailleur
47bc0ee690 Merge branch 'develop' into FIX_ERREUR_ADD_CONSTRAINT_V22 2025-02-24 14:22:54 +01:00
ldestailleur
825ff7d56c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-24 14:21:51 +01:00
ldestailleur
a9b511b715 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-24 14:13:14 +01:00
ldestailleur
28fdefc9a6 NEW Can filter on string with spaces if search criteria is inside quote. 2025-02-24 13:43:44 +01:00
ldestailleur
607656c08c Look and fill v22 2025-02-24 13:24:54 +01:00
x
d7f7fbd1ac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into FIX_ERREUR_ADD_CONSTRAINT_V22 2025-02-24 12:03:00 +01:00
x
c8b4f554fc fix error fk_bank_record 2025-02-24 11:58:48 +01:00
ldestailleur
63eca863b9 NEW Can force the tooltip before the text on column title. 2025-02-24 11:53:28 +01:00
ldestailleur
abcd0d2cf2 Qual: Clean code related to categories 2025-02-23 19:42:49 +01:00
ldestailleur
d8943876ea Fix regression 2025-02-23 18:39:40 +01:00
ldestailleur
3ff078734b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-23 18:26:26 +01:00
ldestailleur
4dc87949fd Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-23 18:26:03 +01:00
Laurent Destailleur
22dfa59dca Merge pull request #33187 from mdeweerd/fix/ci.2025.02.22
Fix ci - customreports, list_print_total
2025-02-23 16:40:12 +01:00
MDW
7ee4956653 Fix ci - customreports, list_print_total 2025-02-22 18:55:06 +01:00
Laurent Destailleur
0221204cd1 Merge pull request #32456 from Hystepik/fix-email-collector
Fix email collector datetimelast ok and email fetching
2025-02-22 17:32:05 +01:00
Laurent Destailleur
93499c29f1 Update emailcollector.class.php 2025-02-22 17:30:38 +01:00
Laurent Destailleur
e219484634 Merge pull request #31829 from Hystepik/New-status-for-webhook
New status for webhook Target
2025-02-22 17:24:31 +01:00
MDW
edfb385fd7 More explicit reporting for NOT IN sql forge notices 2025-02-22 17:07:37 +01:00
MDW
6257c892bf Replace some db->escape's with int casts 2025-02-22 16:28:13 +01:00
MDW
1632befc92 Qual: Fix phan notices (user) 2025-02-22 16:28:13 +01:00
MDW
369506d5b7 Fix ci - customreports, list_print_total 2025-02-22 16:13:29 +01:00
Laurent Destailleur
126a344550 Merge pull request #33185 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-02-22 15:38:52 +01:00
ldestailleur
31cfd4c04d Look and feel v22 2025-02-22 14:51:06 +01:00
ldestailleur
e8df374b6b Debug v21 2025-02-22 13:57:07 +01:00
ldestailleur
93ec574121 Debug v21 2025-02-22 13:12:36 +01:00
Dolibot
fd025aad24 PHPStan > Update baseline 2025-02-22 12:06:09 +00:00
ldestailleur
16e94d54b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-22 02:36:55 +01:00
ldestailleur
d307aaa5d2 Look and feel v22 2025-02-22 02:36:43 +01:00
Laurent Destailleur
e1c388dd99 Merge pull request #32976 from FHenry/dev_32975
NEW: add const to not include default lib_head.js in top_htmlhead with DISABLE_LIB_HEAD_JS
2025-02-22 02:16:52 +01:00
ldestailleur
5cb56c9bf6 Look and feel v22 2025-02-22 02:16:22 +01:00
ldestailleur
8a7851b452 Clean code 2025-02-22 01:40:30 +01:00
ldestailleur
85c36e8176 Clean code 2025-02-22 01:07:30 +01:00
Laurent Destailleur
249cd938bb Merge branch 'develop' into dev_32975 2025-02-21 22:22:25 +01:00
ldestailleur
01ba0f8524 Fix warnings 2025-02-21 22:22:07 +01:00
Laurent Destailleur
c84284f542 Merge branch 'develop' into dev_32975 2025-02-21 22:10:14 +01:00
ldestailleur
4fcf24292f Debug v21 2025-02-21 21:05:27 +01:00
ldestailleur
8553c555e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-21 19:26:35 +01:00
ldestailleur
ca56418efb CSS v22 2025-02-21 19:26:25 +01:00
ldestailleur
3fa0d3a0a3 Debug menu 2025-02-21 19:26:17 +01:00
Laurent Destailleur
0a49585cc3 Merge pull request #33096 from c3do/patch-1
dol_eval_new
2025-02-21 19:01:27 +01:00
Laurent Destailleur
c7325f07e7 Merge pull request #33091 from francoisPE/isInSEPA
FIX #33090 Is in sepa
2025-02-21 18:48:39 +01:00
Laurent Destailleur
42083398f6 Update functions.lib.php 2025-02-21 18:48:08 +01:00
Laurent Destailleur
7fe80dcf81 Update company.lib.php
Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
2025-02-21 18:15:50 +01:00
ldestailleur
b8978e5cb9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-21 18:04:16 +01:00
Laurent Destailleur
1654f43e71 Merge pull request #33175 from Hystepik/Fix-formai-class-to-be-more-general
Fix formai class to make ai prompt code to be more general
2025-02-21 18:04:03 +01:00
ldestailleur
1341a7e241 Fix phan 2025-02-21 18:00:34 +01:00
Laurent Destailleur
898acf1ff1 Merge pull request #33176 from FHenry/dev_bank_records_32617
new: add tables to prerapre bank records in Dolibarr
2025-02-21 17:58:02 +01:00
ldestailleur
1eb73bac6c Debug v22 - Use of $SEL$ was broken. 2025-02-21 17:52:54 +01:00
ldestailleur
a9cc4833ed Close #33158 2025-02-21 17:52:32 +01:00
Laurent Destailleur
45ec0a5bbe Merge branch 'develop' into isInSEPA 2025-02-21 16:07:32 +01:00
ldestailleur
a25f9a7e00 Add the SEPA column in dictionary 2025-02-21 16:07:07 +01:00
Laurent Destailleur
5130848c8c Merge branch 'develop' into patch-1 2025-02-21 15:58:10 +01:00
Lucas Marcouiller
23d4ff27ac Merge branch 'develop' into Fix-formai-class-to-be-more-general 2025-02-21 15:55:59 +01:00
ldestailleur
5e7bc3fea3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-02-21 15:54:51 +01:00
ldestailleur
113ac3607d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-21 15:46:56 +01:00
ldestailleur
f199d3fd61 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-21 15:46:33 +01:00
Laurent Destailleur
f02a19d980 Merge pull request #33174 from EchoLoGeek/fixInvoiceSituation
Fix Situation Percent with USE_INVOICE_SITUATION = 2
2025-02-21 15:42:44 +01:00
Anthony Damhet
e5ba5b97ca Merge branch 'develop' into fixInvoiceSituation 2025-02-21 15:18:41 +01:00
EchoLoGeek
7c14239658 Fix 0 if > 100 2025-02-21 15:12:25 +01:00
Laurent Destailleur
86d93a7768 Merge pull request #33177 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-02-21 15:03:54 +01:00
Lucas Marcouiller
bbb6b3955a Merge branch 'develop' into Fix-formai-class-to-be-more-general 2025-02-21 13:35:55 +01:00
ldestailleur
0f7936220a Clean code and tooltip on using field in extrafields definition 2025-02-21 13:28:32 +01:00
ldestailleur
a3470bbd06 FIX Missing quotes when using __NOW__ 2025-02-21 13:21:51 +01:00
Dolibot
dd70e27178 PHPStan > Update baseline 2025-02-21 12:06:57 +00:00
Hystepik
540364050e fix ci 2025-02-21 12:45:02 +01:00
Florian HENRY
7c0c238812 new: add table to prerapre bank records in Dolibarr 2025-02-21 12:41:39 +01:00
Hystepik
afbab1953d Fix formai class to make ai prompt code to be more general 2025-02-21 12:36:16 +01:00
EchoLoGeek
a1a3430ff1 fix spaces 2025-02-21 12:31:03 +01:00
EchoLoGeek
1b0cd777c2 Fix Situation Percent with USE_INVOICE_SITUATION = 2
Lines situation percent on new lines must be 0 (No cumulative)
2025-02-21 12:23:30 +01:00
ldestailleur
80adcffa4f Clean md file 2025-02-21 11:48:53 +01:00
Laurent Destailleur
51eeae597b Merge pull request #33155 from rycks/develop_doc_markdown
DOC: markdown version of doc (easyer to read)
2025-02-21 11:41:11 +01:00
Laurent Destailleur
3d41ec9436 Update makepack-howto.md 2025-02-21 11:40:05 +01:00
Laurent Destailleur
ca0c8e44da Merge pull request #33170 from jyhere/patch-23
NEW: add hooks to modify select_produits_fournisseurs_list sql query
2025-02-21 11:37:58 +01:00
Laurent Destailleur
ada2b9759a Merge pull request #33159 from marc-dll/develop_NEW_cashcontrol_ttc_column
NEW: cash control: add hidden setting to show total including taxed in detail by vat rate
2025-02-21 11:35:30 +01:00
Laurent Destailleur
8bfd6b9103 Merge pull request #33150 from mdeweerd/phan/ticket.variants.webhook
Qual: Fix phan notices (ticket,variants,webhook)
2025-02-21 11:30:27 +01:00
Laurent Destailleur
14e8655736 Merge pull request #33156 from Daoud-mohamed/init-external-modules-class
NEW Init externalModules Class to Fetch Modules from Multiple Sources
2025-02-21 11:29:58 +01:00
Laurent Destailleur
833c9b8171 Merge pull request #33161 from Easya-Solutions/qual-expedition-class-db-prefix
QUAL db prefix on expedition class
2025-02-21 11:28:46 +01:00
Laurent Destailleur
8d895b4cb4 Merge pull request #33165 from frederic34/product_multilangs
clean code
2025-02-21 11:28:27 +01:00
Jyhere
5f32475cb0 NEW: add hooks to modify select_produits_fournisseurs_list sql query
As for the select_products_list() method, add hooks to add columns in select and sql joins.
2025-02-21 11:08:31 +01:00
Frédéric FRANCE
c8e1b80ec3 clean code 2025-02-21 09:49:14 +01:00
Frédéric FRANCE
57a725e6c0 clean code 2025-02-21 09:45:57 +01:00
Frédéric FRANCE
d917d4896e clean code 2025-02-21 09:45:20 +01:00
Frédéric FRANCE
d67816aa18 clean code 2025-02-21 08:57:42 +01:00
Cédric A.
99afc022e0 Security vulnerability fix 2025-02-20 23:11:15 +01:00
Frédéric France
d778aace82 Merge remote-tracking branch 'upstream/develop' into product_multilangs 2025-02-20 20:43:47 +01:00
Frédéric France
1a733ec4ca clean code 2025-02-20 20:43:20 +01:00
Frédéric France
f170a5e3b8 clean code 2025-02-20 20:33:21 +01:00
ldestailleur
5acde9f5a3 css 2025-02-20 20:25:19 +01:00
ldestailleur
c831af8f6a Look and feel v22 2025-02-20 19:50:49 +01:00
ldestailleur
5f365f1326 Trans 2025-02-20 19:38:21 +01:00
ldestailleur
398d923d4f CSS 2025-02-20 19:20:11 +01:00
ldestailleur
cbd8415bd0 CSS 2025-02-20 19:16:44 +01:00
ldestailleur
14dc02bf90 Debug CSS 2025-02-20 19:12:03 +01:00
Frédéric France
e6a2da4e05 clean code 2025-02-20 18:18:04 +01:00
Mohamed DAOUD
6328f056ae Fix CI 2025-02-20 17:46:25 +01:00
Mohamed DAOUD
b3e7c0dcd0 fix CI 2025-02-20 17:14:36 +01:00
Mohamed DAOUD
ad646e441c Fix CI 2025-02-20 16:42:17 +01:00
Mohamed DAOUD
7e13d7fe52 Fix CI 2025-02-20 16:33:32 +01:00
Mohamed DAOUD
7d6ce09146 fix CI 2025-02-20 16:17:33 +01:00
Mohamed DAOUD
06e237640e FIX CI 2025-02-20 15:58:34 +01:00
Mohamed DAOUD
1bd029b5b3 fix Phan 2025-02-20 15:16:53 +01:00
Mohamed DAOUD
d15e265e56 fix phan errors 2025-02-20 14:58:06 +01:00
VESSILLER
ff870fb199 QUAL db prefix on expedition class 2025-02-20 14:42:07 +01:00
Marc de Lima Lucio
5bf3ca419d NEW: cash control: add hidden setting to show total including taxed in detail by vat rate 2025-02-20 14:21:38 +01:00
Mohamed DAOUD
e3e70ee35b fix phan 2025-02-20 13:12:22 +01:00
Mohamed DAOUD
08f3dab91d add trans 2025-02-20 12:36:32 +01:00
Mohamed DAOUD
9a12c97b97 init external modules class 2025-02-20 12:35:42 +01:00
Eric Seigne
3dc800ec1c intermediate version and indent 2025-02-20 10:44:52 +01:00
Eric Seigne
83ab2290c4 try diff indent 2025-02-20 10:42:06 +01:00
Eric Seigne
e955314c00 Indented item 2025-02-20 10:41:10 +01:00
Eric Seigne
124015b1c3 markdown version of doc (easyer to read) 2025-02-20 10:30:56 +01:00
MDW
469ced0a8d Qual: Fix phan notices (ticket,variants,webhook) 2025-02-20 10:29:39 +01:00
VESSILLER
fcc02bebde Add disable stock calculate on supplier bill and order on stock setup 2025-02-20 08:34:05 +01:00
Laurent Destailleur
a2bf0b5b02 Merge pull request #33136 from frederic34/update_phpstan
use phpstan latest version
2025-02-20 02:06:08 +01:00
Frédéric France
bdb648e6cf fix phpstan 2025-02-19 20:28:18 +01:00
Frédéric France
3b47fa900b fix phpstan 2025-02-19 20:25:03 +01:00
Frédéric France
b3df1bb62d fix phpstan 2025-02-19 20:21:30 +01:00
Frédéric France
16917827a6 fix by baseline update 2025-02-19 20:09:01 +01:00
Frédéric FRANCE
44f7cf8253 Merge remote-tracking branch 'upstream/develop' into update_phpstan 2025-02-19 19:52:25 +01:00
Frédéric FRANCE
f4739288f6 fix 2025-02-19 19:51:46 +01:00
Frédéric FRANCE
a84f1e3a34 fix 2025-02-19 19:06:27 +01:00
Frédéric FRANCE
084caaaf01 fix 2025-02-19 18:55:35 +01:00
Frédéric FRANCE
4d405cdda3 fix 2025-02-19 18:33:25 +01:00
Laurent Destailleur
4a1199a00e Merge pull request #31419 from frederic34/extrafields_object_filter
can filter on object properties
2025-02-19 18:33:03 +01:00
Laurent Destailleur
6cb03ff454 Merge pull request #33129 from Hystepik/new-ai-model-setup-for-feature
New add new setup in ai setup
2025-02-19 18:23:59 +01:00
Frédéric FRANCE
e79b9424e9 Merge remote-tracking branch 'upstream/develop' into update_phpstan 2025-02-19 18:13:17 +01:00
Frédéric FRANCE
89918c58e5 fix 2025-02-19 18:12:17 +01:00
ldestailleur
5daaa6809a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-19 18:11:03 +01:00
ldestailleur
177b5de737 Clean code - no duplicate amount if not foreign currency 2025-02-19 18:10:45 +01:00
Frédéric FRANCE
b21ddf7872 Merge remote-tracking branch 'upstream/develop' into update_phpstan 2025-02-19 17:54:05 +01:00
Frédéric FRANCE
4d604fff55 fix 2025-02-19 17:53:51 +01:00
Laurent Destailleur
7c909eb638 Update functions.lib.php 2025-02-19 17:47:28 +01:00
Laurent Destailleur
bc5f62d25b Merge pull request #33140 from mdeweerd/fix/deprecationhandler.isset
Fix: DeprecationHandler, correct isset(), ignore false phpstan positive
2025-02-19 17:44:12 +01:00
Frédéric FRANCE
b36d32ad74 Merge remote-tracking branch 'upstream/develop' into update_phpstan 2025-02-19 17:42:10 +01:00
Laurent Destailleur
2d292c8be0 Merge branch 'develop' into new-ai-model-setup-for-feature 2025-02-19 17:41:09 +01:00
ldestailleur
dd726641c7 Clean code 2025-02-19 17:32:11 +01:00
Laurent Destailleur
6f240d98e9 Merge pull request #33143 from mdeweerd/fix/commonclasstest.nologfile
Qual: Fix CommanClassTest in case there is no logfile
2025-02-19 17:29:55 +01:00
Laurent Destailleur
409fd381ed Merge branch 'develop' into fix/deprecationhandler.isset 2025-02-19 17:21:36 +01:00
Laurent Destailleur
32b5dbc724 Merge branch 'develop' into update_phpstan 2025-02-19 17:19:28 +01:00
Laurent Destailleur
373df20bdc Merge pull request #33139 from Easya-Solutions/qual-shipment-dispatch-sellby-eatby-enabled
QUAL use one var to determine if sell-by or eat-by date is enabled
2025-02-19 17:18:50 +01:00
Laurent Destailleur
e89232d37c Merge pull request #33137 from frederic34/patch-11
fix CI
2025-02-19 17:16:48 +01:00
MDW
1811ea7e39 Qual: Fix CommanClassTest in case there is no logfile
# Qual: Fix CommanClassTest in case there is no logfile

When running an individual test in the absence of a logfile, the test
did not run properly (setup issues, and tearDown issues on error).

This adds checks that the logfile exists.
2025-02-19 15:56:13 +01:00
MDW
cee100dea4 Update DolDeprecationHandlerTest 2025-02-19 15:53:56 +01:00
VESSILLER
91e4dbc53c QUAL setup disable stock calculate on rules 2025-02-19 15:21:44 +01:00
Frédéric FRANCE
e40b44358e Merge branch 'develop' into patch-11 2025-02-19 15:21:00 +01:00
MDW
27e3a3ffc6 Fix: DeprecationHandler, correct isset(), ignore false phpstan positive
# Fix: DeprecationHandler, correct isset(), ignore false phpstan positive

When the old property name is used, the 'isset' result was not tested on the property.

Also ignore a false positive from phpstan
2025-02-19 15:20:51 +01:00
Hystepik
20e669c136 fix CI 2025-02-19 15:19:52 +01:00
Lucas Marcouiller
4e26febdd8 Merge branch 'develop' into new-ai-model-setup-for-feature 2025-02-19 14:49:18 +01:00
Hystepik
8ce483009a modify code has feedback 2025-02-19 14:44:54 +01:00
VESSILLER
e0d459a1b2 QUAL use one var to determine if sell-by or eat-by date is enabled 2025-02-19 14:41:37 +01:00
ldestailleur
7956d3099d Fix fatal error 2025-02-19 14:36:06 +01:00
Frédéric FRANCE
42753c7f3f Merge branch 'develop' into patch-11 2025-02-19 14:34:21 +01:00
ldestailleur
1ee468cb43 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-02-19 14:32:52 +01:00
ldestailleur
2049d56cdd Clean code 2025-02-19 14:32:17 +01:00
Frédéric FRANCE
dfa87a2cd2 Merge remote-tracking branch 'upstream/develop' into update_phpstan 2025-02-19 14:28:36 +01:00
Frédéric FRANCE
42280740aa Merge branch 'develop' into patch-11 2025-02-19 14:18:00 +01:00
Laurent Destailleur
0afd34e7dd Merge pull request #33095 from aspangaro/22_accfydefault
NEW Accountancy - Define fiscal year by default
2025-02-19 14:16:24 +01:00
Frédéric FRANCE
4809aa2585 use phpstan latest version 2025-02-19 14:15:23 +01:00
Laurent Destailleur
8340747117 Merge pull request #33128 from rycks/develop_add_buildzip_script_for_modulebuilder
NEW: build zip from command line (full php)
2025-02-19 14:15:14 +01:00
Frédéric FRANCE
6cf15c70ac fix CI 2025-02-19 14:15:05 +01:00
Laurent Destailleur
6d595260ab Merge pull request #33135 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-02-19 14:14:39 +01:00
Laurent Destailleur
8cbe5ae54f Merge pull request #33133 from ibuiv/patch-11
FIX Avoid remove supplier order with dispateched lines
2025-02-19 14:14:24 +01:00
Frédéric FRANCE
278006c148 Merge remote-tracking branch 'upstream/develop' into update_phpstan 2025-02-19 14:14:22 +01:00
ldestailleur
98cc1acbec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-19 14:13:26 +01:00
ldestailleur
881b9fd5ee FIX Bad picto of user 2025-02-19 14:13:15 +01:00
ldestailleur
5619bf83e2 FIX bad param position and warning 2025-02-19 14:10:49 +01:00
Frédéric FRANCE
09b0703e3f Merge remote-tracking branch 'upstream/develop' into update_phpstan 2025-02-19 13:49:07 +01:00
Frédéric FRANCE
32b85ca843 use phpstan latest version 2025-02-19 13:48:53 +01:00
Laurent Destailleur
151685052e Merge pull request #33134 from mdeweerd/fix/phan.theme
Qual: Fix phan notices (theme)
2025-02-19 13:47:37 +01:00
ldestailleur
fab600ab94 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-19 13:46:54 +01:00
ldestailleur
53f12a50e3 Close #29312 Can keep date filters between screens 2025-02-19 13:46:14 +01:00
Frédéric FRANCE
b02fd54610 use phpstan latest version 2025-02-19 13:45:14 +01:00
ldestailleur
fde184c1e3 FIX #29312 Can keep date between screen 2025-02-19 13:34:58 +01:00
MDW
272808cc9b Qual: Fix phan notices (theme) 2025-02-19 13:28:35 +01:00
Dolibot
d8f5823230 PHPStan > Update baseline 2025-02-19 12:06:46 +00:00
ldestailleur
b3d75ccc47 QUAL Use the new GETPOSTDATE to simplify the code 2025-02-19 13:05:45 +01:00
antonin_tdj
ab939f79ae Update card.php 2025-02-19 12:52:06 +01:00
antonin_tdj
20e2553864 Avoid remove supplier order with dispateched lines 2025-02-19 12:41:18 +01:00
ldestailleur
3956de0b96 Trans 2025-02-19 12:36:34 +01:00
ldestailleur
4ba5286ad2 Doc 2025-02-19 12:17:41 +01:00
Laurent Destailleur
86e17b96ed Update buildzip.php 2025-02-19 11:38:42 +01:00
ldestailleur
086626c3c0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-02-19 11:24:13 +01:00
ldestailleur
79aef24733 Trans 2025-02-19 11:17:12 +01:00
Laurent Destailleur
e5faa7a393 Update buildzip.php 2025-02-19 11:13:32 +01:00
Laurent Destailleur
0db097ca5b Merge pull request #33127 from mdeweerd/fix/phan.takepos
Qual: Fix phan notices (takepos)
2025-02-19 11:10:02 +01:00
Laurent Destailleur
1caa121234 Merge pull request #33122 from Hystepik/New-add-formai.class
New move getSectionAIPrompt to new formAI class
2025-02-19 11:09:20 +01:00
Laurent Destailleur
1fe84f444a Merge pull request #33126 from frederic34/hierachy_card
clean code
2025-02-19 11:08:09 +01:00
Hystepik
7eb0b2b885 New add new setup in ai setup 2025-02-19 10:59:19 +01:00
Eric Seigne
3298b135c7 use env to find php path 2025-02-19 09:35:47 +01:00
Eric Seigne
e8ff0be5e1 use official phpdoc syntax 2025-02-19 09:34:57 +01:00
Eric Seigne
8d5594ea64 correct phan return map 2025-02-19 09:25:10 +01:00
Eric Seigne
7225a82cc7 phpdoc for phan 2025-02-19 09:16:19 +01:00
Eric Seigne
7b57b55686 fix phan errors 2025-02-19 09:03:23 +01:00
Eric Seigne
df3a94f687 fix comments 2025-02-19 08:54:59 +01:00
Eric Seigne
1ce290fac0 fix missing zipdir returns bool 2025-02-19 08:53:40 +01:00
Eric Seigne
ef921dba60 fix exit syntax 2025-02-19 08:50:20 +01:00
Eric Seigne
d0d8e26cc4 fix typo 2025-02-19 08:36:49 +01:00
Eric Seigne
82d47c45e6 build zip from command line full php 2025-02-19 08:29:03 +01:00
MDW
81e870f7c1 Qual: Fix phan notices (takepos) 2025-02-18 22:55:56 +01:00
Frédéric France
906a7ffe58 clean code 2025-02-18 21:10:53 +01:00
Frédéric France
6decc709f4 clean code 2025-02-18 21:09:46 +01:00
Laurent Destailleur
4c0918f0ae Merge pull request #33116 from jyhere/patch-22
Fix:  shipping workflow values comparison may fail
2025-02-18 20:50:08 +01:00
Laurent Destailleur
5aa224c097 Merge pull request #33125 from frederic34/fix/remove_duplicate
remove duplicate code
2025-02-18 20:49:02 +01:00
Laurent Destailleur
d19cbb5e6e Merge pull request #33124 from Easya-Solutions/qual-child-arbo-qty-as-float
QUAL multiply can be float in get child arbo function
2025-02-18 20:47:50 +01:00
Laurent Destailleur
0d10942855 Merge pull request #33105 from BenjaminFlr/fixMB
FIX(modulebuilder): validate after creation
2025-02-18 20:42:49 +01:00
Laurent Destailleur
cea44d5b06 Update myobject.class.php 2025-02-18 20:41:53 +01:00
Laurent Destailleur
65cd5351a8 Merge pull request #33108 from mdeweerd/phan/fix.2025.2.17
Qual: Fix phan notices (stripe, supplier_proposal)
2025-02-18 20:38:12 +01:00
Laurent Destailleur
fc3e55ba98 Merge pull request #33112 from frederic34/fix/translations_orders
fix missing translations
2025-02-18 20:37:50 +01:00
Laurent Destailleur
d4ab5ad472 Merge pull request #33123 from mdeweerd/phan/scripts.enable
Qual: Enable and fix phan notices for scripts
2025-02-18 20:37:38 +01:00
Laurent Destailleur
fa8a84f540 Merge pull request #33119 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-02-18 20:36:56 +01:00
Frédéric France
ed3f115a1e remove duplicate code 2025-02-18 20:16:00 +01:00
Frédéric FRANCE
d11a8884f6 Merge branch 'develop' into extrafields_object_filter 2025-02-18 19:44:50 +01:00
ldestailleur
f22054b004 Fix regression 2025-02-18 19:06:26 +01:00
VESSILLER
ade035733d QUAL multiply can be float in get child arbo function 2025-02-18 17:16:42 +01:00
MDW
891e11d692 Qual: Enable and fix phan notices for scripts
# Qual: Enable and fix phan notices for scripts

phpstan is already enable on scripts, so there is no reason to not
enable phan.
This enables phan and fixes the notices at the same time
2025-02-18 16:33:41 +01:00
ldestailleur
12848fcdd5 Avoid fatal error if hookmanager not defined 2025-02-18 16:25:51 +01:00
Hystepik
b53bfa1212 fix CI 2025-02-18 16:03:21 +01:00
Lucas Marcouiller
550f9ffbea Merge branch 'develop' into New-status-for-webhook 2025-02-18 15:50:05 +01:00
Hystepik
e8fa5fe982 Merge branch 'New-add-formai.class' of github.com:Hystepik/dolibarr into New-add-formai.class 2025-02-18 15:47:46 +01:00
Hystepik
1e90fdac1d add nesw line 2025-02-18 15:47:29 +01:00
Lucas Marcouiller
a3050c2397 Merge branch 'develop' into New-add-formai.class 2025-02-18 15:37:15 +01:00
Hystepik
06f9e5e667 New move getSectionAIPrompt to new formAI class 2025-02-18 15:34:35 +01:00
MDW
11ed394b4b Qual: Fix phan notices (supplier_proposal) 2025-02-18 14:16:49 +01:00
MDW
fc9c05b604 Qual: Fix phan notices (stripe) 2025-02-18 14:16:48 +01:00
ldestailleur
b1e975c797 Fix default field 2025-02-18 13:59:51 +01:00
ldestailleur
e8f8416215 NEW Filter on date creation/date modification in invoice list 2025-02-18 13:56:44 +01:00
Dolibot
3487f05778 PHPStan > Update baseline 2025-02-18 12:06:47 +00:00
Jyhere
8064fe6ce9 Fix: shipping workflow values comparison may fail
Due to php internal float values (eg. 40.00000000000001 instead of 40), comparison may fail.
2025-02-18 11:58:19 +01:00
Jakub Stříbrný
f9750fcf69 Merge branch 'develop' into profid-societe 2025-02-18 11:42:28 +01:00
Frédéric FRANCE
981fd12872 fix missing translations 2025-02-18 11:10:49 +01:00
Frédéric FRANCE
2dbfe1e2e3 fix missing translations 2025-02-18 11:08:14 +01:00
ldestailleur
cabd8a680e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-18 10:25:53 +01:00
Benjamin Falière
49cd08bc87 Merge branch 'develop' into fixMB 2025-02-18 10:04:17 +01:00
Laurent Destailleur
2c7b2a11d0 Update myobject.class.php 2025-02-17 19:53:09 +01:00
Laurent Destailleur
bec6401388 Merge branch 'develop' into 22_accfydefault 2025-02-17 19:50:10 +01:00
Laurent Destailleur
28cacb8d1a Merge pull request #33102 from Easya-Solutions/fix-ticket-addlinkbyref-in-view-mode
FIX #33101 white page on ticket card when adding a link by reference
2025-02-17 19:47:35 +01:00
Laurent Destailleur
e24003d39d Merge pull request #33100 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-02-17 19:46:35 +01:00
Laurent Destailleur
68db1800e7 Merge pull request #33094 from iLLixM/develop
New: Option to set Third Party Customer Code equal to Member Reference
2025-02-17 19:46:19 +01:00
Laurent Destailleur
fc610a0adf Merge pull request #33092 from mdeweerd/phan/2025.2.14.societe-1
Qual: Fix phan notices (societe)
2025-02-17 19:45:38 +01:00
Laurent Destailleur
43d0990a07 Merge pull request #22849 from solution-libre/feat-order-tags
NEW Add order tags
2025-02-17 19:37:49 +01:00
Benjamin Falière
23ae7b5e7d Merge branch 'develop' into fixMB 2025-02-17 18:49:25 +01:00
Laurent Destailleur
cac751ead0 Merge branch 'develop' into feat-order-tags 2025-02-17 18:20:01 +01:00
ldestailleur
b65189f4e3 Fix regression 2025-02-17 18:18:57 +01:00
Alexandre SPANGARO
167e327459 FIX CI phpstan 2025-02-17 17:23:18 +01:00
Laurent Destailleur
4d46197aed Update html.form.class.php 2025-02-17 17:23:16 +01:00
Alexandre SPANGARO
23fc3e18d3 Merge branch 'develop' into 22_accfydefault 2025-02-17 16:41:11 +01:00
Benjamin Falière
c52d0d2db0 Restore contributor line 2025-02-17 16:22:57 +01:00
Benjamin Falière
ca85ad74b9 FIX(modulebuilder): validate after creation 2025-02-17 16:18:19 +01:00
Laurent Destailleur
417f10c99d Update modCategorie.class.php 2025-02-17 16:08:20 +01:00
ldestailleur
33d722c84f API use syntax "Authorization: Bearer ..." instead of "DOLAPIKEY: ..." 2025-02-17 16:02:22 +01:00
VESSILLER
eaf978cb12 FIX #33101 white page on ticket card when adding a link by reference 2025-02-17 15:09:31 +01:00
Laurent Destailleur
1e4a9bfe9b Update modCategorie.class.php 2025-02-17 14:41:01 +01:00
Laurent Destailleur
6ab146468e Merge branch 'develop' into feat-order-tags 2025-02-17 14:30:00 +01:00
ldestailleur
1cad2a092e Standardize the category tables. 2025-02-17 14:29:44 +01:00
Laurent Destailleur
1df8cc3bd5 Merge branch 'develop' into feat-order-tags 2025-02-17 14:03:53 +01:00
ldestailleur
5de4d8a166 Standardize category tables 2025-02-17 14:02:39 +01:00
ldestailleur
fc96a88bd9 Standardize category tables 2025-02-17 14:01:16 +01:00
ldestailleur
8e411b3ead Standardize category tables 2025-02-17 13:59:59 +01:00
ldestailleur
9af5292cc3 Standardize category tables 2025-02-17 13:58:47 +01:00
Alexandre SPANGARO
3ab4a08c13 Language 2025-02-17 13:53:01 +01:00
ldestailleur
d800b721fd Standardize category tables 2025-02-17 13:52:52 +01:00
Alexandre SPANGARO
803995b645 Merge branch '22_accfydefault' of https://github.com/aspangaro/dolibarr into 22_accfydefault 2025-02-17 13:51:49 +01:00
Alexandre SPANGARO
d259b2a65c Update language 2025-02-17 13:51:47 +01:00
ldestailleur
3339ca0ed7 Standardize category tables 2025-02-17 13:45:16 +01:00
ldestailleur
33b915abbe NEW Better presentation of list of user approver. 2025-02-17 13:18:20 +01:00
Dolibot
868fc56312 PHPStan > Update baseline 2025-02-17 12:07:19 +00:00
Laurent Destailleur
8f58256ede Update viewcat.php 2025-02-17 11:46:29 +01:00
Lucas Marcouiller
4cb99147e1 Merge branch 'develop' into fix-email-collector 2025-02-17 10:16:09 +01:00
MDW
5035580e56 Qual: Fix phan notices (societe) 2025-02-17 09:44:12 +01:00
Alexandre SPANGARO
a194d2f0c4 Remove dev code 2025-02-17 06:41:59 +01:00
Alexandre SPANGARO
330bd5543a Add missing trad 2025-02-17 06:38:07 +01:00
Alexandre SPANGARO
da54ed8e57 Indentation 2025-02-17 06:30:55 +01:00
Laurent Destailleur
8402394e5b Merge branch 'develop' into feat-order-tags 2025-02-17 04:06:32 +01:00
Laurent Destailleur
e9438c4d39 Merge branch 'develop' into patch-1 2025-02-17 04:03:02 +01:00
Laurent Destailleur
bd6c9b6d0d Merge branch 'develop' into 22_accfydefault 2025-02-17 04:02:57 +01:00
Laurent Destailleur
a5a5e7d3ab Merge branch 'develop' into develop 2025-02-17 04:02:51 +01:00
ldestailleur
99e8842f0a Fix phpstan 2025-02-17 03:49:11 +01:00
ldestailleur
511f92aeb3 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-17 02:28:23 +01:00
Laurent Destailleur
9729bb084e Merge branch 'develop' into patch-1 2025-02-17 02:25:31 +01:00
Laurent Destailleur
11cbeeff82 Merge branch 'develop' into 22_accfydefault 2025-02-17 02:24:49 +01:00
Laurent Destailleur
21ded4f599 Merge branch 'develop' into develop 2025-02-17 02:24:42 +01:00
ldestailleur
6d0423ac53 Fix warnings 2025-02-17 02:24:17 +01:00
Cédric A.
a8dd169817 dol_eval_new 2025-02-17 01:54:44 +01:00
ldestailleur
3258dd4837 Fix TODO 2025-02-16 23:15:51 +01:00
ldestailleur
e1b27feea1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-16 23:07:09 +01:00
ldestailleur
4a6baf1df4 Enhance AI 2025-02-16 23:06:58 +01:00
ldestailleur
4c9dc44c85 Fix picto 2025-02-16 22:47:22 +01:00
ldestailleur
47d59c7938 NEW Add a test mode for AI setup 2025-02-16 22:45:14 +01:00
Alexandre SPANGARO
8e36ecf4f7 Add default fiscal year on all report 2025-02-16 21:29:03 +01:00
ldestailleur
bc1dbae6b0 Enhance test of AI 2025-02-16 19:56:03 +01:00
ldestailleur
320dbe483e Fix js syntax error. 2025-02-16 19:52:17 +01:00
iLLixM
92a8fcccfe New: Option to set Third Party Customer Code equal to Member Reference
when using the function of creating third parties from members, you are able to set the customer code equal to the existing member reference by setting the parameter THIRDPARTY_CUSTOMERCODE_EQUALS_MEMBERREF
2025-02-16 18:54:51 +01:00
ldestailleur
574273bbf3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-02-16 15:31:35 +01:00
ldestailleur
7500c9e075 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-16 14:50:26 +01:00
ldestailleur
7fc8136362 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-16 14:50:09 +01:00
Laurent Destailleur
aec8d67545 Update README.md 2025-02-16 14:17:21 +01:00
Laurent Destailleur
2f409f0065 Update README.md 2025-02-16 14:00:52 +01:00
Alexandre SPANGARO
8bd3564eee Merge branch 'develop' into 22_accfydefault 2025-02-16 11:32:50 +01:00
Laurent Destailleur
63c0e8a513 Merge pull request #26693 from moreauftheobald/develop_adherent_type_class_update
Adherent type class refactoring
2025-02-15 00:10:22 +01:00
Laurent Destailleur
63483e960b Update adherent_type.class.php 2025-02-14 23:49:09 +01:00
Laurent Destailleur
0cd52e0810 Update adherent_type.class.php 2025-02-14 23:42:25 +01:00
Laurent Destailleur
d49750a5e2 Update adherent_type.class.php 2025-02-14 23:34:43 +01:00
Laurent Destailleur
c15a37b879 Merge pull request #33089 from Easya-Solutions/qual-shipment-replace-warehouse
QUAL use fk_warehouse instead of deprecated entrepot_id in line batch
2025-02-14 23:25:25 +01:00
Laurent Destailleur
7507e7a0df Update README.md 2025-02-14 23:21:32 +01:00
Laurent Destailleur
f4cd3bb803 Merge pull request #33085 from Hystepik/new-add-website-security-constant
New add website security constant for CSPRO
2025-02-14 22:32:57 +01:00
Laurent Destailleur
b87489f65e Merge pull request #33087 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-02-14 22:31:55 +01:00
Laurent Destailleur
8dc02126da Merge pull request #33088 from Easya-Solutions/qual-shipment-dispatch-db-prefix
QUAL replace MAIN_DB_PREFIX with db prefix in shipment dispatch
2025-02-14 22:31:42 +01:00
Amael-PE
17dbddb78c FIX pre-commit error 2025-02-14 21:10:42 +01:00
Amael-PE
757aec629f New Create isInSEPA function 2025-02-14 21:03:16 +01:00
Amael-PE
5261b2fe92 FIX Replace isInEEC by isInSEPA where needed 2025-02-14 21:03:13 +01:00
VESSILLER
5d6d07745e QUAL use fk_warehouse instead of deprecated entrepot_id in line batch 2025-02-14 16:47:08 +01:00
Florent Poinsaut
fa512af180 NEW #22848 FIx phpstan alert 2025-02-14 15:46:40 +01:00
VESSILLER
6d87423e88 QUAL replace MAIN_DB_PREFIX with db prefix in shipment dispatch 2025-02-14 14:35:54 +01:00
Florent Poinsaut
c8cc7884e4 NEW #22848 Fix CI 2025-02-14 14:35:44 +01:00
Florent Poinsaut
05a11b7cef NEW Dolibarr#22848 typo 2025-02-14 14:35:36 +01:00
Florent Poinsaut
941e703e34 NEW #22848 Fix doc 2025-02-14 14:34:42 +01:00
Florent Poinsaut
6dcb53f4c3 NEW #22848 Fix link between invoice and order and tags export / import 2025-02-14 14:34:23 +01:00
Florent Poinsaut
ee8791666c NEW #22848 Remove linked categories 2025-02-14 14:32:59 +01:00
Florent Poinsaut
0c6ee5d47d NEW #22848 Use the right tag id 2025-02-14 14:32:43 +01:00
Florent Poinsaut
8152d88b00 NEW #22848 Add import and export functions 2025-02-14 14:30:40 +01:00
Florent Poinsaut
ba78df46bd NEW #22848 Fix Typo 2025-02-14 14:30:01 +01:00
Florent Poinsaut
bfed762fe9 NEW Dolibarr#22848 Add order tags 2025-02-14 14:29:49 +01:00
Laurent Destailleur (aka Eldy)
46d94d25d3 Try to exclude GETPOST from dol_eval allowed functions 2025-02-14 13:29:51 +01:00
Dolibot
841ff0edf3 PHPStan > Update baseline 2025-02-14 12:06:43 +00:00
Hystepik
ea92fc39b3 fix CI 2025-02-14 11:44:19 +01:00
Hystepik
421390a3ad fix CI 2025-02-14 11:39:17 +01:00
Hystepik
1696e4d154 New add website security constant for CSPRO 2025-02-14 11:13:39 +01:00
Laurent Destailleur
7b2e315d23 Merge branch 'develop' into develop_adherent_type_class_update 2025-02-14 02:33:53 +01:00
Laurent Destailleur (aka Eldy)
d7205f3404 Fix: The translation should be a step done the later as possible when we
need to exploit or output a translated data. Must not be done at each
call to load meta information.
2025-02-14 02:14:19 +01:00
Laurent Destailleur (aka Eldy)
eeb8907f33 Fix missing properties 2025-02-14 02:09:59 +01:00
Laurent Destailleur
fb1e3151c2 Merge pull request #32903 from hregis/fix_dev_add_mysoc_currency
QUAL add $mysoc->currency and call default lang before setMysoc()
2025-02-14 01:59:48 +01:00
Laurent Destailleur
bbea873a46 Merge pull request #33081 from mdeweerd/phan/2025.2.13.resource-salary
Qual: Fix phan notices (resource+salary)
2025-02-14 01:49:50 +01:00
Laurent Destailleur
8109d03eab Merge pull request #33079 from mdeweerd/phan/2025.2.13.recruitment
Qual: Fix phan notices (recruitment+various_payment)
2025-02-14 01:49:31 +01:00
Laurent Destailleur
26ea0bc3c4 Merge pull request #33074 from atm-lena/NEW/DocumentationUI/Inputs
New/documentation UI/inputs
2025-02-14 01:44:18 +01:00
MDW
78f5938485 Qual: Fix phan notices (resource+salary) 2025-02-14 01:42:25 +01:00
Laurent Destailleur
a58ab30e30 Update inputs.php 2025-02-13 23:57:17 +01:00
MDW
c405666765 Qual: Fix phan notices (recruitment) 2025-02-13 22:37:20 +01:00
Laurent Destailleur
5e4b89e88b Merge branch 'develop' into NEW/DocumentationUI/Inputs 2025-02-13 21:00:02 +01:00
Laurent Destailleur (aka Eldy)
1910ca079f Test fix phpstan 2025-02-13 20:59:43 +01:00
Laurent Destailleur
9a08b2c638 Merge branch 'develop' into NEW/DocumentationUI/Inputs 2025-02-13 20:46:06 +01:00
Laurent Destailleur (aka Eldy)
d223f8a0b9 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-13 20:42:23 +01:00
Laurent Destailleur (aka Eldy)
e70995ca7e Fix phpstan 2025-02-13 20:16:42 +01:00
Laurent Destailleur
311d24a9a0 Merge branch 'develop' into NEW/DocumentationUI/Inputs 2025-02-13 19:34:56 +01:00
Laurent Destailleur (aka Eldy)
01b9ff7f00 Add exclude file 2025-02-13 19:34:39 +01:00
Laurent Destailleur
cae8e0425e Merge branch 'develop' into NEW/DocumentationUI/Inputs 2025-02-13 19:28:24 +01:00
Laurent Destailleur (aka Eldy)
09e1708268 Fix missing files.lib 2025-02-13 18:57:04 +01:00
Laurent Destailleur
276af7df89 Merge branch 'develop' into NEW/DocumentationUI/Inputs 2025-02-13 17:46:46 +01:00
Laurent Destailleur (aka Eldy)
097ba9bc9e Clean code 2025-02-13 17:44:36 +01:00
Laurent Destailleur
65875c2a1b Merge pull request #33076 from Daoud-mohamed/use-personalized-header-for-website-payment-page
New use personalized header for website payment page
2025-02-13 17:35:42 +01:00
Laurent Destailleur
055e1971c7 Merge branch 'develop' into NEW/DocumentationUI/Inputs 2025-02-13 17:31:19 +01:00
Laurent Destailleur
971ebb2b6f Merge pull request #33073 from mdeweerd/phan/20250213.reception
Qual: Fix phan notices (reception)
2025-02-13 17:30:11 +01:00
Laurent Destailleur
861725e87b Merge pull request #33070 from frederic34/patch-11
fix phpdoc
2025-02-13 17:29:41 +01:00
Mohamed DAOUD
842196c96a use personalized header for website payment page 2025-02-13 16:53:44 +01:00
atm-lena
a675c3fcaf Fix errors 2025-02-13 16:01:39 +01:00
atm-lena
924868a683 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW/DocumentationUI/Inputs 2025-02-13 15:59:12 +01:00
atm-lena
b661ea69d4 Fix translations 2025-02-13 15:52:31 +01:00
atm-lena
2fc61b5433 Add translation 2025-02-13 15:51:06 +01:00
atm-lena
c0d39e08ae Add element and reorganize 2025-02-13 15:49:32 +01:00
MDW
d8678c793e Qual: Fix phan notices (reception) 2025-02-13 15:39:39 +01:00
Laurent Destailleur
ae3dae7244 Merge pull request #33068 from Hystepik/fix-error-on-update-in-editsecurity
Fix error on website/index when updating security fields
2025-02-13 15:37:28 +01:00
Laurent Destailleur
67e119fdb1 Merge branch 'develop' into fix-error-on-update-in-editsecurity 2025-02-13 15:37:07 +01:00
Laurent Destailleur (aka Eldy)
da7bd36ce4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-13 15:36:51 +01:00
Laurent Destailleur (aka Eldy)
f02554d328 Fix warnings 2025-02-13 15:36:39 +01:00
Laurent Destailleur
9a7767908a Merge pull request #33063 from ilhan69/patch-2
Fix: don stats: SQL query was not formatted correctly due to double quotes
2025-02-13 15:30:09 +01:00
Laurent Destailleur
81f5019d51 Merge pull request #33067 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-02-13 15:29:33 +01:00
Laurent Destailleur
48944b691c Merge pull request #33060 from GregoryBT/patch-2
fix: Fix undefined value $socid
2025-02-13 15:28:01 +01:00
Laurent Destailleur (aka Eldy)
c3aaa6a510 Clean code 2025-02-13 15:22:03 +01:00
Frédéric FRANCE
781bff6e9d Update date.lib.php 2025-02-13 15:06:01 +01:00
Laurent Destailleur
0d220914a1 Merge pull request #33049 from ilhan69/develop
Fix: projects/tasks list : nothing is displayed when you check a task to delete it (mass action)
2025-02-13 14:39:00 +01:00
Laurent Destailleur
6212f978d7 Update tasks.php 2025-02-13 14:38:49 +01:00
Laurent Destailleur
a1f9147709 Merge pull request #33047 from RemiLecas/patch-2
fix: remove unused variable $show_files
2025-02-13 14:31:14 +01:00
Laurent Destailleur
9e620f99ae Merge pull request #33071 from kbegot/patch-3
fix: cast timestamp to int
2025-02-13 14:28:06 +01:00
Laurent Destailleur
7b95c57ea3 Merge pull request #33033 from Hystepik/new-duplicate-pdf-configuration-for-order-in-sepcific-page
New duplicate order's pdf / terms and condition of sale configuration…
2025-02-13 14:26:12 +01:00
Laurent Destailleur
9ee26cbb09 Merge pull request #33055 from ilhan69/patch-1
Fix: donation: fix url to see last 3 donations
2025-02-13 14:22:44 +01:00
Laurent Destailleur (aka Eldy)
0aa6d4f237 NEW The public media browser is stable 2025-02-13 14:21:31 +01:00
Lucas Marcouiller
23941f88c7 Merge branch 'develop' into fix-error-on-update-in-editsecurity 2025-02-13 14:17:35 +01:00
Laurent Destailleur (aka Eldy)
c5ea61d9d4 NEW Mass action delete on donation list 2025-02-13 14:17:07 +01:00
Laurent Destailleur (aka Eldy)
a75a791620 Fix regression 2025-02-13 14:13:45 +01:00
Frédéric FRANCE
0524c4ea10 Update date.lib.php 2025-02-13 13:48:43 +01:00
Kévin Begot
d727977cb7 fix: cast timestamp to int 2025-02-13 13:38:48 +01:00
Frédéric FRANCE
8df094317d fix phpdoc 2025-02-13 13:33:05 +01:00
Hystepik
ecb4a6ea45 Fix error on website/index when updating security fields 2025-02-13 13:26:51 +01:00
Dolibot
60e718eba6 PHPStan > Update baseline 2025-02-13 12:06:47 +00:00
Ilhan K.
55b5298d5b Fix: don stats: SQL query was not formatted correctly due to double quotes 2025-02-13 12:35:41 +01:00
Gregory Toccanier
26dad23379 Update workstation_agenda.php 2025-02-13 12:28:33 +01:00
Ilhan K.
e359d09609 Fix: donation: fix url to see last 3 donations 2025-02-13 12:23:56 +01:00
Ilhan K.
2d30cf9f92 Revert "Fix: donation index: fix url to see last 3 donations"
This reverts commit 87618233d6.
2025-02-13 12:15:24 +01:00
Ilhan K.
87618233d6 Fix: donation index: fix url to see last 3 donations 2025-02-13 12:13:49 +01:00
Ilhan K.
5e1caa56ac Fix: projects/tasks list : nothing is displayed when you check a task to delete it (mass action) 2025-02-13 11:51:17 +01:00
Lucas Marcouiller
4b45e7ac64 Merge branch 'develop' into new-duplicate-pdf-configuration-for-order-in-sepcific-page 2025-02-13 11:42:52 +01:00
Lucas Marcouiller
05fca81ab4 Merge branch 'develop' into New-status-for-webhook 2025-02-13 11:42:24 +01:00
RemiLecas
a325fc5042 fix: remove unused variable $show_files 2025-02-13 11:41:09 +01:00
Laurent Destailleur
f1e6d4b7d6 Merge pull request #33025 from altairisfr/fix_time_pdf_time_spent
FIX: Time spent for timespent PDF
2025-02-13 10:21:09 +01:00
Laurent Destailleur
cd88ad0bc6 Merge pull request #33019 from homer8173/patch-45
Added substitutions in AI response
2025-02-13 10:09:16 +01:00
Regis Houssin
c326d6c84f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_dev_add_mysoc_currency 2025-02-13 06:18:27 +01:00
Laurent Destailleur
92aa7259e8 Merge branch 'develop' into fix_time_pdf_time_spent 2025-02-13 01:03:41 +01:00
Laurent Destailleur
b7079accb6 Merge branch 'develop' into patch-45 2025-02-13 01:03:14 +01:00
Laurent Destailleur
cdb651f2cf Merge pull request #33029 from mdeweerd/phan/2025.2.10.public-2
Qual: Fix phan notices (public-2)
2025-02-13 01:02:37 +01:00
Laurent Destailleur
be659f14a0 Merge pull request #33035 from BenjaminFlr/commonfields
ENH: accessibility on commonfields_add tpl
2025-02-13 00:59:51 +01:00
MDW
45868680a7 Qual: Revert renaming of llxHeader/Footer(Vierge) because used in functions.lib:recordNotFound 2025-02-12 23:41:08 +01:00
MDW
3b1200df77 Qual: Fix phan notices (public-2) 2025-02-12 23:41:07 +01:00
MDW
f352a68150 Qual: Fix phan notices (public-1) 2025-02-12 23:40:57 +01:00
sonikf
87fbe22fad Merge branch 'develop' into sonikf-patch-salary-clone 2025-02-13 00:25:34 +02:00
Laurent Destailleur
a74ba98393 Merge branch 'develop' into commonfields 2025-02-12 23:12:08 +01:00
Laurent Destailleur (aka Eldy)
d59421ff84 Fix warning 2025-02-12 23:11:48 +01:00
Laurent Destailleur
6ab6f02241 Update html.formmail.class.php 2025-02-12 23:02:04 +01:00
Laurent Destailleur
335da91c65 Merge branch 'develop' into fix_time_pdf_time_spent 2025-02-12 22:59:10 +01:00
Laurent Destailleur (aka Eldy)
382394575d Fix warning 2025-02-12 22:58:51 +01:00
Laurent Destailleur
898beaa750 Update html.formmail.class.php 2025-02-12 22:52:42 +01:00
Laurent Destailleur
389a24c234 Merge branch 'develop' into commonfields 2025-02-12 22:51:42 +01:00
Laurent Destailleur (aka Eldy)
62e441ad3d Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-12 22:51:21 +01:00
Laurent Destailleur (aka Eldy)
8c082525fd Fix warning 2025-02-12 22:50:59 +01:00
Benjamin Falière
1c71464b8e Merge branch 'develop' into commonfields 2025-02-12 21:36:11 +01:00
Laurent Destailleur (aka Eldy)
073a6eeae3 NEW Add options PDF_XXX_SHOW_PRICE_INCL_TAX into PDF setup 2025-02-12 21:02:50 +01:00
Laurent Destailleur (aka Eldy)
48354a6d73 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-02-12 19:16:56 +01:00
Laurent Destailleur (aka Eldy)
9d266a0e6a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-12 19:16:32 +01:00
Laurent Destailleur (aka Eldy)
fe3669621a NEW Add option MAIN_MAIL_EMAIL_FROM_PASSWORDRESET 2025-02-12 19:16:20 +01:00
Laurent Destailleur (aka Eldy)
922e58e1e1 WIP Add option MAIN_MAIL_EMAIL_FROM_PASSWORDRESET 2025-02-12 19:10:36 +01:00
Laurent Destailleur (aka Eldy)
863248b618 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-12 15:50:23 +01:00
Benjamin Falière
f214d76d35 ENH: accessibility on commonfields_add tpl 2025-02-12 10:57:58 +01:00
Noé Cendrier
96fdc43e8b Merge branch 'develop' into fix_time_pdf_time_spent 2025-02-12 10:37:28 +01:00
Hystepik
64cbc2ca22 fix to be more constant 2025-02-12 10:32:35 +01:00
Hystepik
8c6b4f20c2 fix ci 2025-02-12 10:30:36 +01:00
Hystepik
8c3faeb974 fix CI 2025-02-12 10:30:06 +01:00
Noé Cendrier
630caa0562 FIX: project time spent in ODT template 2025-02-12 10:13:29 +01:00
Hystepik
9675b95fa3 New duplicate order's pdf / terms and condition of sale configuration in order module configuration 2025-02-12 10:02:39 +01:00
Lucas Marcouiller
16e2a120ad Merge branch 'develop' into New-status-for-webhook 2025-02-12 08:59:04 +01:00
sonikf
89045e1fab Merge branch 'develop' into sonikf-patch-salary-clone 2025-02-12 09:19:07 +02:00
Laurent Destailleur
9fe6d7a5c5 Merge pull request #32986 from Easya-Solutions/new-shipment-card-warehouse-in-cache
QUAL shipment with warehouse in cache
2025-02-12 05:06:20 +01:00
Laurent Destailleur
622f330517 Merge pull request #32980 from Hystepik/new-website-security-const
New website security const by website
2025-02-12 05:05:04 +01:00
Laurent Destailleur
652e31982d Merge pull request #32860 from leninrivas/patch-23
NEW ORDER_TYPE_CONTACT_DEFAULT
2025-02-12 04:46:28 +01:00
Laurent Destailleur
2fe3318aeb Merge pull request #32916 from hregis/fix_dev_multicompany_compatibility
FIX Multicompany compatibility
2025-02-12 04:42:12 +01:00
Laurent Destailleur
86c4c0ccc6 Merge pull request #31904 from IC-Mathieu/FIx_go_back_status
FIX go back status #24944
2025-02-12 04:39:42 +01:00
Laurent Destailleur
a93053eae7 Merge pull request #31953 from Benoit-PASCAL/feat-setup-entity-in-custom-translation
feat: add entity in custom translation with multicompany
2025-02-12 04:29:33 +01:00
Laurent Destailleur
ec4424ae6d Merge pull request #31963 from mdeweerd/new/vcard/third-party
NEW: vcard (vcf) download for third party (#31957)
2025-02-12 04:26:50 +01:00
Laurent Destailleur
7bb331f9f8 Merge pull request #32042 from rycks/develop_takepos_search_term_is_not_same_as_term_variable
new variable search_term to be more clear
2025-02-12 04:11:45 +01:00
Laurent Destailleur
966cfeb0bc Merge pull request #33027 from frederic34/public_member_card
fix phpstan
2025-02-12 04:02:53 +01:00
Laurent Destailleur
5015034d80 Merge pull request #33018 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-02-12 03:09:07 +01:00
Laurent Destailleur
2cb93fc9f6 Merge pull request #33017 from mdeweerd/phan/2025.2.10.project-2
Qual: Fix phan (project-2)
2025-02-12 03:08:41 +01:00
Laurent Destailleur
574d4be99e Merge pull request #33005 from Hystepik/new-move-of-pdf-configuration-in-sepcific-page
New move propal's pdf / terms and condition of sale configuration in propal module configuration
2025-02-12 03:08:04 +01:00
Laurent Destailleur
e92a620754 Merge pull request #33015 from frederic34/fix/translations_2025_02_11
fix missing translations
2025-02-12 03:03:56 +01:00
Laurent Destailleur
41ccf2a309 Merge pull request #33021 from homer8173/patch-46
not enough test
2025-02-12 03:03:07 +01:00
Laurent Destailleur (aka Eldy)
9bc2a3a6bd Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-11 22:24:47 +01:00
MDW
288aca6423 Qual: Fix phan (project-2) 2025-02-11 22:08:21 +01:00
Frédéric France
cba2737c37 fix phpstan 2025-02-11 20:28:41 +01:00
Frédéric France
3327875ee4 fix phpstan 2025-02-11 20:22:06 +01:00
Laurent Destailleur (aka Eldy)
2fc2e045be NEW Add link to create shipment on picto 2025-02-11 18:45:39 +01:00
Noé Cendrier
bdf2632f35 Merge pull request #26 from altairis-melina/fix_time_pdf_timespent
FIX: Time spent for timespent PDF
2025-02-11 17:48:16 +01:00
Mélina JOUM
517959f7cf FIX: Time spent for timespent PDF 2025-02-11 16:59:38 +01:00
VESSILLER
1464e87438 Merge from develop 2025-02-11 16:06:33 +01:00
Norbert Penel
ef802d426e not enough test
can be a problem with objects who don't have required socid
Furthermore it is impossible to unset a property : https://www.php.net/manual/en/function.property-exists.php#116824
2025-02-11 15:44:46 +01:00
Lucas Marcouiller
435fce303d Merge branch 'develop' into new-website-security-const 2025-02-11 15:17:56 +01:00
Hystepik
8a1ff96622 try fix CI 2025-02-11 15:10:28 +01:00
Hystepik
c41dfe087b FIx CI 2025-02-11 15:00:48 +01:00
Hystepik
44807b1452 Fix Ci + error 2025-02-11 14:54:50 +01:00
Hystepik
cbf8d6ae01 Merge branch 'new-website-security-const' of github.com:Hystepik/dolibarr into new-website-security-const 2025-02-11 14:46:55 +01:00
Hystepik
1c24333b57 fix Ci 2025-02-11 14:46:46 +01:00
Hystepik
fb51a285d6 Fix CI by enableing permission check 2025-02-11 14:41:25 +01:00
Norbert Penel
4ecf7334e5 Added substitutions in AI response 2025-02-11 14:30:48 +01:00
Lucas Marcouiller
00482b7e3d Merge branch 'develop' into New-status-for-webhook 2025-02-11 14:25:30 +01:00
Dolibot
9264608bb5 PHPStan > Update baseline 2025-02-11 12:06:50 +00:00
Lucas Marcouiller
9efeead27b Merge branch 'develop' into new-move-of-pdf-configuration-in-sepcific-page 2025-02-11 11:44:05 +01:00
Laurent Destailleur (aka Eldy)
a4e39ba1be Debug v21 2025-02-11 11:01:24 +01:00
Laurent Destailleur (aka Eldy)
b58fa4cfb0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-11 10:59:06 +01:00
Laurent Destailleur
36078f2a32 Merge pull request #33006 from NefiteTifall/patch-2
FIX: Correct HTML escaping function
2025-02-11 10:58:48 +01:00
Laurent Destailleur (aka Eldy)
3ab8e31d76 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-11 10:58:33 +01:00
Frédéric FRANCE
d76a862500 Merge branch 'develop' into fix/translations_2025_02_11 2025-02-11 10:56:36 +01:00
Laurent Destailleur
900717b267 Merge pull request #33013 from mdeweerd/phan/2025.2.10.project-1
Qual: Fix phan (project-1)
2025-02-11 10:56:00 +01:00
Laurent Destailleur (aka Eldy)
9055ab3b4c css 2025-02-11 10:55:34 +01:00
Hystepik
d29fff8a13 Fix CI 2025-02-11 10:27:47 +01:00
Hystepik
39a844ff9b Fix CI 2025-02-11 10:20:45 +01:00
NefiteTifall | Nicolas
b4f06c8f1c 🔧 Remove escape
Eliminated unnecessary escaping of help text in button titles, simplifying the code and ensuring that the title attribute directly uses the provided help text without modification.
2025-02-11 10:20:23 +01:00
Frédéric FRANCE
ec4d6bf7c8 fix missing translations 2025-02-11 10:09:34 +01:00
Frédéric FRANCE
fa35c6e776 fix missing translations 2025-02-11 09:57:01 +01:00
Hystepik
fcc391f6c4 Merge branch 'new-move-of-pdf-configuration-in-sepcific-page' of github.com:Hystepik/dolibarr into new-move-of-pdf-configuration-in-sepcific-page 2025-02-11 09:46:22 +01:00
Hystepik
94e12da906 fix as asked 2025-02-11 09:46:06 +01:00
Lucas Marcouiller
a0812cf7be Merge branch 'develop' into new-move-of-pdf-configuration-in-sepcific-page 2025-02-11 09:18:47 +01:00
MDW
928402c847 Qual: Fix phan (project-1) 2025-02-11 00:22:39 +01:00
MDW
6b6acbd4a5 NEW: vcard (vcf) download for third party (#31957)
# NEW: vcard (vcf) download for third party (#31957)

This adds a download link to fetch a vcard for a Third party.
2025-02-10 22:32:27 +01:00
Laurent Destailleur
5051faa325 Merge pull request #33012 from mdeweerd/phan/2025.2.10.stock-2
Qual: Fix phan (stock-2)
2025-02-10 21:42:31 +01:00
Laurent Destailleur
fe43393b6e Merge pull request #33011 from homer8173/patch-44
Update html.formmargin.class.php
2025-02-10 21:41:39 +01:00
Laurent Destailleur
0fbaad635a Update html.formmargin.class.php 2025-02-10 21:39:55 +01:00
Laurent Destailleur
18179b8ebf Merge pull request #33009 from GregoryBT/patch-1
fix: Remove fk_product to Prevent Undefined Key Error
2025-02-10 21:36:58 +01:00
Laurent Destailleur
c94395ff10 Merge pull request #33004 from AnthonyVallenet/patch-1
Fix: Avoid undefined array key warning in form setup
2025-02-10 21:32:42 +01:00
Laurent Destailleur
6c44d74554 Merge pull request #33008 from AnthonyVallenet/patch-3
Fix: Prevent invalid foreach() on extrafields label in product/price.php
2025-02-10 21:20:46 +01:00
MDW
076399b11b Qual: Fix phan (stock-2) 2025-02-10 21:20:32 +01:00
Laurent Destailleur
968936d390 Merge pull request #33007 from AnthonyVallenet/patch-2
Fix: Prevent warnings and fatal error in admin/mrp.php
2025-02-10 21:19:46 +01:00
Laurent Destailleur (aka Eldy)
2954234420 FIX #33003 2025-02-10 21:04:12 +01:00
Laurent Destailleur (aka Eldy)
3a212e4ddb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-10 19:48:46 +01:00
Norbert Penel
a7a2014215 Update html.formmargin.class.php
Under PHP 8 , can't add string and float on following lines. So i propose to convert to avoid errors
2025-02-10 17:10:41 +01:00
Anthony V
a0eaf653e6 Fix: Use getDolGlobalString 2025-02-10 16:09:47 +01:00
Anthony V
2358dc81a6 Fix: Prevent invalid foreach() on extrafields label in product/price.php
- Ensured $extralabels is always an array before looping to prevent warnings.
- Fixes "foreach() argument must be of type array|string given" error.
- Improves stability when handling extrafields.
2025-02-10 16:05:25 +01:00
Gregory Toccanier
e26b5ae428 Update facture.class.php
Delete fk_product when $prodids[$prodid] is undefined
2025-02-10 16:00:50 +01:00
Anthony V
eac36245bb Fix: Prevent warnings and fatal error in admin/mrp.php
- Fixed "Undefined property: stdClass::$MRP_MO_ADDON_PDF" by checking existence with !empty().
- Fixed "Class 'Product' not found" by adding require_once for product.class.php.
- Improves stability and prevents unexpected crashes in MRP module.
2025-02-10 15:55:28 +01:00
Hystepik
c514d82d45 fix Ci 2025-02-10 15:54:52 +01:00
Hystepik
c5b40a1238 try fix ci 2025-02-10 15:48:21 +01:00
NefiteTifall | Nicolas
4cceac1f46 FIX: Correct HTML escaping function 2025-02-10 15:48:04 +01:00
Hystepik
250ec4ad86 fix CI 2025-02-10 15:19:48 +01:00
Hystepik
996109e9be New move pdf configuration in propal module configuration 2025-02-10 15:12:55 +01:00
Anthony V
0062c9929a Fix: Avoid undefined array key warning in form setup
- Added a check to ensure 'isMandatory' exists in $item->fieldParams before accessing it.
- Prevents "Undefined array key" warning in html.formsetup.class.php.
- Improved robustness by using !empty() to handle missing or false values safely.
2025-02-10 15:10:28 +01:00
Laurent Destailleur
5e47f63c8b Merge pull request #32886 from altairis-noe/element_type
QUAL: deleteObjectLinked() element value matching add_object_linked()
2025-02-10 13:46:46 +01:00
Laurent Destailleur
b3f45f78bd Merge pull request #33001 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-02-10 13:32:19 +01:00
Laurent Destailleur
96368b8e0e Merge branch 'develop' into patch-23 2025-02-10 13:25:48 +01:00
Laurent Destailleur
03c8d418ae Merge pull request #33000 from mdeweerd/phan/2025.2.8.stock-1
Qual: Fix phan notices (stock-1)
2025-02-10 13:23:47 +01:00
Laurent Destailleur
8c6e0021fd Merge pull request #32997 from MarcVJ/patch-1
Added one line to allow use of price_ttc in calculated extra fields (…
2025-02-10 13:20:58 +01:00
Laurent Destailleur
8e61c27793 Update index.php 2025-02-10 13:20:04 +01:00
Laurent Destailleur
7a27235379 Merge pull request #32994 from mdeweerd/phan/fix2025.2.8.product-2
Qual: Fix phan (product-2)
2025-02-10 13:18:59 +01:00
Laurent Destailleur
d1d5815539 Merge pull request #32989 from aspangaro/20_fixtdtimesheet
FIX Timesheet per month - table header with <th>
2025-02-10 13:18:37 +01:00
Laurent Destailleur
caf8f43024 Merge pull request #32993 from mdeweerd/phan/2025.2.8.ifsql
Qual: Fix ifsql argument type
2025-02-10 13:16:46 +01:00
Laurent Destailleur
0691c18355 Merge pull request #32992 from mdeweerd/phan/2025.2.8.product
Qual: Fix phan (product-part-1) implies fixing unit types
2025-02-10 13:15:37 +01:00
Laurent Destailleur
5b37bcd342 Merge branch 'develop' into 20_fixtdtimesheet 2025-02-10 13:13:32 +01:00
Laurent Destailleur
a9b9e98bc1 Merge pull request #32985 from Easya-Solutions/new-shipment-card-product-in-cache
QUAL shipment with product in cache
2025-02-10 13:10:20 +01:00
Laurent Destailleur
21d22fcbc3 Update index.php 2025-02-10 13:08:55 +01:00
Dolibot
1f61789e5b PHPStan > Update baseline 2025-02-10 12:06:47 +00:00
Hystepik
267053f0fd fix Ci 2025-02-10 13:05:40 +01:00
Laurent Destailleur (aka Eldy)
09ba5162e7 Clean code 2025-02-10 13:03:37 +01:00
Laurent Destailleur
9f55909d93 Merge branch 'develop' into new-website-security-const 2025-02-10 12:56:03 +01:00
Laurent Destailleur (aka Eldy)
c45adc4e96 Close #32966 2025-02-10 12:55:45 +01:00
Laurent Destailleur
35689a2d8a Update website.lib.php 2025-02-10 12:47:08 +01:00
Laurent Destailleur
d3808a331b Update website.lib.php 2025-02-10 12:46:36 +01:00
Laurent Destailleur (aka Eldy)
b702561969 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-10 12:42:59 +01:00
Laurent Destailleur (aka Eldy)
461a576669 Close #32966 2025-02-10 12:42:41 +01:00
Laurent Destailleur
2450886446 Merge pull request #32978 from hregis/new_add_hook_load_cache_dictionary
QUAL add hook "loadDictionaryCache"
2025-02-10 12:10:49 +01:00
Laurent Destailleur
830d787e82 Update website.lib.php 2025-02-10 12:06:24 +01:00
MDW
c9bedf8fe2 Qual: Fix phan notices (stock-1) 2025-02-10 11:32:05 +01:00
Hystepik
7d5929ec1f fix phpstan 2025-02-10 10:45:38 +01:00
Hystepik
bc54d4c6cf fix CI 2025-02-10 10:27:06 +01:00
Hystepik
b3d80ea432 fix CI 2025-02-10 09:41:06 +01:00
Hystepik
a6f39c83a0 Merge branch 'new-website-security-const' of github.com:Hystepik/dolibarr into new-website-security-const 2025-02-10 09:34:07 +01:00
Hystepik
44107c7447 fix ci 2025-02-10 09:33:41 +01:00
Lucas Marcouiller
3467a7bda3 Merge branch 'develop' into new-website-security-const 2025-02-10 09:26:03 +01:00
Regis Houssin
a3466b3fa4 FIX merge conflict 2025-02-10 08:13:15 +01:00
Regis Houssin
46f9911ea7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
fix_dev_multicompany_compatibility
2025-02-10 08:06:07 +01:00
MarcVJ
4c3329481a Removed incorrect white space on line 1632 2025-02-09 22:33:56 +01:00
MarcVJ
99fac7c8d3 Added one line to allow use of price_ttc in calculated extra fields (ex : price per kilo) 2025-02-09 22:20:05 +01:00
MDW
1a2d4ed6be Qual: Fix phan (product-2) 2025-02-09 20:14:25 +01:00
MDW
c9d69aa954 Qual: Update phan baseline 2025-02-09 20:14:23 +01:00
MDW
4168a16151 Qual: Fix ifsql argument type 2025-02-09 20:14:22 +01:00
MDW
7952e82a6f Update baseline 2025-02-09 20:14:21 +01:00
MDW
2130f1395a Qual: Fix phan (product-part-1) implies fixing unit types 2025-02-09 20:14:20 +01:00
Laurent Destailleur
bd852dbf5c Merge pull request #32991 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-02-09 19:47:14 +01:00
Laurent Destailleur
db08b160fa Merge pull request #32990 from mdeweerd/phan/2025.2.8
Qual: Fix phan notices (multicurrency,opcache,opensurvey,partnership)
2025-02-09 19:46:34 +01:00
Dolibot
c0e4894a17 PHPStan > Update baseline 2025-02-09 12:06:23 +00:00
MDW
f45b1c0540 Update phan baseline 2025-02-08 14:38:02 +01:00
MDW
8a2a1331f7 Qual: Fix phan (printing) 2025-02-08 14:24:26 +01:00
MDW
7bd354ef17 Qual: Fix phan (partnership) 2025-02-08 14:17:44 +01:00
MDW
23ff8b378c Qual: Fix phan: dol_mktime GETPOST args to GETPOSTINT 2025-02-08 14:06:14 +01:00
MDW
43ed58a0e9 Ignore phpstan notice in baseline 2025-02-08 13:54:24 +01:00
MDW
687421d8f0 Qual: Fix phan notices (multicurrency,opcache,opensurvey) 2025-02-08 12:42:27 +01:00
Alexandre SPANGARO
d41f178adb FIX Timesheet per month - header with <th> 2025-02-08 08:04:18 +01:00
Alexandre SPANGARO
72e262ff76 NEW Accountancy - Define fiscal year by default 2025-02-08 07:52:46 +01:00
MDW
fd7fee2e8f Qual: Fix textwithpicto $type argument (0->info,1->help) 2025-02-08 01:49:54 +01:00
MDW
395fdbf39b Qual: Fix phan notices (mrp) 2025-02-08 01:49:52 +01:00
Regis Houssin
936311ff27 FIX try to fix phpstan error 2025-02-07 23:49:57 +01:00
Regis Houssin
732269a8bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into new_add_hook_load_cache_dictionary 2025-02-07 21:47:47 +01:00
Laurent Destailleur
48bc672991 Merge pull request #32984 from hregis/fix_dev_travis_error
FIX travis error
2025-02-07 21:35:54 +01:00
VESSILLER
846e3aa712 NEW shipment with warhouse in cache 2025-02-07 17:15:46 +01:00
VESSILLER
ce2f46379a NEW shipment with product in cache 2025-02-07 16:52:46 +01:00
Regis Houssin
f3e7e69107 FIX travis error 2025-02-07 16:26:26 +01:00
Lucas Marcouiller
00f30ba3ef Merge branch 'develop' into new-website-security-const 2025-02-07 15:47:04 +01:00
Hystepik
5d02a42b13 add comment information 2025-02-07 15:46:21 +01:00
Hystepik
661bec8fd1 fix translate 2025-02-07 15:43:13 +01:00
Hystepik
d0e0c3bee9 fix elseif 2025-02-07 15:41:34 +01:00
Hystepik
da22c23b55 add translations 2025-02-07 15:41:06 +01:00
Regis Houssin
59c3d3a0ef FIX missing escape 2025-02-07 15:40:17 +01:00
Regis Houssin
be255c72a5 FIX travis error 2025-02-07 15:30:34 +01:00
Hystepik
7aa17b3d37 add all sources + modification for some 2025-02-07 15:27:00 +01:00
Regis Houssin
cbe214d9f6 FIX add $this in $object and remove parameter 2025-02-07 15:03:58 +01:00
Regis Houssin
9c28ee4c1b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into new_add_hook_load_cache_dictionary 2025-02-07 14:55:10 +01:00
Laurent Destailleur
c316d1e5f3 Merge pull request #32959 from mdeweerd/qual/phan.2025.2.5-2
Qual: Fix phan notices (modulebuilder)
2025-02-07 14:54:57 +01:00
Regis Houssin
8a2eb08248 FXI phan error 2025-02-07 14:54:05 +01:00
Laurent Destailleur
ef38d94eea Merge pull request #32872 from pratushraj/20.0-discount
Bug Fix: #32206
2025-02-07 14:47:59 +01:00
Laurent Destailleur
ecda92f15d Merge pull request #32977 from frederic34/fix/2025-02-07-phpstan
fix phpstan
2025-02-07 14:45:53 +01:00
Laurent Destailleur
ab83124738 Merge branch 'develop' into 20.0-discount 2025-02-07 14:40:02 +01:00
Regis Houssin
96dd84ce8b QUAL add hook "loadDictionaryCache" 2025-02-07 14:39:50 +01:00
Laurent Destailleur (aka Eldy)
e57e185ef1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-02-07 14:39:37 +01:00
Laurent Destailleur (aka Eldy)
6c3b530c9c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-07 14:38:43 +01:00
Laurent Destailleur (aka Eldy)
baa6a7928e Fix type 2025-02-07 14:38:28 +01:00
Laurent Destailleur
9ef2ee4dcc Merge branch 'develop' into qual/phan.2025.2.5-2 2025-02-07 14:28:44 +01:00
Laurent Destailleur
8d04badf2d Merge branch 'develop' into fix/2025-02-07-phpstan 2025-02-07 14:28:35 +01:00
Laurent Destailleur
21530703d8 Merge pull request #32969 from futurehousestore/develop
FIX: Warehouse Total Number of Records is Wrong #30248
2025-02-07 14:28:24 +01:00
Laurent Destailleur
d7b19d40b6 Merge branch 'develop' into develop 2025-02-07 14:17:03 +01:00
Laurent Destailleur (aka Eldy)
568a7723c9 Fix phan 2025-02-07 14:16:48 +01:00
Laurent Destailleur (aka Eldy)
c01c49074c Fix phan 2025-02-07 14:12:42 +01:00
Frédéric FRANCE
473592055f Merge branch 'develop' into fix/2025-02-07-phpstan 2025-02-07 13:28:06 +01:00
Laurent Destailleur
bc51e3bcf2 Merge branch 'develop' into develop 2025-02-07 13:01:21 +01:00
Laurent Destailleur (aka Eldy)
0b67bf4dad Fix phan 2025-02-07 13:00:24 +01:00
Laurent Destailleur (aka Eldy)
68ffd2b6a8 Doc 2025-02-07 12:51:44 +01:00
MDW
f05bc70b2e Qual: Fix phan notices (modulebuilder) 2025-02-07 12:31:19 +01:00
Hystepik
b3f40b2c83 fix some naming and add comment 2025-02-07 12:21:44 +01:00
Laurent Destailleur
5642b8b747 Merge branch 'develop' into develop 2025-02-07 12:19:59 +01:00
Laurent Destailleur (aka Eldy)
d01274ef4c Fix phan 2025-02-07 11:28:13 +01:00
Laurent Destailleur
1e76faedd2 Merge branch 'develop' into develop 2025-02-07 10:54:11 +01:00
Laurent Destailleur (aka Eldy)
28724db69e Try to fix phpstan false positive 2025-02-07 10:52:23 +01:00
Frédéric FRANCE
998ff72130 Merge remote-tracking branch 'upstream/develop' into fix/2025-02-07-phpstan 2025-02-07 10:48:21 +01:00
Laurent Destailleur (aka Eldy)
0dbf65c40d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-07 10:46:56 +01:00
Laurent Destailleur (aka Eldy)
9f9eeaa2c4 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-07 10:46:47 +01:00
Frédéric FRANCE
e0a8caec45 fix phpstan 2025-02-07 10:45:03 +01:00
Laurent Destailleur
aea8e51bc3 Merge pull request #32974 from FHenry/dev_DISABLED_JQUERY_UI
NEW: add const to not include default CSS in top_htmlhead with DISABLE_JQUERY_UI
2025-02-07 10:43:18 +01:00
Florian HENRY
a0f868d520 NEW: add const to not include default lib_head.js in top_htmlhead with DISABLE_LIB_HEAD_JS 2025-02-07 10:31:00 +01:00
Laurent Destailleur
42d6c653dd Merge pull request #32940 from marc-dll/develop_NEW_cashcontrol_vat_detail
NEW: takepos cash control: add vat taxless total
2025-02-07 10:19:35 +01:00
Laurent Destailleur
b87c5e99f8 Merge pull request #32972 from FHenry/dev_32971
NEW: add const to not include default CSS in top_htmlhead with DISABLE_CSS_DEFAULT_THEME
2025-02-07 10:13:10 +01:00
Florian HENRY
a881155109 NEW: add const to not include default CSS in top_htmlhead with DISABLE_CSS_DEFAULT_THEME 2025-02-07 10:10:45 +01:00
Florian HENRY
867215e2ea NEW: add const to not include JQuery UI in top_htmlhead DISABLE_JQUERY_UI 2025-02-07 10:05:17 +01:00
Florian HENRY
15dec468cb NEW: add const to not include JQuery UI in top_htmlhead DISABLE_JQUERY_UI 2025-02-07 10:05:06 +01:00
Florian HENRY
91abc644dd NEW: add const to not include JQuery UI in top_htmlhead DISABLE_JQUERY_UI 2025-02-07 10:04:34 +01:00
Florian HENRY
ae7e3dcf2d NEW: add const to not include default CSS in top_htmlhead with DISABLE_CSS_DEFAULT_THEME 2025-02-07 09:54:02 +01:00
futurehousestore
c470629a79 Update list.php
fix total stock quantity
2025-02-07 02:07:06 +00:00
Laurent Destailleur
fb9129b113 Merge pull request #32962 from frederic34/fix/missing_translation
fix missing translations
2025-02-06 22:25:37 +01:00
Laurent Destailleur
88910af035 Merge branch 'develop' into fix/missing_translation 2025-02-06 22:22:29 +01:00
Laurent Destailleur (aka Eldy)
7ef4f5984c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-06 22:22:04 +01:00
Laurent Destailleur (aka Eldy)
aba1eb90b8 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-06 22:21:53 +01:00
Laurent Destailleur
0e191c918e Merge pull request #32960 from BenjaminFlr/fixDomain
ENH: use a non existing domain in install data
2025-02-06 18:17:19 +01:00
Frédéric FRANCE
770a1ccbb3 Merge branch 'develop' into fix/missing_translation 2025-02-06 18:14:35 +01:00
Laurent Destailleur (aka Eldy)
6efcada2c9 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-06 18:14:33 +01:00
Frédéric FRANCE
fb71027aec Update donateurs_code.php 2025-02-06 18:13:42 +01:00
Frédéric FRANCE
d69636b921 Update index.php 2025-02-06 18:02:17 +01:00
Laurent Destailleur (aka Eldy)
ed67378548 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-06 16:42:48 +01:00
Laurent Destailleur (aka Eldy)
11719102b3 Fix phan 2025-02-06 16:42:24 +01:00
Laurent Destailleur
787e18f620 Merge pull request #32965 from BenjaminFlr/fixODT
FIX: rights on odt files
2025-02-06 16:40:01 +01:00
Laurent Destailleur (aka Eldy)
fac786d7d0 Merge 2025-02-06 16:39:40 +01:00
Laurent Destailleur (aka Eldy)
5f13420343 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-06 16:26:48 +01:00
Laurent Destailleur (aka Eldy)
d23ca9083c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-06 16:15:13 +01:00
Benjamin Falière
7c96ba9f7b FIX: rights on odt fiels
Three .odt files had execution rights for ugo. Should be u+rw, g+r and o+r
2025-02-06 15:33:12 +01:00
Laurent Destailleur (aka Eldy)
57a3daa358 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-06 15:03:44 +01:00
Laurent Destailleur (aka Eldy)
22fa107077 Clean code 2025-02-06 14:12:06 +01:00
Laurent Destailleur (aka Eldy)
adb455e4a5 NEW Can set isMandatory property in generic setup framework 2025-02-06 13:51:35 +01:00
Frédéric FRANCE
e1c9dd32a7 fix missing translations 2025-02-06 13:48:23 +01:00
Frédéric FRANCE
ea2728afa0 fix missing translations 2025-02-06 13:31:18 +01:00
Frédéric FRANCE
a9ef15ee55 fix missing translations 2025-02-06 13:26:58 +01:00
Laurent Destailleur (aka Eldy)
0772222900 QUAL Add get_substitutionarray_each_var_object in phpunit 2025-02-06 12:04:41 +01:00
Laurent Destailleur (aka Eldy)
52a4cd5975 FIX get_substitutionarray_each_var_object was returning empty array 2025-02-06 12:01:41 +01:00
Laurent Destailleur (aka Eldy)
7f78e009c6 FIX line_date_xxx into ODF was not loaded 2025-02-06 11:40:27 +01:00
Benjamin Falière
e68b8652ad ENH: use a non existing domain in install data
The domain domain.com is an existing domain. If a user tests email sending with the default value, it will make useless requests to the domain.com domain. Here, I propose to change it by domain.tld, which can't exist
2025-02-06 11:11:15 +01:00
Laurent Destailleur
634cbf4b71 Merge pull request #32952 from mdeweerd/phan/2025.2.5
Qual Fix phan notices (margin)
2025-02-06 10:52:32 +01:00
MDW
da81270fb8 Qual Fix phan notices (margin) 2025-02-06 00:03:13 +01:00
Laurent Destailleur (aka Eldy)
4de757a774 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-05 23:38:29 +01:00
Laurent Destailleur (aka Eldy)
97cccaf0bd Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-05 23:38:11 +01:00
Laurent Destailleur
7295489e26 Merge pull request #32956 from frederic34/fix/missing_translation
fix missing translations
2025-02-05 23:33:39 +01:00
Frédéric FRANCE
42c64af578 fix missing translations 2025-02-05 19:01:42 +01:00
Frédéric FRANCE
16b861b1d7 fix missing translations 2025-02-05 18:52:38 +01:00
Laurent Destailleur
8e1f3aa18b Merge branch 'develop' into patch-23 2025-02-05 18:51:17 +01:00
Frédéric FRANCE
26c0b7778d fix missing translations 2025-02-05 18:46:47 +01:00
Laurent Destailleur (aka Eldy)
7e3c11c285 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-05 18:32:40 +01:00
Laurent Destailleur (aka Eldy)
e400883ad1 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-05 18:32:15 +01:00
Laurent Destailleur
3b31279fcc Merge pull request #32876 from noec764/develop_FichInterClone_Contacts_Not
NEW: Add options on fichinter clone popup to clone or not contacts and notes
2025-02-05 18:02:22 +01:00
Laurent Destailleur
d0b45c9723 Merge pull request #32691 from Tetras-Libre/takepos-start-new-sale-on-click-product-after-payment
TakePos Once payment is complet, a click on a product should start a new sale
2025-02-05 18:02:07 +01:00
Laurent Destailleur
0060cb2041 Update card.php 2025-02-05 16:53:04 +01:00
Laurent Destailleur
010aeec0b9 Update card.php 2025-02-05 16:52:13 +01:00
Laurent Destailleur
12e249f0cf Merge pull request #32915 from Dolibarr/dependabot/github_actions/mdeweerd/logToCheckStyle-2025.1.1
Bump mdeweerd/logToCheckStyle from 2024.3.5 to 2025.1.1
2025-02-05 16:38:25 +01:00
Laurent Destailleur (aka Eldy)
6cf72fbf77 Fix travis 2025-02-05 16:37:55 +01:00
Laurent Destailleur
cd832aa8e3 Merge branch 'develop' into dependabot/github_actions/mdeweerd/logToCheckStyle-2025.1.1 2025-02-05 14:13:36 +01:00
Laurent Destailleur (aka Eldy)
e32f0ea2c9 Fix phpunit 2025-02-05 14:13:16 +01:00
Laurent Destailleur (aka Eldy)
56b44faac6 Fix phpunit 2025-02-05 14:04:47 +01:00
Laurent Destailleur
610683ab7a Merge branch 'develop' into dependabot/github_actions/mdeweerd/logToCheckStyle-2025.1.1 2025-02-05 13:53:12 +01:00
Laurent Destailleur (aka Eldy)
6d5dfe2c1d Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-05 13:52:56 +01:00
Laurent Destailleur
80c0254890 Merge branch 'develop' into dependabot/github_actions/mdeweerd/logToCheckStyle-2025.1.1 2025-02-05 13:36:32 +01:00
Laurent Destailleur (aka Eldy)
4ee2bf5428 Clean cache. Must use conf->cache 2025-02-05 13:35:43 +01:00
Laurent Destailleur (aka Eldy)
c9f9d549e6 Fix cache 2025-02-05 13:27:41 +01:00
Laurent Destailleur
c428116691 Merge branch 'develop' into dependabot/github_actions/mdeweerd/logToCheckStyle-2025.1.1 2025-02-05 13:09:23 +01:00
Laurent Destailleur (aka Eldy)
b1132131f3 Fix regression 2025-02-05 13:09:06 +01:00
Laurent Destailleur
0f08101f5b Merge branch 'develop' into dependabot/github_actions/mdeweerd/logToCheckStyle-2025.1.1 2025-02-05 11:51:48 +01:00
Laurent Destailleur (aka Eldy)
d97a91b83e Merge 2025-02-05 11:16:03 +01:00
Laurent Destailleur (aka Eldy)
1284bd7f4f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-05 10:46:27 +01:00
Laurent Destailleur (aka Eldy)
b6ac3ea2e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-02-05 10:45:38 +01:00
Laurent Destailleur
8e1ed33322 Merge pull request #32944 from frederic34/fix/translations_admin
fix translations admin
2025-02-05 10:06:19 +01:00
Frédéric FRANCE
51353339cf fix translations modulebuilder 2025-02-05 09:23:36 +01:00
Frédéric FRANCE
e6e79fde1f fix translations admin 2025-02-05 09:00:24 +01:00
Regis Houssin
0a58c0b751 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_dev_multicompany_compatibility 2025-02-05 08:20:38 +01:00
Laurent Destailleur
9eaf17de7a Merge branch 'develop' into dependabot/github_actions/mdeweerd/logToCheckStyle-2025.1.1 2025-02-05 03:17:47 +01:00
Laurent Destailleur
2a0713addd Merge pull request #32806 from rycks/19.0_changelog_add_booking_to_calendar
add an info against booking.class.php > calendar.class.php
2025-02-05 03:06:20 +01:00
Laurent Destailleur
14f3ee6cc0 Update ChangeLog 2025-02-05 03:04:11 +01:00
Laurent Destailleur
737ec141c1 Merge branch 'develop' into 20.0-discount 2025-02-05 03:02:47 +01:00
Laurent Destailleur
054df65f66 Merge branch 'develop' into develop_FichInterClone_Contacts_Not 2025-02-05 03:02:30 +01:00
Laurent Destailleur
f39f05889a Merge pull request #32925 from frederic34/2025-02-03-fix_phpstan
fix phpstan
2025-02-05 03:01:14 +01:00
Laurent Destailleur
df3742c742 Merge pull request #32942 from mdeweerd/qual/phan.2024.2.4.2
Qual: Fix argument types in calls to some PDF functions
2025-02-05 03:00:51 +01:00
Laurent Destailleur
aedb416c59 Merge pull request #32931 from mdeweerd/qual/phan.2024.2.4
Qual: Fix phan notices (intracomm, knowledgemgmt, loan,main.inc,master.inc,eldy.lib)
2025-02-05 02:58:31 +01:00
Laurent Destailleur
09f8344629 Merge pull request #32921 from mdeweerd/qual/phan.2025.2.3.3
Qual: Fix phan notices (install,blockedlog,import)
2025-02-05 02:58:10 +01:00
Laurent Destailleur
5b66a3fca3 Merge pull request #32917 from mdeweerd/qual/phan.2025.2.3.kanban
Qual: Fix getKanban phpdoc
2025-02-05 01:50:26 +01:00
MDW
3c39df33f5 Qual: Update phan baseline 2025-02-05 01:43:55 +01:00
MDW
bb4ae71c75 Qual: New fixers for phan 2025-02-05 01:43:54 +01:00
MDW
e5b1946bc7 Qual: Fix arguments types on TCPDF/TCPDI calls 2025-02-05 01:43:53 +01:00
MDW
2117c5e550 Qual: Fix setPageOrientation 'autopagebreak' type 2025-02-05 01:43:52 +01:00
MDW
7841b55813 Qual: Fix MultiCell 'fill' argument type 2025-02-05 01:43:50 +01:00
MDW
2e30ae50ac Qual: fix phpstan notices after fixing phan notices 2025-02-05 01:43:49 +01:00
MDW
4eeb0bdf58 Qual: Update phan baseline 2025-02-05 01:43:48 +01:00
MDW
fb62409ca7 Qual: Fix phan notices (eldy.lib) 2025-02-05 01:43:47 +01:00
MDW
5ead746511 Qual: Fix phan notices (main.inc,master.inc) 2025-02-05 01:43:46 +01:00
MDW
b8e083a4a0 Qual: Fix phan notices (loan) 2025-02-05 01:43:45 +01:00
MDW
941fa4964b Qual: Fix phan notices (knowledgemanagement) 2025-02-05 01:43:44 +01:00
MDW
6bf8f7674d Qual: Fix phan notices (intracomm) 2025-02-05 01:43:43 +01:00
MDW
30c10f54c8 Qual: Update phan baseline 2025-02-05 01:43:42 +01:00
MDW
97099b854f Qual: Fix phan notices (install) 2025-02-05 01:43:41 +01:00
MDW
97c2c3aea2 Qual: Fix phan notices (blockedlog) 2025-02-05 01:43:39 +01:00
MDW
aa521a46d2 Qual: Fix phan notices (import) 2025-02-05 01:43:38 +01:00
MDW
24fa28dfe2 Qual: Fix getKanban phpdoc
# Qual: Fix getKanban phpdoc

Array phpdoc for getKanban corrections.
2025-02-05 01:43:37 +01:00
Laurent Destailleur
4a710ee409 Merge pull request #32914 from mdeweerd/qual/phan.2025.2.3
Qual: Fix phan notices (hrm)
2025-02-05 01:04:04 +01:00
Laurent Destailleur
aa2b3cabc3 Merge pull request #32910 from alexandre-janniaux/docker-compose/2
QUAL: docker-dev: Improve docker-dev compose setup
2025-02-05 00:52:38 +01:00
Laurent Destailleur
3d54a4a638 Merge branch 'develop' into qual/phan.2025.2.3 2025-02-05 00:47:00 +01:00
Laurent Destailleur
5a3b07e440 Merge pull request #32913 from mdeweerd/qual/phan.2025.2.2
Qual: Fix phan notices (ftp, holiday)
2025-02-05 00:45:25 +01:00
Laurent Destailleur (aka Eldy)
62b1fbc41d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-05 00:41:07 +01:00
Laurent Destailleur (aka Eldy)
732f97d73c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-02-05 00:40:06 +01:00
Laurent Destailleur
e307b9d575 Merge pull request #32907 from hregis/fix_20_multicurrency
FIX problem of duplicate data with Multicompany
2025-02-05 00:33:51 +01:00
Laurent Destailleur (aka Eldy)
3af37cbb3f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-05 00:32:47 +01:00
Laurent Destailleur (aka Eldy)
9cafa5f1a9 Fix phan 2025-02-05 00:32:27 +01:00
Laurent Destailleur
a02b7e0549 Merge branch 'develop' into 20.0-discount 2025-02-05 00:16:14 +01:00
Laurent Destailleur
b5ec082794 Merge pull request #32856 from vdegrandpre/32855-calendrier-externe-local
Adding global variables to have more flexibility on external calendar location
2025-02-05 00:13:48 +01:00
Laurent Destailleur
52bbbcde8a Merge pull request #32901 from mdeweerd/qual/phan.2025.1.31
Qual: Fix notices, update baseline, enable PhanTypeMismatchArgument
2025-02-05 00:13:08 +01:00
Laurent Destailleur (aka Eldy)
1bd28eb9a2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-05 00:10:24 +01:00
Laurent Destailleur (aka Eldy)
ac7269eb68 Fix phpstan 2025-02-05 00:10:06 +01:00
Laurent Destailleur (aka Eldy)
39d15ffde2 Fix annotation 2025-02-05 00:06:43 +01:00
Laurent Destailleur
46ff845100 Merge pull request #32922 from frederic34/netmeasure
add missing translation
2025-02-04 23:59:15 +01:00
Laurent Destailleur (aka Eldy)
efeeab4108 Debug v22 2025-02-04 23:58:14 +01:00
Laurent Destailleur (aka Eldy)
c4f52d0484 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-04 22:51:31 +01:00
Frédéric France
fa846254e5 fix phpstan 2025-02-04 20:42:07 +01:00
Frédéric FRANCE
bb42002417 Merge branch 'develop' into 2025-02-03-fix_phpstan 2025-02-04 20:26:26 +01:00
Laurent Destailleur
e60186fbaf Merge pull request #32937 from Easya-Solutions/fix-task-search-status
FIX search status in tasks
2025-02-04 20:05:06 +01:00
Laurent Destailleur
7295cec3a3 Merge pull request #32938 from Easya-Solutions/fix-shipment-updated-message
FIX wrong message on update shipment
2025-02-04 20:03:29 +01:00
Laurent Destailleur
c8f0e3ff44 Merge pull request #32939 from frederic34/patch-14
remove superfluous characters
2025-02-04 20:02:40 +01:00
Laurent Destailleur (aka Eldy)
ab4eb1f834 WIP Dir statement in ECM 2025-02-04 18:46:20 +01:00
Laurent Destailleur (aka Eldy)
fda8e56ded CSS 2025-02-04 16:30:06 +01:00
Marc de Lima Lucio
0a958e98ec NEW: takepos cash control: add vat taxless total 2025-02-04 16:16:02 +01:00
Hystepik
9bd98124bf working select for content security policy 2025-02-04 15:42:50 +01:00
Laurent Destailleur (aka Eldy)
6c9f3f64f2 Missing info in link 2025-02-04 14:10:13 +01:00
Laurent Destailleur (aka Eldy)
288f37a4b8 Missing info in link 2025-02-04 14:10:12 +01:00
Frédéric FRANCE
4f7d5770bd remove superfluous characters 2025-02-04 12:03:45 +01:00
VESSILLER
7a9ad13adf FIX wrong message on update shipment 2025-02-04 11:15:48 +01:00
VESSILLER
09395edd95 FIX search status in tasks 2025-02-04 10:51:55 +01:00
Laurent Destailleur (aka Eldy)
260309c82e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-04 09:30:01 +01:00
Alexandre SPANGARO
99cc7cf993 NEW Accountancy - Define fiscal year by default 2025-02-04 05:12:35 +01:00
Frédéric France
729c7068f0 fix phpstan 2025-02-03 20:29:43 +01:00
Laurent Destailleur (aka Eldy)
50f3fa27c5 WIP Upload file 2025-02-03 20:25:56 +01:00
Frédéric France
1dabc6d120 fix phpstan 2025-02-03 20:06:32 +01:00
Frédéric France
2794f53a10 fix phpstan 2025-02-03 18:42:04 +01:00
Frédéric France
fb0083a3ec fix phpstan 2025-02-03 18:37:57 +01:00
Frédéric France
7a0f37febd fix phpstan 2025-02-03 18:33:28 +01:00
Regis Houssin
9111591016 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_dev_multicompany_compatibility 2025-02-03 17:28:40 +01:00
Frédéric FRANCE
fa52f92270 add missing translation 2025-02-03 16:37:04 +01:00
Frédéric FRANCE
6c7fe69582 add missing translation 2025-02-03 16:36:35 +01:00
Frédéric FRANCE
71e1d9ff10 add missing translation 2025-02-03 16:32:06 +01:00
Vincent de Grandpré
145f3aa659 Merge branch 'Dolibarr:develop' into 32855-calendrier-externe-local 2025-02-03 10:15:58 -05:00
MDW
749296b6e1 Qual: Fix phan notices (hrm)
# Qual: Fix phan notices (hrm)
2025-02-03 16:06:04 +01:00
MDW
2cd13853d5 Qual: Fix phan notices (ftp, holiday)
# Qual: Fix phan notices (ftp, holiday)
2025-02-03 16:06:02 +01:00
MDW
f750f2c40c Qual: Fix phan notices not seen locally 2025-02-03 16:06:01 +01:00
MDW
7f6c09fc63 Qual: Update baseline, enable PhanTypeMismatchArgument
# Qual: Update baseline, enable PhanTypeMismatchArgument

Update the baseline for fixes.
Enable PhanTypeMismatchArgument as this is being fixed and to avoid
that new cases occur in files where these are fixed.
Only about 3800 cases remain, was more than 12000 when starting with Phan.
2025-02-03 16:05:59 +01:00
MDW
4af154c6d5 Qual: Fix phan notices
# Qual: Fix phan notices

Fix phan notices mostly in relation with supplier invoices,
Fix phan notices in relation with formquestion (phpdoc update, casts).
2025-02-03 16:05:57 +01:00
MDW
f66e9553d5 Qual: Fix phan notices
# Qual: Fix phan notices

Fix phan notices in fourn/commande (+form class)
2025-02-03 16:05:55 +01:00
Laurent Destailleur
ae7cc3b95a Merge pull request #32908 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-02-03 15:54:20 +01:00
Dolibot
ed2a013da3 PHPStan > Update baseline 2025-02-03 12:06:55 +00:00
Regis Houssin
fb3f10762e FIX Multicompany compatibility 2025-02-03 10:43:15 +01:00
Laurent Destailleur
671c1252fa Merge pull request #32904 from SebHashe/patch-2
Update llx_accounting_account_fr.sql
2025-02-03 09:18:13 +01:00
SebHashe
efddb65ac9 Update llx_accounting_account_fr.sql
fix 1 to __ENTITY___
2025-02-03 08:27:11 +01:00
dependabot[bot]
ab80e0337d Bump mdeweerd/logToCheckStyle from 2024.3.5 to 2025.1.1
Bumps [mdeweerd/logToCheckStyle](https://github.com/mdeweerd/logtocheckstyle) from 2024.3.5 to 2025.1.1.
- [Commits](https://github.com/mdeweerd/logtocheckstyle/compare/v2024.3.5...v2025.1.1)

---
updated-dependencies:
- dependency-name: mdeweerd/logToCheckStyle
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-03 05:55:39 +00:00
Alexandre Janniaux
39e0723214 docker-dev: README: improve usage documentation
This commit adds more documentation on how to use the docker-compose
setup in different environment (postgres / mariadb) as well as how to
setup it for module development.
2025-02-02 20:09:54 +01:00
Alexandre Janniaux
e6516f06a4 docker-dev: extract mariadb.yml from docker compose file
This extracts the mariadb part to be able to compose different
docker-compose manifests and use PostgreSQL instead for module
development and debugging.
2025-02-02 20:09:53 +01:00
Alexandre Janniaux
99d9d99115 docker-dev: README: use new docker compose subcommand
docker-compose has been replaced by docker compose.
2025-02-02 20:09:51 +01:00
Alexandre Janniaux
2b9deda89b docker-dev: README: set document width to 80
Improve terminal reading experience by limiting the document width to
80. On the web interface, markdown with merge every line into a single
paragraph.
2025-02-02 20:09:50 +01:00
Alexandre Janniaux
f3613f0425 docker-dev: compose: fix warnings
version is deprecated and yaml document starts after --- marker.
2025-02-02 20:09:49 +01:00
Alexandre Janniaux
57ccb41c6e docker-dev: remove files rights change in docker-run.sh
File rights from the whole environment should not change since the files
are belonging to the git tree. In addition, setting www-data to the same
user id as the user (or likewise, setting a userns remapping) remove the
need to change the rights.
2025-02-02 20:09:47 +01:00
Alexandre Janniaux
19d69eaac9 docker-dev: add support for postgresql database
The PostgreSQL database can be used as the following:

        docker compose -f docker-compose.yml -f docker-compose.postgres.yml up

This allows a bit more modularity and ensuring people can start a
PostgreSQL development setup quickly.
2025-02-02 20:09:46 +01:00
Alexandre Janniaux
2e7b90a31c docker-dev: fix LDAP configuration
The libraries are not in /usr/lib/x86_64-gnu-linux anymore, multilib not
being enabled.
2025-02-02 20:09:44 +01:00
Alexandre Janniaux
e1da6dd789 docker-dev: fix paths for docker-compose volumes
The folder was moved in c9519a1a5a
but the paths in 9a61a6e6c9 were not
updated afterwards.
2025-02-02 20:09:41 +01:00
Regis Houssin
01d9ff6a1b FIX phan error 2025-02-02 07:10:28 +01:00
Regis Houssin
5f1723ef6d Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into fix_20_multicurrency 2025-02-02 05:34:35 +01:00
Laurent Destailleur
9e97204ccb Merge pull request #32859 from dolibit-ut/patch-863414
Update llx_c_forme_juridique.sql  #32803
2025-02-02 02:37:12 +01:00
Laurent Destailleur
81639bd6b2 Merge pull request #32861 from hregis/fix_dev_deprecated
FIX E_STRICT is deprecated since PHP 8.4
2025-02-02 02:21:11 +01:00
Laurent Destailleur
f20b4a76d3 Merge branch 'develop' into fix_dev_deprecated 2025-02-02 02:19:32 +01:00
Laurent Destailleur
dc069b8439 Update societe.class.php 2025-02-02 02:07:56 +01:00
Laurent Destailleur
3c7ca42065 Merge branch 'develop' into patch-863414 2025-02-02 02:06:29 +01:00
Laurent Destailleur
265c518684 Merge pull request #32863 from sonikf/sonikf-patch-translation
fix trans
2025-02-02 02:06:13 +01:00
Laurent Destailleur
07264cc9d7 Merge branch 'develop' into sonikf-patch-translation 2025-02-02 02:06:02 +01:00
Laurent Destailleur
cafdcc8a0e Merge branch '20.0' into 20.0-discount 2025-02-02 02:01:26 +01:00
Laurent Destailleur
16fbfc937d Merge branch 'develop' into develop_FichInterClone_Contacts_Not 2025-02-02 02:01:16 +01:00
Laurent Destailleur
f9d5723101 Merge branch 'develop' into patch-2 2025-02-02 02:00:17 +01:00
Laurent Destailleur
f342a52d14 Merge pull request #32810 from vold-lu/fix_right_massfilesarea_
FIX : Mass file area rights with "objects"
2025-02-02 02:00:01 +01:00
Laurent Destailleur
eb406b8065 Merge pull request #32853 from frederic34/patch-11
more fields in liste_contacts
2025-02-02 01:57:26 +01:00
Laurent Destailleur
eb5e35ec1a Merge pull request #32864 from frederic34/membertype_list
enhance member types list
2025-02-02 01:56:40 +01:00
Laurent Destailleur
1427b92c15 Merge pull request #32842 from mdeweerd/qual/phan.2025.1.19
Qual: Fix multiple Phan notices
2025-02-02 01:54:43 +01:00
Laurent Destailleur
3089572667 Merge pull request #32852 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-02-02 01:54:17 +01:00
Laurent Destailleur
c5bbb7ec22 Merge pull request #32875 from Sakura2908/bug_fix_fichinter
FIX Recurring Interventions Translations
2025-02-02 01:53:05 +01:00
MDW
42be9a3442 Qual: Update phan baseline 2025-02-02 01:26:44 +01:00
MDW
18f616b201 Qual: Fix remaining phan notice in expensereport_linktofile 2025-02-02 01:26:43 +01:00
MDW
991afe2b21 Qual: Fix notices in api_interventions, phpstan notice 2025-02-02 01:26:42 +01:00
MDW
bea27b0be4 Qual: Fix phan notices 2025-02-02 01:26:41 +01:00
Laurent Destailleur
8a5c5ac09f Merge pull request #32902 from mdeweerd/fix/ci2025.2.1
Fix ci: Add full array definition to selectForForms:$objectfield
2025-02-02 01:16:33 +01:00
Laurent Destailleur
8b04314ea3 Add a TODO 2025-02-02 01:08:40 +01:00
Laurent Destailleur
93fab21b79 Merge pull request #32463 from Benoit-PASCAL/feat-add-function-to-get-public-holidays-list-within-period
NEW: Add function to get public holidays list within period
2025-02-02 01:03:21 +01:00
Laurent Destailleur
b1fa23608f Debug v21 2025-02-02 00:29:08 +01:00
SebHashe
465be392bb Update llx_accounting_account_fr.sql
Fix PCG18-ASSOC datas with helloAsso
2025-02-01 23:40:11 +01:00
Regis Houssin
6277c76e17 FIX avoid warning if NOREQUIRETRAN is defined 2025-02-01 18:44:12 +01:00
Regis Houssin
a16bc363c7 QUAL add $mysoc->currency and call default lang before setMysoc() 2025-02-01 17:40:51 +01:00
MDW
bb0212ef6a Fix ci: Add full array definition to selectForForms:$objectfield
# Fix ci: Add full array definition to selectForForms:$objectfield

Add field definition to phpdoc
2025-02-01 15:39:56 +01:00
Regis Houssin
d32f1e716a FIX missing entity filter 2025-02-01 14:48:39 +01:00
Regis Houssin
22bc17bd5f Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into fix_20_multicurrency 2025-02-01 14:34:12 +01:00
Hystepik
5fb161260f add remove div 2025-01-31 14:42:34 +01:00
Noé Cendrier
285a07aa32 FIX: searched element value should be the same as the one used in add_object_linked() 2025-01-31 10:52:43 +01:00
Rémi Champlon
e34d4a7a0b fix space 2025-01-31 08:29:38 +01:00
Rémi Champlon
f8e27e3c9d remove "lire" test 2025-01-31 08:28:44 +01:00
Laurent Destailleur (aka Eldy)
81dda600fc Merge 2025-01-30 23:11:33 +01:00
Laurent Destailleur (aka Eldy)
b5091dd425 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-30 23:09:46 +01:00
Laurent Destailleur (aka Eldy)
9530afc85e Fix trans 2025-01-30 22:51:43 +01:00
Laurent Destailleur (aka Eldy)
0136b4cc71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-30 22:40:00 +01:00
sonikf
e6160cc7ff Merge branch 'develop' into sonikf-patch-salary-clone 2025-01-30 20:32:54 +02:00
Regis Houssin
a623623bbf Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into fix_20_multicurrency 2025-01-30 19:27:11 +01:00
Noé
1d1eafb19f FIX: Add documentation for hte new two params 2025-01-30 17:33:57 +01:00
Noé
ac8557e129 NEW: Add options on intervention clone popup to clone or not contact and notes 2025-01-30 17:24:42 +01:00
Laurent Destailleur (aka Eldy)
e83e318fc9 Enhance selectForForms 2025-01-30 16:04:25 +01:00
Solène
0cc2ce2c11 Translations fixed 2025-01-30 15:48:50 +01:00
Laurent Destailleur
18314da71e Merge pull request #32841 from mdeweerd/qual/phan.2025.1.19-a
Qual: Fix multiple phan notices
2025-01-30 14:59:51 +01:00
Laurent Destailleur
923649b1ec Merge branch 'develop' into qual/phan.2025.1.19-a 2025-01-30 13:19:39 +01:00
Laurent Destailleur
2abf8c9d5e Merge pull request #32831 from frederic34/patch-15
Update llx_c_type_contact.sql
2025-01-30 13:18:36 +01:00
Laurent Destailleur (aka Eldy)
58134e840d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-01-30 13:14:15 +01:00
Dolibot
4e1a319113 PHPStan > Update baseline 2025-01-30 12:06:34 +00:00
Laurent Destailleur (aka Eldy)
1062c736de Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-30 12:10:36 +01:00
Laurent Destailleur (aka Eldy)
1298229345 Doc 2025-01-30 12:10:21 +01:00
Pratush Raj
7260476397 Bug Fix: #32206 2025-01-30 15:14:07 +05:30
Laurent Destailleur
c07be3dfc3 Update README.md 2025-01-30 09:30:10 +01:00
Regis Houssin
d831e30869 FIX multicompany compatibility 2025-01-30 08:29:46 +01:00
Frédéric FRANCE
f0b37f958e Merge remote-tracking branch 'upstream/develop' into membertype_list 2025-01-29 19:35:15 +01:00
Frédéric FRANCE
82eb875fab enhance member types list 2025-01-29 19:34:35 +01:00
Frédéric FRANCE
6fad33e592 Merge branch 'develop' into patch-11 2025-01-29 19:30:12 +01:00
Frédéric FRANCE
7806439914 Merge remote-tracking branch 'upstream/develop' into patch-15 2025-01-29 19:25:49 +01:00
Frédéric FRANCE
7a6b650e82 fix phan 2025-01-29 19:25:32 +01:00
Frédéric FRANCE
1c94227320 fix phan 2025-01-29 19:24:40 +01:00
Frédéric FRANCE
d1adfb32a4 enhance member types list 2025-01-29 19:21:44 +01:00
Laurent Destailleur (aka Eldy)
0cbedd4ff0 Fix warnings 2025-01-29 19:15:57 +01:00
Frédéric FRANCE
de131d7d8e enhance member types list 2025-01-29 19:13:23 +01:00
Frédéric FRANCE
0338b5c658 enhance member types list 2025-01-29 19:11:03 +01:00
Frédéric FRANCE
841cd5f570 enhance member types list 2025-01-29 19:08:08 +01:00
sonikf
9984652a45 fix trans 2025-01-29 19:43:00 +02:00
sonikf
d66ff94c72 fix trans 2025-01-29 19:38:49 +02:00
sonikf
4d8f28f22b fix typo 2025-01-29 19:36:31 +02:00
sonikf
9cb16ea555 fix trans 2025-01-29 19:34:18 +02:00
Regis Houssin
40567ce7f6 FIX E_STRICT is deprecated since PHP 8.4 2025-01-29 18:13:03 +01:00
Lenin Rivas
bd87aa005d NEW CONSTANT: ORDER_TYPE_CONTACT_DEFAULT
For example: Direct to SHIPPING
2025-01-29 12:05:23 -05:00
UT from dolibit
8f3b814aaf Update llx_c_forme_juridique.sql
added new Austrian business entity type FlexKapG #32803
2025-01-29 17:31:07 +01:00
Frédéric FRANCE
0364e11b2d Merge remote-tracking branch 'upstream/develop' into patch-15 2025-01-29 17:17:15 +01:00
Vincent de Grandpré
71d13cc77a added cpr 2025-01-29 10:13:01 -05:00
Vincent de Grandpré
841356613e code format 2025-01-29 09:40:57 -05:00
Vincent de Grandpré
5b1c5397ba Adding global variables to have more flexibility on external calendars location. 2025-01-29 09:34:16 -05:00
Frédéric FRANCE
9870069f44 more fields in liste_contacts 2025-01-29 13:56:46 +01:00
Laurent Destailleur (aka Eldy)
e0494b8e1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-01-29 13:31:40 +01:00
Laurent Destailleur (aka Eldy)
65ba6c7a1c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-29 13:30:00 +01:00
Laurent Destailleur (aka Eldy)
f94cfd0d60 Fix position 2025-01-29 13:29:44 +01:00
Hystepik
180954eb16 fix php typo 2025-01-29 10:17:38 +01:00
Hystepik
e0be95f531 New westite security constants 2025-01-29 10:17:18 +01:00
Frédéric FRANCE
0eb75b7e4f dict type contact 2025-01-29 09:28:36 +01:00
Frédéric FRANCE
262a07f5fa dict type contact 2025-01-29 09:25:23 +01:00
Frédéric FRANCE
40d8bea77e dict type contact 2025-01-29 09:14:13 +01:00
Frédéric FRANCE
3f1efcfb53 dict type contact 2025-01-29 09:01:32 +01:00
Frédéric FRANCE
d5a7d01566 Merge remote-tracking branch 'upstream/develop' into patch-15 2025-01-29 08:37:49 +01:00
MDW
e5c385999d Qual: Fix multiple phan notices
# Qual: Fix multiple phan notices

Fix multiple phan notices
2025-01-29 01:41:41 +01:00
Laurent Destailleur
2483c4ec58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-29 01:38:42 +01:00
Laurent Destailleur
1c7a3a0e73 More complete fix for #32839 2025-01-29 01:38:11 +01:00
Laurent Destailleur
1af487b8b2 Merge pull request #32747 from altairisfr/qty_multiple_sale
NEW: Add the "packaging" feature to round the quantities to some given multiples
2025-01-29 00:50:35 +01:00
Laurent Destailleur
df4c9fe250 Merge pull request #32773 from atm-lucasmantegari/NEW/Adding_Products_Mails
NEW Can send mails from product
2025-01-29 00:04:57 +01:00
Laurent Destailleur
91324505b7 Merge pull request #32818 from frederic34/clean_phpstan_baseline
clean phpstan baseline
2025-01-29 00:04:03 +01:00
Laurent Destailleur
6b9ecb7cf9 Merge pull request #32817 from mdeweerd/qual/phan.2024.1.18
Qual: Fix phan notices
2025-01-29 00:02:10 +01:00
Laurent Destailleur
4cb3d72471 Merge pull request #32816 from mdeweerd/qual/phan.2025.1.18-a
Qual: Fix Phan notices
2025-01-28 23:58:35 +01:00
Laurent Destailleur
02b479d28c Merge pull request #32819 from mdeweerd/qual/spelling
Qual: Spelling fixes, cleanup exceptions
2025-01-28 23:51:20 +01:00
Laurent Destailleur
2f80474ee5 Merge pull request #32824 from hregis/fix_dev_look_and_feel
FIX hide duplicate help
2025-01-28 23:49:43 +01:00
Laurent Destailleur
9861f0feb6 Merge pull request #32825 from frederic34/patch-10
give a chance to use origin_type instead deprecated origin
2025-01-28 23:48:55 +01:00
Laurent Destailleur
934f98c314 Merge pull request #32827 from frederic34/patch-14
fix page title
2025-01-28 23:47:47 +01:00
Laurent Destailleur
8e37879acc Merge pull request #32836 from altairisfr/prodsql_fix
FIX: float is not int
2025-01-28 23:39:52 +01:00
Frédéric France
64f1d966f1 fix phpstan 2025-01-28 21:33:32 +01:00
Frédéric France
00249c9a90 fix phpstan 2025-01-28 20:46:05 +01:00
Frédéric France
612c26c2e0 fix phpstan 2025-01-28 20:35:25 +01:00
Frédéric France
fefb112a21 Merge remote-tracking branch 'upstream/develop' into clean_phpstan_baseline 2025-01-28 20:33:36 +01:00
Frédéric France
4a08b6cfcb fix phpstan 2025-01-28 20:32:57 +01:00
Laurent Destailleur (aka Eldy)
7b8f20da1c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-28 19:30:30 +01:00
Laurent Destailleur (aka Eldy)
2cf7b43f9e Fix update manifest json 2025-01-28 19:18:06 +01:00
Frédéric France
c7aa6f9c40 fix phpstan 2025-01-28 19:07:41 +01:00
Laurent Destailleur (aka Eldy)
06a3e6e980 Add catch for better error management 2025-01-28 19:01:38 +01:00
Frédéric France
23270663df fix phpstan 2025-01-28 18:43:05 +01:00
Frédéric France
8ba644340f fix phpstan 2025-01-28 18:33:13 +01:00
Frédéric France
a8d35dc6bb fix phpstan 2025-01-28 18:26:53 +01:00
Frédéric France
6fd7871489 Merge remote-tracking branch 'upstream/develop' into clean_phpstan_baseline 2025-01-28 18:24:41 +01:00
Frédéric France
877b9dc811 fix phpstan 2025-01-28 18:14:54 +01:00
Laurent Destailleur (aka Eldy)
bd8b9708cd Doc 2025-01-28 16:02:30 +01:00
Laurent Destailleur (aka Eldy)
0dc88fe9ba Fix error management of website module 2025-01-28 16:02:23 +01:00
Noé Cendrier
d57de9cc85 FIX: number display format 2025-01-28 15:51:46 +01:00
Noé Cendrier
f8ec4c2c91 FIX: var type 2025-01-28 15:46:20 +01:00
Noé Cendrier
758f1398a8 FIX: float is not int 2025-01-28 15:37:32 +01:00
Noé Cendrier
966d079019 FIX: implement mdeweerd review 2025-01-28 15:31:08 +01:00
Frédéric FRANCE
8d39020f2a Update llx_c_type_contact.sql 2025-01-28 14:55:43 +01:00
Frédéric FRANCE
4b23a78f7f Update expedition.class.php 2025-01-28 14:32:09 +01:00
Frédéric FRANCE
b647b4dc3f Update llx_c_type_contact.sql 2025-01-28 14:29:48 +01:00
Laurent Destailleur (aka Eldy)
6b38b320bc Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-28 14:01:32 +01:00
Frédéric FRANCE
feacc728b7 Merge branch 'develop' into patch-10 2025-01-28 13:13:43 +01:00
Frédéric FRANCE
136575d967 fix page title 2025-01-28 12:47:44 +01:00
Laurent Destailleur (aka Eldy)
838ffdcc7a Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-28 12:44:20 +01:00
Frédéric FRANCE
0958934849 give a chance to use origin_type instead deprecated origin 2025-01-28 10:05:18 +01:00
Regis Houssin
37146ff8f4 FIX hide duplicate help 2025-01-28 08:50:23 +01:00
Frédéric France
63b56ade21 fix phpstan 2025-01-27 22:15:37 +01:00
Frédéric France
4616a2f636 fix phpstan 2025-01-27 22:00:15 +01:00
Frédéric France
377043686a fix phpstan 2025-01-27 21:22:52 +01:00
Frédéric France
306e66e3d7 fix phpstan 2025-01-27 20:44:10 +01:00
Frédéric France
fe2cdc47cc fix phpstan 2025-01-27 20:15:12 +01:00
Frédéric France
e0e03f1a1a fix phpstan 2025-01-27 20:01:20 +01:00
Frédéric France
11cb6282b6 clean phpstan baseline 2025-01-27 19:55:39 +01:00
MDW
581b079e14 Qual: Spelling fixes, cleanup exceptions
# Qual: Spelling fixes, cleanup exceptions

Fix some spelling and cleanup ignored lines
2025-01-27 19:32:38 +01:00
MDW
49315de959 Qual: Update phan baseline 2025-01-27 19:15:10 +01:00
MDW
f250f7caa5 Qual: Fix Phan notices
# Qual: Fix phan notices
2025-01-27 19:15:09 +01:00
Frédéric France
1f02f68422 clean phpstan baseline 2025-01-27 18:53:37 +01:00
Laurent Destailleur (aka Eldy)
c631d66751 CSS 2025-01-27 18:26:56 +01:00
Laurent Destailleur (aka Eldy)
3b6f36f2ae Missing br 2025-01-27 18:25:14 +01:00
Laurent Destailleur (aka Eldy)
6dcaaf9276 Better look of feel of bank page 2025-01-27 18:22:49 +01:00
Laurent Destailleur (aka Eldy)
b9f10cbc33 Fix css 2025-01-27 18:17:36 +01:00
Laurent Destailleur (aka Eldy)
59ba087128 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-27 18:13:42 +01:00
Laurent Destailleur (aka Eldy)
440c08346f Fix responsive 2025-01-27 18:13:25 +01:00
Laurent Destailleur
040f4e2c7a Merge pull request #32772 from mdeweerd/qual/phan.2025.1.6
Qual: phan fixes
2025-01-27 15:51:32 +01:00
Laurent Destailleur (aka Eldy)
6382968f1f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-27 15:41:07 +01:00
Laurent Destailleur
6eeb2d8a60 Merge branch 'develop' into NEW/Adding_Products_Mails 2025-01-27 15:37:55 +01:00
Laurent Destailleur
3ad526b754 Merge branch 'develop' into qual/phan.2025.1.6 2025-01-27 15:37:42 +01:00
Laurent Destailleur
5f334bdb68 Merge pull request #32771 from mdeweerd/qual/phan.2025.1.6-a
Qual: Phan fixes
2025-01-27 15:37:07 +01:00
Laurent Destailleur (aka Eldy)
13d78bf14c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-27 15:36:05 +01:00
Laurent Destailleur (aka Eldy)
bc5ce5b086 Doc 2025-01-27 15:35:45 +01:00
Laurent Destailleur
9a619bb7c1 Merge branch 'develop' into qual/phan.2025.1.6-a 2025-01-27 14:52:56 +01:00
Laurent Destailleur
cc20b2431b Merge pull request #32779 from mdeweerd/fix/ci/2025.1.25
Fix ci phan/phpstan notices
2025-01-27 14:52:40 +01:00
Laurent Destailleur
fa1bb0b1ec Merge pull request #32813 from Easya-Solutions/develop_fix_extrafield_checkbox_default_value
NEW: Support default values in extrafield definition for extrafields select list (n choices)
2025-01-27 14:51:26 +01:00
tnegre
4b393fdd47 fix: use default values for extrafields checkboxes 2025-01-27 14:43:35 +01:00
Laurent Destailleur
d71633600c Merge branch 'develop' into fix/ci/2025.1.25 2025-01-27 14:42:33 +01:00
Laurent Destailleur
fccbab9a10 Merge pull request #32809 from frederic34/patch-10
fix phpstan
2025-01-27 14:41:19 +01:00
Laurent Destailleur (aka Eldy)
10982b208f Fix warnings 2025-01-27 14:37:00 +01:00
Laurent Destailleur (aka Eldy)
e5a0ea8f25 Fix warning 2025-01-27 14:34:50 +01:00
Frédéric FRANCE
d6034cf16a Update project.lib.php 2025-01-27 14:00:59 +01:00
Frédéric FRANCE
907a874988 Update project.lib.php 2025-01-27 13:52:55 +01:00
MDW
ba53bd741d Qual: Update phan baseline 2025-01-27 13:24:32 +01:00
MDW
dd418533d7 Qual: Update PHPdoc - $page is a url, not an int 2025-01-27 13:24:31 +01:00
MDW
fdef25e5de Qual: Fix PhanTypeMismatchArgument with phpdoc type change in called function 2025-01-27 13:24:30 +01:00
MDW
564cd737a1 Qual: Fix PhanTypeMismatchArgumentNullable by updating PHPdoc of target function
# Qual: Fix PhanTypeMismatchArgumentNullable by updating PHPdoc of target function

Reduce the number PhanTypeMismatchArgumentNullable by updating the phpdoc
of the function that is called.  Done when the called function allows null
(empty check, or `if` test).
2025-01-27 13:24:29 +01:00
MDW
7150af31dc Fix Phan notices introduced since 30/12/2024 2025-01-27 13:24:29 +01:00
MDW
4707d29f0a Qual: Update PHPdoc of editfieldval to reduce typemismatch notices 2025-01-27 13:24:27 +01:00
Laurent Destailleur (aka Eldy)
b043cd0290 More phpunit test 2025-01-27 13:24:26 +01:00
MDW
2696c9a107 Fix ci phan/phpstan notices
# Fix ci phan/phpstan notices

Fix most notices, except undefined fk_website in SocieteAccount
as it is not clear if that is supposed to be a property there
(more specifically, that it is set).
2025-01-27 13:21:30 +01:00
Rémi Champlon
97af0975bc indent 2025-01-27 11:58:33 +01:00
Rémi Champlon
da1bee6872 re fix 2025-01-27 11:57:07 +01:00
Rémi Champlon
180366a2ca fix 2025-01-27 11:56:47 +01:00
Rémi Champlon
806b01c0a6 fix 2025-01-27 11:54:02 +01:00
Frédéric FRANCE
ca619914c2 Update icons.php 2025-01-27 11:49:39 +01:00
Frédéric FRANCE
73e3a260cf Update icons.php 2025-01-27 11:49:01 +01:00
Frédéric FRANCE
d5934b427d Merge branch 'develop' into patch-10 2025-01-27 11:43:11 +01:00
Laurent Destailleur (aka Eldy)
77c8457d88 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-27 11:42:51 +01:00
Frédéric FRANCE
16f8de0f4d Update icons.php 2025-01-27 11:27:34 +01:00
Frédéric FRANCE
3a19a7d277 fix phpstan 2025-01-27 11:22:10 +01:00
Laurent Destailleur
0cbf1f6598 Merge branch 'develop' into 19.0_changelog_add_booking_to_calendar 2025-01-27 11:00:00 +01:00
Laurent Destailleur
3c27f6d912 Merge branch 'develop' into qual/phan.2025.1.6-a 2025-01-27 10:56:31 +01:00
MDW
f959aab7e2 Update baseline 2025-01-27 10:24:18 +01:00
MDW
881e6712cf Qual: Fix last PhanPossiblyNullTypeMismatchProperty 2025-01-27 10:24:17 +01:00
MDW
a42bc6755c Qual: Fix PhanPluginUnknownPropertyType, PhanPossiblyUndeclaredVariable 2025-01-27 10:24:16 +01:00
MDW
b61d286e7d Update baseline 2025-01-27 10:24:15 +01:00
ATM-Lucas
cd642e7e02 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW/Adding_Products_Mails 2025-01-27 10:23:27 +01:00
ATM-Lucas
16e5b04803 conflict 2025-01-27 10:22:08 +01:00
ATM-Lucas
553d7c70a5 space 2025-01-27 10:19:54 +01:00
ATM-Lucas
87e46db256 error 2025-01-27 10:19:22 +01:00
Laurent Destailleur (aka Eldy)
a99b132c34 Accept img src=data into dolPrintHTML 2025-01-27 10:16:28 +01:00
ATM-Lucas
c1058da4c5 Travis error 2025-01-27 10:15:56 +01:00
Laurent Destailleur (aka Eldy)
2bf034fe07 Clean code 2025-01-27 10:03:53 +01:00
Laurent Destailleur (aka Eldy)
a45a86a812 Fix sql syntax error on empty filter 2025-01-27 09:48:13 +01:00
Eric Seigne
046d0511db add an info against booking.class.php > calendar.class.php 2025-01-27 08:40:13 +01:00
Laurent Destailleur
0ffc50e942 Merge pull request #32074 from thersane-john/new_doc_icons
New doc for icon list
2025-01-27 05:01:17 +01:00
Laurent Destailleur
12f2534a03 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-27 03:53:46 +01:00
Laurent Destailleur
73e4e05bad Fix phpstan 2025-01-27 02:25:57 +01:00
Laurent Destailleur
eb81cd4f22 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-27 02:06:35 +01:00
Laurent Destailleur
64c3e3fb36 Fix phan 2025-01-27 02:06:15 +01:00
Laurent Destailleur
156b537296 Merge pull request #32790 from hregis/fix_dev_add_help_text
QUAL add help text for default values (for newbies !)
2025-01-27 01:49:48 +01:00
Laurent Destailleur
49cda2c7db Merge branch 'develop' into fix_dev_add_help_text 2025-01-27 01:45:06 +01:00
Laurent Destailleur
5e7aa32faa Fix warning 2025-01-27 01:44:51 +01:00
Laurent Destailleur
adae4f0fb3 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-27 01:37:52 +01:00
Laurent Destailleur
24c65645db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-27 01:31:01 +01:00
Laurent Destailleur
ada32d6e8d Merge pull request #32642 from Easya-Solutions/NEW_option_not_prefill_shipment_lines_qty
NEW add option to not prefill qty line at shipment creation
2025-01-27 01:05:12 +01:00
Laurent Destailleur
b414ac8ae6 Show position in source 2025-01-27 00:53:22 +01:00
Laurent Destailleur
8ac4567c61 Merge pull request #32775 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-01-27 00:31:07 +01:00
Laurent Destailleur
4ff0d54cb4 Merge pull request #32787 from frederic34/patch-10
fix search with array
2025-01-27 00:05:14 +01:00
Laurent Destailleur (aka Eldy)
bff7f88b38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-26 15:11:53 +01:00
Laurent Destailleur
aca840e100 Merge pull request #32788 from hregis/revert-32778-fix_dev_avoid_waring_de_merde
Revert "QUAL can defined a json format in default search filters"
2025-01-25 19:34:25 +01:00
Laurent Destailleur (aka Eldy)
7de7bd5ef6 Clean code 2025-01-25 18:43:05 +01:00
Laurent Destailleur (aka Eldy)
01c5025bef Center 2025-01-25 16:07:41 +01:00
Laurent Destailleur (aka Eldy)
c3ca19e6e7 CSS 2025-01-25 16:06:31 +01:00
Laurent Destailleur (aka Eldy)
722797aaad Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-25 16:02:17 +01:00
Regis Houssin
41058de4ef FIX look and feel 2025-01-25 15:48:21 +01:00
Regis Houssin
7e4c8ef622 QUAL add help text for default values 2025-01-25 15:27:51 +01:00
Regis Houssin
52c835af33 Revert "QUAL can defined a json format in default search filters" 2025-01-25 14:18:38 +01:00
Frédéric FRANCE
f6deb314fa fix search with array 2025-01-25 13:20:29 +01:00
Laurent Destailleur
cb8da6c03c Merge pull request #32778 from hregis/fix_dev_avoid_waring_de_merde
QUAL can defined a json format in default search filters
2025-01-24 21:57:52 +01:00
Regis Houssin
887d56a557 ΩUAL can defined a json format in default search filters 2025-01-24 21:22:43 +01:00
ATM-Lucas
9c10d36b1b fault 2025-01-24 16:55:13 +01:00
ATM-Lucas
4afb100767 Adding model Mail 2025-01-24 16:52:50 +01:00
Laurent Destailleur (aka Eldy)
48be055227 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-24 15:26:10 +01:00
Laurent Destailleur (aka Eldy)
fbe4ccd0e2 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-24 15:25:51 +01:00
ATM-Lucas
e3856d0de5 pre-commit error 2025-01-24 14:04:30 +01:00
Dolibot
81b0ff4ebf PHPStan > Update baseline 2025-01-24 12:06:49 +00:00
ATM-Lucas
ba6f80c307 comm 2025-01-24 12:24:43 +01:00
ATM-Lucas
75db806102 Adding sending mails on product 2025-01-24 12:23:08 +01:00
Laurent Destailleur
ec649b027a Merge pull request #32536 from mdeweerd/qual/phan.2025.1.5
Qual: Fix phan notices
2025-01-24 11:20:19 +01:00
Laurent Destailleur
6be560e7d4 Merge pull request #32763 from IC-William/NEW_taskClose
NEW project task status
2025-01-24 11:05:45 +01:00
MDW
f17ad3933b Update baseline 2025-01-24 10:55:58 +01:00
MDW
7aa845efd0 Qual: Fix phan notices 2025-01-24 10:55:57 +01:00
MDW
44944ac15a Qual: fix phan notices 2025-01-24 10:55:56 +01:00
MDW
1ae4f984ed Qual: fix phan notices 2025-01-24 10:55:55 +01:00
MDW
c0ad3f22b9 Qual: fix phan notices 2025-01-24 10:55:54 +01:00
MDW
ccc0528dd4 Qual: Fix argument types 2025-01-24 10:55:54 +01:00
MDW
56c060e14a Qual: Define types for properties 2025-01-24 10:55:53 +01:00
MDW
ac9301dc8f Qual: Handle case where code to convert is <false> 2025-01-24 10:55:52 +01:00
MDW
7847da3c11 Qual: Fix phan notices 2025-01-24 10:55:51 +01:00
MDW
f64c0818f9 Qual: Fix nullable and typing (phan notices) 2025-01-24 10:55:50 +01:00
MDW
a35d502409 Fix: Correct key for position of extrafield 2025-01-24 10:55:49 +01:00
MDW
f322aad97b Qual: Ensure type is string. 2025-01-24 10:55:48 +01:00
MDW
ba32606084 Fix return value for getListOfCollation() 2025-01-24 10:55:47 +01:00
MDW
3fb717bb68 Fix date types/arrays (phan notices) 2025-01-24 10:55:46 +01:00
MDW
694342484d Qual: Fix phan notices 2025-01-24 10:55:45 +01:00
MDW
4246215730 Fix: Convert email references array to string 2025-01-24 10:55:45 +01:00
MDW
b19122b046 Qual: Fix argument type 2025-01-24 10:55:44 +01:00
MDW
c2be92dad5 Fix: fetch_object takes resultset, not sql 2025-01-24 10:55:43 +01:00
Laurent Destailleur
fbb52d6778 Merge pull request #32759 from altairisfr/fix_customer_price_and_multiprices
FIX: customer price and multiprices
2025-01-24 10:29:41 +01:00
Laurent Destailleur
10a6c29950 Merge pull request #32762 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-01-24 10:27:57 +01:00
Laurent Destailleur
4c6b022e46 Merge pull request #32381 from aspangaro/22accreturn
NEW Accountancy - Add backtopage & type on create for return
2025-01-24 10:18:50 +01:00
Alexandre SPANGARO
0a42a9bb14 Merge branch 'develop' into 22accreturn 2025-01-24 04:53:34 +01:00
Laurent Destailleur
802b040f31 Merge pull request #32079 from frederic34/loan_schedule
refactor loan schedule
2025-01-24 01:09:49 +01:00
Frédéric FRANCE
43ee8a1561 Merge branch 'develop' into loan_schedule 2025-01-23 21:46:47 +01:00
William Mead
9af6ccf845 Fixed comment 2025-01-23 15:26:47 +01:00
William Mead
598c034dfa Cleaned code 2025-01-23 15:17:31 +01:00
Dolibot
c395b626ed PHPStan > Update baseline 2025-01-23 12:06:56 +00:00
Lucas Marcouiller
edb865f686 Merge branch 'develop' into New-status-for-webhook 2025-01-23 11:15:47 +01:00
Noé Cendrier
2589febbae FIX: property type 2025-01-23 10:34:59 +01:00
Noé Cendrier
4ba28e0182 Merge pull request #25 from altairis-melina/fix_customer_price_and_multiprices
FIX: Import, export and choice of number of levels with different price per customer + price per level
2025-01-23 10:28:52 +01:00
Noé Cendrier
db97347497 FIX: phan remarks 2025-01-23 10:25:24 +01:00
Noé Cendrier
dc83dd7cbe FIX: trailing space 2025-01-23 10:02:59 +01:00
William Mead
845cf809fe Merge branch 'develop' into NEW_taskClose 2025-01-23 09:48:31 +01:00
William Mead
4263b25686 Added task reopen button. Refactored task status method. Updated EN localization. 2025-01-23 09:36:35 +01:00
Laurent Destailleur
fdd3ad6fe6 Merge pull request #32731 from frederic34/patch-10
NEW default values for filters that are multiselect array are now supported
2025-01-23 02:04:56 +01:00
Laurent Destailleur
5448c64d76 Merge branch 'develop' into qty_multiple_sale 2025-01-23 02:03:20 +01:00
Laurent Destailleur
69f5e3727f Merge pull request #32746 from altairisfr/product_min_qty
ADD: packaging column for product
2025-01-23 01:55:27 +01:00
Laurent Destailleur
8be5fd4e56 Merge branch 'develop' into product_min_qty 2025-01-23 01:50:53 +01:00
Laurent Destailleur
b26c36bcde Merge pull request #32748 from hregis/fix_dev_mysql_keywords
QUAL invoice payment, the requested invoice sort first (FACTURE_PAYMENTS_INVOICE_REQUESTED_SORT_FIRST)
2025-01-23 01:45:40 +01:00
Laurent Destailleur
19c71c1085 Merge pull request #32745 from frederic34/patch-11
remove debug and fix CI
2025-01-23 00:52:31 +01:00
Laurent Destailleur
a9b229428f Merge branch 'develop' into patch-11 2025-01-23 00:52:15 +01:00
Laurent Destailleur
323de9a435 Merge pull request #32755 from hregis/fix_dev_avoid_waring_de_merde
TODO if loan schedule is not created, you can not create a payment !
2025-01-23 00:36:15 +01:00
Laurent Destailleur
86096280ea Fix doc 2025-01-23 00:35:28 +01:00
Regis Houssin
1589d5f9fc FIX add TODO 2025-01-22 22:26:05 +01:00
Regis Houssin
8be6642289 TODO big problem here !!!!!!! 2025-01-22 21:57:49 +01:00
Regis Houssin
01a34b62d1 FIX avoid php warnings 2025-01-22 21:43:53 +01:00
Mélina JOUM
0fd7d517be FIX: Allow import and export with the PRODUCT_CUSTOMER_PRICES_AND_MULTIPRICES option 2025-01-22 11:40:59 +01:00
Mélina JOUM
d7bdb09417 FIX: If the constant PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES is active, allow you to choose the price level 2025-01-22 11:28:44 +01:00
Regis Houssin
6c0a94bfed QUAL invoice payment, the requested invoice sort first 2025-01-22 09:27:14 +01:00
Noé Cendrier
590c9f761f Merge pull request #24 from altairis-melina/product_min_qty
ADD: packaging column for product
2025-01-22 09:16:31 +01:00
Noé Cendrier
6d41eb1f87 Merge pull request #23 from altairis-melina/qty_multiple_sale
NEW:  Add the "packaging" feature to round the quantities to some given multiples
2025-01-22 09:15:55 +01:00
Frédéric FRANCE
0ca2921950 fix doc 2025-01-22 09:14:43 +01:00
Frédéric FRANCE
618f733d25 fix doc 2025-01-22 09:03:45 +01:00
Frédéric FRANCE
ab33cdff50 fix doc 2025-01-22 09:00:07 +01:00
Frédéric FRANCE
928a59a1b3 check translations 2025-01-22 08:53:33 +01:00
IC-Nicolas
bd0d5524ea Merge branch 'Dolibarr:develop' into NEW_taskClose 2025-01-22 08:51:35 +01:00
Frédéric FRANCE
0c9fd6714b remove debug 2025-01-22 08:50:53 +01:00
Laurent Destailleur
c11bea799a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-21 19:15:28 +01:00
Laurent Destailleur
4bae510cfc Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-21 19:15:19 +01:00
Frédéric FRANCE
24d8dec4e0 Update functions.lib.php 2025-01-21 16:13:12 +01:00
Laurent Destailleur
64a007f879 Merge pull request #32733 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-01-21 16:09:59 +01:00
Mélina JOUM
3230e83f2b ADD: the packaging field to product import 2025-01-21 16:02:40 +01:00
Mélina JOUM
cb18ba20d4 ADD: packaging column for product 2025-01-21 15:38:10 +01:00
Mélina JOUM
1569366feb ADD: translations for option Use the packaging feature to round the quantities to some given multiples for the sale 2025-01-21 14:45:33 +01:00
William Mead
d03810a0d0 Fixed filter 2025-01-21 14:19:26 +01:00
Dolibot
d0399fdb32 PHPStan > Update baseline 2025-01-21 12:07:00 +00:00
Laurent Destailleur (aka Eldy)
bd46a19c3f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-21 13:00:34 +01:00
Laurent Destailleur (aka Eldy)
69b5956119 Fix warning 2025-01-21 13:00:18 +01:00
William Mead
932df6a5ed Cleaned code 2025-01-21 12:18:16 +01:00
William Mead
58676e4287 Added task list status filter. Cleaned code. 2025-01-21 12:03:17 +01:00
Frédéric FRANCE
75ee77678c default values for array 2025-01-21 11:12:12 +01:00
William Mead
cf1ae3a5da Fixed task status badge. Refactored LibStatut. 2025-01-21 10:15:41 +01:00
Mélina JOUM
33d2969ab8 ADD: packaging to round the quantities to some given multiples for the invoices 2025-01-21 09:56:43 +01:00
Mélina JOUM
3c2e6140a1 ADD: packaging to round the quantities to some given multiples for the commercials proposals 2025-01-21 09:43:00 +01:00
William Mead
d220277c37 Merge branch 'develop' into NEW_taskClose 2025-01-21 09:21:50 +01:00
Laurent Destailleur
64e1fa050b Merge pull request #32603 from atm-maxime/fix_getrights_loadrights
Fix : getRights has been replaced by loadRights in V20
2025-01-21 08:41:20 +01:00
Laurent Destailleur
d37897b50c Merge branch 'develop' into fix_getrights_loadrights 2025-01-21 08:34:22 +01:00
Laurent Destailleur
87333363d4 Merge pull request #32622 from atm-maxime/new_detect_country_code2
NEW : auto-detect country from code in creation	(follow-up⁾
2025-01-21 08:33:16 +01:00
Laurent Destailleur (aka Eldy)
5bd172ad0e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-20 19:33:18 +01:00
Laurent Destailleur
7576636162 Merge pull request #32722 from mdeweerd/fix/phan/members
Qual: Fix ci for new api_memberstypes.class + 2 other fixes
2025-01-20 19:31:25 +01:00
Laurent Destailleur (aka Eldy)
297e9316a8 Clean code 2025-01-20 19:30:24 +01:00
MDW
133c67510c Qual: Fix phpstan, remove useless test that price_var_percent is array 2025-01-20 16:47:29 +01:00
MDW
c720370a9c Qual: Fix phpstan notice about undefined copy 2025-01-20 16:47:28 +01:00
MDW
adb1c58d05 Qual: Fix ci for new api_memberstypes.class
# Qual: Fix ci for new api_memberstypes.class

This fixes the notifications for the new api_memberstypes.class
2025-01-20 16:47:27 +01:00
Laurent Destailleur (aka Eldy)
3418887436 Clean code 2025-01-20 16:40:05 +01:00
Laurent Destailleur
3edd1816ff Merge pull request #32723 from defrance/patch-659973
Add ecc field on fetch for expose on api
2025-01-20 16:38:11 +01:00
Laurent Destailleur
4cc4771b02 Merge branch 'develop' into patch-659973 2025-01-20 16:37:06 +01:00
Laurent Destailleur (aka Eldy)
4d03af63c7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-20 16:36:44 +01:00
Laurent Destailleur (aka Eldy)
11ad1e88e1 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-20 16:36:36 +01:00
Charlène Benke
a6baef68d2 Add ecc field on fetch for expose on api 2025-01-20 16:18:33 +01:00
Laurent Destailleur
9d71909305 Merge pull request #32721 from Dolibarr/phpstan-baseline
PHPStan > Update baseline
2025-01-20 15:10:03 +01:00
Laurent Destailleur (aka Eldy)
30dc853bb7 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-20 15:09:16 +01:00
Dolibot
f7838a9459 PHPStan > Update baseline 2025-01-20 12:06:56 +00:00
Mélina JOUM
b7b0a29e42 ADD: packaging to round the quantities to some given multiples for the sales orders 2025-01-20 12:50:09 +01:00
Mélina JOUM
a14a474a70 ADD: packaging to round the quantities to some given multiples for the sale prices 2025-01-20 12:43:30 +01:00
Mélina JOUM
1ca277faef NEW: Use the packaging feature to round the quantities to some given multiples for the sale 2025-01-20 12:36:10 +01:00
Laurent Destailleur (aka Eldy)
e49c37106b Confirmation useless 2025-01-20 12:17:39 +01:00
Laurent Destailleur
1b19cd62e3 Merge pull request #32649 from hregis/fix_dev_split_data_for_multicompany
FIX split data and rename files (Multicompany compatibility)
2025-01-20 10:08:18 +01:00
Laurent Destailleur
bd935c556f Merge pull request #32714 from hregis/fix_dev_mysql_keywords
NEW add credit note ids in API invoice return
2025-01-20 08:36:06 +01:00
Regis Houssin
bf5e6ac88b FIX wrong API object 2025-01-20 07:00:55 +01:00
Regis Houssin
38e9df4f7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
fix_dev_mysql_keywords
2025-01-20 06:56:21 +01:00
Regis Houssin
8623166d59 FIX remove from CRUD 2025-01-20 06:53:03 +01:00
Laurent Destailleur
67521e9c4f Clean code 2025-01-20 03:54:04 +01:00
Laurent Destailleur
6eaf7d7c82 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-20 03:02:23 +01:00
Laurent Destailleur
8d3e7bfc6d Fix phpunit 2025-01-20 02:31:41 +01:00
Laurent Destailleur
bd0668ab54 Merge pull request #32704 from SebHashe/patch-1
Update llx_accounting_account_fr.sql
2025-01-20 01:21:10 +01:00
Laurent Destailleur
08d32dbf25 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-20 01:00:21 +01:00
Laurent Destailleur
162878ecf4 Fix phpunit 2025-01-20 00:44:02 +01:00
Laurent Destailleur
93fdcf9b54 Merge pull request #32687 from mdeweerd/qual/fixphpstan2025.1.6
Qual: Fix dolPrintHtmlForAttribute->dolPrintHTMLForAttribute
2025-01-20 00:10:21 +01:00
Laurent Destailleur (aka Eldy)
f6e493341f Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-19 19:05:25 +01:00
Laurent Destailleur (aka Eldy)
38da2a61e4 Clean code 2025-01-19 17:38:34 +01:00
Regis Houssin
a780f9d80b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_dev_mysql_keywords 2025-01-19 16:05:44 +01:00
Laurent Destailleur (aka Eldy)
03125565d5 Debug error message 2025-01-19 15:43:04 +01:00
Laurent Destailleur (aka Eldy)
4ff29f3e76 Fix position of columns 2025-01-19 15:15:24 +01:00
Laurent Destailleur (aka Eldy)
f11d701486 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-19 15:02:20 +01:00
Laurent Destailleur (aka Eldy)
9c5e0747c6 Fix change position of graph 2025-01-19 15:01:26 +01:00
Laurent Destailleur (aka Eldy)
a13d88d179 Debug v22 2025-01-19 14:57:07 +01:00
Regis Houssin
0f83ffe24b FIX phan error 2025-01-19 13:39:34 +01:00
Regis Houssin
62b5964462 FIX wrong var type 2025-01-19 13:30:09 +01:00
Regis Houssin
313716a027 FIX syntax error 2025-01-19 13:21:21 +01:00
Regis Houssin
d39ef7b752 NEW add creditnotelist var in fetch 2025-01-19 13:18:36 +01:00
SebHashe
059dfdb949 Update llx_accounting_account_fr.sql
Add details
2025-01-18 12:33:16 +01:00
SebHashe
03866f7014 Update llx_accounting_account_fr.sql
Compilation plan asso avec PCG
2025-01-18 11:33:03 +01:00
Laurent Destailleur (aka Eldy)
9ed7ffd3a1 Add TODO 2025-01-17 01:39:14 +01:00
Laurent Destailleur (aka Eldy)
4786d75277 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-17 01:30:31 +01:00
Laurent Destailleur (aka Eldy)
e925907b26 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-17 01:30:16 +01:00
Laurent Destailleur
e2b3b6360f Merge pull request #32686 from mdeweerd/fix/phpunit.win
FIX ci: Remove exit from SocieteTest, include company.lib in Societe.class.php which uses getCountry
2025-01-16 18:45:45 +01:00
Laurent Destailleur (aka Eldy)
619392e25a Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-16 17:58:18 +01:00
MDW
8ac29f71fb Qual: Fix dolPrintHtmlForAttribute->dolPrintHTMLForAttribute
# Qual: Fix dolPrintHtmlForAttribute->dolPrintHTMLForAttribute

Make printed text correspond to executed statement
2025-01-16 17:47:56 +01:00
MDW
eadf4c9f59 Qual: Remove var_dump and exit from SocieteTest 2025-01-16 17:32:05 +01:00
MDW
7c31549f71 FIX societe.class.php uses getCountry, provided by company.lib
# FIX Societe.class.php uses getCountry, provided by company.lib

Include company.lib.php in societe.class.php.
The SocieteTest.php test failed when run independently on windows.
2025-01-16 17:32:04 +01:00
Laurent Destailleur (aka Eldy)
9979f64ae4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-16 17:29:03 +01:00
Laurent Destailleur (aka Eldy)
f97b2f44cd Debug v21 - Fix export in accountancy 2025-01-16 17:27:22 +01:00
Laurent Destailleur
e09c2c62df Merge pull request #32648 from hregis/fix_dev_multicompany_compatibility
FIX the rules for rowid (fk_pays+'1') is no longer used (Multicompany)
2025-01-16 15:41:14 +01:00
Laurent Destailleur (aka Eldy)
3bb748a4ee Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-16 14:48:33 +01:00
Laurent Destailleur
2d29c0a09f Merge pull request #32684 from BenjaminFlr/accessibility
ENH: accessibility on ticket admin page
2025-01-16 14:38:32 +01:00
Laurent Destailleur
0bf729f143 Merge pull request #32675 from alexandre-janniaux/accounting-num_rows_leftovers
FIX: accounting: fix num_rows without call from $db
2025-01-16 14:36:27 +01:00
Laurent Destailleur
e4a7b286b2 Merge pull request #32677 from alexandre-janniaux/apithirdparties-num_rows-leftovers
FIX: api_thirdparties: fix num_rows typo
2025-01-16 14:35:42 +01:00
Laurent Destailleur
72ef34f698 Merge branch 'develop' into accounting-num_rows_leftovers 2025-01-16 14:33:36 +01:00
Laurent Destailleur (aka Eldy)
3c2f6739d1 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-16 14:06:23 +01:00
Laurent Destailleur (aka Eldy)
6f26816185 Migration 2025-01-16 14:02:43 +01:00
Laurent Destailleur (aka Eldy)
683f4f931e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-16 13:06:43 +01:00
Laurent Destailleur (aka Eldy)
b41584de08 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-16 12:09:36 +01:00
Benjamin Falière
05a7c16422 ENH: accessibility on ticket admin page 2025-01-16 12:09:27 +01:00
Laurent Destailleur (aka Eldy)
c01e3faea4 Update eclipse rules 2025-01-16 12:09:13 +01:00
Alexandre Janniaux
d5584f4e32 api_thirdparties: fix num_rows typo
$res->num_rows will not work on PostgreSQL. $db->num_rows() must be used
instead to execute the correct procedure depending on the database
backend.

But the call was not written properly and both were mixed up in commit
25741a618e which used $db->num_rows, and
then fixed in 72c443868c which used
$db->num_rows($result) where suited, except this location.
2025-01-15 20:09:25 +01:00
Alexandre Janniaux
f757f9c4cc accounting: fix num_rows without call from $db
$res->num_rows will not work on PostgreSQL. $db->num_rows() must be used
instead to execute the correct procedure depending on the database
backend.
2025-01-15 20:03:28 +01:00
Laurent Destailleur
ece1317824 Merge pull request #32668 from mdeweerd/qual/flow-precommit-shellcheck
Qual: Fix ci (pre-commit) Exclude/fix shellcheck notices
2025-01-15 18:02:42 +01:00
MDW
ac35daf08f Qual: Fix whitespace 2025-01-15 14:54:33 +01:00
MDW
fffa47723f Qual: Fix ci (pre-commit) Exclude/fix shellcheck notices 2025-01-15 14:37:24 +01:00
Laurent Destailleur
55b96e085e Merge pull request #32659 from atm-quentin/FIX/32460/DBPrefix
FIX Issue #32460 db prefix for module builder
2025-01-15 14:19:49 +01:00
Laurent Destailleur
2d641d7537 Merge pull request #32657 from rycks/develop_hook_for_vat_rates
add a hook on vat rate
2025-01-15 14:19:19 +01:00
Laurent Destailleur
acf1430bed Update html.form.class.php 2025-01-15 14:18:22 +01:00
Laurent Destailleur (aka Eldy)
4e3b11d8ad Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-15 14:13:10 +01:00
Laurent Destailleur (aka Eldy)
f6f38aebb4 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-15 13:02:21 +01:00
Laurent Destailleur (aka Eldy)
a8d99ed459 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-15 11:42:41 +01:00
Laurent Destailleur (aka Eldy)
761c04cc4d Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-15 11:42:32 +01:00
Frédéric FRANCE
b5aa5d7fd7 Merge branch 'develop' into loan_schedule 2025-01-15 10:28:39 +01:00
Quentin VIAL--GOUTEYRON
01be602fb1 FIX Issue 32460 db prefix module builder 2025-01-15 08:42:14 +01:00
Laurent Destailleur
9ee4a03e7f Merge pull request #32572 from mdeweerd/fix_phan_202408.1
Qual: Improve phpdoc for phan notices
2025-01-15 01:01:28 +01:00
Eric Seigne
9587403e0a add a hook on vat rate 2025-01-14 22:16:34 +01:00
MDW
0f0073b575 Qual: Improve phpdoc for phan notices
Also changed some `"$var"` to more efficient `(string) $var`.
2025-01-14 12:50:16 +01:00
Laurent Destailleur (aka Eldy)
1198ae5769 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-01-14 12:03:57 +01:00
Laurent Destailleur (aka Eldy)
84940c6f84 Debug v21 2025-01-14 12:02:52 +01:00
uvaldenaire-opendsi
152f2b1eaa Merge branch 'develop' into NEW_option_not_prefill_shipment_lines_qty 2025-01-14 11:57:04 +01:00
Maxime Kohlhaas
69c8be97bf Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_detect_country_code2 2025-01-14 09:56:45 +01:00
Regis Houssin
2526e6f68d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_dev_multicompany_compatibility 2025-01-14 09:40:32 +01:00
Regis Houssin
6fee85b7ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_dev_split_data_for_multicompany 2025-01-14 09:39:42 +01:00
Laurent Destailleur
ad36bdadad Merge pull request #32643 from hregis/fix_dev_avoid_php8_warning
FIX avoid php8 warning
2025-01-14 09:26:48 +01:00
Laurent Destailleur
2edee4dba1 Merge pull request #32638 from mdeweerd/fix/phan.2025.1.13
Qual: Fix ci by correcting PHPDoc typing + var name
2025-01-14 09:26:09 +01:00
Regis Houssin
5d6c8690b9 FIX to avoid postgresql error 2025-01-14 09:14:55 +01:00
Regis Houssin
9cd495438a FIX split data and rename files (Multicompany compatibility) 2025-01-14 08:35:48 +01:00
Regis Houssin
47a468c9e7 FIX syntax error 2025-01-14 07:45:29 +01:00
Regis Houssin
a3fd2ad245 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_dev_avoid_php8_warning 2025-01-14 07:40:08 +01:00
Regis Houssin
da62fa9edf FIX the rules for rowid (fk_pays+'1') is no longer used (Multicompany) 2025-01-14 07:36:46 +01:00
MDW
d8824dd141 Fix: Change hash type to 'md5' which was used for invalid 'master' type 2025-01-13 21:59:05 +01:00
MDW
d32ba0f1e1 Fix: Correct $search_ref typo into $search_ref_ext 2025-01-13 21:59:04 +01:00
MDW
620dea9e29 Qual: Fix ci by correcting PHPDoc typing
# Qual: Fix ci by correcting PHPDoc typing

Fix the return type, while reviewing the typing, also made some
PHPDoc more specific
2025-01-13 21:58:43 +01:00
Laurent Destailleur (aka Eldy)
f35c232530 Debug v21 2025-01-13 21:25:36 +01:00
Laurent Destailleur (aka Eldy)
44a5c320fc Clean code 2025-01-13 21:20:16 +01:00
Laurent Destailleur (aka Eldy)
8473cd253c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-13 21:06:49 +01:00
Laurent Destailleur (aka Eldy)
682ba1099e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-13 21:06:25 +01:00
Regis Houssin
e5a6f5f9ce FIX avoid "Undefined array key" warning 2025-01-13 14:24:17 +01:00
Regis Houssin
188070729a FIX avoid php8 warning 2025-01-13 14:10:34 +01:00
uvaldenaire-opendsi
0918533172 NEW add option to not prefill qty line at shipment creation 2025-01-13 11:54:58 +01:00
Laurent Destailleur
19c8eae273 Merge pull request #32088 from alexandre-janniaux/accountingjournal-create/1
QUAL accountingjournal: add create() method
2025-01-13 03:16:26 +01:00
Laurent Destailleur
700efa507e Merge pull request #32128 from altairisfr/dirgenpdf
FIX output dir for generated modules
2025-01-13 03:11:36 +01:00
Laurent Destailleur
0097d75df2 Merge pull request #32588 from hregis/fix_dev_avoid_warnings
NEW add hook 'addMoreObjectBlock'
2025-01-13 02:39:56 +01:00
Laurent Destailleur
8b3c958e14 Merge branch 'develop' into fix_getrights_loadrights 2025-01-13 02:37:59 +01:00
Laurent Destailleur
2ae2ddc0c2 Merge pull request #32610 from aspangaro/22loantotal
NEW Loan - Add total on each payment
2025-01-13 02:36:27 +01:00
Laurent Destailleur
bd78cb11aa Merge pull request #32630 from frederic34/modProduct
fix phpstan
2025-01-13 02:20:25 +01:00
Laurent Destailleur (aka Eldy)
a021c4e667 Fix date selector html 2025-01-13 01:05:34 +01:00
Laurent Destailleur (aka Eldy)
b178466577 Fix migration 2025-01-13 00:08:36 +01:00
Laurent Destailleur (aka Eldy)
f6115ec70b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-13 00:07:00 +01:00
Frédéric France
da7675c822 fix phpstan 2025-01-11 17:45:29 +01:00
Frédéric France
b4babd6fcb fix phpstan 2025-01-11 10:46:57 +01:00
Frédéric France
c28f5ba1be fix phpstan 2025-01-11 09:58:01 +01:00
Frédéric France
1652b5b178 fix phpstan 2025-01-11 09:53:00 +01:00
Frédéric France
44bfbb7f4a fix phpstan 2025-01-11 09:24:21 +01:00
Frédéric France
6d845eefa1 fix phpstan 2025-01-11 09:16:13 +01:00
Frédéric France
714aa5b529 fix phpstan 2025-01-11 09:14:43 +01:00
Frédéric France
a355dbb660 fix phpstan 2025-01-11 09:04:55 +01:00
Regis Houssin
62c543ef17 FIX remove specific hook return 2025-01-10 23:34:45 +01:00
Regis Houssin
6e4f603c7c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_dev_avoid_warnings 2025-01-10 23:33:05 +01:00
Laurent Destailleur
546bc6ffb9 Merge pull request #32618 from frederic34/patch-10
fix phpstan
2025-01-10 23:23:48 +01:00
Maxime Kohlhaas
ba2dab2a44 NEW : auto-detect country from code in creation (follow-up⁾ 2025-01-10 16:56:14 +01:00
Regis Houssin
ef4697cba3 FIX phpstan: wrong case 2025-01-10 16:54:21 +01:00
Frédéric FRANCE
deb7663337 Merge branch 'develop' into patch-10 2025-01-10 16:41:31 +01:00
Regis Houssin
273454f434 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_dev_avoid_warnings 2025-01-10 16:36:52 +01:00
Alexandre SPANGARO
ca4840dd4a Fix php-stan 2025-01-10 13:59:16 +01:00
Laurent Destailleur (aka Eldy)
b48c9239df Fix js console warnings of html into option 2025-01-10 13:47:53 +01:00
atm-lena
40c63c1178 Add multiselect, wysiwyg and radio button 2025-01-10 13:46:50 +01:00
Laurent Destailleur (aka Eldy)
5f2c05d5f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-10 13:34:41 +01:00
Frédéric FRANCE
04f3f56978 fix phpstan 2025-01-10 13:27:58 +01:00
Laurent Destailleur (aka Eldy)
7c3b92e02b NEW Add ip into table of website accounts 2025-01-10 13:04:12 +01:00
Laurent Destailleur
d45c1de5f4 Merge branch 'develop' into 22loantotal 2025-01-10 12:40:36 +01:00
Laurent Destailleur
a9fbea57ff Merge pull request #32602 from frederic34/modExpedition
fix phpstan
2025-01-10 12:24:21 +01:00
Laurent Destailleur
316b76f754 Merge pull request #32607 from frederic34/odtphp
add odtphp to phpstan check
2025-01-10 12:07:23 +01:00
atm-lena
41fae65ec8 Wip 2025-01-10 11:10:46 +01:00
Laurent Destailleur (aka Eldy)
40eb24917b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-10 10:43:05 +01:00
Regis Houssin
3854719ee9 FIX phpstan 2025-01-10 06:58:51 +01:00
Alexandre SPANGARO
113360b0f1 NEW Loan - Add total on each payment to see the global amount off the reimbursement 2025-01-10 06:46:26 +01:00
Regis Houssin
5ab7e9ec3f FIX use the right hook name 2025-01-10 03:21:20 +01:00
Regis Houssin
f8b957fd0d FIX tu veux ou tu veux pas ? 2025-01-10 03:10:01 +01:00
Regis Houssin
8d11c1625f FIX wrong hook name 2025-01-10 03:04:55 +01:00
Regis Houssin
57c185d136 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_dev_avoid_warnings 2025-01-10 00:34:46 +01:00
Regis Houssin
3f7d5cf790 NEW add hook 'addMoreInformationsBlock' 2025-01-10 00:33:51 +01:00
Frédéric France
74b445ac31 fix phpstan 2025-01-09 21:38:06 +01:00
Frédéric France
1ba37602bc fix phpstan 2025-01-09 21:27:13 +01:00
Frédéric France
ba956df9c6 fix phpstan 2025-01-09 21:18:21 +01:00
Frédéric France
23c2f0de53 Merge remote-tracking branch 'upstream/develop' into odtphp 2025-01-09 21:11:55 +01:00
Frédéric France
8ad5751d91 fix phpstan 2025-01-09 21:11:26 +01:00
Frédéric France
01a956a48a add odtphp to phpstan check 2025-01-09 21:01:00 +01:00
Frédéric France
a8fa5e57d1 fix phpstan 2025-01-09 20:07:40 +01:00
Frédéric France
d6aa69a950 fix phpstan 2025-01-09 20:02:11 +01:00
Laurent Destailleur
9de730aeab Add more phpunit 2025-01-09 19:28:08 +01:00
Laurent Destailleur
000e2ebe54 Test 2025-01-09 19:19:28 +01:00
Maxime Kohlhaas
9535baf6d2 Fix : getRights has been replaced by loadRights in V20 2025-01-09 18:33:26 +01:00
Maxime Kohlhaas
76c98a4666 Merge branch '21.0' of github.com:Dolibarr/dolibarr into develop 2025-01-09 18:24:41 +01:00
Frédéric France
df23a371b7 fix phpstan 2025-01-09 18:22:53 +01:00
Frédéric France
cbefb5a2d8 fix phpstan 2025-01-09 18:18:23 +01:00
Laurent Destailleur (aka Eldy)
429f5db55a Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-09 14:09:33 +01:00
Laurent Destailleur (aka Eldy)
7b4946b146 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-09 13:03:44 +01:00
Regis Houssin
7618df8726 FIX remove html entities 2025-01-09 11:04:32 +01:00
Lucas Marcouiller
1b8a9c2431 Merge branch 'develop' into New-status-for-webhook 2025-01-09 10:48:18 +01:00
Regis Houssin
41b07d1630 FIX compatibility with externals modules 2025-01-09 10:36:48 +01:00
Regis Houssin
4934a335b0 FIX use transnoentities to avoid html entities 2025-01-09 10:09:23 +01:00
Regis Houssin
8e427353e0 FIX avoid to show html entities 2025-01-09 07:39:24 +01:00
Laurent Destailleur (aka Eldy)
a7a50b39a9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-09 02:02:09 +01:00
Laurent Destailleur (aka Eldy)
de321e8f01 Fix typo 2025-01-09 02:01:49 +01:00
Laurent Destailleur
bd08efc497 Merge pull request #32575 from altairisfr/reception_picto
FIX: reception picto alignement in product menu
2025-01-09 01:48:42 +01:00
Laurent Destailleur
0d3825e47d Merge pull request #32576 from alexandre-janniaux/bookkeeping-listbyaccount-pg/1
bookkeeping: listbyaccount: fix $num_rows warning
2025-01-09 01:45:00 +01:00
Laurent Destailleur
b9d35ff580 Merge pull request #32584 from hregis/fix_dev_avoid_warnings
FIX avoid warnings + debug
2025-01-09 01:44:28 +01:00
Laurent Destailleur
580d279da6 Merge pull request #32582 from hregis/fix_dev_xdebug3
FIX compatibility with xdebug 3
2025-01-09 01:43:20 +01:00
Laurent Destailleur
eef11a27d5 Merge pull request #32574 from alexandre-janniaux/32374-expensereportsjournal/1
expensereportsjournal: fix empty IN () SQL request
2025-01-09 01:34:08 +01:00
Laurent Destailleur
37bc7918cd Merge pull request #32573 from alexandre-janniaux/fix-32374-purchasesjournal
purchasesjournal: fix empty IN () SQL request
2025-01-09 01:32:19 +01:00
Laurent Destailleur (aka Eldy)
9fb463481e Sync transifex 2025-01-09 01:16:51 +01:00
Laurent Destailleur (aka Eldy)
0c58529d2d Debug v21 2025-01-08 23:29:04 +01:00
Laurent Destailleur (aka Eldy)
5fef2d7287 Debug v21 2025-01-08 21:31:07 +01:00
Regis Houssin
929aa8ee91 FIX avoid warnings + debug 2025-01-08 20:32:19 +01:00
Regis Houssin
4ab4c2772b FIX compatibility with xdebug 3 2025-01-08 19:26:14 +01:00
Laurent Destailleur (aka Eldy)
79ae59ee2a Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-08 17:54:13 +01:00
William Mead
3415fffaac Added status update on addTimeSpent 2025-01-08 17:14:05 +01:00
William Mead
3daf44bf68 Fixed status 2025-01-08 15:21:40 +01:00
Alexandre Janniaux
8cdd88e27d bookkeeping: listbyaccount: fix $num_rows warning
Fix the following warning:

	Warning: Undefined property: PgSql\Result::$num_rows in
	/var/www/html/accountancy/bookkeeping/listbyaccount.php on line 160

The warning is happening when listing the operations after the
accounting setup is done but no accounts for bank nor operations are
created.
2025-01-08 15:17:05 +01:00
William Mead
f0c79bcb77 Merge branch 'develop' into NEW_taskClose 2025-01-08 15:04:25 +01:00
Alexandre Janniaux
5d778eedab expensereportsjournal: fix empty IN () SQL request
`WHERE xx IN ()` is not allowed in PostgreSQL queries, and result in
fatal errors.

We can check whether we have valid invoices before running the query,
since the query will only check whether the invoices are complete or
not.

It also fixes the following error on the development PHP output:

    Fatal error: Uncaught TypeError: pg_num_rows(): Argument #1 ($result)
    must be of type PgSql\Result, bool given in
    /var/www/html/core/db/pgsql.class.php:654 Stack trace: #0
    /var/www/html/core/db/pgsql.class.php(654): pg_num_rows(false) #1
    /var/www/html/accountancy/journal/expensereportsjournal.php(264):
    DoliDBPgsql->num_rows(false) #2 {main} thrown in
    /var/www/html/core/db/pgsql.class.php on line 654

Refs #32374 but for the expensereportsjournal page.
2025-01-08 14:42:36 +01:00
Alexandre Janniaux
b9419a869c purchasesjournal: fix empty IN () SQL request
`WHERE xx IN ()` is not allowed in PostgreSQL queries, and result in the
following fatal error:

	GROUP BY fk_facture_fourn
	    33 DoliDBPgsql::query SQL Error message: ERROR:  42601: syntax error at or near ")"
	LINE 10:  AND fk_facture_fourn IN ()
                                           ^

We can check whether we have valid invoices before running the query,
since the query will only check whether the invoices are complete or
not.

It also fixes the following error on the development PHP output.

	Fatal error: Uncaught TypeError: pg_num_rows(): Argument #1
	($result) must be of type PgSql\Result, bool given in
	/var/www/html/core/db/pgsql.class.php:654 Stack trace: #0
	/var/www/html/core/db/pgsql.class.php(654): pg_num_rows(false) #1
	/var/www/html/accountancy/journal/purchasesjournal.php(418):
	DoliDBPgsql->num_rows(false) #2 {main} thrown in
	/var/www/html/core/db/pgsql.class.php on line 654

Fixes #32374
2025-01-08 14:42:09 +01:00
Noé Cendrier
fee2005faa FIX: reception picto alignement in product menu 2025-01-08 14:41:45 +01:00
Laurent Destailleur (aka Eldy)
8febf249ce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 21:47:22 +01:00
Laurent Destailleur (aka Eldy)
710ed35a22 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 21:47:12 +01:00
Laurent Destailleur
de208ace1d Merge pull request #32567 from frederic34/mod_member
fix phpstan
2025-01-07 21:28:26 +01:00
Laurent Destailleur (aka Eldy)
badb23635b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 21:03:59 +01:00
Laurent Destailleur (aka Eldy)
c3f06059cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 19:12:54 +01:00
Frédéric France
fa2be8a553 fix phpstan 2025-01-07 18:54:08 +01:00
Frédéric France
d4714983f1 fix phpstan 2025-01-07 18:31:56 +01:00
Frédéric France
b6fc9f4d86 fix phpstan 2025-01-07 18:30:27 +01:00
Frédéric FRANCE
af9efd8608 Merge branch 'develop' into loan_schedule 2025-01-07 18:02:05 +01:00
Laurent Destailleur (aka Eldy)
e5bb7e48db Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 17:20:06 +01:00
Laurent Destailleur
afe3856d9d Merge pull request #32554 from Daoud-mohamed/fix-website-purge-function
Fix Website Purge Function
2025-01-07 14:01:44 +01:00
Laurent Destailleur
3b480109c9 Merge pull request #32534 from frederic34/fix_phpstan_2025_01_05_01
fix phpstan
2025-01-07 13:41:30 +01:00
Mohamed DAOUD
75f23fca52 fix website purge function 2025-01-07 12:27:56 +01:00
Frédéric France
7b1c4e11e4 fix phpstan 2025-01-06 21:10:21 +01:00
Frédéric France
e2a6a94a52 fix phpstan 2025-01-06 21:02:02 +01:00
Frédéric France
ef103e55dd Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05_01 2025-01-06 20:45:37 +01:00
Laurent Destailleur
bd8a839d3e Merge pull request #32549 from Easya-Solutions/develop_odt_dimensions_substitutions
NEW Add 4 substitutions for ODTs.
2025-01-06 20:22:59 +01:00
Frédéric France
86e1625793 fix phpstan 2025-01-06 18:27:30 +01:00
Frédéric France
a5af79c230 Merge remote-tracking branch 'origin/fix_phpstan_2025_01_05_01' into fix_phpstan_2025_01_05_01 2025-01-06 18:10:01 +01:00
Frédéric France
62a230b047 Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05_01 2025-01-06 18:09:12 +01:00
Frédéric FRANCE
0828579216 Merge branch 'develop' into loan_schedule 2025-01-06 18:05:49 +01:00
Laurent Destailleur (aka Eldy)
935e7e6d31 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-06 17:44:06 +01:00
tnegre
81298d6787 fix Phpstan 2025-01-06 17:09:45 +01:00
tnegre
86913a7681 Add 4 substitutions for ODTs. Reuse logic from PDF generator, but reformat to make it clearer. 2025-01-06 17:02:43 +01:00
Frédéric FRANCE
b6c6d10eb0 Merge branch 'develop' into fix_phpstan_2025_01_05_01 2025-01-06 16:42:14 +01:00
Laurent Destailleur (aka Eldy)
cbd677040e Port #32544 in develop 2025-01-06 16:36:10 +01:00
Alexandre SPANGARO
510d622f15 Remove DOL_URL_ROOT already present in backtopage 2025-01-06 14:16:36 +01:00
Alexandre SPANGARO
68226d4399 Merge branch 'develop' into 22accreturn 2025-01-06 14:12:02 +01:00
Alexandre SPANGARO
fa71c76b16 Merge branch 'develop' into 22accreturn 2025-01-06 14:11:51 +01:00
Laurent Destailleur (aka Eldy)
b9f15e4c93 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-06 12:56:38 +01:00
Laurent Destailleur (aka Eldy)
3bfd6c1e30 Debug MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY 2025-01-06 12:56:24 +01:00
Laurent Destailleur
799a86702d FIX Must not have both thirdparty and member. 2025-01-06 00:02:39 +01:00
Frédéric France
c2c99c0a2d fix phpstan 2025-01-05 21:09:21 +01:00
Frédéric FRANCE
c0f4ad3729 Merge branch 'develop' into loan_schedule 2025-01-05 20:30:23 +01:00
Laurent Destailleur
1cba827ceb Merge pull request #32290 from Hystepik/new-regroup-2-tabs-bank
New regroup report bank tabs
2025-01-05 19:17:13 +01:00
Laurent Destailleur
985bf20ca5 Merge pull request #32288 from Hystepik/add-drag&drop-on-some-cards
NEW add drag & drop of files on some cards
2025-01-05 19:16:48 +01:00
Laurent Destailleur
7820af834e Merge pull request #32535 from Dolibarr/revert-32303-Improve-SEPA_2
Revert "New dictionaries"
2025-01-05 19:11:24 +01:00
Laurent Destailleur
8993fece48 Revert "New dictionaries" 2025-01-05 19:09:51 +01:00
Laurent Destailleur
6834c9405c Merge pull request #32303 from InfraS-SARL/Improve-SEPA_2
New dictionaries
2025-01-05 19:07:48 +01:00
Laurent Destailleur (aka Eldy)
7da0580b68 Fix INVOICE_HIDE_LINKED_OBJECT 2025-01-05 19:06:28 +01:00
Laurent Destailleur
edf137c92d Merge pull request #32305 from nat-itopie/develop
NEW Adds the option of not displaying linked objects in the left header on the Sponge invoice template
2025-01-05 19:05:11 +01:00
Laurent Destailleur
b11ac447bd Update admin.lang 2025-01-05 19:04:13 +01:00
Frédéric France
57b440677a Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05_01 2025-01-05 19:02:46 +01:00
Frédéric France
9eb58c9ce9 fix phpstan 2025-01-05 19:02:28 +01:00
Laurent Destailleur
b05958fb25 Merge pull request #32322 from FHenry/dev_new_default_email_template_ticket
new: if default template for ticket exist we use it avec if there is email template 'all'
2025-01-05 19:01:42 +01:00
Laurent Destailleur
5ae9d1bd13 Merge pull request #32335 from Hystepik/New-add-replace-for-memcached-module
NEW add replace for memecached and filecache
2025-01-05 18:58:59 +01:00
Laurent Destailleur (aka Eldy)
981f291765 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-05 18:57:35 +01:00
Laurent Destailleur (aka Eldy)
6681979596 NEW Option MAIN_RESTRICTHTML_ONLY_VALID_HTML and
MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY are on by default
2025-01-05 18:57:18 +01:00
Frédéric France
2977a1af0e fix phpstan 2025-01-05 18:55:59 +01:00
Laurent Destailleur
6312b646b5 Merge pull request #32337 from Hystepik/Fix-#32193
Fix #32193 Add verification on extension file for upload
2025-01-05 18:52:16 +01:00
Laurent Destailleur
b1704356cb Merge branch 'develop' into 22accreturn 2025-01-05 18:46:50 +01:00
Laurent Destailleur (aka Eldy)
49f5eabc22 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-05 18:44:56 +01:00
Frédéric France
4187e87dc4 fix phpstan 2025-01-05 18:44:12 +01:00
Laurent Destailleur (aka Eldy)
8e3948fda7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-01-05 18:39:39 +01:00
Laurent Destailleur (aka Eldy)
2c2ac2a48f Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-05 18:38:48 +01:00
Laurent Destailleur
a9d48c278c Merge pull request #32482 from Bahfirilyes/lounes2001-3
NEW : hook for adding params for bill closing
2025-01-05 18:36:24 +01:00
sonikf
4373c7dd88 Merge branch 'develop' into sonikf-patch-salary-clone 2025-01-05 19:24:25 +02:00
Laurent Destailleur (aka Eldy)
9db8f648cf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-05 18:07:49 +01:00
Laurent Destailleur
2b865e791e Merge branch 'develop' into lounes2001-3 2025-01-05 18:07:04 +01:00
Laurent Destailleur
88f75f9c76 Merge pull request #32420 from aspangaro/22tabthirdacc
NEW Accountancy - Show subsidiary ledger in thirdparty card
2025-01-05 18:06:23 +01:00
Laurent Destailleur (aka Eldy)
716c89219b Prepare v22 2025-01-05 18:04:56 +01:00
Laurent Destailleur
377233d998 Merge pull request #32394 from Easya-Solutions/develop_new_odt_invoice_type
NEW : ODT {object_type_label} for Invoices and Supplier Invoices
2025-01-05 18:02:18 +01:00
Laurent Destailleur
3b647aca5e Merge pull request #32439 from thersane-john/2024_new_factoring
New : Add hook
2025-01-05 18:01:44 +01:00
Laurent Destailleur
4d818d0d10 Merge pull request #32531 from frederic34/fix_phpstan_2025_01_05
fix phpstan
2025-01-05 18:00:41 +01:00
Laurent Destailleur
001fc9107b Merge pull request #32527 from erikvanberkum/develop
FIX units product
2025-01-05 17:41:09 +01:00
Frédéric France
7a5356397f fix phpstan 2025-01-05 17:23:31 +01:00
Frédéric France
68badc13ab Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05 2025-01-05 17:11:38 +01:00
Frédéric France
a82c517e09 fix phpstan 2025-01-05 17:09:38 +01:00
Laurent Destailleur
36437e3436 Merge branch 'develop' into develop 2025-01-05 16:54:30 +01:00
Laurent Destailleur
6c05e3741d Merge pull request #32529 from mdeweerd/fix/copyrighttool
Fix: Copyright generation when single year
2025-01-05 16:51:59 +01:00
Laurent Destailleur (aka Eldy)
0ec3b7c858 Fix phpunit 2025-01-05 16:51:32 +01:00
Laurent Destailleur
4f989c14c9 Merge branch 'develop' into fix/copyrighttool 2025-01-05 16:32:30 +01:00
Laurent Destailleur (aka Eldy)
9b52c4a10a Fix CI github 2025-01-05 16:30:56 +01:00
Laurent Destailleur (aka Eldy)
a2eb970bb7 Fix type 2025-01-05 16:18:38 +01:00
Laurent Destailleur (aka Eldy)
3b1bc8bbb1 Prepare v22 dev 2025-01-05 16:14:21 +01:00
Laurent Destailleur (aka Eldy)
16e45e90c4 Doc 2025-01-05 16:13:56 +01:00
Laurent Destailleur (aka Eldy)
a934cd49e3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-05 15:42:01 +01:00
Laurent Destailleur (aka Eldy)
a9d526e74a Fix travis 2025-01-05 15:41:50 +01:00
Laurent Destailleur
a226756b9b Merge pull request #32499 from jyhere/jyhere/import-file-double-space-fix
FIX: double space file bug when using dolibarr import
2025-01-05 15:20:34 +01:00
MDW
83f350bea4 Fix: Copyright generation when single year 2025-01-05 15:16:18 +01:00
Laurent Destailleur (aka Eldy)
64e83886fb Doc 2025-01-05 14:49:20 +01:00
Laurent Destailleur (aka Eldy)
9a61a6e6c9 Update files after moving build into dev/ 2025-01-05 14:46:26 +01:00
Laurent Destailleur (aka Eldy)
c9519a1a5a Move dir build into dev/build 2025-01-05 14:28:07 +01:00
Laurent Destailleur (aka Eldy)
4253fa54ec Standardize name of field. 2025-01-05 14:05:50 +01:00
Laurent Destailleur (aka Eldy)
25a033c64e Rename field to avoid conflict. 2025-01-05 13:53:16 +01:00
Laurent Destailleur (aka Eldy)
9236a9899f Debug v21 2025-01-05 13:38:02 +01:00
Erik van Berkum
f836156414 FIX units product
solves issue #32495: current Empty testing for 0 results in TRUE and makes it an empty string. Testing for is_null solves the issue. 

this issue is connected with pull FIX #32496
2025-01-05 16:44:41 +09:00
Jyhere
627f4f5ae3 Merge branch 'develop' into jyhere/import-file-double-space-fix 2025-01-03 09:09:45 +01:00
Laurent Destailleur
11d029bc6b Merge branch 'develop' into jyhere/import-file-double-space-fix 2025-01-02 18:47:13 +01:00
Laurent Destailleur
d49aabf640 Merge branch 'develop' into jyhere/import-file-double-space-fix 2025-01-02 17:40:22 +01:00
Laurent Destailleur
a02081244f Merge branch 'develop' into jyhere/import-file-double-space-fix 2025-01-02 16:56:37 +01:00
Jyhere
ea67c6d727 FIX: double space file bug when using dolibarr import 2024-12-31 10:18:48 +01:00
Bahfirilyes
1751705f1f Merge branch 'develop' into lounes2001-3 2024-12-30 22:08:25 +01:00
ilyes bahfir
77e1dd62ad Fix: hook for adding params for bill closing 2024-12-29 23:28:14 +01:00
HENRY Florian
5762d0d843 Merge branch 'develop' into dev_new_default_email_template_ticket 2024-12-24 11:55:52 +01:00
Chloé
303b7423f3 fix: update list_public_holiday return type 2024-12-24 11:01:15 +01:00
Chloé
39e509f380 fix: list_public_holiday function return type 2024-12-24 10:50:29 +01:00
Benoît PASCAL
fed049e93e feat: add function to get public holidays list within period 2024-12-24 10:36:53 +01:00
Laurent Destailleur
d7c739145e Merge branch 'develop' into dev_new_default_email_template_ticket 2024-12-24 02:03:12 +01:00
Laurent Destailleur
4b0879d211 Merge branch 'develop' into fix-email-collector 2024-12-24 01:57:39 +01:00
Laurent Destailleur
909b14df26 Merge branch 'develop' into 2024_new_factoring 2024-12-24 00:58:19 +01:00
Laurent Destailleur
a276b7b236 Merge branch 'develop' into fix-email-collector 2024-12-24 00:38:46 +01:00
Laurent Destailleur
35db3d25b7 Merge branch 'develop' into 2024_new_factoring 2024-12-24 00:37:30 +01:00
Laurent Destailleur
e33b46c3e0 Merge branch 'develop' into fix-email-collector 2024-12-24 00:32:55 +01:00
Laurent Destailleur
49d103366d Merge branch 'develop' into 2024_new_factoring 2024-12-24 00:28:00 +01:00
Hystepik
f8f292ca91 Fix email collector datetimelast ok and email fetching 2024-12-23 10:49:54 +01:00
John BOTELLA
42974ced26 fix indent 2024-12-20 12:04:03 +01:00
John BOTELLA
41309e3cc0 Add hook 2024-12-20 11:33:58 +01:00
Hystepik
a4384c9f8b add replace to filecache 2024-12-20 09:35:03 +01:00
Hystepik
6e1b3e61fb Merge branch 'develop' of github.com:Dolibarr/dolibarr into New-add-replace-for-memcached-module 2024-12-20 09:14:23 +01:00
Frédéric FRANCE
786a6571f4 Merge branch 'develop' into extrafields_object_filter 2024-12-19 20:36:32 +01:00
Laurent Destailleur
901b9dab72 Merge branch 'develop' into dev_new_default_email_template_ticket 2024-12-19 18:33:34 +01:00
Laurent Destailleur
a21c88468b Merge branch 'develop' into 22tabthirdacc 2024-12-19 17:33:20 +01:00
Laurent Destailleur
78b56f9980 Merge branch 'develop' into 22accreturn 2024-12-19 17:32:12 +01:00
Laurent Destailleur
79465a9d90 Merge branch 'develop' into 22accreturn 2024-12-19 17:14:21 +01:00
atm-lena
a2cb9eaaeb WIP : add inputs.php file 2024-12-19 15:39:14 +01:00
Alexandre SPANGARO
46922e2b8e Merge branch 'develop' into 22accreturn 2024-12-19 07:28:57 +01:00
Alexandre SPANGARO
6e05afc711 Merge branch 'develop' into 22tabthirdacc 2024-12-19 06:47:59 +01:00
Alexandre SPANGARO
4859de8ffd CI 2024-12-19 06:47:30 +01:00
Alexandre SPANGARO
005c4483ec Merge branch 'develop' into 22tabthirdacc 2024-12-18 23:24:21 +01:00
Alexandre SPANGARO
54c3470ed1 CI 2024-12-18 23:21:34 +01:00
Alexandre SPANGARO
0d41500f95 CI 2024-12-18 23:18:19 +01:00
Alexandre SPANGARO
602a1af348 Remove old code 2024-12-18 22:44:56 +01:00
Alexandre SPANGARO
72b4085237 Translate 2024-12-18 22:37:08 +01:00
Alexandre SPANGARO
c92e7c337f NEW Accountancy - Show subledger account in thirdparty 2024-12-18 22:17:12 +01:00
William Mead
9bb3345c7b Added status change on progress update. Updated task status & labels. Added status to update method. 2024-12-18 15:45:57 +01:00
William Mead
dd9d459550 Merge branch 'develop' into NEW_taskClose 2024-12-18 15:08:53 +01:00
Alexandre SPANGARO
c6a7d8cef1 NEW Accountancy - Show subledger account in thirdparty 2024-12-18 09:19:48 +01:00
Alexandre SPANGARO
d093282fb0 Merge branch 'develop' into 22accreturn 2024-12-18 03:33:45 +01:00
tnegre
34cf08d940 update ODT templates 2024-12-17 10:30:59 +01:00
tnegre
e0e5594669 add invoice type label 2024-12-17 09:25:37 +01:00
Laurent Destailleur
41ec35f514 Merge branch 'develop' into 22accreturn 2024-12-17 02:49:29 +01:00
Florian HENRY
d7184adb3b chore: revert phan warning fix 2024-12-16 19:40:35 +01:00
Florian HENRY
5964ba5223 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_new_default_email_template_ticket 2024-12-16 19:38:15 +01:00
Florian HENRY
1635a430d7 chore: phan rename param to avoid PhanPluginSuspiciousParamOrder: Suspicious order for arguments named tooltip and name - These are being passed to parameters #2 (string htmltext) and #8 (string tooltiptrigger) 2024-12-16 19:37:40 +01:00
Florian HENRY
5097572c5d chore: review 2024-12-16 19:07:03 +01:00
Alexandre SPANGARO
e577232359 CI 2024-12-16 08:27:31 +01:00
Alexandre SPANGARO
077a8e2653 Right on create link 2024-12-16 08:19:52 +01:00
Alexandre SPANGARO
ceff811daf CI 2024-12-16 08:09:32 +01:00
Alexandre SPANGARO
a90fd44e3e Accountancy - Add backtopage & type 2024-12-15 22:57:53 +01:00
Alexandre SPANGARO
790396a488 Ledger - Add backtopage on create 2024-12-15 22:57:27 +01:00
Alexandre SPANGARO
eb7c02b33a Journal - Add backtopage on create 2024-12-15 22:57:02 +01:00
Alexandre SPANGARO
05faaab489 Balance - Add backtopage on create 2024-12-14 08:36:41 +01:00
Laurent Destailleur
47b034e33c Update files.lib.php 2024-12-13 14:53:35 +01:00
Laurent Destailleur
4d02fb03d0 Update security_file.php 2024-12-13 14:52:58 +01:00
Laurent Destailleur
2827139499 Update files.lib.php 2024-12-13 14:51:32 +01:00
Laurent Destailleur
7661d52ba1 Merge branch 'develop' into Fix-#32193 2024-12-13 14:47:15 +01:00
Laurent Destailleur
912ae1c334 Update admin.lang 2024-12-13 14:32:50 +01:00
Lucas Marcouiller
a443f9ace5 Merge branch 'develop' into New-add-replace-for-memcached-module 2024-12-13 09:14:58 +01:00
Lucas Marcouiller
46134ff5c6 Merge branch 'develop' into Fix-#32193 2024-12-13 09:14:43 +01:00
Hystepik
b71b8e5e4f Fix #32193 Add verification on extension file for upload 2024-12-12 14:40:03 +01:00
Noé Cendrier
a1a102b4e4 FIX: $dir cannot be null, commenting wrong test 2024-12-12 14:34:49 +01:00
Noé Cendrier
af29a9095b Merge branch 'develop' into dirgenpdf 2024-12-12 14:03:02 +01:00
Hystepik
c44a336f0e fix Ci 2024-12-12 11:28:33 +01:00
Hystepik
79a6d694b2 New add replace for memecached 2024-12-12 10:24:51 +01:00
Florian HENRY
7195af1bdf new: if default template for ticket existe we use it avec if there is email template 'all' 2024-12-11 11:05:15 +01:00
Alexandre Janniaux
678283dab6 Merge branch 'develop' into accountingjournal-create/1 2024-12-11 09:53:36 +01:00
Laurent Destailleur
54f584e836 Merge branch 'develop' into develop 2024-12-10 18:47:44 +01:00
Frédéric FRANCE
142cb6262a Merge branch 'develop' into loan_schedule 2024-12-09 22:11:52 +01:00
Sylvain Legrand
1a6f69e7c2 Merge branch 'develop' into Improve-SEPA_2 2024-12-09 22:04:27 +01:00
nat
50d9bb8ca0 Update admin.lang
Adds the label of the new PDF option.
2024-12-09 21:02:03 +01:00
nat
7a842dc104 Update pdf_sponge.modules.php
Does not display linked objects if the new PDF option is checked
2024-12-09 21:00:25 +01:00
Sylvain Legrand
5ec819c253 New dictionaries
Prepare improvements regarding SEPA transfers.

2 - Add dictionaries for "category purpose" and "community instrument".

Users should be able to choose the value of these two parameters for each bank account as they may be different from one bank to another.
2024-12-09 20:24:44 +01:00
nat
6004c64905 Update pdf_other.php
Adds the setting for the option to hide linked objects.
2024-12-09 20:07:38 +01:00
Hystepik
db228a8866 fix name 2024-12-09 11:47:46 +01:00
Hystepik
a24f5d4f55 New regroup report bank tabs 2024-12-09 11:41:18 +01:00
Hystepik
4553ba1f81 New add drag & drop on some cards 2024-12-09 11:08:49 +01:00
Frédéric FRANCE
34517f7a5b Merge branch 'develop' into extrafields_object_filter 2024-12-08 12:08:24 +01:00
Frédéric FRANCE
9773604ebf Merge branch 'develop' into extrafields_object_filter 2024-12-08 09:45:00 +01:00
Frédéric France
2e18d20a3b wip 2024-12-08 09:36:11 +01:00
Frédéric France
c161abedc9 Merge remote-tracking branch 'origin/extrafields_object_filter' into extrafields_object_filter 2024-12-08 09:30:59 +01:00
Frédéric France
a45494099f wip 2024-12-08 09:29:38 +01:00
Christophe Battarel
5340f9f8c5 Update pdf_standard_myobject.modules.php 2024-12-05 16:47:34 +01:00
Laurent Destailleur
d34250c6e5 Merge branch 'develop' into dirgenpdf 2024-12-03 21:17:36 +01:00
Christophe Battarel
98c8a17666 try to fix phpstan error 2024-12-03 11:56:36 +01:00
Frédéric FRANCE
17e31c1d91 Merge branch 'develop' into extrafields_object_filter 2024-11-28 18:34:12 +01:00
Christophe Battarel
9e00b5ec0e FIX output dir 2024-11-28 12:08:22 +01:00
Frédéric FRANCE
8d5c5cf447 Merge branch 'develop' into extrafields_object_filter 2024-11-27 22:06:10 +01:00
Frédéric France
447a9f2ec6 Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-11-27 20:22:50 +01:00
Frédéric France
076ae6a3c2 fix 2024-11-27 20:20:41 +01:00
Frédéric France
4c97950f2a fix 2024-11-27 20:10:41 +01:00
Frédéric France
da8ac80588 fix merge 2024-11-27 18:59:23 +01:00
Frédéric France
edd1a50324 Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-11-27 18:57:47 +01:00
Frédéric France
07eab5003d fix 2024-11-27 18:54:25 +01:00
Frédéric France
365873a48d fix 2024-11-27 18:53:43 +01:00
Frédéric France
8bfb3251d1 Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-11-27 18:30:25 +01:00
Frédéric France
02937ac100 fix phpstan 2024-11-27 18:25:18 +01:00
Frédéric FRANCE
64bca59c1f Merge branch 'develop' into loan_schedule 2024-11-26 18:25:16 +01:00
Frédéric FRANCE
4075f8f54e Merge branch 'develop' into extrafields_object_filter 2024-11-26 17:55:21 +01:00
David Beniamine
343873c82f Once payment is complet, a click on a product should start a new sale 2024-11-26 13:13:07 +01:00
Laurent Destailleur
1fc7bc278b Merge branch 'develop' into develop_takepos_search_term_is_not_same_as_term_variable 2024-11-26 03:59:08 +01:00
Frédéric France
cdf71ad042 doc 2024-11-25 22:26:15 +01:00
Frédéric France
6741eadc64 fix with last updates 2024-11-25 21:47:27 +01:00
Frédéric FRANCE
95fadde61b Merge branch 'develop' into extrafields_object_filter 2024-11-25 21:43:27 +01:00
Alexandre Janniaux
0099fbbd2c accountingjournal: add create() method
Adding a create method ensure we create the accountingjournal in a
uniform way, and allow creating the journals in tests without getting
out-of-sync.
2024-11-25 21:23:33 +01:00
Frédéric France
eb7faffec2 refactor loan schedule 2024-11-23 18:49:12 +01:00
John BOTELLA
c642396dca Add List of usable icons with img_picto function 2024-11-23 18:26:40 +01:00
Frédéric France
0df412b6be refactor loan schedule 2024-11-23 18:24:15 +01:00
John BOTELLA
469baa0b5b remove double 2024-11-23 17:53:12 +01:00
John BOTELLA
0cb35d5b03 New doc for icon list 2024-11-23 09:15:34 +01:00
Laurent Destailleur
552812e052 Merge branch 'develop' into develop_takepos_search_term_is_not_same_as_term_variable 2024-11-21 22:59:39 +01:00
Laurent Destailleur
6353a06c47 Merge branch 'develop' into develop_takepos_search_term_is_not_same_as_term_variable 2024-11-21 22:37:09 +01:00
Eric Seigne
101ee350d3 new variable search_term to be more clear, term is only for terminal number 2024-11-21 19:51:29 +01:00
Frédéric France
af925191c9 test 2024-11-19 23:37:10 +01:00
Frédéric France
4425f38afd test 2024-11-19 23:25:01 +01:00
Frédéric France
ad8a5c9054 Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-11-19 21:26:20 +01:00
sonikf
63dbc8d4de fix white space 2024-11-17 14:52:50 +02:00
sonikf
bc9e75a785 fix duplicate translation strings 2024-11-17 14:45:09 +02:00
sonikf
a00fb0f5db fix duplicate translation strings 2024-11-17 14:43:21 +02:00
Hystepik
3c5b397439 Fix CI 2024-11-17 10:16:05 +01:00
Laurent Destailleur
b6b53218c5 Update don.class.php 2024-11-17 01:18:57 +01:00
Laurent Destailleur
f24ee650fc Update don.class.php 2024-11-17 01:11:41 +01:00
sonikf
fd10b6206d Update salaries.lang 2024-11-17 01:57:42 +02:00
sonikf
920e1b77b4 NEW: Add also start date fill buttons for salary clone 2024-11-17 01:47:12 +02:00
William Mead
4cab9e8a62 Fixed & refactored status label 2024-11-16 23:34:10 +01:00
Laurent Destailleur
6a8b4c1141 Merge branch 'develop' into New-status-for-webhook 2024-11-16 22:42:46 +01:00
Laurent Destailleur
2c9e58296d Merge branch 'develop' into New-status-for-webhook 2024-11-16 22:32:24 +01:00
Laurent Destailleur
88c90b0f8a Merge branch 'develop' into New-status-for-webhook 2024-11-16 22:23:38 +01:00
Laurent Destailleur
768a7ec926 Update target_card.php 2024-11-16 22:03:43 +01:00
Lucas Marcouiller
519cafc75d Merge branch 'develop' into New-status-for-webhook 2024-11-16 19:04:23 +01:00
Hystepik
172f937a4d Fix Ci 2024-11-16 18:47:19 +01:00
Hystepik
cfff3093d9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New-status-for-webhook 2024-11-16 18:46:23 +01:00
William Mead
ee1b3df3f1 Fixed task closed confirm localisation 2024-11-16 18:42:01 +01:00
Nicolas
007860ae81 NEW Closing task 2024-11-16 17:53:53 +01:00
Benoît PASCAL
bcf7031a04 fix: declare entity before using it 2024-11-16 17:32:30 +01:00
Benoît PASCAL
0bac63ffbc feat: add entity in custom translation with multicompany 2024-11-16 17:16:37 +01:00
Frédéric France
b9f8c188f7 Merge remote-tracking branch 'origin/extrafields_object_filter' into extrafields_object_filter 2024-11-16 01:16:09 +01:00
Frédéric France
4492cedc54 fix 2024-11-16 01:15:25 +01:00
Frédéric France
2a19191fd5 Merge remote-tracking branch 'origin' into extrafields_object_filter 2024-11-16 01:06:14 +01:00
Frédéric FRANCE
98f7f21cf1 Merge branch 'develop' into extrafields_object_filter 2024-11-15 22:20:49 +01:00
Hystepik
ba739c601d fix CI 2024-11-15 22:02:50 +01:00
ICMathieu
8fe93618cd FIX go back status #24944 2024-11-15 16:59:11 +01:00
Hystepik
2d8c854c59 fix runtrigger 2024-11-15 09:38:21 +01:00
Hystepik
0db9999fa1 phpdoc modifications 2024-11-15 09:33:38 +01:00
Hystepik
f81f3ed2ee Merge branch 'develop' of github.com:Dolibarr/dolibarr into New-status-for-webhook 2024-11-15 09:26:30 +01:00
Hystepik
0f539e4b09 webhook manual trigger 2024-11-14 21:08:06 +01:00
Hystepik
20c5fee4cb Merge branch 'develop' of github.com:Dolibarr/dolibarr into New-status-for-webhook 2024-11-14 13:28:20 +01:00
Hystepik
4d13b2b9a7 fix some unwanted code 2024-11-14 13:27:09 +01:00
Frédéric FRANCE
6b45be1a0d Merge branch 'develop' into extrafields_object_filter 2024-11-13 23:55:16 +01:00
Frédéric FRANCE
e16c01234b Merge branch 'develop' into extrafields_object_filter 2024-11-11 20:20:55 +01:00
Frédéric France
1471626cf4 clean code 2024-11-09 11:50:10 +01:00
Frédéric France
86d2641e54 Merge remote-tracking branch 'origin/extrafields_object_filter' into extrafields_object_filter 2024-11-09 11:48:09 +01:00
Frédéric FRANCE
66374f2859 Merge branch 'develop' into extrafields_object_filter 2024-11-09 11:46:45 +01:00
Frédéric France
3e96b33f72 Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-27 20:16:46 +01:00
Frédéric France
26f788b73a Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-27 18:21:53 +01:00
Frédéric France
8d149c0b6f wip 2024-10-26 21:56:17 +02:00
Frédéric France
3246cabe79 Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-26 20:12:05 +02:00
Frédéric France
f4e05cfcfb Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-26 18:30:17 +02:00
Frédéric France
259ce6020d Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-26 18:27:45 +02:00
Frédéric France
3e685dffb2 fix phpstan 2024-10-26 18:23:33 +02:00
Frédéric FRANCE
8828b41679 Merge branch 'develop' into extrafields_object_filter 2024-10-26 17:24:49 +02:00
Frédéric FRANCE
2e12fb00fd Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-24 20:53:27 +02:00
Frédéric FRANCE
36b507ad4d wip 2024-10-24 19:04:12 +02:00
Frédéric FRANCE
cf27abb4b4 Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-24 18:59:33 +02:00
Frédéric FRANCE
ee12679f49 Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-24 09:25:05 +02:00
Frédéric FRANCE
56ebe9bb5a Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-23 20:26:36 +02:00
Frédéric FRANCE
4f07ec967b Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-23 19:06:40 +02:00
Frédéric FRANCE
3fcb57f911 wip 2024-10-23 19:06:21 +02:00
Frédéric FRANCE
05c4dbcf09 new ajax search with infinite scroll 2024-10-22 22:45:51 +02:00
Frédéric FRANCE
12a9b43dee new ajax search with infinite scroll 2024-10-22 22:37:48 +02:00
Frédéric FRANCE
a7ee5b6a29 new ajax search with infinite scroll 2024-10-22 22:29:41 +02:00
Frédéric FRANCE
6b2767c3d2 Merge remote-tracking branch 'origin/extrafields_object_filter' into extrafields_object_filter 2024-10-22 21:46:10 +02:00
Frédéric FRANCE
2a0d4bf2ae new ajax search with infinite scroll 2024-10-22 21:46:04 +02:00
Frédéric FRANCE
6f95ffe650 Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-22 10:22:54 +02:00
Frédéric FRANCE
bd2567528a Merge branch 'develop' into extrafields_object_filter 2024-10-20 10:32:28 +02:00
Hystepik
2003be5e79 Add action to send manual trigger 2024-10-18 10:43:06 +02:00
Frédéric FRANCE
35935a5e17 fix 2024-10-17 13:28:33 +02:00
Frédéric FRANCE
f2ef1486ef Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-17 08:34:54 +02:00
Frédéric FRANCE
c23f06d5db fix sql 2024-10-17 08:34:08 +02:00
Frédéric FRANCE
324fe1e7a7 can filter on object properties 2024-10-16 11:56:49 +02:00
Frédéric FRANCE
befaf262d9 can filter on object properties 2024-10-16 11:17:24 +02:00
Frédéric FRANCE
f0f8bc595e can filter on object properties 2024-10-16 11:00:05 +02:00
Frédéric FRANCE
6152d2e885 Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-16 10:52:04 +02:00
Frédéric FRANCE
9b44b5e3a0 can filter on object properties 2024-10-16 10:51:52 +02:00
Frédéric FRANCE
348a0d7779 can filter on object properties 2024-10-16 10:37:41 +02:00
Hystepik
e3dbd3b6cf Merge branch 'develop' of github.com:Dolibarr/dolibarr into New-status-for-webhook 2024-10-14 13:06:52 +02:00
Hystepik
ec99c226e5 set status button 2024-10-07 12:48:49 +02:00
Hystepik
086bbb862c New add new status to webhook 2024-10-03 15:04:27 +02:00
Florent Poinsaut
939a4d1695 Merge branch 'develop' into fix-external-users-cannot-see-projects 2024-08-26 15:05:45 +02:00
Jakub Stříbrný
1ce807d0e7 add professional id 7-10 to mysoc 2024-08-02 12:07:12 +02:00
Florent Poinsaut
c0731e07a2 Merge branch 'develop' into fix-external-users-cannot-see-projects 2024-08-01 16:46:25 +02:00
Florent Poinsaut
38b2da8f0a Fix indent #10789 2024-07-12 21:56:38 +02:00
Florent Poinsaut
ec268d2add Merge remote-tracking branch 'origin/develop' into fix-external-users-cannot-see-projects 2024-07-11 19:45:42 +00:00
Florent Poinsaut
23fc9d9acf Lint #10789 2024-07-11 19:45:26 +00:00
Florent Poinsaut
efd263579f Add a warning if we add a contact that has a user #10789 2024-07-11 18:49:44 +02:00
Christophe Battarel
1d9993dcae better code 2024-07-02 16:11:45 +02:00
Christophe Battarel
1389f8b43a codesniffer made a mess 2024-07-02 15:48:22 +02:00
Christophe Battarel
9a54948dfd fix tabs 2024-07-02 15:45:53 +02:00
Christophe Battarel
00909f8e11 NEW : use specific landing page to home menu entry 2024-07-02 15:42:54 +02:00
moreauf
291cd79b1d Merge remote-tracking branch 'origin/develop' into develop_adherent_type_class_update 2023-12-05 10:11:40 +01:00
moreauf
0df5f17372 develop_adherent_type_class_update 2023-11-29 08:39:56 +01:00
moreauf
59557c1ca3 Merge remote-tracking branch 'origin/develop' into develop_adherent_type_class_update 2023-11-29 08:35:47 +01:00
moreauf
2004b154c8 Merge remote-tracking branch 'origin/develop' into develop_adherent_type_class_update 2023-11-28 08:39:16 +01:00
moreauf
9f5bca3b7e Merge remote-tracking branch 'origin/develop' into develop_adherent_type_class_update 2023-11-27 16:37:51 +01:00
moreauf
5ba2a65047 Merge remote-tracking branch 'origin/develop' into develop_adherent_type_class_update 2023-11-26 18:20:25 +01:00
moreauf
814033ac74 Merge remote-tracking branch 'origin/develop' into develop_adherent_type_class_update 2023-11-24 11:59:05 +01:00
moreauf
a6ef63b089 Merge remote-tracking branch 'origin/develop' into develop_adherent_type_class_update 2023-11-24 09:51:25 +01:00
moreauf
7bc547154f Merge remote-tracking branch 'origin/develop' into develop_adherent_type_class_update 2023-11-22 13:53:37 +01:00
moreauf
a4c713723e Merge remote-tracking branch 'origin/develop' into develop_adherent_type_class_update 2023-11-22 09:06:33 +01:00
moreauf
3211991436 Merge remote-tracking branch 'origin/develop' into develop_adherent_type_class_update 2023-11-21 14:02:18 +01:00
moreauf
a3f426a322 Merge remote-tracking branch 'origin/develop' into develop_adherent_type_class_update 2023-11-21 09:04:29 +01:00
moreauf
a0610373a5 Merge remote-tracking branch 'origin/develop' into develop_adherent_type_class_update 2023-11-18 14:27:04 +01:00
moreauf
1871d2a50d cron job class refactoring following new class standard and using CommonObject methode 2023-11-18 00:42:06 +01:00
moreauf
d2cd625081 add array feilds and somme property
correct some display bugs on card.
2023-11-17 22:55:35 +01:00
5484 changed files with 268679 additions and 169179 deletions

View File

@@ -6,7 +6,6 @@ languages:
engines:
phpcodesniffer: true
exclude_paths:
- 'build/*'
- 'dev/*'
- 'doc/*'
- 'test/*'

View File

@@ -153,7 +153,7 @@ Long description (Can span across multiple lines).
Pull Request (PR) process is the process to submit a change (enhancement, bug fix, ...) into the code of the project. There is some rules to know and
a process to follow to optimize the chance to have PRs merged efficiently...
* A PR must be atomic. It means it must contains the lower possible changes for 1 need (1 bug fix or 1 new feature) without breaking usability of code. If a PR can be split into several PRs, it often means your PR is not atomic.
* A PR must be atomic. It means it must contains the lower possible changes for 1 need (1 bug fix or 1 new feature) without breaking usability of code. If a PR can be split into several PRs, it often means your PR is not atomic. For PR on maintenance versions, the modified code must be as low as possible and only the absolutely necessary changes are allowed (You must have the number of lines modified as low as possible to have the visible bug fixed (no refactoring, no perf, no quality, no renaming must be joined). This allow to reduce to the maximum the number of future conflicts (so the number of regressions) when merging fixes into higher version to reduce the time of any future impact analysis.
* Your Pull Request (PR) must pass the Continuous Integration checks and code quality checks.
@@ -185,7 +185,7 @@ A so high ratio is very rare on a so popular project and with the increasing pop
Translations
------------
The source language (en_US) is maintained in the repository. See the [Code](#code) section above.
The source language (en_US) is maintained in the repository.
All other translations are managed online at [Transifex](https://www.transifex.com/dolibarr-association/dolibarr/).

View File

@@ -1,8 +1,9 @@
# Instructions
*This is a template to help you make good pull requests. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
*Please:*
- *only keep the "FIX", "CLOSE", "NEW", "PERF" or "QUAL" section* (use uppercase to have the PR appears into the ChangeLog, lowercase will not appears)
- *only keep the "FIX", "CLOSE", "NEW", "UIUX", PERF" or "QUAL" section* (use uppercase to have the PR appears into the ChangeLog, lowercase will not appears)
- *follow the project [contributing guidelines](/.github/CONTRIBUTING.md)*
- ***in particular, in case of a bugfix, please check that you are targetting the branch corresponding to the oldest version in which the bug occurs***
- *replace the bracket enclosed texts with meaningful information*
@@ -18,6 +19,10 @@
[*Long description*]
# UIUX|Uiux [*Short description*]
[*Long description*]
# PERF|Perf #[*issue_number Short description*]
[*Long description*]

86
.github/scripts/get_changed_php.sh vendored Executable file
View File

@@ -0,0 +1,86 @@
#!/bin/bash
# Copyright (C) 2025 MDW <mdeweerd@users.noreply.github.com>
set -euo pipefail
# This script retrieves the list of changed PHP files for a pull request
# using the GitHub API and sets two outputs:
# - any_changed: "true" if at least one PHP file changed, "false" otherwise
# - all_changed_files: space-separated list of changed PHP file paths
#
# Required environment variables:
# GITHUB_TOKEN - GitHub token with repo access
# GITHUB_REPOSITORY - "owner/repo"
# GITHUB_EVENT_PATH - Path to the event JSON payload
# Verify required environment variables are set
if [[ -z "${GITHUB_TOKEN:-}" ]]; then
echo "GITHUB_TOKEN is not set" >&2
exit 1
fi
if [[ -z "${GITHUB_REPOSITORY:-}" ]]; then
echo "GITHUB_REPOSITORY is not set" >&2
exit 1
fi
if [[ -z "${GITHUB_EVENT_PATH:-}" ]]; then
echo "GITHUB_EVENT_PATH is not set" >&2
exit 1
fi
# Extract the pull request number from the event payload
pr_number=$(jq --raw-output '.pull_request.number' "$GITHUB_EVENT_PATH")
if [[ "$pr_number" == "null" ]]; then
echo "Not a pull request event"
exit 0
fi
# Split repository into owner and repo name
# Split repository into owner and repo name using Bash parameter expansion
owner="${GITHUB_REPOSITORY%%/*}" # Extract text before the first '/'
repo="${GITHUB_REPOSITORY##*/}" # Extract text after the last '/'
page=1
per_page=100
changed_php_files=()
# Loop through all pages to gather changed files
while true; do
response=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" \
"https://api.github.com/repos/${owner}/${repo}/pulls/${pr_number}/files?per_page=${per_page}&page=${page}")
# Filter for files ending with .php and add them to the list
mapfile -t files < <(echo "$response" | jq -r '.[] | select(.filename | test("\\.php$")) | .filename')
changed_php_files+=("${files[@]}")
# Check if we have reached the last page (less than per_page results)
count=$(echo "$response" | jq 'length')
if (( count < per_page )); then
break
fi
((page++))
done
# Build a space-separated string of changed PHP files
# This does not cope with files that have spaces.
# But such files do not exist in the project (at least not for the
# files we are filtering).
all_changed_files=$(IFS=" " ; echo "${changed_php_files[*]}")
# Determine changed files flag
if [ -z "$all_changed_files" ]; then
any_changed="false"
else
any_changed="true"
fi
# Set outputs for GitHub Actions if GITHUB_OUTPUT is available
if [ -n "${GITHUB_OUTPUT:-}" ]; then
echo "any_changed=${any_changed}" >> "$GITHUB_OUTPUT"
echo "all_changed_files=${all_changed_files}" >> "$GITHUB_OUTPUT"
else
# Otherwise, print the outputs
echo "any_changed=${any_changed}"
echo "all_changed_files=${all_changed_files}"
fi

View File

@@ -1,16 +1,33 @@
# Workflow run order
# CI Workflows
To reduce run minutes, the following order is put in place:
The 2 main CI workflows are:
----------------------------
On PR & Merge, always run:
- ci-on-pull_request.yml
- ci-on-push.yml
- pre-commit;
- phan.
This run the actions:
When both succeed, start:
- phpstan;
- pre-commit.yml
- phan.yml
- phpstan.yml
When all succeed, start:
- Windows-ci;
- travis.
See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-a-workflow-based-on-the-conclusion-of-another-workflow
The other worklows are:
-----------------------
- stale-issues-safe to autoclose old issues.
- phpstan_baseline to update the phpstan baseline file.
- cache-clean-pr to clean cache when closing a PR.
Some tests workflows are:
------------------------
- pr-18
- pr-18-autolbal
- test

View File

@@ -1,6 +1,7 @@
---
name: Cleanup caches of a closed branch
# This clean the caches of a branch when we close the pull request.
# See https://github.com/actions/cache/blob/main/tips-and-workarounds.md#force-deletion-of-caches-overriding-default-cache-eviction-policy
name: Cleanup caches of a closed branch
on:
pull_request:
types: [closed]

View File

@@ -1,28 +0,0 @@
name: Qodana
on:
schedule:
- cron: "0 20 * * 1,3,5"
workflow_dispatch:
branches:
- develop
# push:
# branches:
# - develop
permissions:
contents: read
jobs:
qodana:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 1
#php-version: '7.1'
- name: 'Qodana Scan'
uses: JetBrains/qodana-action@v2023.2.1
#with:
# php-version: '7.1'
env:
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

View File

@@ -1,38 +0,0 @@
# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
name: Doxygen
on:
schedule:
- cron: "0 15 * * *"
workflow_dispatch:
branches:
- develop
permissions:
contents: write
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Build
uses: DenverCoder1/doxygen-github-pages-action@v1.2.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
folder: build/html
config_file: build/doxygen/dolibarr-doxygen.doxyfile
# - name: Deploy
# uses: JamesIves/github-pages-deploy-action@v4
# with:
# branch: gh-pages
# folder: build/html # The folder the action should deploy.
# target-folder: docs/html2
#jobs:
# doxygen:
# runs-on: ubuntu-latest
# steps:
# - name: 'Doxygen'
# uses: mattnotmitt/doxygen-action@1.9.5
# with:
# doxyfile-path: build/doxygen

View File

@@ -1,27 +0,0 @@
# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
name: "Exakat analysis"
on:
# execute once a month, the 1st
schedule:
- cron: "0 20 1 * *"
workflow_dispatch:
permissions:
contents: read
jobs:
exakat:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1
ref: develop
- name: Exakat
uses: docker://exakat/exakat-ga
with:
ignore_rules: 'Classes/UseInstanceof,Constants/ConstantStrangeNames,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/NestedTernary,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant'
ignore_dirs: '/htdocs/includes/,/htdocs/install/doctemplates/,/build/,/dev/,/doc/,/scripts/,/test/'
file_extensions: php
project_reports: Perfile

View File

@@ -35,14 +35,14 @@ jobs:
--health-timeout 5s
--health-retries 5
ports:
- 5432:5432
- 5432:5432
steps:
# git clone dolibarr into GITHUB_WORKSPACE = /home/runner/work/dolibarr/dolibarr
- uses: actions/checkout@v3
with:
fetch-depth: 1
- name: Version PHP
run: |
php -i | head -
@@ -59,7 +59,7 @@ jobs:
sudo apt install apache2 php7.1 php7.1-cli php7.1-curl php7.1-mysql php7.1-pgsql php7.1-gd php7.1-imap php7.1-intl php7.1-ldap php7.1-xml php7.1-mbstring php7.1-xml php7.1-zip libapache2-mod-php7.1
sudo update-alternatives --set php /usr/bin/php7.1
php -i | head -
cd $GITHUB_WORKSPACE
ls $GITHUB_WORKSPACE
composer -n require --ignore-platform-reqs phpunit/phpunit ^7.5 \
@@ -76,7 +76,7 @@ jobs:
sudo rm -fr htdocs/includes/phpunit/php-code-coverage/src/Report/Html
- name: Adding path of binaries tools installed by composer to the PATH
run: |
run: |
export PATH="$GITHUB_WORKSPACE/htdocs/includes/bin:$PATH"
echo $PATH
# We must have a directory bin created by the previous composer call
@@ -107,32 +107,32 @@ jobs:
psql --version
echo "Check pgloader version"
pgloader --version
- name: Create database
run: |
pwd
echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE
echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE
sudo apt-get install -y mysql-client
mysql --version | head -
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SELECT VERSION();" | head -
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SHOW DATABASES"
echo "Drop and create database"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'DROP DATABASE IF EXISTS travis;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8';"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password';"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'FLUSH PRIVILEGES;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';"
echo "Init postgresql database"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';"
echo "Init postgresql database"
ps fauxww | grep postgres
ls /etc/postgresql/14/main/
sudo chmod -R a+rwx /etc/postgresql/14/main/pg_hba.conf
sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/14/main/pg_hba.conf
sudo cat /etc/postgresql/14/main/pg_hba.conf
@@ -144,7 +144,7 @@ jobs:
sudo mkdir -p /tmp/pgloader
sudo chmod -R a+rwx /tmp/pgloader/
echo sudo pgloader mysql://root:password@127.0.0.1:32574/travis postgresql://postgres:postgres@127.0.0.1:5432/travis
sudo pgloader mysql://root:password@127.0.0.1:32574/travis postgresql://postgres:postgres@127.0.0.1:5432/travis
echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql postgresql://postgres:postgres@127.0.0.1:5432/travis
@@ -190,7 +190,7 @@ jobs:
echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
echo '$'force_install_main_data_root=\'/var/www/html\'';' >> $INSTALL_FORCED_FILE
cat $INSTALL_FORCED_FILE
- name: Create document directory
run: |
echo "Create documents directory and set permissions"
@@ -199,9 +199,9 @@ jobs:
sudo chmod -R a+rwx /var/www/html/documents
sudo echo "***** First line of dolibarr.log" > /var/www/html/documents/dolibarr.log
sudo chmod a+rwx /var/www/html/documents/dolibarr.log
- name: Copy app into /var/www
run: |
run: |
sudo cp -r $GITHUB_WORKSPACE/htdocs/. /var/www/html
sudo mv /var/www/html/index.html /var/www/html/index.disabled.html
sudo ln -fs /var/www/html /var/www/htdocs
@@ -217,7 +217,7 @@ jobs:
a2query -s
a2query -m
ls /etc/apache2/sites-available
#sudo cp -f $GITHUB_WORKSPACE/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf
#sudo cp -f $GITHUB_WORKSPACE/dev/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf
#sudo sed -e "s?%GITHUB_WORKSPACE%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
a2ensite 000-default
a2enmod php7.1
@@ -245,7 +245,7 @@ jobs:
# The wget should return a page with line '<meta name="generator" content="Dolibarr installer">
wget -O - --debug http://127.0.0.1 > $GITHUB_WORKSPACE/test.html 2>&1
head -n 200 $GITHUB_WORKSPACE/test.html
echo Logs are...
#sudo cat /tmp/install.log
sudo cat /var/log/apache2/access.log
@@ -287,7 +287,7 @@ jobs:
php upgrade.php 6.0.0 7.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade600700.log
php upgrade2.php 6.0.0 7.0.0 > $GITHUB_WORKSPACE/upgrade600700-2.log
php step5.php 6.0.0 7.0.0 > $GITHUB_WORKSPACE/upgrade600700-3.log
echo "\dt llx_c_paiement" | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
echo "\dt llx_c_payment_term" | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
@@ -324,17 +324,17 @@ jobs:
php upgrade.php 17.0.0 18.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade17001800.log
php upgrade2.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-2.log
php step5.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-3.log
- name: Result of migration scripts
if: always()
run: |
ls -alrt $GITHUB_WORKSPACE/
echo Show content of last file
cat "$(ls -rt $GITHUB_WORKSPACE/ | tail -n1)"
- name: Enabling new modules
run: |
run: |
# Enable modules not enabled into original dump
set -e
cd /var/www/html/install
@@ -361,5 +361,4 @@ jobs:
includes/bin/phpunit -d memory_limit=-1 -c /var/www/test/phpunit/phpunittest.xml /var/www/test/phpunit/AllTests.php
phpunitresult=$?
echo "Phpunit return code = $phpunitresult"
set +e
set +e

View File

@@ -28,7 +28,7 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 1
- name: Version PHP
run: |
php -i | head -
@@ -38,14 +38,14 @@ jobs:
sudo composer self-update 2.2.18
sudo chmod -R a+rwx /home/runner
composer -n config -g vendor-dir htdocs/includes
sudo add-apt-repository -y ppa:ondrej/php
sudo apt-get update
sudo apt-get install -y pgloader memcached
sudo apt install apache2 php8.1 php8.1-cli php8.1-curl php8.1-mysql php8.1-pgsql php8.1-gd php8.1-imap php8.1-intl php8.1-ldap php8.1-xml php8.1-mbstring php8.1-xml php8.1-zip libapache2-mod-php8.1
sudo update-alternatives --set php /usr/bin/php8.1
php -i | head -
cd $GITHUB_WORKSPACE
ls $GITHUB_WORKSPACE
composer -n require --ignore-platform-reqs phpunit/phpunit ^8 \
@@ -56,7 +56,7 @@ jobs:
sudo rm -fr htdocs/includes/phpunit/php-code-coverage/src/Report/Html
- name: Adding path of binaries tools installed by composer to the PATH
run: |
run: |
export PATH="$GITHUB_WORKSPACE/htdocs/includes/bin:$PATH"
echo $PATH
# We must have a directory bin created by the previous composer call
@@ -87,26 +87,26 @@ jobs:
psql --version
echo "Check pgloader version"
pgloader --version
- name: Create database
run: |
pwd
echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE
echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE
sudo apt-get install -y mysql-client
mysql --version | head -
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SELECT VERSION();" | head -
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SHOW DATABASES"
echo "Drop and create database"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'DROP DATABASE IF EXISTS travis;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8';"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password';"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'FLUSH PRIVILEGES;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';"
- name: Generate Dolibarr conf file
run: |
@@ -145,7 +145,7 @@ jobs:
echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
echo '$'force_install_main_data_root=\'/var/www/html\'';' >> $INSTALL_FORCED_FILE
cat $INSTALL_FORCED_FILE
- name: Create document directory
run: |
echo "Create documents directory and set permissions"
@@ -154,9 +154,9 @@ jobs:
sudo chmod -R a+rwx /var/www/html/documents
sudo echo "***** First line of dolibarr.log" > /var/www/html/documents/dolibarr.log
sudo chmod a+rwx /var/www/html/documents/dolibarr.log
- name: Copy app into /var/www
run: |
run: |
sudo cp -r $GITHUB_WORKSPACE/htdocs/. /var/www/html
sudo mv /var/www/html/index.html /var/www/html/index.disabled.html
sudo ln -fs /var/www/html /var/www/htdocs
@@ -172,7 +172,7 @@ jobs:
a2query -s
a2query -m
ls /etc/apache2/sites-available
#sudo cp -f $GITHUB_WORKSPACE/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf
#sudo cp -f $GITHUB_WORKSPACE/dev/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf
#sudo sed -e "s?%GITHUB_WORKSPACE%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
a2ensite 000-default
a2enmod php8.1
@@ -200,7 +200,7 @@ jobs:
# The wget should return a page with line '<meta name="generator" content="Dolibarr installer">
wget -O - --debug http://127.0.0.1 > $GITHUB_WORKSPACE/test.html 2>&1
head -n 200 $GITHUB_WORKSPACE/test.html
echo Logs are...
#sudo cat /tmp/install.log
sudo cat /var/log/apache2/access.log
@@ -274,17 +274,17 @@ jobs:
php upgrade.php 17.0.0 18.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade17001800.log
php upgrade2.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-2.log
php step5.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-3.log
- name: Result of migration scripts
if: always()
run: |
ls -alrt $GITHUB_WORKSPACE/
echo Show content of last file
cat "$(ls -rt $GITHUB_WORKSPACE/ | tail -n1)"
- name: Enabling new modules
run: |
run: |
# Enable modules not enabled into original dump
set -e
cd /var/www/html/install
@@ -311,7 +311,7 @@ jobs:
includes/bin/phpunit -d memory_limit=-1 -c /var/www/test/phpunit/phpunittest.xml /var/www/test/phpunit/AllTests.php
phpunitresult=$?
echo "Phpunit return code = $phpunitresult"
set +e
set +e
- name: Code quality check - Lint
if: github.event_name == 'push'
@@ -325,10 +325,9 @@ jobs:
- name: Code quality check - phpcs
if: github.event_name == 'push'
run: |
htdocs/includes/bin/phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;
htdocs/includes/bin/phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;
- name: Code quality check - var-dump-check
if: github.event_name == 'push'
run: |
htdocs/includes/bin/var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .

View File

@@ -1,13 +0,0 @@
# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
name: Greetings PR
on: [pull_request]
jobs:
greeting:
runs-on: ubuntu-latest
steps:
- uses: actions/first-interaction@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
pr-message: 'Welcome to the Dolibarr army. You are on the road to become an Admiral (see https://wiki.dolibarr.org/index.php/Dolibarr_Project)'

View File

@@ -1,32 +0,0 @@
name: "PHPCS"
on:
push:
pull_request:
paths:
- "**.php"
- "phpcs.xml"
- ".github/workflows/phpcs.yml"
jobs:
phpcs:
runs-on: ubuntu-latest
steps:
# Get git sources
- uses: actions/checkout@v4
with:
fetch-depth: 50 # important!
# we may use whatever way to install phpcs, just specify the path on the next step
# however, curl seems to be the fastest
- name: Install PHP_CodeSniffer
run: |
curl -OL https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
php phpcs.phar --version
- uses: thenabeel/action-phpcs@v8
with:
files: "**.php" # you may customize glob as needed
phpcs_path: php phpcs.phar
standard: dev/setup/codesniffer/ruleset.xml
fail_on_warnings: false

View File

@@ -43,7 +43,7 @@ jobs:
with:
php-version: ${{ matrix.php-version }}
coverage: none # disable xdebug, pcov
tools: phpstan:2.0, cs2pr
tools: phpstan:2.1.8, cs2pr
extensions: calendar, json, imagick, gd, zip, mbstring, intl, opcache, imap,
mysql, pgsql, sqlite3, ldap, xml, mcrypt
@@ -67,7 +67,7 @@ jobs:
- name: Run PHPStan
id: phpstan
run: |
phpstan -vvv analyse --error-format=checkstyle --memory-limit 7G -a build/phpstan/bootstrap_action.php | tee _stan.xml | cs2pr --graceful-warnings
phpstan -vvv analyse --error-format=checkstyle --memory-limit 7G -a dev/build/phpstan/bootstrap_action.php | tee _stan.xml | cs2pr --graceful-warnings
# continue-on-error: true
# Save cache
@@ -90,4 +90,4 @@ jobs:
# id: phpstan-baseline
# if: ${{ success() }}
# run: |
# phpstan -vv analyse --memory-limit 7G -a build/phpstan/bootstrap_action.php --generate-baseline build/phpstan/phpstan-baseline.neon
# phpstan -vv analyse --memory-limit 7G -a dev/build/phpstan/bootstrap_action.php --generate-baseline dev/build/phpstan/phpstan-baseline.neon

View File

@@ -1,3 +1,5 @@
---
# This run the script to update the phpstan baseline file dev/build/phpstan/phpstan-baseline.neon
name: 'PHPStan baseline'
on:
@@ -37,7 +39,7 @@ jobs:
with:
php-version: ${{ env.PHP_VERSION }}
coverage: none # disable xdebug, pcov
tools: phpstan:2.0, cs2pr
tools: phpstan:2.1.8, cs2pr
extensions: calendar, json, imagick, gd, zip, mbstring, intl, opcache, imap,
mysql, pgsql, sqlite3, ldap, xml, mcrypt
env:
@@ -60,8 +62,8 @@ jobs:
github_token: ${{ env.GH_TOKEN }}
phpstan_path: phpstan
configuration_path: phpstan.neon.dist
phpstan_additional_arguments: --memory-limit 7G -a build/phpstan/bootstrap_action.php
baseline_path: build/phpstan/phpstan-baseline.neon
phpstan_additional_arguments: --memory-limit 7G -a dev/build/phpstan/bootstrap_action.php
baseline_path: dev/build/phpstan/phpstan-baseline.neon
commit_name: Dolibot
commit_email: dolibarr-bot@users.noreply.github.com
commit_message: PHPStan > Update baseline

View File

@@ -1,21 +0,0 @@
name: "Set label for v18"
on:
pull_request:
types: [opened, synchronize, reopened]
branches:
- "18.0"
push:
branches:
- "18.0"
jobs:
changed-lines-count-labeler:
runs-on: ubuntu-latest
name: An action for automatically labelling pull requests based on the changed lines count
steps:
- name: Set a label
uses: vkirilichev/changed-lines-count-labeler@v0.2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
configuration-path: .github/changed-lines-count-labeler.yml
continue-on-error: true

View File

@@ -1,64 +0,0 @@
name: Set reviewer for v18
on:
pull_request:
types: [opened, synchronize, reopened]
branches:
- "18.0"
push:
branches:
- "18.0"
jobs:
pr18:
runs-on: ubuntu-latest
#env:
# GH_TOKEN: ${{ github.token }}
# GH_TOKENS: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Checkout repository
uses: actions/checkout@v4
#- name: Install GitHub CLI
# run: |
# sudo apt update
# sudo apt install gh -y
- name: Assign reviewer method 1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
url: ${{ github.event.pull_request.html_url }}
run: |
gh pr edit "$url" --add-assignee rycks --add-reviewer rycks
gh pr merge "$url" --merge --auto
continue-on-error: true
- name: Assign reviewer method 2
env:
#REVIEWER: "eldy,lvessiller-opendsi,rycks" # Remplacez par le nom d'utilisateur GitHub du reviewer
REVIEWER: "rycks" # Remplacez par le nom d'utilisateur GitHub du reviewer
run: |
# shellcheck disable=2086
echo "Run action by ${{ github.actor }}"
# shellcheck disable=2086
echo "github.token=${{ github.token }}"
# shellcheck disable=2086
echo "secrets.GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}"
# shellcheck disable=2086
echo "GITHUB_EVENT_PATH=$GITHUB_EVENT_PATH"
# shellcheck disable=2086
echo Get the pr_number
# shellcheck disable=2086
pr_number=$(jq --raw-output .number < $GITHUB_EVENT_PATH)
# shellcheck disable=2086
echo "pr_number=$pr_number"
# shellcheck disable=2086
echo Authenticate login gh
# shellcheck disable=2086
gh auth login --with-token <<< "${{ secrets.GITHUB_TOKEN }}"
# shellcheck disable=2086
gh auth setup-git
# shellcheck disable=2086
gh pr edit $pr_number --add-reviewer "$REVIEWER"
continue-on-error: true

View File

@@ -23,23 +23,43 @@ jobs:
RAW_LOG: pre-commit.log
CS_XML: pre-commit.xml
steps:
- name: Install required tools
run: sudo apt-get update && sudo apt-get install cppcheck
if: false
# The next uses the git API because there is no clone yet.
# It sets the variable steps.changed-php.outputs.all_changed_files for other steps
# This is faster for a big repo.
- name: Get all changed php files (if PR)
id: changed-php
uses: tj-actions/changed-files@v45
if: env.gh_event == 'pull_request'
with:
files: |
**.php
#- name: Install required tools
# run: sudo apt-get update && sudo apt-get install cppcheck
# if: false
# Checkout git sources to analyze
- uses: actions/checkout@v4
# Try to get the list of modified files into steps.changed-php.outputs.all_changed_files
#- name: Get changed files
# id: changed-files
# uses: actions/github-script@v7
# with:
# script: |
# const base = context.payload.pull_request?.base?.sha;
# const head = context.payload.pull_request?.head?.sha;
# const response = await github.rest.repos.compareCommits({
# owner: context.repo.owner,
# repo: context.repo.repo,
# base,
# head
# });
#
# const changedFiles = response.data.files.map(file => file.filename);
# core.setOutput("all_changed_files", changedFiles.join(" "));
# Another method to get the list of changed files
# It sets the variable steps.changed-php.outputs.all_changed_files for other steps
- name: Get all changed php files (if PR)
id: changed-php
if: env.gh_event == 'pull_request'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: ./.github/scripts/get_changed_php.sh
#- name: Print changed files
# run: echo "Changed files are ${{ steps.changed-files.outputs.all_changed_files }}"
# Action setup-python needs a requirements.txt or pyproject.toml
# This ensures one of them exists.
- name: Create requirements.txt if no requirements.txt or pyproject.toml
@@ -131,7 +151,7 @@ jobs:
ls -l ~/.cache/pre-commit/
- name: Convert Raw Log to Annotations
uses: mdeweerd/logToCheckStyle@v2024.3.5
uses: mdeweerd/logToCheckStyle@v2025.1.1
if: ${{ failure() }}
with:
in: ${{ env.RAW_LOG }}

View File

@@ -10,6 +10,7 @@ env:
ENVGHU: ${{ github.token }}
TEST_ACCESS_KEY: ${{ secrets.TEST_ACCESS_KEY }}
TEST_VAR_REPO: ${{ vars.TEST_VAR_REPO }}
TEST_VAR_ORGA: ${{ vars.TEST_VAR_ORGA }}
ENVLOCAL: "varenvlocal"
jobs:
@@ -25,4 +26,5 @@ jobs:
echo "repo-token: ${{secrets.GITHUB_TOKEN}}"
echo "secret repository TEST_ACCESS_KEY: ${{secrets.TEST_ACCESS_KEY}}"
echo "variable repository : ${{vars.TEST_VAR_REPO}}"
echo "variable organization : ${{vars.TEST_VAR_ORGA}}"
echo "ENVLOCAL: ${{env.ENVLOCAL}}"

View File

@@ -165,7 +165,7 @@ jobs:
for /f "tokens=2 delims==" %%A in ('doskey /m:err') do EXIT /B %%A
- name: Convert Raw Log to Annotations
uses: mdeweerd/logToCheckStyle@v2024.3.5
uses: mdeweerd/logToCheckStyle@v2025.1.1
if: ${{ failure() }}
with:
in: ${{ env.PHPUNIT_LOG }}

8
.gitignore vendored
View File

@@ -47,8 +47,8 @@ htdocs/.well-known/apple-developer-merchantid-domain-association
/output/
# Node Modules
build/yarn-error.log
build/node_modules/
dev/build/yarn-error.log
dev/build/node_modules/
node_modules/
vendor/
@@ -84,8 +84,8 @@ doc/install.lock
/INI_PHPUNIT
# ignore cache builds
/build/phpstan/phpstan
/build/phpstan/bootstrap_custom.php
/dev/build/phpstan/phpstan
/dev/build/phpstan/bootstrap_custom.php
phpstan_custom.neon
/.php-cs-fixer.cache
/.php_cs.cache

View File

@@ -1,6 +1,9 @@
# This is mapping list between real user name/email and entry into sources files
# If you don't want to have your real email appears here, just send a Pull Request to
# replace the second field between <> with <secret>
#
# This files allows to have several profiles (the second part) matched to the same name/email (the first part).
#
Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <eldy@users.sourceforge.net>
Laurent Destailleur <eldy@destailleur.fr> eldy <eldy@destailleur.fr>
Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <ldestailleur@teclib.com>

View File

@@ -3,7 +3,7 @@ exclude: (?x)^( htdocs/includes/ckeditor/.*|(\.(?!github/workflows)[^/]*/.*))$
repos:
# Several miscellaneous checks and fix (on yaml files, end of files fix)
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
# This hook tests the name of the branch and return an error if the name is
# 'develop' or an official version 'x.y'
@@ -51,8 +51,8 @@ repos:
exclude:
(?x)^( dev/tools/dolibarr-postgres2mysql.php |test/other/test_serialize.php
|test/phpunit/textutf8.txt |test/phpunit/textiso.txt |htdocs/includes/.*
|htdocs/modulebuilder/template/.* |build/debian/dolibarr.postrm |build/debian/dolibarr.postinst
|build/debian/dolibarr.config )$
|htdocs/modulebuilder/template/.* |dev/build/debian/dolibarr.postrm |dev/build/debian/dolibarr.postinst
|dev/build/debian/dolibarr.config )$
# Fix the first UTF8 byte
- id: fix-byte-order-marker
# Check that there are no files that have are the same when uppercased (conflict on windows)
@@ -60,13 +60,13 @@ repos:
# Gitleaks is a SAST tool for detecting and preventing hardcoded secrets like passwords, api keys, and tokens in git repos
- repo: https://github.com/gitleaks/gitleaks.git
rev: v8.16.1
rev: v8.24.0
hooks:
- id: gitleaks
# Check github actions
- repo: https://github.com/rhysd/actionlint
rev: v1.7.3
rev: v1.7.7
hooks:
- id: actionlint
@@ -168,7 +168,7 @@ repos:
# Prettier (format code, only for non common files)
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.3
rev: v3.1.0
hooks:
- id: prettier
stages: [manual]
@@ -191,7 +191,7 @@ repos:
# Check format of yaml files
- repo: https://github.com/adrienverge/yamllint.git
rev: v1.35.1
rev: v1.36.2
hooks:
- id: yamllint
args:
@@ -201,7 +201,7 @@ repos:
# Execute codespell to fix typo errors (setup of codespell into dev/tools/codespell/)
- repo: https://github.com/codespell-project/codespell
rev: v2.3.0
rev: v2.4.1
hooks:
- id: codespell
# Due to a current limitation of configuration files,
@@ -251,7 +251,7 @@ repos:
# Check sql file syntax
- repo: https://github.com/sqlfluff/sqlfluff
rev: 3.1.0
rev: 3.3.1
hooks:
- id: sqlfluff-lint
stages: [pre-commit, manual] # manual needed for ci

View File

@@ -2,9 +2,9 @@
# from Dolibarr GitHub repository.
# For syntax, see https://docs.travis-ci.com/user/languages/php/
# We use dist: focal = 20.04
# We use dist: focal = 20.04, jammy = 22.04
os: linux
dist: focal
dist: jammy
language: generic
@@ -21,7 +21,7 @@ services:
addons:
mariadb: '10.5'
mariadb: '10.6'
env:
@@ -37,7 +37,7 @@ cache:
jobs:
fast_finish: true
allow_failures:
- php: '8.4'
- php: 'latest'
include:
- stage: PHP min and max
if: type = push
@@ -47,16 +47,16 @@ jobs:
- TRAVIS_PHP_VERSION=7.1
- stage: PHP min and max
if: type = pull_request OR type = push
php: '8.3'
env:
- DB=mysql
- TRAVIS_PHP_VERSION=8.3
- stage: PHP 8.4
if: type = push AND branch = develop
php: '8.4'
env:
- DB=mysql
- TRAVIS_PHP_VERSION=8.4
- stage: PHP latest
if: type = push AND branch = develop
php: 'latest'
env:
- DB=mysql
- TRAVIS_PHP_VERSION=latest
notifications:
email:
@@ -97,6 +97,9 @@ before_install:
if [ "$TRAVIS_PHP_VERSION" = '8.4' ]; then
sudo apt install unzip apache2 php8.4 php8.4-cli php8.4-curl php8.4-mysql php8.4-pgsql php8.4-gd php8.4-imap php8.4-intl php8.4-ldap php8.4-xml php8.4-mbstring php8.4-xml php8.4-zip libapache2-mod-php8.4
fi
if [ "$TRAVIS_PHP_VERSION" = 'latest' ]; then
sudo apt install unzip apache2 php8.4 php8.4-cli php8.4-curl php8.4-mysql php8.4-pgsql php8.4-gd php8.4-imap php8.4-intl php8.4-ldap php8.4-xml php8.4-mbstring php8.4-xml php8.4-zip libapache2-mod-php8.4
fi
- |
echo Install pgsql if run is for pgsql
@@ -122,6 +125,9 @@ before_install:
install:
- |
if [ "$TRAVIS_PHP_VERSION" = '7.0' ]; then
sudo update-alternatives --set php /usr/bin/php7.0
fi
if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then
sudo update-alternatives --set php /usr/bin/php7.1
fi
@@ -144,7 +150,8 @@ install:
#sudo apt install composer
composer -V
composer -n config -g vendor-dir htdocs/includes
sudo composer -n config -g vendor-dir htdocs/includes
sudo chmod -R a+rwx /home/travis/.config/composer
echo
- |
@@ -167,7 +174,7 @@ install:
squizlabs/php_codesniffer ^3
fi
# phpunit 9 is required for php 8
if [ "$TRAVIS_PHP_VERSION" = '8.0' ] || [ "$TRAVIS_PHP_VERSION" = '8.1' ] || [ "$TRAVIS_PHP_VERSION" = '8.2' ] || [ "$TRAVIS_PHP_VERSION" = '8.3' ] || [ "$TRAVIS_PHP_VERSION" = '8.4' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
if [ "$TRAVIS_PHP_VERSION" = '8.0' ] || [ "$TRAVIS_PHP_VERSION" = '8.1' ] || [ "$TRAVIS_PHP_VERSION" = '8.2' ] || [ "$TRAVIS_PHP_VERSION" = '8.3' ] || [ "$TRAVIS_PHP_VERSION" = '8.4' ] || [ "$TRAVIS_PHP_VERSION" = 'latest' ]; then
sudo composer self-update 2.4.4
composer -n require --ignore-platform-reqs phpunit/phpunit ^8 \
php-parallel-lint/php-parallel-lint ^1.2 \
@@ -214,8 +221,8 @@ before_script:
phpcs -i | head -
# Check PHP Vardump check version
echo "PHP Vardump check version"
which var_dump_check
var_dump_check --version
which var-dump-check
var-dump-check --version
# Check PHPUnit version
echo "PHPUnit version"
which phpunit
@@ -270,6 +277,7 @@ before_script:
#echo '\d llx_c_country' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
# Create pgsql compatibility functions
echo "Load functions.sql (may generated errors for tables that does not exists yet)"
psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis' < htdocs/install/pgsql/functions/functions.sql
fi
echo
@@ -313,7 +321,7 @@ before_script:
- |
echo "Setting up Apache"
sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars
sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf
sudo cp -f dev/build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf
sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
sudo cat /etc/apache2/sites-available/000-default.conf
sudo service apache2 restart
@@ -511,6 +519,9 @@ script:
php upgrade.php 20.0.0 21.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade20002100.log || cat $TRAVIS_BUILD_DIR/upgrade20002100.log
php upgrade2.php 20.0.0 21.0.0 > $TRAVIS_BUILD_DIR/upgrade20002100-2.log || cat $TRAVIS_BUILD_DIR/upgrade20002100-2.log
php step5.php 20.0.0 21.0.0 > $TRAVIS_BUILD_DIR/upgrade20002100-3.log || cat $TRAVIS_BUILD_DIR/upgrade20002100-3.log
php upgrade.php 21.0.0 22.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade21002200.log || cat $TRAVIS_BUILD_DIR/upgrade21002200.log
php upgrade2.php 21.0.0 22.0.0 > $TRAVIS_BUILD_DIR/upgrade21002200-2.log || cat $TRAVIS_BUILD_DIR/upgrade21002200-2.log
php step5.php 21.0.0 22.0.0 > $TRAVIS_BUILD_DIR/upgrade21002200-3.log || cat $TRAVIS_BUILD_DIR/upgrade21002200-3.log
set +e
echo

View File

@@ -48,7 +48,7 @@ Swift Mailer 5.4.2-DEV MIT License Yes
Symfony/var-dumper ??? MIT License Yes Library to make var dump (used by DebugBar)
Stripe 10.7.0 MIT Licence Yes Library for Stripe module
TCPDF 6.7.5 LGPL-3+ Yes PDF generation
TCPDI 1.0.0 LGPL-3+ / Apache 2.0 Yes FPDI replacement
TCPDI 1.1.0 LGPL-3+ / Apache 2.0 Yes FPDI replacement
bacon, dasprid, swiss-qr-bill, kmukku, symfony/validator
@@ -59,7 +59,6 @@ CKEditor 4.22.1 LGPL-2.1+ Yes
jQuery 3.6.4 MIT License Yes JS library
jQuery UI 1.13.2 GPL and MIT License Yes JS library plugin UI
jQuery select2 4.0.13 GPL and Apache License Yes JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
jQuery blockUI 2.70.0 GPL and MIT License Yes JS library plugin blockUI (to use ajax popups)
jQuery Colorpicker 1.1 MIT License Yes JS library for color picker for a defined list of colors
jQuery JCrop 0.9.8 GPL and MIT License Yes JS library plugin Crop (to crop images)
jQuery Jeditable 1.7.1 GPL and MIT License Yes JS library plugin jeditable (to edit in place)

513
ChangeLog
View File

@@ -2,6 +2,408 @@
English Dolibarr ChangeLog
--------------------------------------------------------------
***** ChangeLog for 22.0.2 compared to 22.0.1 *****
FIX: ContratLigne::fetch() returns 1 even if the line doesn't exist (#35324)
FIX: #34678
FIX: #35142 FIX: #35143
FIX: #35154 - Massaction createbills in reception list don't mind about order and/or thirdparty currency (#35156)
FIX: #35181 Cancelled purchase orders now shown as such in Project Overview (#35186)
FIX: #35407 After updating to version 22, local taxes were no longer applied (#35408)
FIX: #35425 (#35426)
FIX: accountancy general ledger: bad handling of hook return (#34029)
FIX: Add security test for show terminal selection if no terminal selected when invoice.php is call (#34717)
FIX: allow to create First Sutuation Invoice (#35228)
FIX: api orders : forward database error on failure (backpot commit d9e81cb) (#35478)
FIX: Can't edit tags of a user.
FIX: can't reset intracomm transport mode
FIX: can't save setup of odt template for stock
FIX: check commande liste validate (#35479)
FIX: color of late warning for nb of bank account reconciliation lines
FIX: Correct the calculation of the amount of the current period between the period provided (#35083)
FIX: Date planned of delivery is not propagated from order to shipment
FIX: Edit of email in emailing. Property messtype not set.
FIX: extra field list depend on parent list when editing a card (#35165)
FIX: fallback of "from" email when sending email in member module
FIX: missing token to disable custom group category for compta report (page /htdocs/accountancy/admin/categories_list.php) (#35084)
FIX: Generation of member cards (file not found and substitution broken)
FIX: invoice not set to closed when we add a credit note to close it
FIX: missing check constant PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS (#33277)
FIX: missing entity filter (#35461)
FIX: missing quick edit for extrafields (baclport commit 4fc66c6) (#35160)
FIX: Missing sentence part (#35144)
FIX: Remove perms to access commerce tab when the only active permission is fournisseur:lire (#35467)
FIX: Restore decimal quantity for stock correction/transfer
FIX: save the packaging qty on update buying price (#35234)
FIX: set global mysoc and load langs in API access (#35041)
FIX: Societe - Problem of date on outstanding opened late (#35266)
FIX: vat detection when country of buyer is unknown.
FIX: wrong extrafield template in create mode (#35241) (#35470)
***** ChangeLog for 22.0.1 compared to 22.0.0 *****
FIX: #34843 (#34875)
FIX: #34936
FIX: a Fatal error when a trigger files is not correctly named.
FIX: array for arrayofkeyval is lost in module builder edit of property
FIX: asset: could not select invoice in disposal pop-in (#34725)
FIX: avoid php warning with "$forceFullTextIndexation" (#34881)
FIX: bad consistency on test on permission to disable service
FIX: Can edit status of tasks
FIX: Create public ticket if email need exist. (#34965)
FIX: DA026536: missing <br> in automatic e-mail (#34895)
FIX: extrafields of type "int" not displayed on `projet/tasks.php` (#34896)
FIX: Filter on the balance of leave
FIX: Logo on company is no more visible.
FIX: mailing destination list title (#34929)
FIX: main checkbox left column was before global conf (#34858)
FIX: Missing a column on group permissions
FIX: several minor troubles with modulebuilder
FIX: Test on mandatory product or thirdparty barcode
FIX: trigger mailmanspip when un/linking categories
***** ChangeLog for 22.0.0 compared to 21.0 *****
For users:
----------
NEW: Module WebPortal is moved as stable
NEW: Subtotal module (#33502) - development
NEW: shipment kits with dispatcher v2 (#33750)
NEW: ticket : display files linked to actioncomm (#32325)
NEW: Support of monthly or weekly recurring events
NEW: AI feature to autofill extrafields
NEW: Introduce the view "Kanban Grouped By" opportunity status in projects
NEW: #32706 - Treasury accountancy (#33701)
NEW: #33506 Add a constant to apply a ratio to resize images in ODT templates (#33543)
NEW: Accountancy - Add centralized account (SQL & migration part) (#33384) (#33577)
NEW: Accountancy - Add filter on chart of accounts (#33656)
NEW: Accountancy - Centralized account are highlighted (#33648)
NEW: Accountancy - Define fiscal year by default
NEW: Accountancy - Show subledger account in thirdparty
NEW: Add a delay to be sure that any Stripe action from webhooks are executed after interactive actions
NEW: Add also start date fill buttons for salary clone
NEW: Add a test mode for AI setup
NEW: Add DateMaxPayment option on selectDate (#33601)
NEW: Add/enhance the popup for preview of icons
NEW: Add field usenewcurrencyrate
NEW: Add globale MAIN_DISABLE_PDF_AUTO_DOWNLOAD_AFTER_CONVERT_FROM_ODT to disable the auto download after auto convert odt to pdf (#33511)
NEW: add home box mrp (#33549)
NEW: Add invoice tags
NEW: Add ip into table of website accounts
NEW: Add knowledgebase info on box_dolibarr_state_board.php (#33960)
NEW: Add link to create shipment on picto
NEW: Add link to picto help page on module builder
NEW: Add management of date begin/end and discount for a customer price (Code + SQL)
NEW: add new permissions to read supplier prices (#33598)
NEW: Add option MAIN_ALLOW_DOUBLE_COLON_IN_DOL_EVAL
NEW: Add option MAIN_MAIL_EMAIL_FROM_PASSWORDRESET
NEW: Add options on intervention clone popup to clone or not contact and notes
NEW: Add options PDF_XXX_SHOW_PRICE_INCL_TAX into PDF setup
NEW: add option to not prefill qty line at shipment creation
NEW: Add page list for categories.
NEW: Add parameters for the hook selectProductsListWhere (#33718)
NEW: add phone_mobile to export of thirdparty (#33893)
NEW: Add public page for donation module (#33978)
NEW: add setasnumber for forms (#33845)
NEW: Add Shared links on links in attachments (#33459)
NEW: Add tags / category on supplier invoice (#33490)
NEW: Add the possibility to merge PDF from the product list (#33723)
NEW: allow stock management by product (#32326)
NEW: attendee status "Showed up" - to ensure that only one attendee gets in on a ticket (#33987)
NEW: auto-detect country from code in creation (follow-up)
NEW: autofix mysqldump command for backup when path is wrong
NEW: Better presentation of list of user approver.
NEW: Can define a different PDF for concatenation for proposal, order and invoices
NEW: Can filter on field "Refuse emailing" in list of thirdparties.
NEW: Can filter on public/private notes in list sale orders thirdparties
NEW: Can filter on string with spaces if search criteria is inside quote.
NEW: Can force the tooltip before the text on column title.
NEW: Can link member subscription/contribution with proposal, order and invoice (#33647)
NEW: Can set a specific permission on an extrafields
NEW: cash control: add hidden setting to show total including taxed in detail by vat rate
NEW: Closing task
NEW: CONSTANT: ORDER_TYPE_CONTACT_DEFAULT
NEW: const PREVIEW_PICTO_ON_LEFT_OF_NAME for icon to preview documents (#33519)
NEW: Dictionary - Manage countries of SEPA Area
NEW: Dolibarr#22848 Add order tags
NEW: Filter on date creation/date modification in invoice list
NEW: fix #33456 (#33458)
NEW: force Extrafields values when constants THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_(ORDER|INVOICE) are set (#33954)
NEW: input reason for customer invoice (#33599)
NEW: Invoice - Add constant to prevent modification of an invoice (#33455)
NEW: Loan - Add total on each payment to see the global amount off the reimbursement
NEW: login page: button to toggle the visibility of the password (#33698)
NEW: Look and feel - Checkboxes and radio buttons are larger
NEW: Allow user to define the number of email sent by batch directly from mailing config page (#32750)
NEW: Mass action delete on donation list
NEW: Merge surface and volume in one line on product card.
NEW: Module external website is deprecated. Replaced with menu editor.
NEW: Move right from advance to normal for thirdparty information payment page (#33885)d
NEW: delays conf for supplier proposals (#33800)
NEW: new option in invoice setup to limit options of deposit invoice (#33468)
NEW: No auto open keyboard on smartphone when opening list of columns
NEW: On list, see complete ref customer/supplier with constant MAIN_SHOW_GLOBAL_REF_CUSTOMER_SUPPLIER (#33373)
NEW: Option MAIN_RESTRICTHTML_ONLY_VALID_HTML and MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY are on by default
NEW: Option MAIN_SECURITY_MAXFILESIZE_DOWNLOADED become official
NEW: Order - Add drag & drop file (#33848)
NEW: reopen for interventions API (#33982)
NEW: Rounding unit price - line discount before applying quantity - option MAIN_APPLY_DISCOUNT_ON_UNIT_PRICE_THEN_ROUND_BEFORE_MULTIPLICATION_BY_QTY (#33690)
NEW: shipment with product in cache
NEW: shipment with warehouse in cache
NEW: Show code of stripe hooks supported in setup page
NEW: Show country flag in list of chart of account
NEW: Show IP of previous connection and date of last password change in the "Connection" widget.
NEW: Some trans keys to prepare a new website template (#33886)
NEW: SUBMIT_FOR_ALL_MARK_RESPAWN (#32101)
NEW: Supplier orders - Add tags/categories (#33386)
NEW: takepos cash control: add vat taxless total
NEW: The closing reason of invoice appear on tooltip of invoice status
NEW: The link "In accountancy" is now clickable to reach bookkeeping
NEW: The public media browser is now a stable feature
NEW: The signature is on the good page even if another module add pages
NEW: Toggle Display of Supplier Invoices and Credit Notes on Payment Page (#33856)
NEW: Try to set the tooltip as ajax call by default.
NEW: Update of currency supports also apilayer (not only currencylayer)
NEW: use specific landing page to home menu entry
NEW: Use the packaging feature to round the quantities to some given multiples for the sale
NEW: Use the PhpZipProxy handler to generate ODT files (avoid corrupted ODT with recent version of Libre Office).
NEW: vcard (vcf) download for third party (#31957)
NEW: Web pages of websites are protected by the WAF
NEW: Add constant to show stock in products combo
NEW: Can edit the module_source and pos_source field.
NEW: Accountancy - Add actions on entries (Cloning, assigning, returning)
NEW: Add conf PDF_HIDE_LINKED_OBJECT_IN_PUBLIC_NOTE to hide linked object in public note of pdf.
NEW: Add MULTICURRENCY_SHOW_ALSO_MAIN_CURRENCY_ON_PDF for legal requirement that need both currencies on PDF
NEW: Add note public and private on order export
NEW: Finish dev for API_ENABLE_COUNT_CALLS (count of API use is visible on user API key field)
For developers:
----------
NEW: Add an API endpoint to get properties of a single line of an order (#34045)
NEW: add const to not include default CSS in top_htmlhead with DISABLE_CSS_DEFAULT_THEME
NEW: add const to not include default lib_head.js in top_htmlhead with DISABLE_LIB_HEAD_JS
NEW: add const to not include JQuery UI in top_htmlhead DISABLE_JQUERY_UI
NEW: add create category project link via api (#34016)
NEW: add creditnotelist var in fetch
NEW: add hook 'addMoreInformationsBlock'
NEW: Add hook on API call (#33501)
NEW: add hooks to modify select_produits_fournisseurs_list sql query
NEW: Adding API endpoints for event attendee handling (#33932)
NEW: Add internal contact of proposal, order and invoice on api call (#34009)
NEW: Add option to create simple shipment of non origin. SQL part (#34071)
NEW: add settodraft to the supplier invoice API (#34064)
NEW: Can set isMandatory property in generic setup framework
NEW: endpoints DELETE event atteendee by ID or REF (#33986)
NEW: endpoints GET event attendee by ID or REF (#33984)
NEW: endpoints PUT (update) event atteendee by ID or REF (#33985)
NEW: hidden conf for api contrat putLine endpoint to only return the line (#33809)
NEW: introduce method dolSetCookie
NEW: Invoice - Document - Add hook on action
NEW: Pagination data for intervention APi
NEW: Add experimental Website Template for Association
NEW: expense report API deny
WARNING:
--------
The following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
* The use of GETPOST function is not allowed inside extrafields conditions or any strings that contains dynamic code evaluated with dol_eval().
* The deprecated variable $trigger_name (duplicate of variable $triggersendname) has been removed. You must use $triggersendname everywhere now.
* The behavior of constant STOCK_ALLOW_NEGATIVE_TRANSFER has been reversed. It has been renamed into STOCK_DISALLOW_NEGATIVE_TRANSFER.
* Method Categoie->getObjectsInCateg() is deprecated. Try by using instead: getListForItem() or containing().
* Global variables $bctag, $conffiletoshowshort, $type2label has been removed.
* Deprecatedproperty ->fk_departement that was replaced by ->state_id has been completely removed.
* If you setup the API to update multicurrency rate from internet, you may need to re-enter your API key (so API key will be crypted in database).
* The signature of API get for intervention has been modified to match other get api on other objects.
* The directory /build has been moved into /dev/build.
* The API to create a website account /idthirdparty/accounts/site is now POST (instead of PUT) and to update is PUT (instead of PATCH).
* Debug v22 - Invert option TICKET_DO_NOT_INCLUDE_LINK_TO_CUSTOMER (that add link to backoffice interface link when it should remain private)
into TICKET_INCLUDE_LINK_TO_PUBLIC_INTERFACE_IN_MESSAGE. It also avoid often emails marked as SPAM due to suspicious link.
* The property ->price_ht of an object line that was a duplicate of ->subprice has been standardized. Use ->subprice everywhere now.
***** ChangeLog for 21.0.4 compared to 21.0.3 *****
FIX: #35147 SQL Error on Beluga Export when ExpenseReport is enabled (#35149)
FIX: error when using a code too large in dictionary
FIX: Security when using Advanced Target page of emailing (feature hidden in v21, default in v22+). Possible
SQL injection by users with permission to make and send mass emailing.
***** ChangeLog for 21.0.3 compared to 21.0.2 *****
FIX: #34843 (#34875)
FIX: #34936
FIX: #35005
FIX: #35006 SQL error when using external user
FIX: a Fatal error when a trigger files is not correctly named.
FIX: array for arrayofkeyval is lost in module builder edit of property
FIX: asset: could not select invoice in disposal pop-in (#34725)
FIX: avoid php warning with "$forceFullTextIndexation" (#34881)
FIX: bad consistency on test on permission to disable service
FIX: Can edit status of tasks
FIX: Create public ticket if email need exist. (#34965)
FIX: DA026536: missing <br> in automatic e-mail (#34895)
FIX: extrafields of type "int" not displayed on `projet/tasks.php` (#34896)
FIX: Filter on the balance of leave
FIX: Logo on company is no more visible.
FIX: mailing destination list title (#34929)
FIX: main checkbox left column was before global conf (#34858)
FIX: Missing a column on group permissions
FIX: several minor troubles with modulebuilder
FIX: Test on mandatory product or thirdparty barcode
FIX: trigger mailmanspip when un/linking categories
SEC: Remove functions accepting callable params - Reported by phdwg1410 - CVE-2024-40137
***** ChangeLog for 21.0.2 compared to 21.0.1 *****
FIX: 21.0: $height and $width can be ints, but also 'auto' (#34636)
FIX: #33030 (#34460)
FIX: #33727 Sec
FIX: #33774 #34214
FIX: #33854
FIX: #34313 Accountancy - Export with sources no longer works (#34324)
FIX: (#34448)
FIX: #34541 (#34597)
FIX: #34564 (#34590)
FIX: #34591 FIX: #34692
FIX: #34618 (#34621)
FIX: #34654
FIX: accountancy: bad filter on custom account groups (#34205)
FIX: accountancy balance: keep subtotals when sorting (#34001)
FIX: accountancy closure: if subledger_label is not found, PHP8.2 throws an error. (#34736)
FIX: accountancy: create new french PCG25-DEV accounting system in upgrade (#34036)
FIX: accountancy expensereport journal: php 8.1 warning (#34457)
FIX: accountancy fec export: remove dol_print_date warning (#34363)
FIX: accountancy general ledger: last total not shown if last account group shown has only one entry (#34251)
FIX: accountancy lettering: php8.1 warning (#34469)
FIX: Accountancy - Problem with constant ACCOUNTANCY_COMBO_FOR_AUX (#34414)
FIX: accountancy sales/purchases journal: sql error logged when no invoice in journal (#34339)
FIX: accountancy: warning when account not found in plan (#34030)
FIX: a comment without after a comma create a sql error (#33752)
FIX: Add others allowed tags (table, tr, td) for the prices history table displayed in the link url of the supplier product in supplier product prices list (#34532)
FIX: add payment to bank (#34263)
FIX: allow double colon and string obfuscation in dol eval for computed extra fields (#34015)
FIX: API expense report line comments (v18+) (#34297)
FIX: Approver must be able to approve even if user not in hierarchy.
FIX: asset depreciation: division by zero (#34218)
FIX: asset depreciation: php warnings (#34219)
FIX: avoid sql error when a comment is after without comma (#33758)
FIX: Backport fix of substitution of thirdparty info in notification
FIX: backport of replaceement of thirdparty information on notification
FIX: bad value for company ref crashes canvas feature (#34331)
FIX: bank payment rejection on SEPA (backport commit 100a657) (#33838)
FIX: BankTransfer information in line.php (#34425)
FIX: BankTransfer link in list.php (#34513)
FIX: BankTransfer link in rejets.php (#34424)
FIX: Bug filters (#34546)
FIX: Can set default value of the nature of member
FIX: Can set the default value of nature of thirdparty
FIX: cash control report: php warning (#34358)
FIX: common fields: php warning with select input field (#34495)
FIX: constant PAYMENTBYBANKTRANSFER_ADDDAYS was never saved (#33799)
FIX: creating acredit note from the remain to pay was always 0
FIX: DetecHTML on upload file from filemanager fails due to need to lock
FIX: Disallow special char in name of oauth entries
FIX: do not add a filter on status when doing a global search on project
FIX: Do not allow to force amount for online payment of order
FIX: do not forget extrafields for BOM in export lines (#34020)
FIX: Edition of target of menu entries
FIX: element must be visible to set focus on select input when using default values (#34406)
FIX: email collector: php 8 warning (#34496)
FIX: encoding issues with underscores in mb_convert_encoding functionality (#34411)
FIX: ensure dir exists before trying to move something in it (#34211)
FIX: event info tab: php 8.1 warning (#34458)
FIX: expense report card: mail notifications not sent (#34556)
FIX: expensereport payment list: php warning (#34453)
FIX: expensereport: php warning when generating pdf with multilangs (#34492)
FIX: files lib: multiple php 8.1 warnings (#34462)
FIX: filter agenda on user and resource SQL error (#34580)
FIX: HTML broken by the trunc.
FIX: html title when using custom value
FIX: if filter is set on export for Duree type filed, then there is SQL error (#34616)
FIX: interventions: sql error when signed_status not set (#34515)
FIX: js warning (Backport commit 84d982c) (#34555)
FIX: local taxes text in object line view mode (#34103)
FIX: local taxes text in PDF (#34343)
FIX: mandatory extrafelds on lines are not checked (#34228)
FIX: manufacturing orders: php 8.1 warnings on agenda tab (#34475)
FIX: mass assignment of sale representative
FIX: Missing ol in no escape tags (#34261)
FIX: modification de dates de pièces comptables sur plusieurs entités différentes (#34226)
FIX: oauth: php 8 warnings (#34027)
FIX: online propal sign: double header with logo when custom logo set (#34504)
FIX: Order error translation (#33834)
FIX: page of bom when only bom module is on
FIX: partial result on timespent list (#33855)
FIX: pgsql: boolean fields correctly defined in creation but not in migration (#34215)
FIX: pgsql: case sensitivity in select queries (#34028)
FIX: pgsql: error when creating sequences in migration scripts (#34021)
FIX: PHP 8 Error 500 (#34545)
FIX: prelevement order list: handle case of use by banktransfer module (#33801)
FIX: pre-send mail mass action: keep __EMAIL__ substitution (#34522)
FIX: prevent log warning with online signature url (#34361)
FIX: Product batch series - Title, help url et picto (#34560)
FIX: product multiprices: fatal error on vat update on php 8.2 (#34444)
FIX: product suplier tab: last modif date column was wrongly dependent of module barcode (#34170)
FIX: product translation: redirect after successful action (#34403)
FIX: projects: go back to edit view after cloning (#34221)
FIX: receptions: crash from api because of classes not found (#34523)
FIX: Remove useless amp; after & (#34288)
FIX: select supplier when creating object from project (#33766)
FIX: social contribution payment: correct error reporting (#34002)
FIX: stock control condition in reception delete (#33952)
FIX: Tmparray string not array (#34287)
FIX: Too heavy sql query (#34371)
FIX: try to fix v18 github action workflow (#34439)
FIX: Various payment - List - Can't see payment with subledger account (#34101)
FIX: warehouse list: broken status filter (#33667)
FIX: warnings when printing start/end date on line tpl (#34359)
FIX: wrong multicompany filter (#34714)
FIX: ws detection
***** ChangeLog for 21.0.1 compared to 21.0.0 *****
FIX: #33360
FIX: #33365 Global search for single shipment (#33401)
FIX: #33404 - to keep the method findNearest an agnostic method.
FIX: #33435 Warnings
FIX: Accountancy simplified - with multiple entities, amount of the entry is multiplied by the number of entities (#33370)
FIX: Add a new email for notification
FIX: Bad link to download tax vat document
FIX: Blank page on agenda event per user
FIX: blank page on smartphone for bank SEPA direct transfer page
FIX: close all services on contract will close all lines (#33466)
FIX: Count on supplier invoice list does not match count in DB (#33351)
FIX: CR on script output
FIX: CSS center end CSS in total
FIX: Duplicate load of extrafield ->fetch_optionals()
FIX: fatal error in notification sending email when error array is empty
FIX: Link to country setup on company setup page
FIX: Loading of deliveries in shipping card was loading everything
FIX: Missing ref_ext in group by in list of product
FIX: Must make different redirect in paymentok/ko according to frame or not.
FIX: PAIEMENT Wrong field displayed for DateChequeReceived (#33390)
FIX: picto for unknown mime type
FIX: Replace compromised tj-actions/changed-files (#33481)
FIX: Report by custom group was empty
FIX: Responsive
FIX: shipment dispatch origin line (#33415)
FIX: Show the default duration of a membership type.
FIX: Sort and search Ref Project column was missing (#33539)
FIX: syntax error on list of intervention for external users
FIX: text in tooltip on buttons when pb is not a permission problem
FIX: Translation of column in list of invoice
FIX: warnings (#33423)
FIX: Warning when getNomUrl is called before top_httphead
FIX: we must retrieve linked order_supplier and no other object (#33602)
SEC FIX: Reflected XSS reported by 柏天浩
***** ChangeLog for 21.0.0 compared to 20.0 *****
For users:
@@ -295,7 +697,7 @@ FIX: product variants copy: also copy multiprice variations
FIX: refactorize (maybe broken feature for not received completely)
FIX: remove debug trace
FIX: remove socid when cloning a project without third parties
FIX: removes traces of <<<HEAD conflicts following the postponement of branch 13 modifications (#32014)
FIX: removes traces of HEAD conflicts following the postponement of branch 13 modifications (#32014)
FIX: remove unused code
FIX: same broken feature for propal and invoice
FIX: select 2 no record found translate
@@ -602,7 +1004,7 @@ NEW: fetch object by element for website account card
NEW: filter on sale representative in contact list
NEW: Filter shipments by selecting multiple shipping methods (#28376)
NEW: Font param Look and Feel (#29302)
NEW: functionality for stock configuration prompt in AI module (#28030)
NEW: functionality for configuration of post and pre prompt in AI module (#28030)
NEW: functionality to delete contact of company list
NEW: functionality to display codebar on pdf files (#29623)
NEW: functionality to list event for user
@@ -841,6 +1243,7 @@ FIX: when qty is not an integer, apply price() (#31138)
FIX: Wrong default PDF model when creating the second situation invoice (#30843)
FIX: wrong subprice if price base type is TTC (#30887)
***** ChangeLog for 19.0.3 compared to 19.0.2 *****
FIX: #29403 HRM - Unable to delete a skill in a job Profile (#29779)
FIX: #29439 incomplete API return (#29796)
@@ -1076,7 +1479,6 @@ SEC: Add a protection against installation of external module bypassing
SEC: A user with export permission can export module data without permissions on module.
***** ChangeLog for 19.0.1 compared to 19.0.0 *****
FIX: 16.0 - parent company gets emptied when updating a third party from the card in edit mode (#28269)
FIX: 17.0: $num doesn't take trigger-modified newref into account, leading to inconsistencies if BILL_SUPPLIER_VALIDATE changes the invoice's ref (#28684)
FIX: #22948
@@ -1303,8 +1705,13 @@ NEW: updating for display Help title when try to delete Don (issue #25314)
NEW: Upgrade in module builder in menu section
NEW: use account address in sepa mandate (#23642)
NEW: VAT rate - Add entity
NEW: Website: Support of js into the Dolibarr server preview
NEW: When an user unset the batch management of products, transformation of each batch stock movement in global stock movement
NEW: PDF Generation for each Human Resource Evaluations.
SEC: #25512 applicative anti bruteforce - security on too many login attempts (#25520)
SEC: Add action confirm_... as sensitive to need a CSRF token
SEC: Disable not used PHP streams
SEC: Add option MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY
For developers or integrators:
@@ -1398,6 +1805,102 @@ The following changes may create regressions for some external modules, but were
* The delete() method of AdherentType, Contact, Delivery, MultiCurrency, CurrencyRate now need $user as first parameter.
* A very high number of class properties (with old name in french) are now deprecated in favor of the property name in english.
* The load of hook context productdao has been removed before calling loadvirtualstock. Modules must use the context of main parent page or 'all' for all cases.
* booking.class.php was removed, please have a look at calendar.class.php
***** ChangeLog for 18.0.8 compared to 18.0.7 *****
35 files changed, 647 insertions(+), 298 deletions(-)
FIX: #34746 - More complete fix for CVE-2024-40137
FIX: Correct the calculation of the amount of the current period between the period provided (#35083)
FIX: Add security test for show terminal selection if no terminal selected when invoice.php is call (#34717)
FIX: Add security test for show terminal selection if no terminal selected when invoice.php is call
FIX: missing quick edit for extrafields (baclport commit 4fc66c6) (#35160)
FIX: Missing sentence part (#35144)
FIX: set global mysoc and load langs in API access (#35041)
FIX: set global mysoc and load langs in API access
FIX: reset mysoc and langs only if entity of API has changed
FIX: accountancy general ledger: bad handling of hook return (#34029)
FIX: accountancy general ledger: bad handling of hook return
FIX: accountancy balance: bad handling of hook return
FIX: - Fix missing token for disable custom group category for compta report (page /htdocs/accountancy/admin/categories_list.php) (#35084)
FIX: The combo of custom groups has disappeared (backport v19) (#35016)
FIX: #34893 (#34897)
FIX: #34893
FIX: change error code to USERNOTALLOWEDTOCHANGEPASS
FIX: asset: could not select invoice in disposal pop-in (#34725)
FIX: 17.0 SQL syntax error and/or constraint error when calling Facture::update() after a clone (e.g. in a trigger) (#34778)
FIX: 17.0: when you clone an invoice that was created from a template invoice, the clone should not be linked to the template invoice (#34777)
FIX: pre-send mail mass action: keep __EMAIL__ substitution (#34522)
FIX: pre-send mail mass action: keep __EMAIL__ substitution
FIX: comment
FIX: massaction email tpl: keep preset
FIX: loop interrupt if an error occurs in sendEmailsRemindersOnInvoiceDueDate (#34657)
FIX: #34654
***** ChangeLog for 18.0.7 compared to 18.0.6 *****
138 files changed, 1622 insertions(+), 530 deletions(-)
FIX: 17.0 API endpoints "PUT": prevent overwriting all extrafields if only some are supplied in the request cf. PR #29237
FIX: 17.0 - collisions in cache for dol_getIdFromCode
FIX: 17.0 - missing error handling for FactureRec::fetch in card-rec.php
FIX: 17.0: warnings due to uninitialized variables + delete code that doesn't apply to recurring invoices (AFAIK, there is no recurring credit note feature)
FIX: #21294 Stock import sql query
FIX: #26250 fatal error on kit
FIX: #32339 Delete a loan settlement is partial
FIX: #33038 drag and drop files are not prefixed with object reference
FIX: #33117 accountancy export Quadratus when doc ref is less than 10 char
FIX: #33145 wrong label status buy on product tooltip
FIX: accountancy export Quadratus when doc ref is less than 10 char
FIX: bad dispatched quantities for batches on shipment card
FIX: bank payment rejection on SEPA (backport commit 100a657) (#33838)
FIX: calculate start date of cloned task from cloned project (#31799)
FIX: can not delete files in task card
FIX: close all services on contract will close all lines (#33466)
FIX: compatibility with multicompany
FIX: constant PAYMENTBYBANKTRANSFER_ADDDAYS was never saved (#33799)
FIX: Count on supplier invoice list does not match count in DB (#33351)
FIX: #CVE-2024-34051
FIX: delete supplier order line when linked to customer order line
FIX: delete supplier order when at least one line linked to customer order line
FIX: display error when loan can't be deleted
FIX: display full tree on shipment card when a kit contains a same component in other sub-kit
FIX: Fix case when the value of a extrafields of the type 'boolean', 'select' or other have an option with a value equal to '0'.
FIX: Fix return value of hook sendMail when hook return -1 who must be return false in sendfile() function
FIX: GETPOST('private_message')
FIX: in projet/element.php total_time is always back to 0
FIX: invoice creation : use dol_include_once instead of require_once to allow external modules
FIX: invoice creation : use dol_include_once instead of require_once to allow external modules.
FIX: issue #28222 Edit date extrafield displayed on all on lines (#31914)
FIX: Many status on invoice linked object block
FIX: Multilangs : PDF lines description
FIX: ODT substitution when many HTML tags in string
FIX: old copy not needed in supplier order create method (#31733)
FIX: PAIEMENT Wrong field displayed for DateChequeReceived (#33390)
FIX: phpcs
FIX: product variants copy: also copy multiprice variations
FIX: qual
FIX: removes traces of <<<HEAD conflicts following the postponement of branch 13 modifications (#32014)
FIX: Replace compromised tj-actions/changed-files (#33481)
FIX: selectcontact is loading all contacts if socid is empty and MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT is not set
FIX: selectcontact is loading all contacts when update event
FIX: select group and severity search fields on ticket list
FIX: send email to assigned user on ticket create
FIX: send mail to BCC when email formatted as Fullname <email> (#31983)
FIX: Show true error when send notify email at validate expense report
FIX: status ticket update for new message
FIX: swiftmailer: correctly set errors-to header (#31826)
FIX: TakePos barcode rule (#31857)
FIX: There were many status indicator in the invoice linked object block (propal card)
FIX(ticket): Notification email without public interface
FIX: Update on a sold line of bank entries set the type to empty, now it's fixed #22539 (#31888)
FIX: update status on create supplier order for trigger (#31642)
FIX: use tax with code on supplier order line give tax code missing in supplier invoice (#32018)
FIX: use vat with code on supplier order result code missing in supplier invoice
FIX: warehouse list: broken status filter (#33667)
FIX: warnings (#33423)
FIX: wrong left margin (v18 to develop ?)
FIX: wrong message on update shipment
FIX: wrong update function parameter
***** ChangeLog for 18.0.6 compared to 18.0.5 *****
@@ -2010,7 +2513,7 @@ Following changes may create regressions for some external modules, but were nec
***** ChangeLog for 17.0.4 compared to 17.0.3 *****
FIX: $this->newref already exists and could have been modified by trigger but we still use a local variable for the filesystem-based renaming
FIX: $this->newref already exists and could have been modified by a trigger but we still use a local variable for the filesystem-based renaming
FIX: 16.0 only, backport fix for SQL error on global search product
FIX: 17.0: deprecated field should only be a fallback
FIX: 17.0 PHP8: supplier invoice class:

View File

@@ -1,195 +0,0 @@
# DOLIBARR ERP & CRM
![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
![Docker hub pulls](https://img.shields.io/docker/pulls/dolibarr/dolibarr.svg)
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.1-8892BF.svg?style=flat-square)](https://php.net/)
[![GitHub release](https://img.shields.io/github/v/release/Dolibarr/dolibarr)](https://github.com/Dolibarr/dolibarr)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5521/badge)](https://bestpractices.coreinfrastructure.org/projects/5521)
Dolibarr ERP & CRM est un logiciel moderne pour gérer votre activité (société, association, auto-entrepreneurs, artisans).
Il est simple d'utilisation et modulaire, vous permettant de n'activez que les fonctions dont vous avez besoin (contacts, fournisseurs, factures, commandes, stocks, agenda, ...).
![ScreenShot](https://www.dolibarr.org/medias/dolibarr_screenshot1_1920x1080.jpg)
## LICENCE
Dolibarr est distribué sous les termes de la licence GNU General Public License v3+ ou supérieure.
## INSTALLER DOLIBARR
### Installation simple
Si vous avez peu de compétences techniques et que vous souhaitez installer Dolibarr ERP/CRM en quelques clics, vous pouvez utiliser l'une des versions pré-packagées avec les prérequis:
- DoliWamp pour Windows
- DoliDeb pour Debian ou Ubuntu
- DoliRpm pour Redhat, Fedora, OpenSuse, Mandriva ou Mageia
Les packages peuvent être téléchargés à partir de [site web officiel](https://www.dolibarr.org/).
### Installation recommandée/avancée
Vous pouvez aussi utiliser un serveur Web et une base de données prise en charge (MariaDB, MySQL ou PostgreSQL) pour installer la version standard.
- Décompressez l'archive .zip téléchargée pour copier le répertoire "dolibarr/htdocs" et tous ses fichiers à la racine du serveur Web ou récupérez-les directement à partir de GitHub (recommandé si vous connaissez git):
  `git clone https://github.com/dolibarr/dolibarr -b x.y` (où x.y est la version principale comme 3.6, 9.0, ...)
- Configurez votre serveur Web pour qu'il utilise "*dolibarr/htdocs*" en tant que racine si votre serveur Web ne possède pas déjà de répertoire défini vers lequel pointer.
- Créez un fichier `htdocs/conf/conf.php` vide et définissez les autorisations d'*écrire* pour l'utilisateur de votre serveur Web (l'autorisation *écrire* sera supprimée une fois l'installation terminée)
- Depuis votre navigateur, allez à la page "install/" de dolibarr
LURL dépendra de la façon dont votre configuration Web a été configurée pour pointer vers votre installation de dolibarr. Cela peut ressembler à:
`http://localhost/dolibarr/htdocs/install/`
ou
`http://localhost/dolibarr/install/`
ou
`http://yourdolibarrvirtualhost/install/`
- Suivez les instructions de l'installateur
## METTRE A JOUR DOLIBARR
Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
- Faites une sauvegarde de votre instance [voir ce tutorial](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
- Vérifiez que la nouvelle version est compatible avec la version PHP de votre serveur [voir PHP support](https://wiki.dolibarr.org/index.php/Releases).
- Ecrasez les vieux fichiers dans le vieux répertoire 'dolibarr' par les fichiers
fournis dans ce nouveau package.
- Au prochain accès, Dolibarr proposera la page de "mise à jour" des données (si nécessaire).
Si un fichier install.lock existe pour verrouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transférés sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents")
Note: *Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
## CE QUI EST NOUVEAU
Voir le fichier [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog).
## CE QUE DOLIBARR PEUT FAIRE
### Modules principaux (tous optionnels)
- Annuaires des prospects et/ou client et/ou fournisseurs
- Gestion de catalogue de produits et services
- Gestion des devis, propositions commerciales
- Gestion des commandes
- Gestion des factures clients/fournisseurs et paiements
- Gestion des virements bancaires SEPA
- Gestion des comptes bancaires
- Calendrier/Agenda partagé (avec export ical, vcal)
- Suivi des opportunités et/ou projets (suivi de rentabilité incluant les factures, notes de frais, temps consommé valorisé, ...)
- Gestion de contrats de services
- Gestion de stock et inventaires
- Gestion des expéditions
- Gestion des demandes de congés
- Gestion des notes de frais
- Gestion de recrutement
- GED (Gestion Electronique de Documents)
- E-Mailings de masse
- Réalisation de sondages
- Gestion d'adhérents
- Point de vente/Caisse enregistreuse
- … (près de 100 modules disponibles en standard, près de 1000 autre sur la place de marché d'extensions)
### Autres modules
- Gestion de marque-pages
- Gestion des promesses de dons
- Rapports
- Imports/Exports des données
- Support des codes barres
- Calcul des marges
- Connectivité LDAP
- Intégration de ClickToDial
- Intégration RSS
- Intégration Skype
- Intégration de système de paiements (PayPal, Stripe, Paybox...)
-
### Divers
- Multi-langue.
- Multi-utilisateurs avec différents niveaux de permissions par module.
- Multidevise.
- Peux être multi-société par ajout du module externe multi-société.
- Plusieurs thèmes visuels.
- Application simple à utiliser.
- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur [https://wiki.dolibarr.org/index.php/Prérequis](https://wiki.dolibarr.org/index.php/Prérequis)).
- Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
- APIs.
- Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
- Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
- Support natif de nombreuses fonctions spécifiques aux pays comme:
- La taxe espagnole TE et ISPF
- Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
- La loi française Finance 2016 et logiciels de caisse
- La double taxe canadienne
- Le timbre fiscal tunisien
- Numérotation de facture de l'argentines (avec type A,B,C...)
- Compatible avec vos processus RGPD
- ...
-
### Extension
Dolibarr peut aussi être étendu à volonté avec l'ajout de modules/applications externes développées par des développeurs tiers, disponible sur [DoliStore](https://www.dolistore.com).
## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE
Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
- Dolibarr ne contient pas de module de génération de feuille de paie.
- Les tâches du module de gestion de projets n'ont pas de dépendances entre elle.
- Dolibarr n'embarque pas de Webmail intégré nativement.
- Dolibarr ne fait pas le café (pas encore).
## DOCUMENTATION
La documentation utilisateur, développeur et traducteur est disponible sous forme de ressources de la communauté via le site [Wiki](https://wiki.dolibarr.org).
## CONTRIBUER
Ce projet existe grâce à ses nombreux contributeurs [[Contribuer](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
[![Dolibarr](https://opencollective.com/dolibarr/contributors.svg?width=890&button=false)](https://github.com/Dolibarr/dolibarr/graphs/contributors)
## CREDITS
Dolibarr est le résultat du travail de nombreux contributeurs depuis des années et utilise des librairies d'autres contributeurs.
Voir le fichier [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT)
## ACTUALITES ET RESEAUX SOCIAUX
Suivez le projet Dolibarr sur les réseaux francophones
- [Facebook](https://www.facebook.com/dolibarr.fr)
- [X](https://www.twitter.com/dolibarr_france)
ou sur les réseaux anglophones
- [Facebook](https://www.facebook.com/dolibarr)
- [X](https://www.twitter.com/dolibarr)
- [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
- [GitHub](https://github.com/Dolibarr/dolibarr)

View File

@@ -34,12 +34,12 @@ There is a lot of different solutions to install Dolibarr.
### Using packages
If you have low technical skills and you're looking to install Dolibarr ERP/CRM with just a few clicks, you can use one of the packaged versions:
If you have low technical skills and you're looking to install Dolibarr ERP/CRM with just few clicks, you can use one of the packaged versions (see next chapter if you have IT knowledge) :
- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_(DoliWamp))
- [DoliDeb for Debian](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian)
- [DoliDeb for Debian, Ubuntu](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian)
- DoliRpm for Red Hat, Fedora, OpenSuse, Mandriva or Mageia
- The Docker image (see next chapter)
- The Docker image (see chapter "Using Docker")
Releases can be downloaded from [official website](https://www.dolibarr.org/).
@@ -116,6 +116,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
- Product Variants
- Bill of Materials (BOM)
- Manufacturing Orders (MO)
- Workstations / Workplaces
Customer/Sales Management
@@ -175,12 +176,13 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
- Data export/import
- Barcodes
- LDAP connectivity
- ClickToDial integration
- Click-To-Dial integration
- Mass emailing
- RSS integration
- Social platforms linking
- Payment platforms integration (PayPal, Stripe, Paybox...)
- Email-Collector
- AI support via API
(around 100 modules available by default, 1000+ addons at the official marketplace Dolistore.com)
@@ -237,7 +239,7 @@ These are features that Dolibarr does **not** yet fully support:
Administrator, user, developer and translator's documentation are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
## CONTRIBUTING
## CONTRIBUTING AND RELEASE PROCESS
This project exists thanks to all the people who contribute.
Please read the instructions on how to contribute (report a bug/error, a feature request, send code, ...) [[Contributing](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]
@@ -246,6 +248,8 @@ A View on Contributors:
[![Dolibarr](https://opencollective.com/dolibarr/contributors.svg?width=890&button=false)](https://github.com/Dolibarr/dolibarr/graphs/contributors)
The release process is described into the file dev/build/makepack-howto.md
## CREDITS
@@ -258,9 +262,12 @@ See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) fil
Follow Dolibarr project on:
- [Facebook](https://www.facebook.com/dolibarr)
- [X](https://x.com/dolibarr)
- [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
- [Mastodon](https://pouet.chapril.org/@dolibarr)
- [BlueSky](https://bsky.app/profile/dolibarr.org)
- [Threads](https://www.threads.net/@dolibarr)
- [X](https://x.com/dolibarr)
- [Facebook](https://www.facebook.com/dolibarr)
- [Reddit](https://www.reddit.com/r/Dolibarr_ERP_CRM/)
- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
- [GitHub](https://github.com/Dolibarr/dolibarr)

View File

@@ -24,7 +24,8 @@ To report a vulnerability, for a private report, you can:
We believe that the future of software is online SaaS. This means software are more and more critical and no technology is perfect. Working with skilled security researchers is crucial in identifying weaknesses in our technology.
If you believe you've found a security bug in our service, we are happy to work with you to resolve the issue promptly and ensure you are fairly rewarded for your discovery.
If you believe you've found a security bug in our service, we are happy to work with you to resolve the issue promptly.
We plan to re-open our bug bounty program (closed in end of 2024) in the future, but this is not yet available.
Any type of denial-of-service attack is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure.
@@ -109,8 +110,7 @@ Scope is the web application (backoffice) and the APIs.
* Software or libraries versions, private IP disclosure, Stack traces or path disclosure when logged-in user is admin.
* Vulnerabilities affecting outdated browsers or platforms, or vulnerabilities inside browsers themself.
* Brute force attacks on login page, password forgotten page or any public pages (/public/*) are not qualified if the recommended fail2ban rules were not installed.
* SSL/TLS best practices
* SSL/TLS practices (cypher enabled or not)
* Invalid or missing SPF (Sender Policy Framework) records (Incomplete or missing SPF/DKIM/DMARC)
* Physical or social engineering attempts or issues that require physical access to a victims computer/device
* Vulnerabilities of type XSS exploited by using javascript into a website page (with permission to edit website pages) or by using php code into a website page
using the permission to edit php code are not qualified, except if this allow to get higher privileges (being able to set javascript or php code is the expected behaviour).
* Vulnerabilities of type XSS exploited by using javascript into a website page of the website module or by using php code into a website page (being able to set javascript or php code is the expected behaviour in the website module), except if the user does not have the permission to edit page or php code.

View File

@@ -1 +0,0 @@
10

View File

@@ -1 +0,0 @@
[type: gettext/rfc822deb] dolibarr.templates

View File

@@ -1 +0,0 @@
3.0 (quilt)

View File

@@ -1,34 +0,0 @@
# How to use it ?
The docker-compose.yml file is a sample of a config file to use to build and run Dolibarr in the current workspace with Docker.
This docker image is intended for development usage.
For production usage you should consider other contributor reference like https://hub.docker.com/r/dolibarr/dolibarr
Before build/run, define the variable HOST_USER_ID as following:
export HOST_USER_ID=$(id -u)
Go in repository build/docker :
cd build/docker
And then, you can run :
docker-compose up
This will run 4 containers Docker : Dolibarr, MariaDB, PhpMyAdmin and MailDev.
The URL to go to the Dolibarr is :
http://0.0.0.0
The URL to go to PhpMyAdmin is (login/password is root/root) :
http://0.0.0.0:8080
In Dolibarr configuration Email let PHP mail function, To see all mail send by Dolibarr go to maildev
http://0.0.0.0:8081
Setup the database connection during the installation process, please use mariadb (name of the database container) as database host.
Setup documents folder, during the installation process, to /var/documents

View File

@@ -1 +0,0 @@
"Help wanted..."

View File

@@ -1,89 +0,0 @@
----- Dolibarr Makepack How To -----
This documentation describe steps to build a BETA or RELEASE versions
of Dolibarr. There is a chapter for BETA version and a chapter for RELEASE version.
***** Prerequisites For Linux *****
Prerequisites to build tgz, debian and rpm packages:
> apt-get install perl tar dpkg dpatch p7zip-full rpm zip php-cli
Prerequisites to build autoexe DoliWamp package from Linux (solution seems broken since Ubuntu 20.04):
> apt-get install wine q4wine
> Launch "wine cmd" to check a drive Z: pointing to / exists.
> Install InnoSetup
For example by running isetup-5.5.8.exe (https://www.jrsoftware.org) https://files.jrsoftware.org/is/5/
> Install WampServer into "C:\wamp64" to have Apache, PHP and MariaDB
For example by running wampserver3.2.6_x64.exe (https://www.wampserver.com).
See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
> Add path to ISCC into PATH windows var:
Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommended),
open file build/exe/doliwamp.iss and click on button "Compile".
The .exe file will be build into directory build.
***** Prerequisites For Windows *****
Prerequisites to build autoexe DoliWamp package from Windows:
> Install Perl for Windows (https://strawberryperl.com/)
> Install isetup-5.5.8.exe (https://www.jrsoftware.org)
> Install Microsoft Visual C++ Redistributable 2017 (https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170)
> Install WampServer-3.2.6-64.exe (Apache 2.4.51, PHP 7.4.26, MariaDB 10.6.5 for example. Version must match the values found into doliwamp.iss)
> Install GIT for Windows (https://git-scm.com/ => You must choose option "Add Git bash profile", "Git commit as-is")
> Install Dolibarr current version:
git clone https://github.com/dolibarr/dolibarr or git clone --branch X.Y https://github.com/dolibarr/dolibarr
> Add the path of PHP (C:\wamp64\bin\php\php7.4.26) and InnoSetup (C:\Program Files (x86)\Inno Setup 5) into the %PATH% of Windows.
> Create a config file c:\dolibarr\dolibarr\htdocs\conf\conf.php with content
<?php
$dolibarr_main_document_root="c:\dolibarr\dolibarr\htdocs";
$dolibarr_main_url_root='http://localhost';
***** Actions to do a BETA *****
This files describe steps made by Dolibarr packaging team to make a beta version of Dolibarr, step by step.
- Check all files are committed.
- Update version/info in ChangeLog, for this you can:
To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
To generate a changelog of a major new version x.y.0 (from a repo on branch x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
Recopy the content of the output file into the file ChangeLog.
- Note: To know number of lines changes: git diff --shortstat A B
- Update version number with x.y.z-w in file htdocs/filefunc.inc.php
- Commit all changes.
- Run makepack-dolibarr.pl to check the generation of all packages. No need to publish them.
- Post a news on dolibarr.org/dolibarr.fr + social networks about the freeze
- Create a branch x.y (but only when version seems stable enough).
***** Actions to do a RELEASE *****
This files describe steps made by Dolibarr packaging team to make a complete release of Dolibarr, step by step.
We suppose the branch x.y has already been created during the beta (see previous step).
- Check all files are committed.
- Update version/info in ChangeLog, for this you can:
To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
To generate a changelog of a major new version x.y.0 (from a repo pn branch x.y), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
Recopy the content of the output file into the file ChangeLog.
- Note: To know the number of lines changes: git diff --shortstat A B
- Update version number with x.y.z in file htdocs/filefunc.inc.php
- Commit all changes.
- Run makepack-dolibarr.pl to generate all packages.
- Check content of built packages.
- Run makepack-dolibarr.pl again with option to publish files on dolibarr foundation server (Dir /home/dolibarr/wwwroot/files/stable on www.dolibarr.org).
- Run makepack-dolibarr.pl again with option to publish files on sourceforge. This will also add official tag.
- Post a news on dolibarr.org/dolibarr.fr + social networks

View File

@@ -1,26 +0,0 @@
PHPStan (https://phpstan.org)
-----------------------------
PHPStan requires PHP >= 7.1
Config File is: ./phpstan.neon
= Installation =
cd ./build/phpstan
mkdir phpstan
cd phpstan
composer require --dev phpstan/phpstan
= Build report from CLI =
In dolibarr/
mv htdocs/custom /tmp/
php build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=table htdocs/commande/class
php build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=table htdocs/
mv /tmp/custom htdocs
Build HTML report from Cron:
Example of line to add into a cron to generate a HTML report:
0 1 5 * * cd /home/dolibarr/preview.dolibarr.org/dolibarr; chmod -R u+w /home/dolibarr/preview.dolibarr.org/dolibarr; git pull; /home/dolibarr/phpstan/vendor/bin/phpstan -v analyze --memory-limit 4G --error-format=github | awk ' BEGIN{ print "Date "strftime("%Y-%m-%d")"<br>" } { print $0"<br>" } END{ print NR } ' > /home/dolibarr/doxygen.dolibarr.org/phpstan/index.html

File diff suppressed because it is too large Load Diff

View File

@@ -1,13 +1,13 @@
README (English)
Path: /dolibarr/build/README
Path: /dolibarr/dev/build/README
##################################################
Building packages
##################################################
All sub-directories of "build" directory contains files (setup or binary tools) required to build automatically Dolibarr packages.
The build directory and all its contents is absolutely not required to make Dolibarr working.
The build directory and all its contents is absolutely not required to make Dolibarr working.
It is here only to build Dolibarr packages, and those generated packages will not contains this "build" directory.
@@ -21,7 +21,7 @@ There are several tools:
See makepack-howto.txt for prerequisites.
--------------------------------------------------------------------------------------------------
- To build a theme package, launch the script
> perl makepack-dolibarrtheme.pl

View File

@@ -5,7 +5,7 @@
update-alternatives --config php
* To list packages
* To list packages
cd htdocs/includes/diroflib
composer install
@@ -37,4 +37,3 @@ Edit composer.json to change version to "x.y.z"
composer -v update --root-reqs --no-dev --ignore-platform-reqs
composer -v update --root-reqs --no-dev --ignore-platform-reqs [--no-autoloader] [--dry-run] ccampbell/chromephp

View File

@@ -43,16 +43,16 @@ END
# Complete .bashrc with DEBEMAIL and DEBFULLNAME
Example:
export DEBFULLNAME="Laurent Destailleur (eldy)"
export DEBFULLNAME="Laurent Destailleur (eldy)"
export DEBEMAIL=eldy@users.sourceforge.net
Other example:
export DEBFULLNAME="Laurent Destailleur"
export DEBFULLNAME="Laurent Destailleur"
export DEBEMAIL="eldy@destailleur.fr"
export QUILT_PATCHES=debian/patches
# Note: alioth.debian.org is outdated --> https://alioth-archive.debian.org/ --> https://salsa.debian.org/public
# Note: alioth.debian.org is outdated --> https://alioth-archive.debian.org/ --> https://salsa.debian.org/public
* Create an account login
* Update your ~/.ssh/config file to add:
Host svn.debian.org git.debian.org bzr.debian.org hg.debian.org darcs.debian.org arch.debian.org
@@ -72,10 +72,10 @@ export QUILT_PATCHES=debian/patches
# podebconf-report-po --from email@email.com To send email to ask translations
# Edit manually file XX.po and remove all lines "#, fuzzy" when translation is complete
# msgfmt -v -c -o /dev/null XX.po To have status of translation for language XX
# To check package integrity
# lintian --pedantic -E -I package.deb To test a binary package
# lintian --pedantic -E -I package.dsc To test a source package
# lintian --pedantic -E -I package.deb To test a binary package
# lintian --pedantic -E -I package.dsc To test a source package
# To manipulate packages
# dpkg -l List all packages
@@ -84,7 +84,7 @@ export QUILT_PATCHES=debian/patches
# dpkg -I package.deb Give information on package
# dpkg -i package.deb Install a package
# dpkg-reconfigure -plow package Reconfigure package
# dpkg -L packagename List content of installed package
# dpkg -L packagename List content of installed package
# dpkg -r packagename Remove config files and interactive saved answers
# dpkg -s packagename Give status of installed package
# dpkg --purge Remove config files and interactive saved answers
@@ -104,9 +104,9 @@ See page https://www.debian.org/devel/wnpp/#l1 for example of ITP requests conte
- Wait until you received bug number.
For first ITP submission of Dolibarr, bug id was 634783.
- Check bug is into database by searching with id on
- Check bug is into database by searching with id on
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634783
- Add a line for upstream into file changelog with bug number
- Call for a mentor on ML debian-mentors to upload packages
@@ -129,26 +129,26 @@ To set status of a bug to "pending"
> bts --smtp-host=yoursmtpserver tag 999999 +pending
or replay to email 999999@bugs.debian.org + submitter of bug
With a message starting with:
With a message starting with:
Control: tag -1 +pending
Thanks. Fixed into git.
or replay to email control@bugs.debian.org
With only message
With only message
tag 729538 +pending
To remove status of a bug without "moreinfo" (bug can be processed)
or replay to email 999999@bugs.debian.org + submitter of bug
With a message starting with:
With a message starting with:
Control: tag -1 -moreinfo
Thanks. Fixed into git.
or replay to email control@bugs.debian.org
With only message
With only message
tag 729538 -moreinfo
@@ -172,7 +172,7 @@ Pour lister les env chroot
or
> ls /srv/chroot
Puis pour se connecter et préparer l'environnement
Puis pour se connecter et préparer l'environnement
> schroot -c name_of_chroot (example schroot -c unstable-amd64-sbuild)
> cat /etc/debian_chroot to check which debian branch we are into
> apt-get install vim dialog
@@ -212,7 +212,7 @@ or better
* You can then create a PHP project from Eclipse called tcpdf-debian
from git clone dir and make link to git.
* If local branch upstream and pristine-tar does not exists, create it
from origin/upstream and origin/pristine.
@@ -220,7 +220,7 @@ from origin/upstream and origin/pristine.
> debian/get-orig-source.sh
If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this.
* Some files are removed from archive by the get-orig-source.sh
* Some files are removed from archive by the get-orig-source.sh
* Modify the tag file to replace sRGB.icc with correct free version and rename file into
tcpdf_x.y.z+dfsgw.orig.tar.xz
@@ -243,14 +243,14 @@ Warning: Date must have format reported by "date -R"
Warning: Name and email must match value into debian/control file (Entry added here is used by next step).
* We try to build package
> rm -fr ../build-area;
> rm -fr ../build-area;
> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-x.y.z]
ou
> git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-x.y.z]
Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x]
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommitted file
Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match
Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match
Note: Package is built into directory ../build-area
Note: To compare 2 packages: debdiff package1.dsc package2.dsc
@@ -297,7 +297,7 @@ from origin/upstream and origin/pristine.
> debian/get-orig-source.sh
If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this.
* Edit orig.tar.gz file to remove
* Edit orig.tar.gz file to remove
- debian
- htdocs/includes/ckeditor
- htdocs/includes/jquery/css
@@ -311,7 +311,7 @@ If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VER
- htdocs/includes/restler/framework/Luracast/Restler/explorer
- htdocs/includes/swiftmailer
- htdocs/includes/tcpdf or htdocs/includes/tecnickcom
And rename file into
And rename file into
dolibarr-x.y.z+dfsgw.tgz
(x.y.z = version, w start from 1 and is increased for each new git-import-orig already done)
@@ -343,7 +343,7 @@ To update dolibarr debian package when only files into debian has changed:
To update dolibarr debian package when only files not into debian has changed:
* Checkout the branch you want to work on: master of debian/...
* Checkout the branch you want to work on: master of debian/...
* Manually, add patches into debian/patches and update the file debian/series, or do the 2 steps with "quilt import filepatch.patch"
* You can test patching of series with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revient a l'état du upstream sans les patch.
* Update the debian/changelog to add entry of change.
@@ -358,7 +358,7 @@ ou
Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommitted file
Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match
Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match
Note: Package is built into directory ../build-area
Note: To compare 2 packages: debdiff package1.dsc package2.dsc
@@ -382,7 +382,7 @@ Note: If there was errors managed manually, you may need to make a git commit bu
* Package arrives into FTPmaster taskboard with status NEW (pending upload). You can view it at:
http://ftp-master.debian.org/new/
* Once package is validated, you should see it into area unstable at:
http://packages.qa.debian.org
@@ -390,7 +390,7 @@ http://packages.qa.debian.org
##### Send an unblock request to make a full update of a stable package
##### Send an unblock request to make a full update of a stable package
Use this to move from unstable to testing.
@@ -402,7 +402,7 @@ Fill message, for example:
"Please unblock package dolibarr
A security error CVE-2015-3935 was reported and is fixed into package 3.5.7.
Note that package 3.5.7 contains not only fixed for bugs reported to debian. It includes other fixes, but they are all related to stability or security,
so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935.
so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935.
After discussion with ..., it appears that security holes are enough to request this unblock request."
@@ -423,14 +423,14 @@ Pro are:
- Patches were already tested because deployed and used by several thousands of users.
- It is easier for package maintener to include this official set of fixes than applying one patch after one patch for each debian report or backported each patch into a dedicated version.
- Debian maintenance version is inline with official project maintenance version (better when all fixes are not related to the way the software is packaged)
Cons are:
Cons are:
- The patch include more than the only one security reported fixes
So I just need to know if it's ok to push such a version 3.5.7 (fixes for 3.5.* branch) instead of only one fix for only the few (the only) reported debian bugs,
since it provides more stability and is for me a more secured process.
"
##### Send an request to ask a simple fix of a stable package
##### Send an request to ask a simple fix of a stable package
Use this to ask to apply patches on a stable version.
@@ -442,7 +442,7 @@ Fill message, for example:
"Please unblock package dolibarr
A security error CVE-2015-3935 was reported and is fixed into package 3.5.7.
Note that package 3.5.7 contains not only fixed for bugs reported to debian. It includes other fixes, but they are all related to stability or security,
so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935.
so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935.
After discussion with ..., it appears that security holes are enough to request this unblock request."
Note: If there is a response to ask more information, don't forget to remove the tag during answer.

View File

@@ -2,5 +2,5 @@ dolibarr (__VERSION__) UNRELEASED; urgency=low
[ Laurent Destailleur (eldy) ]
* New upstream release.
-- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Tue, 12 May 2015 12:00:00 +0100
-- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Tue, 12 May 2015 12:00:00 +0100

1
dev/build/debian/compat Normal file
View File

@@ -0,0 +1 @@
10

View File

@@ -137,7 +137,7 @@ $dolibarr_main_db_collation='latin1_swedish_ci';
# Default value: dolibarr
# Possible values: Any values found in files in htdocs/core/login directory after
# the "function_" string and before the ".php" string. You can also separate several
# values using a ",". In this case, Dolibarr will check login/pass for each value in
# values using a ",". In this case, Dolibarr will check login/pass for each value in
# order defined into value. However, note that this can't work with all values.
# Examples:
# $dolibarr_main_authentication='http';
@@ -235,4 +235,3 @@ $dolibarr_main_prod='0';
# dolibarr_main_distrib
# A key to identify the distribution used for first installation
$dolibarr_main_distrib = 'debian';

View File

@@ -7,7 +7,7 @@ Standards-Version: 3.9.6
Homepage: https://www.dolibarr.org
Build-Depends: debhelper (>= 9), po-debconf
# This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version
Package: dolibarr
Architecture: all
# For debian 7 or 8 or 9
@@ -35,8 +35,8 @@ Recommends: apache2 | lighttpd | httpd,
php-xml, php-mbstring, php-intl
Suggests: www-browser, php5-geoip
Description: Web based software to manage a company or foundation
Dolibarr ERP & CRM is an easy to use open source/free software package for
companies, foundations or freelances. It includes different
Dolibarr ERP & CRM is an easy to use open source/free software package for
companies, foundations or freelances. It includes different
features for Enterprise Resource Planning (ERP) and Customer Relationship
Management (CRM) but also for different other activities.
.

View File

@@ -38,7 +38,7 @@ Copyright: 2002-2009, Rodolphe Quiedeville <rodolphe@quiedeville.org>
2011, Herve Prot <herve.prot@symeos.com>
2011, Remy Younes <ryounes@gmail.com>
2012-2013, Christophe Battarel <christophe.battarel@altairis.fr>
License: GPL-3+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
@@ -147,7 +147,7 @@ Comments:
------------------------------------------------------------
Files: doc/images/*
Copyright: Laurent Destailleur
Copyright: Laurent Destailleur
License: CC-BY-SA-3.0
You are free:
to Share (to copy, distribute and transmit the work) and
@@ -306,7 +306,7 @@ Comment:
Files: htdocs/includes/odtphp/*
Copyright: 2008, Julien Pauli
2008, Cyril PIERRE de GEYER
2008, Cyril PIERRE de GEYER
2010, Laurent Destailleur <eldy@users.sourceforge.net>
License: GPL-2+
This program is free software; you can redistribute it

View File

View File

@@ -12,7 +12,7 @@ Comment[es]=Software para gestión de PYMES, profesionales independientes, auto
Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
# Command to open an URL
# For Fedora: xdg-open
# For Fedora: xdg-open
# For Debian/Ubuntu: xdg-open or x-www-browser
# (exo-open for xfde, gnome-open for gnome, ...)
Exec=xdg-open http://localhost/dolibarr

View File

@@ -8,4 +8,4 @@ htdocs usr/share/dolibarr/
scripts usr/share/dolibarr/
doc/install usr/share/doc/dolibarr/
doc/user usr/share/doc/dolibarr/
doc/index.html usr/share/doc/dolibarr/
doc/index.html usr/share/doc/dolibarr/

View File

@@ -7,4 +7,4 @@ dolibarr: apache2-deprecated-auth-config Order
dolibarr: apache2-deprecated-auth-config Allow
# Ignore warning required for a good install process
dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enmod
dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enconf
dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enconf

View File

View File

View File

@@ -102,4 +102,3 @@ Description: Delete database ?
# Delete also all uploaded and generated files (datas related
# to this quetion are all files found into /usr/share/dolibarr/documents,
# uploaded or generated when using Dolibarr) ?

View File

@@ -27,7 +27,7 @@ $force_install_lockinstall='444';
$force_install_distrib='debian';
// Value to overwrite path to use shared libraries/fonts instead of embedded one.
// If during install, we enable/disable declaration to use non embedded libraries, we must also check they are
// If during install, we enable/disable declaration to use non embedded libraries, we must also check they are
// - not removed from package (see rm in rules file),
// - declared into dependencies (see Depends in control file)
//$force_dolibarr_lib_TCPDF_PATH='';

View File

@@ -1,11 +1,11 @@
# Alias for dolibarr directory
alias.url += (
alias.url += (
"/dolibarr" => "/usr/share/dolibarr/htdocs",
)
# Disallow access to libraries
#$HTTP["url"] =~ "^/dolibarr/libraries" {
# url.access-deny = ( "" )
#$HTTP["url"] =~ "^/dolibarr/libraries" {
# url.access-deny = ( "" )
#}
# Limit access to setup script

View File

@@ -19,8 +19,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-//$conffiletoshow = "/etc/dolibarr/conf.php";
+$conffile = "/etc/dolibarr/conf.php";
+$conffiletoshow = "/etc/dolibarr/conf.php";
// Include configuration
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -32,6 +32,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-//$conffiletoshow = "/etc/dolibarr/conf.php";
+$conffile = "/etc/dolibarr/conf.php";
+$conffiletoshow = "/etc/dolibarr/conf.php";
$short_options = "c:h";
$long_options = array(

View File

@@ -0,0 +1 @@
[type: gettext/rfc822deb] dolibarr.templates

View File

@@ -66,7 +66,7 @@ override_dh_install:
rm -fr dev/xdebug
rm -f dev/dolibarr_changes.txt
rm -f dev/README
rm -f doc/images/dolibarr_screenshot2.png
rm -f doc/images/dolibarr_screenshot3.png
rm -f doc/images/dolibarr_screenshot4.png
@@ -81,17 +81,17 @@ override_dh_install:
rm -fr test
rm -fr build/aps
rm -fr build/dmg
rm -fr build/doap
rm -fr build/exe
rm -fr build/launchpad
rm -fr build/live
rm -fr build/patch
rm -fr build/perl
rm -fr build/rpm
rm -fr build/zip
rm -fr dev/build/aps
rm -fr dev/build/dmg
rm -fr dev/build/doap
rm -fr dev/build/exe
rm -fr dev/build/launchpad
rm -fr dev/build/live
rm -fr dev/build/patch
rm -fr dev/build/perl
rm -fr dev/build/rpm
rm -fr dev/build/zip
# clean from all PHP embedded libraries (we use package dependencies instead)
# rm -fr htdocs/includes/geoip
# rm -fr htdocs/includes/nusoap
@@ -128,4 +128,3 @@ override_dh_fixperms:
# Give rights to the webserver on the upload directory
chown www-data:www-data debian/dolibarr/var/lib/dolibarr/documents
chmod 2775 debian/dolibarr/var/lib/dolibarr/documents

View File

@@ -0,0 +1 @@
3.0 (quilt)

View File

@@ -14,4 +14,3 @@ source-is-missing htdocs/includes/restler/framework/Luracast/Restler/explorer/li
# Those are false positives, the files are their own sources since
# they are data files
source-is-missing htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json

View File

@@ -4,4 +4,4 @@ DOLIMAMP Package tools
##################################################
This directory contains files and docs used to build
a DoliMamp package for Mac OS X.
a DoliMamp package for Mac OS X.

View File

@@ -23,11 +23,12 @@ RUN apt-get update -y \
msmtp \
msmtp-mta \
mailutils \
libpq-dev \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* \
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
&& docker-php-ext-install -j$(nproc) calendar intl mysqli pdo_mysql gd soap zip \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
&& docker-php-ext-install -j$(nproc) calendar intl mysqli pdo_mysql pgsql gd soap zip \
&& docker-php-ext-configure ldap \
&& docker-php-ext-install -j$(nproc) ldap && \
mv ${PHP_INI_DIR}/php.ini-development ${PHP_INI_DIR}/php.ini

View File

@@ -0,0 +1,68 @@
# How to use it ?
The docker-compose.yml file is a sample of a config file to use to build and run
Dolibarr in the current workspace with Docker. This docker image is intended for
**development usage**. For production usage you should consider other
contributor reference like https://hub.docker.com/r/dolibarr/dolibarr.
Before build/run, define the variable HOST_USER_ID as following:
export HOST_USER_ID=$(id -u)
Go in repository build/docker :
cd dev/build/docker
And then, depending on whether you want to run with a MariaDB database or
PostgreSQL database, you can run:
docker compose -f docker-compose.yml -f mariadb.yml up
or
docker compose -f docker-compose.yml -f postgres.yml up
This will run 4 containers Docker : Dolibarr, MariaDB, PhpMyAdmin and MailDev.
In the case of PostgreSQL, only Dolibarr, MailDev and the PostgreSQL database
will be running.
The URL to go to the Dolibarr is :
http://0.0.0.0
The URL to go to PhpMyAdmin is (login/password is root/root) :
http://0.0.0.0:8080
In Dolibarr configuration Email let PHP mail function, To see all mail send by
Dolibarr go to maildev
http://0.0.0.0:8081
Setup the database connection during the installation process, please use
mariadb or postgres (name of the database container) as database host.
## Setup your custom modules
You can setup your own modules from your development folder by using volume
mounts and docker compose override. For instance for your module "yourmodule"
located in `/path/to/your/module_folder`, you can edit `yourmodule.yml` and
write:
---
services:
web:
volumes:
- /path/to/your/module_folder:/var/www/html/custom/yourmodule/
This will add your module at runtime inside the dolibarr custom plugins and it
will automatically be synced with your development environment.
Then, you can start by extending one of the commands above, for instance for
mariadb:
docker compose \
-f docker-compose.yml \
-f postgres.yml \
-f yourmodule.yml \
up

View File

@@ -1,5 +1,4 @@
version: '3'
---
networks:
internal-pod:
internal: true
@@ -17,19 +16,6 @@ services:
networks:
- internal-pod
- external-pod
phpmyadmin:
image: phpmyadmin/phpmyadmin
environment:
PMA_HOST: mariadb
depends_on:
- mariadb
ports:
- "8080:80"
networks:
- internal-pod
- external-pod
web:
build: .
environment:
@@ -37,13 +23,12 @@ services:
PHP_INI_DATE_TIMEZONE: $PHP_INI_DATE_TIMEZONE
PHP_INI_MEMORY_LIMIT: $PHP_INI_MEMORY_LIMIT
volumes:
- ../../htdocs:/var/www/html/
- ../../documents:/var/documents
- ../../../htdocs:/var/www/html/
- ../../../documents:/var/www/documents
ports:
- "80:80"
- "9000:9000"
depends_on:
- mariadb
- mail
networks:
- internal-pod

View File

@@ -1,24 +1,21 @@
#!/bin/bash
# Script used by the Dockerfile.
# See README.md to know how to create a Dolibarr env with docker
set -ex
if [ "${HOST_USER_ID}" == "" ]; then
echo "Define HOST_USER_ID to your user ID before starting"
exit 1
fi
usermod -u "${HOST_USER_ID}" www-data
groupmod -g "${HOST_USER_ID}" www-data
chgrp -hR www-data /var/www/html
chmod g+rwx /var/www/html/conf
if [ ! -d /var/documents ]; then
echo "[docker-run] => create volume directory /var/documents ..."
mkdir -p /var/documents
fi
echo "[docker-run] => Set Permission to www-data for /var/documents"
chown -R www-data:www-data /var/documents
echo "[docker-run] => update '${PHP_INI_DIR}/conf.d/dolibarr-php.ini'"
cat <<EOF > "${PHP_INI_DIR}/conf.d/dolibarr-php.ini"
date.timezone = ${PHP_INI_DATE_TIMEZONE:-UTC}
memory_limit = ${PHP_INI_MEMORY_LIMIT:-256M}
display_errors = Off
EOF
exec apache2-foreground

View File

@@ -0,0 +1,34 @@
---
networks:
internal-pod:
internal: true
external-pod:
internal: false
services:
mariadb:
image: mariadb:latest
environment:
MYSQL_ROOT_PASSWORD: rootpassfordev
MYSQL_DATABASE: dolibarr
ports:
- "3306:3306"
networks:
- internal-pod
- external-pod
web:
depends_on:
- mariadb
phpmyadmin:
image: phpmyadmin/phpmyadmin
environment:
PMA_HOST: mariadb
depends_on:
- mariadb
ports:
- "8080:80"
networks:
- internal-pod
- external-pod

View File

@@ -0,0 +1,18 @@
---
networks:
internal-pod:
internal: true
external-pod:
internal: false
services:
postgres:
image: postgres:latest
environment:
POSTGRES_PASSWORD: rootpassfordev
networks:
- internal-pod
- external-pod
web:
depends_on:
- postgres

View File

@@ -19,7 +19,7 @@ my $dir = getcwd;
print "Current dir is: $dir\n";
#print "Running dir for doxygen must be: $DIR\n";
if (! -s "build/doxygen/$CONFFILE")
if (! -s "dev/build/doxygen/$CONFFILE")
{
print "Error: current directory for building Dolibarr doxygen documentation is not correct.\n";
print "\n";
@@ -27,7 +27,7 @@ if (! -s "build/doxygen/$CONFFILE")
print '> perl .\dolibarr-doxygen-build.pl (on Windows)'."\n";
print '> perl ../dolibarr-doxygen-build.pl (on Linux or BSD)'."\n";
sleep 4;
exit 1;
exit 1;
}
$SOURCE=".";
@@ -47,8 +47,8 @@ $version=$MAJOR.".".$MINOR.".".$BUILD;
print "Running doxygen for version ".$version.", please wait...\n";
print "cat build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
$result=`cat build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;
print "cat dev/build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
$result=`cat dev/build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;
print $result;

View File

@@ -8,7 +8,7 @@
# Usage: dolibarr-doxygen-getversion.pl pathtofilefromdolibarrroot
$file=$ARGV[0];
if (! $file)
if (! $file)
{
print "Usage: dolibarr-doxygen-getversion.pl pathtofilefromdolibarrroot\n";
exit;

View File

@@ -41,7 +41,7 @@ PROJECT_NUMBER = x.y.z
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
OUTPUT_DIRECTORY = build
OUTPUT_DIRECTORY = dev/build
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -89,7 +89,7 @@ REPEAT_BRIEF = YES
# "The $name file" "is" "provides" "specifies" "contains"
# "represents" "a" "an" "the"
ABBREVIATE_BRIEF =
ABBREVIATE_BRIEF =
# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
# Doxygen will generate a detailed section even if there is only a brief
@@ -126,7 +126,7 @@ STRIP_FROM_PATH = "/home/dolibarr/doxygen.dolibarr.org/"
# definition is used. Otherwise one should specify the include paths that
# are normally passed to the compiler using the -I flag.
STRIP_FROM_INC_PATH =
STRIP_FROM_INC_PATH =
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
# (but less readable) file names. This can be useful is your file systems
@@ -182,7 +182,7 @@ TAB_SIZE = 2
# will result in a user-defined paragraph with heading "Side Effects:".
# You can put \n's in the value part of an alias to insert newlines.
ALIASES =
ALIASES =
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
# sources only. Doxygen will then generate output that is more tailored for C.
@@ -469,7 +469,7 @@ GENERATE_DEPRECATEDLIST = YES
# The ENABLED_SECTIONS tag can be used to enable conditional
# documentation sections, marked by \if sectionname ... \endif.
ENABLED_SECTIONS =
ENABLED_SECTIONS =
# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
# the initial value of a variable or define consists of for it to appear in
@@ -515,7 +515,7 @@ SHOW_NAMESPACES = NO
# is used as the file version. See the manual for examples.
#FILE_VERSION_FILTER = dolibarr-doxygen-getversion.pl
FILE_VERSION_FILTER =
FILE_VERSION_FILTER =
# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
# by doxygen. The layout file controls the global structure of the generated
@@ -524,7 +524,7 @@ FILE_VERSION_FILTER =
# You can optionally specify a file name after the option, if omitted
# DoxygenLayout.xml will be used as the name of the layout file.
LAYOUT_FILE =
LAYOUT_FILE =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
@@ -575,7 +575,7 @@ WARN_FORMAT = "$file:$line: $text"
# and error messages should be written. If left blank the output is written
# to stderr.
WARN_LOGFILE = build/html/doxygen_warnings.log
WARN_LOGFILE = dev/build/html/doxygen_warnings.log
#---------------------------------------------------------------------------
# configuration options related to the input files
@@ -638,13 +638,13 @@ EXCLUDE_PATTERNS = */CVS/*
# wildcard * is used, a substring. Examples: ANamespace, AClass,
# AClass::ANamespace, ANamespace::*Test
EXCLUDE_SYMBOLS =
EXCLUDE_SYMBOLS =
# The EXAMPLE_PATH tag can be used to specify one or more files or
# directories that contain example code fragments that are included (see
# the \include command).
#EXAMPLE_PATH = htdocs/modulebuilder/template
#EXAMPLE_PATH = htdocs/modulebuilder/template
# If the value of the EXAMPLE_PATH tag contains directories, you can use the
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
@@ -678,7 +678,7 @@ IMAGE_PATH = doc/images
# Works on Linux only
#INPUT_FILTER = ../dolibarr-doxygen-filter.pl
#INPUT_FILTER = "perl ../dolibarr-doxygen-filter.pl"
INPUT_FILTER =
INPUT_FILTER =
# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
# basis.
@@ -689,7 +689,7 @@ INPUT_FILTER =
# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
# is applied to all files.
FILTER_PATTERNS =
FILTER_PATTERNS =
# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
# INPUT_FILTER) will be used to filter the input files when producing source
@@ -774,7 +774,7 @@ ALPHABETICAL_INDEX = YES
# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
# should be ignored while generating the index headers.
IGNORE_PREFIX =
IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
@@ -804,14 +804,14 @@ HTML_FILE_EXTENSION = .html
# standard header.
# Does not work with 1.7.3
#HTML_HEADER = build/doxygen/doxygen_header.html
#HTML_HEADER = dev/build/doxygen/doxygen_header.html
# The HTML_FOOTER tag can be used to specify a personal HTML footer for
# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.
# Does not work with 1.7.3
HTML_FOOTER = build/doxygen/doxygen_footer.html
HTML_FOOTER = dev/build/doxygen/doxygen_footer.html
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
# style sheet that is used by each HTML page. It can be used to
@@ -820,7 +820,7 @@ HTML_FOOTER = build/doxygen/doxygen_footer.html
# the style sheet file to the HTML output directory, so don't put your own
# stylesheet in the HTML output directory as well, or it will be erased!
HTML_STYLESHEET =
HTML_STYLESHEET =
# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
# Doxygen will adjust the colors in the stylesheet and background images
@@ -927,14 +927,14 @@ GENERATE_HTMLHELP = NO
# can add a path in front of the file if the result should not be
# written to the html output directory.
CHM_FILE =
CHM_FILE =
# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
# be used to specify the location (absolute path including file name) of
# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
# the HTML help compiler on the generated index.hhp.
HHC_LOCATION =
HHC_LOCATION =
# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
# controls if a separate .chi index file is generated (YES) or that
@@ -946,7 +946,7 @@ GENERATE_CHI = NO
# is used to encode HtmlHelp index (hhk), content (hhc) and project file
# content.
CHM_INDEX_ENCODING =
CHM_INDEX_ENCODING =
# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
# controls whether a binary table of contents is generated (YES) or a
@@ -970,7 +970,7 @@ GENERATE_QHP = NO
# be used to specify the file name of the resulting .qch file.
# The path specified is relative to the HTML output folder.
QCH_FILE =
QCH_FILE =
# The QHP_NAMESPACE tag specifies the namespace to use when generating
# Qt Help Project output. For more information please see
@@ -988,14 +988,14 @@ QHP_VIRTUAL_FOLDER = doc
# add. For more information please see
# http://doc.trolltech.com/qthelpproject.html#custom-filters
QHP_CUST_FILTER_NAME =
QHP_CUST_FILTER_NAME =
# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
# custom filter to add. For more information please see
# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
# Qt Help Project / Custom Filters</a>.
QHP_CUST_FILTER_ATTRS =
QHP_CUST_FILTER_ATTRS =
# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
# project's
@@ -1003,14 +1003,14 @@ QHP_CUST_FILTER_ATTRS =
# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
# Qt Help Project / Filter Attributes</a>.
QHP_SECT_FILTER_ATTRS =
QHP_SECT_FILTER_ATTRS =
# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
# be used to specify the location of Qt's qhelpgenerator.
# If non-empty doxygen will try to run qhelpgenerator on the generated
# .qhp file.
QHG_LOCATION =
QHG_LOCATION =
# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
# will be generated, which together with the HTML files, form an Eclipse help
@@ -1146,14 +1146,14 @@ PAPER_TYPE = a4
# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
# packages that should be included in the LaTeX output.
EXTRA_PACKAGES =
EXTRA_PACKAGES =
# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
# the generated latex document. The header should contain everything until
# the first chapter. If it is left blank doxygen will generate a
# standard header. Notice: only use this tag if you know what you are doing!
LATEX_HEADER =
LATEX_HEADER =
# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
# is prepared for conversion to pdf (using ps2pdf). The pdf file will
@@ -1223,12 +1223,12 @@ RTF_HYPERLINKS = NO
# config file, i.e. a series of assignments. You only have to provide
# replacements, missing definitions are set to their default value.
RTF_STYLESHEET_FILE =
RTF_STYLESHEET_FILE =
# Set optional variables used in the generation of an rtf document.
# Syntax is similar to doxygen's config file.
RTF_EXTENSIONS_FILE =
RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
# configuration options related to the man page output
@@ -1278,13 +1278,13 @@ XML_OUTPUT = xml
# which can be used by a validating XML parser to check the
# syntax of the XML files.
#XML_SCHEMA =
#XML_SCHEMA =
# The XML_DTD tag can be used to specify an XML DTD,
# which can be used by a validating XML parser to check the
# syntax of the XML files.
#XML_DTD =
#XML_DTD =
# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
# dump the program listings (including syntax highlighting
@@ -1338,7 +1338,7 @@ PERLMOD_PRETTY = YES
# This is useful so different doxyrules.make files included by the same
# Makefile don't overwrite each other's variables.
PERLMOD_MAKEVAR_PREFIX =
PERLMOD_MAKEVAR_PREFIX =
#---------------------------------------------------------------------------
# Configuration options related to the preprocessor
@@ -1372,14 +1372,14 @@ SEARCH_INCLUDES = YES
# contain include files that are not input files but should be processed by
# the preprocessor.
INCLUDE_PATH =
INCLUDE_PATH =
# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
# patterns (like *.h and *.hpp) to filter out the header-files in the
# directories. If left blank, the patterns specified with FILE_PATTERNS will
# be used.
INCLUDE_FILE_PATTERNS =
INCLUDE_FILE_PATTERNS =
# The PREDEFINED tag can be used to specify one or more macro names that
# are defined before the preprocessor is started (similar to the -D option of
@@ -1389,14 +1389,14 @@ INCLUDE_FILE_PATTERNS =
# undefined via #undef or recursively expanded use the := operator
# instead of the = operator.
PREDEFINED =
PREDEFINED =
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
# The macro definition that is found in the sources will be used.
# Use the PREDEFINED tag if you want to use a different macro definition.
EXPAND_AS_DEFINED =
EXPAND_AS_DEFINED =
# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
# doxygen's preprocessor will remove all function-like macros that are alone
@@ -1427,12 +1427,12 @@ SKIP_FUNCTION_MACROS = YES
# If a tag file is not located in the directory in which doxygen
# is run, you must also specify the path to the tagfile here.
TAGFILES =
TAGFILES =
# When a file name is specified after GENERATE_TAGFILE, doxygen will create
# a tag file that is based on the input files it reads.
GENERATE_TAGFILE =
GENERATE_TAGFILE =
# If the ALLEXTERNALS tag is set to YES all external classes will be listed
# in the class index. If set to NO only the inherited external classes
@@ -1471,7 +1471,7 @@ CLASS_DIAGRAMS = NO
# the mscgen tool resides. If left empty the tool is assumed to be found in the
# default search path.
#MSCGEN_PATH =
#MSCGEN_PATH =
# If set to YES, the inheritance and collaboration graphs will hide
# inheritance and usage relations if the target is undocumented
@@ -1515,7 +1515,7 @@ DOT_FONTSIZE = 10
# different font using DOT_FONTNAME you can set the path where dot
# can find it using this tag.
DOT_FONTPATH =
DOT_FONTPATH =
# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
@@ -1598,13 +1598,13 @@ DOT_IMAGE_FORMAT = png
# The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
DOT_PATH =
DOT_PATH =
# The DOTFILE_DIRS tag can be used to specify one or more directories that
# contain dot files that are included in the documentation (see the
# \dotfile command).
DOTFILE_DIRS =
DOTFILE_DIRS =
# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
# nodes that will be shown in the graph. If the number of nodes in a graph
@@ -1655,4 +1655,4 @@ DOT_CLEANUP = YES
FULL_SIDEBAR = NO
HTML_EXTRA_STYLESHEET = build/doxygen/doxygen-awesome.css
HTML_EXTRA_STYLESHEET = dev/build/doxygen/doxygen-awesome.css

View File

@@ -204,7 +204,7 @@ html {
--code-background: #2a2c2f;
--tablehead-background: #2a2c2f;
--blockquote-background: #222325;
--blockquote-foreground: #7e8c92;
@@ -884,7 +884,7 @@ div.header {
flex-wrap: nowrap;
align-items: flex-start;
}
div.contents .textblock {
min-width: 200px;
flex-grow: 1;
@@ -973,21 +973,21 @@ html.dark-mode div.contents table iframe {
h2.groupheader {
border-bottom: 0px;
color: var(--page-foreground-color);
box-shadow:
100px 0 var(--page-background-color),
box-shadow:
100px 0 var(--page-background-color),
-100px 0 var(--page-background-color),
100px 0.75px var(--separator-color),
-100px 0.75px var(--separator-color),
500px 0 var(--page-background-color),
500px 0 var(--page-background-color),
-500px 0 var(--page-background-color),
500px 0.75px var(--separator-color),
-500px 0.75px var(--separator-color),
900px 0 var(--page-background-color),
900px 0 var(--page-background-color),
-900px 0 var(--page-background-color),
900px 0.75px var(--separator-color),
-900px 0.75px var(--separator-color),
1400px 0 var(--page-background-color),
-1400px 0 var(--page-background-color),
-1400px 0 var(--page-background-color),
1400px 0.75px var(--separator-color),
-1400px 0.75px var(--separator-color),
1900px 0 var(--page-background-color),
@@ -1143,8 +1143,8 @@ div.toc li a.aboveActive {
div.contents .toc.interactive > h3::before {
content: "";
width: 0;
height: 0;
width: 0;
height: 0;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 5px solid var(--primary-color);
@@ -1822,8 +1822,8 @@ table.memberdecls img[src="closed.png"],
table.memberdecls img[src="open.png"],
div.dynheader img[src="open.png"],
div.dynheader img[src="closed.png"] {
width: 0;
height: 0;
width: 0;
height: 0;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 5px solid var(--primary-color);
@@ -1841,7 +1841,7 @@ table.memberdecls img {
table.memberdecls img[src="closed.png"],
div.dynheader img[src="closed.png"] {
transform: rotate(-90deg);
}
.compoundTemplParams {
@@ -1884,7 +1884,7 @@ div.dynheader img[src="closed.png"] {
margin-bottom: calc(0px - var(--page-font-size));
}
table.memberdecls .memItemRight,
table.memberdecls .memItemRight,
table.memberdecls .mdescRight,
table.memberdecls .memTemplItemRight {
border-top: 0;
@@ -2070,8 +2070,8 @@ html.dark-mode .iconfopen, html.dark-mode .iconfclosed {
background-color: transparent;
}
/*
Class Index Doxygen 1.8
/*
Class Index Doxygen 1.8
*/
table.classindex {
@@ -2212,7 +2212,7 @@ div.contents .toc::-webkit-scrollbar-thumb {
background-color: transparent;
border: var(--webkit-scrollbar-padding) solid transparent;
border-radius: calc(var(--webkit-scrollbar-padding) + var(--webkit-scrollbar-padding));
background-clip: padding-box;
background-clip: padding-box;
}
#nav-tree:hover::-webkit-scrollbar-thumb,
@@ -2406,8 +2406,8 @@ h2:hover a.anchorlink, h1:hover a.anchorlink, h3:hover a.anchorlink, h4:hover a.
#MSearchBox .left {
background: none !important;
background: none !important;
}
#MSearchBox .right {
background: none !important;
background: none !important;
}

View File

@@ -1,4 +1,4 @@
<!--
<!--
File added into doxygen generated documentation
-->
@@ -23,4 +23,4 @@ File added into doxygen generated documentation
</script>
</body>
</html>
</html>

View File

@@ -48,5 +48,3 @@
</div>
<!-- End doxygen_header.html -->

Some files were not shown because too many files have changed in this diff Show More