lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
117,307 Commits 43 Branches 150 Tags 886 MiB
5bbfdbb775
Commit Graph

3279 Commits

Author SHA1 Message Date
Laurent Destailleur
6d4086fc24 Fix timezone date 2022-11-17 11:08:06 +01:00
Laurent Destailleur
2b9ebe9764
Merge pull request #22801 from Hystepik/develop#3 
New : expand/collapse user permission module
 2022-11-14 11:17:24 +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
lmarcouiller
9a435a1f1b Update perms.php 2022-11-10 14:19:29 +01:00
lmarcouiller
3aac23734f New : expand/collapse user permission module 2022-11-09 16:13:51 +01:00
Laurent Destailleur
fc67d49973 Debug v17 2022-11-06 22:17:25 +01:00
Laurent Destailleur
35c6433316 Prepare setnewpassword mode 2022-11-05 14:38:00 +01:00
Laurent Destailleur
d0a824c5e9 Debug v17 2022-11-03 19:49:57 +01:00
Laurent Destailleur
2e8f0b77be Add column for birth place 2022-11-02 02:20:48 +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
Laurent Destailleur
39ef32326f Better responsive behaviour 2022-11-01 12:05:52 +01:00
Laurent Destailleur
124a969127 Debug v17 2022-10-31 15:35:00 +01:00
Laurent Destailleur
f0e51d4a28 Debug v17 - use of 'mode' for user list and filter on categories 2022-10-31 08:22:53 +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
1f9424a4b3 Clean code/options 2022-10-25 11:34:31 +02:00
Laurent Destailleur
1618bfc902 Debug v17 2022-10-25 10:53:19 +02:00
Laurent Destailleur
cae2f26c05 Responsive 2022-10-22 02:38:44 +02:00
Laurent Destailleur
9a5a3a3517 Fix link to create event from user card 2022-10-21 16:21:09 +02:00
Laurent Destailleur
8c9e5dda1b FIX #yogosha12673 2022-10-20 16:53:18 +02:00
Laurent Destailleur
2aea86dc8c FIX #yogosha12673 2022-10-20 13:58:59 +02:00
Faustin
168ea58a07 NEW #22546 : can now set user supervisors using mass action in htdocs/user 2022-10-12 18:59:05 +02:00
Laurent Destailleur
92d0dff65d Clean code 2022-10-11 02:40:55 +02:00
Laurent Destailleur
201b774d6d Clean code 2022-10-10 20:14:51 +02:00
Laurent Destailleur
959aef914e Clean code 2022-10-04 23:53:17 +02:00
Laurent Destailleur
eebb8290f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-10-02 13:52:48 +02:00
Laurent Destailleur
dfc4543be2 Fix warning 2022-10-02 13:52:14 +02:00
Laurent Destailleur
b1ad4d8580 Warning 2022-10-02 13:40:50 +02:00
Laurent Destailleur
07966f5e6b Clean code 2022-10-01 14:00:43 +02:00
Laurent Destailleur
147e4bcedb Clean code 2022-09-27 15:16:44 +02:00
Laurent Destailleur
5aaf17a340 css 2022-09-27 15:01:07 +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
Alexandre SPANGARO
3cf2048518 Use isModEnabled 2022-09-25 06:32:35 +02:00
Alexandre SPANGARO
37834d3c62 Use isModEnabled 2022-09-25 06:26:04 +02:00
Alexandre SPANGARO
a6040867c8 Use isModEnabled 2022-09-25 06:16:11 +02:00
Alexandre SPANGARO
5d19588037 Use isModEnabled 2022-09-25 06:13:47 +02:00
Alexandre SPANGARO
2a8b32ff98 Use isModEnabled 2022-09-25 06:06:06 +02:00
Philippe GRAND
e10abd95f1 update code toward php8 compliance 2022-09-24 14:56:50 +02:00
Jean
88ff4ad4bc FIX #22379 creating events on supplier order 2022-09-24 09:13:19 +02:00
Laurent Destailleur
a87aa30e75 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-23 18:53:18 +02:00
Jean
7d4b2a664e FIX #22379 creating events on supplier order 2022-09-23 16:47:54 +02:00
lmarcouiller
b0d2aa6d9b Fix : php 8.1 warnings 2022-09-23 16:05:11 +02:00
Regis Houssin
4f6cf3f067 FIX missing check if category module is enabled 2022-09-23 11:46:55 +02:00
Laurent Destailleur
d314ed380b NEW Can edit property css, cssview, csslist on extrafields 2022-09-22 13:01:11 +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
8771dc197b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-12 10:32:50 +02:00
Laurent Destailleur
5b2b5e6a58 Fix picto multicompany 2022-09-10 08:33:36 +02:00
Laurent Destailleur
767897595b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-10 02:46:10 +02:00
Laurent Destailleur
5521cb6afc Fix picto multicompany 2022-09-10 02:45:25 +02:00
Laurent Destailleur
62f8c533c5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 18:36:06 +02:00
Laurent Destailleur
8b2fca8cca Try a fix for margin hasRights 2022-09-09 18:10:31 +02:00
Laurent Destailleur
cf887dba16
Merge pull request #22075 from grandoc/new_branch_04_09_2022 
update code
 2022-09-09 18:03:43 +02:00
