2
0
forked from Wavyzz/dolibarr
Commit Graph

1293 Commits

Author SHA1 Message Date
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
Laurent Destailleur
e19e65d362 Fix phpunit 2022-09-08 16:38:39 +02:00
Laurent Destailleur
4c09252650 Clean code 2022-09-08 12:29:46 +02:00
Laurent Destailleur
1e0ce2f90a FIX test on hasRight for product module 2022-09-08 12:29:33 +02:00
Laurent Destailleur
9d4bc513be Fix regression 2022-09-07 16:39:19 +02:00
lmarcouiller
3df3bd8c4a Fix ; permission check code 2022-09-06 15:37:00 +02:00
ptibogxiv
a0bb17aea9 wip 2022-09-03 11:07:47 +02:00
Laurent Destailleur
19c3763a55 Merge branch 'develop' into userbankaccount 2022-09-02 11:53:02 +02:00
Laurent Destailleur
a28eb9296f Update userbankaccount.class.php 2022-09-02 11:51:28 +02:00
Frédéric France
47c5ec7fc6 Merge remote-tracking branch 'upstream/develop' into productbatch 2022-09-01 19:55:24 +02:00
Laurent Destailleur
5ba0520195 FIX fatal error abs on non int 2022-09-01 15:41:08 +02:00
Laurent Destailleur
a865388b9c FIX fatal error abs on non int 2022-09-01 15:38:31 +02:00
Laurent Destailleur
6903b96f6b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-01 12:39:25 +02:00
Laurent Destailleur
8bf8beb898 Debug module ticket 2022-09-01 10:54:20 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric FRANCE
8ab6d293e1 Merge remote-tracking branch 'upstream/develop' into userbankaccount 2022-08-29 17:00:09 +02:00
Frédéric FRANCE
ec764595f8 enhance bank display for user 2022-08-29 16:59:23 +02:00
Philippe GRAND
664a483e54 FIX php8 compatibility 2022-08-28 14:41:03 +02:00
Philippe GRAND
5aba964726 FIX php8 compatibility 2022-08-28 14:40:36 +02:00
Philippe GRAND
0aba1f6753 FIX php8 compatibility 2022-08-28 14:39:50 +02:00
ptibogxiv
1a1c5d9110 Update user.class.php 2022-08-07 10:14:05 +02:00
lmarcouiller
da53e5ee5c fix hasRights warnings 2022-08-02 19:42:33 +02:00
lmarcouiller
9d036e24e1 fix hasRights warnings 2022-08-02 11:53:33 +02:00
lmarcouiller
d1d5e0836f Fix : HasRight on user.class.php for $permlevel2 2022-07-29 15:12:25 +02:00
lmarcouiller
3dc0e14f0e Fix : HasRight on user.class.php for $permlevel2 2022-07-29 13:04:04 +02:00
Anthony Berton
cfc9819e49 FIX - strlower for email 2022-07-28 15:13:13 +02:00
Laurent Destailleur
cc15923cfb Merge pull request #21517 from hregis/fix_passing_null_of_type_string_is_deprecated
FIX avoid Passing null to parameter #1 of type string is deprecated
2022-07-19 00:57:34 +02:00
Laurent Destailleur
8edebcf314 FIX Debug v16 2022-07-18 13:17:46 +02:00
Regis Houssin
0c7a868306 FIX avoid Passing null to parameter #1 of type string is deprecated 2022-07-16 16:20:11 +02:00
Laurent Destailleur
2c707f0258 Doc 2022-07-16 12:02:30 +02:00
BB2A Anthony Berton
f9eee31f74 FIX - php V8 user class 2022-07-04 15:51:54 +02:00
Laurent Destailleur
4b79d91437 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-23 12:35:24 +02:00