Commit Graph

3820 Commits

Author SHA1 Message Date
Regis Houssin
2ea3c1bc21 FIX conflict between $user->id and $object->id (#36225)
* FIX conflict between $user->id and $object->id

* FIX better fix

* FIX arfff
2025-11-12 09:38:06 +01:00
John BOTELLA
cecc1831a2 Fix llx header body class (#35653) 2025-10-06 12:34:20 +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
Regis Houssin
9666a96d8c FIX #34893 (#34897)
* FIX #34893

* FIX change error code to USERNOTALLOWEDTOCHANGEPASS
2025-08-09 15:19:02 +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
noec764
4096b00bd5 FIX: Too heavy sql query (#34371)
Co-authored-by: Noé <noe@scopen.fr>
2025-06-08 14:26:44 +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
atm-lucas
4c6955017f Adding mapping to module rights (#34212) 2025-05-20 21:47: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
fd928a4d14 Change for #33970 2025-04-26 01:54:30 +02:00
HENRY Florian
8221ab0a58 fix: #33095 (#33907) 2025-04-22 11:51:25 +02:00
Can Arslan
6ed077e446 fix: typo (#33877) 2025-04-16 17:48:17 +02:00
atm-irvine
d5eaa1d281 fix(user): wrong assigned user on agenda, and wrong backtopage (#33717) 2025-04-03 17:13:27 +02:00
Laurent Destailleur (aka Eldy)
c9ab22782e Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-20 14:57:45 +01:00
Laurent Destailleur (aka Eldy)
1f360ca498 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-01-20 12:28:49 +01:00
Laurent Destailleur (aka Eldy)
1b42078d1e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-01-20 10:24:30 +01:00
atm-florian
ba4e97f07b FIX 17.0 API endpoints "PUT": prevent overwriting all extrafields if only some are supplied in the request cf. PR #29237
+ security for Tickets API: disable updating rowid
2025-01-16 10:37:29 +01:00
Laurent Destailleur
0a45c4cad2 Update card.php 2025-01-15 14:16:11 +01:00
Regis Houssin
4d4638c75a FIX avoid php warning 2025-01-15 12:09:49 +01:00
Laurent Destailleur
796b8552e3 Fix var_dump 2025-01-10 15:23:26 +01:00
Laurent Destailleur
1cdcf9beb4 FIX #32611 2025-01-10 15:17:06 +01:00
Laurent Destailleur (aka Eldy)
774a48fa29 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-12-08 16:53:21 +01:00
Regis Houssin
de00de16de FIX avoid php warning 2024-12-07 08:46:56 +01:00
Regis Houssin
5236372921 FIX missing hook parameters 2024-12-05 07:53:04 +01:00
Laurent Destailleur
46b80e85d4 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-11-05 17:29:08 +01:00
Laurent Destailleur
56925afe8e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-11-05 17:16:01 +01:00
HENRY Florian
b8286ab8f3 fix: List of UserGroup display wrong count of records( actual: nb group * nb user * nb perms (*nb entities)) instead of count of group (#31687)
* fix: group list count nb group * nb user * nb perms

* fix: synk.io security issue with zappier sample package in version Dolibarr 18.0
2024-11-05 15:37:04 +01:00
Laurent Destailleur
495a31c8fe FIX CSS and access to media files 2024-10-16 12:51:42 +02:00
Laurent Destailleur
47581442b1 FIX dol_openinpopup for virtual card 2024-10-16 11:45:07 +02:00
Laurent Destailleur
59dadd88a3 FIX Duplicate trigger printFieldPreListTitle 2024-09-25 13:43:11 +02:00
Laurent Destailleur
72d2d716a1 CSS 2024-09-24 14:28:59 +02:00
Laurent Destailleur
ef84ba2a13 Debug v20 2024-09-02 10:21:24 +02:00
Laurent Destailleur
ff79295e2c Debug v20 2024-08-31 12:24:49 +02:00
Florent Poinsaut
4d3b83e625 FIX #30523 An user with only user->rights->user->self->password can't update it's password (#30524) 2024-08-15 17:10:57 +02:00
Laurent Destailleur
db93af6c77 Debug v20 2024-08-13 11:07:04 +02:00
Laurent Destailleur
f11bed462a Fix label list 2024-08-13 05:05:54 +02:00
Laurent Destailleur
fe21cc3605 Debug v20 2024-08-13 04:37:19 +02:00
Laurent Destailleur
5c36a834d1 Debug v20 - Fix sql distinct 2024-08-13 04:12:09 +02:00
Laurent Destailleur
6558c69ac7 Doc 2024-08-02 11:17:14 +02:00
Laurent Destailleur
5727dadfdd Fix condition to get permission 2024-08-02 10:55:53 +02:00
Laurent Destailleur
4223c6241c Fix tooltip 2024-07-30 11:52:40 +02:00
Laurent Destailleur
55425a51fc Debug v20 2024-07-02 23:08:46 +02:00
Laurent Destailleur
db61320098 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/price.php
	htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
	htdocs/user/list.php
2024-06-30 04:05:46 +02:00
Laurent Destailleur
b2e288f8ec Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/menus/standard/eldy.lib.php
2024-06-30 03:53:16 +02:00
Laurent Destailleur
f64e4b4981 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-06-29 20:53:10 +02:00
Alexandre SPANGARO
2e6af87823 FIX User List - Function is show in wrong column when module HRM enabled (#30186) 2024-06-29 19:30:06 +02:00
noec764
42d9b384d4 FIX: Bad calculation of $nbtotalofrecord (#30183)
Co-authored-by: Noé <noe@scopen.fr>
2024-06-29 19:29:14 +02:00