Laurent Destailleur
7a277d9560
Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
Laurent Destailleur
7e6d52c137
Merge pull request #22168 from Hystepik/develop#2 
Fix : php 8.1 warnings
 2022-09-09 15:51:03 +02:00
Laurent Destailleur
b23ab2cb71 FIX #yogosha12266 2022-09-09 13:58:54 +02:00
lmarcouiller
68b72ac17d Fix : php 8.1 warnings 2022-09-09 10:06:16 +02:00
Frédéric France
da8617e3ff Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-08 18:59:23 +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
Frédéric France
07e761d115 Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-07 20:37:29 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Laurent Destailleur
9d4bc513be Fix regression 2022-09-07 16:39:19 +02:00
Laurent Destailleur
11fc7cd870
Merge pull request #22099 from Hystepik/develop#5 
Fix : permission check code
 2022-09-07 13:10:42 +02:00
Alexandre SPANGARO
7b560c19e0
Merge branch 'develop' into develop 2022-09-06 21:32:58 +02:00
Laurent Destailleur
8ee927f593 Fix search 2022-09-06 20:53:51 +02:00
lmarcouiller
3df3bd8c4a Fix ; permission check code 2022-09-06 15:37:00 +02:00
Alexandre SPANGARO
faee162b91 FIX Travis - Complete WIP #22059 2022-09-06 04:48:26 +02:00
Philippe GRAND
d5df85fd3e update code 2022-09-04 13:34:19 +02:00
Laurent Destailleur
cacad72123
Update note.php 2022-09-03 11:53:14 +02:00
ptibogxiv
98b88fab9b Update note.php 2022-09-03 11:12:45 +02:00
ptibogxiv
cfcd243314 Merge branch 'patch-46' of https://github.com/ptibogxiv/dolibarr into patch-46 2022-09-03 11:07:57 +02:00
ptibogxiv
a0bb17aea9 wip 2022-09-03 11:07:47 +02:00
ptibogxiv
98362881a6
Update note.php 2022-09-03 11:06:38 +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
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
Frédéric France
ece2f5553a fix php8 warnings 2022-08-31 21:49:10 +02:00
Laurent Destailleur
e0b1ad308b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-08-30 19:38:35 +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
d0ad4ba8c4 FIX php8 compatibility 2022-08-28 14:42:46 +02:00
Philippe GRAND
37409b1b01 FIX php8 compatibility 2022-08-28 14:42:27 +02:00
Philippe GRAND
b0c3784620 FIX php8 compatibility 2022-08-28 14:42:03 +02:00