Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
119,231 Commits 36 Branches 189 Tags
8b7eaf360e58693a9365544cb1520f28ced7e626
Commit Graph

1124 Commits

Author SHA1 Message Date
Laurent Destailleur
3a887ab2fa FIX #29496 - filtering a record should not hide its child not filtered 2024-04-27 03:12:17 +02:00
Laurent Destailleur
2df1ea2097 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-03-11 13:30:13 +01:00
Laurent Destailleur
ab760df389 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-03-11 13:29:40 +01:00
Laurent Destailleur
2db58f09bc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-03-11 13:19:44 +01:00
ATM-NicolasV
4dcf98b9f7 fix entity in sql from RemoveFromGroup (#28682) 2024-03-07 15:55:07 +01:00
Laurent Destailleur
69376a4e8b Fix test error on setPassword 2023-04-15 12:07:32 +02:00
Laurent Destailleur
747cd766b0 FIX Pb in install when password start with some special char like ! 2023-04-15 04:29:19 +02:00
Jyhere
99d0f5c5d2 FIX : fatal error when margin enable (missing check on element), fix User::hasRight() when checking a margin right 2023-03-17 16:26:21 +01:00
Laurent Destailleur
d369a640de Fix encryption of api_key 2023-03-13 12:48:25 +01:00
Laurent Destailleur
cbb6ca071a Fix #yogosha15157 2023-02-25 19:51:05 +01:00
Laurent Destailleur
b3b94e34d7 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-20 16:21:14 +01:00
Laurent Destailleur
35d496de38 Update user.class.php 2023-02-19 02:41:53 +01:00
Regis Houssin
50721f8df3 TODO object $user parameter is not use in send_password() ! 2023-02-18 16:31:59 +01:00
Regis Houssin
5b81880b97 FIX object $user is not defined 2023-02-18 16:24:56 +01:00
Regis Houssin
992fe1286d FIX request new password with "mc" and "twofactor" authentication 2023-02-18 16:08:19 +01:00
Laurent Destailleur
7a3c752914 Fix permission on an inherited group inside entity 0 no visible 2023-02-04 14:06:40 +01:00
Laurent Destailleur
e2efeeef9a Fix menu accountancy not visible with module "comptabilite" 2023-01-31 16:05:19 +01:00
Laurent Destailleur
5867b62496 Fix do not change password if same 2023-01-16 11:00:34 +01:00
Laurent Destailleur
f0f3deb619 Debug v17 2023-01-14 13:06:13 +01:00
Laurent Destailleur
9f02bd2350 Debug v17 2023-01-03 11:32:33 +01:00
Laurent Destailleur
37ce175d53 Fix user status 2023-01-03 10:38:50 +01:00
Laurent Destailleur
751f79b672 Debug v17 2022-12-31 14:21:16 +01:00
Laurent Destailleur
1fde0a70f5 Fix cast bad type 2022-12-30 19:39:08 +01:00
Laurent Destailleur
9b5fc20308 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-01 17:46:13 +01:00
Laurent Destailleur
cc982adc2f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-01 17:42:02 +01:00
Laurent Destailleur
5905c0e89e Fix error message 2022-11-30 17:37:29 +01:00
Laurent Destailleur
c22d9f282a Merge pull request #23016 from inovea-conseil/FIX_product_type9 
FIX product_type 9
 2022-11-30 00:41:35 +01:00
Laurent Destailleur
7884216197 Merge pull request #23003 from rycks/14_fix_api_status_on_delete 
fix #22766: better API response HTTP code
 2022-11-26 10:26:21 +01:00
stickler-ci
3fd81293a3 Fixing style errors. 2022-11-25 23:57:35 +00:00
Eric Seigne
616e2b79ef fix #22766: better API response HTTP code 2022-11-26 00:50:45 +01:00
Laurent Destailleur
43f9ac59d9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-11 15:34:10 +01:00
Laurent Destailleur
cba92c8bdd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-11 15:28:04 +01:00
Laurent Destailleur
53b0e49886 Merge pull request #22687 from FHenry/15_fix_propal_right 
15 fix propal right
 2022-11-02 00:39:02 +01:00
Laurent Destailleur
88273690c5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
 2022-11-02 00:24:08 +01:00
Laurent Destailleur
bc2e226ef8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/societe/class/societe.class.php
 2022-11-02 00:19:23 +01:00
Laurent Destailleur
c28e6a46e2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/install/step5.php
 2022-11-02 00:15:21 +01:00
kkhelifa
c4543eff73 FIX: Fix the request SQL for transversal user, the join on usergroup table must be with getEntity('usergroup') and not other element 2022-10-28 16:31:01 +02:00
Florian HENRY
15b19840fb fix: cannot edit propal note 2022-10-27 14:40:47 +02:00
Florian HENRY
0f1b63ec9b fix: cannot edit propal note 2022-10-27 14:38:37 +02:00
Laurent Destailleur
959aef914e Clean code 2022-10-04 23:53:17 +02:00
Laurent Destailleur
f5e5de1eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-09-25 17:12:03 +02:00
Laurent Destailleur
86091c3fde Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-25 17:01:44 +02:00
Jean
88ff4ad4bc FIX #22379 creating events on supplier order 2022-09-24 09:13:19 +02:00
Jean
7d4b2a664e FIX #22379 creating events on supplier order 2022-09-23 16:47:54 +02:00
Laurent Destailleur
b69031e979 Fix php8.1 2022-09-21 03:23:03 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Laurent Destailleur
cb7db080cd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-21 01:21:11 +02:00
kevin
81ce609b7b FIX no when contains an @ 2022-09-13 16:04:20 +02:00
Laurent Destailleur
8b2fca8cca Try a fix for margin hasRights 2022-09-09 18:10:31 +02:00
Laurent Destailleur
b23ab2cb71 FIX #yogosha12266 2022-09-09 13:58:54 +02:00