lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
120,211 Commits 43 Branches 150 Tags 886 MiB
1d70280ec2
Commit Graph

1163 Commits

Author SHA1 Message Date
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
5978f40461 Fix user status 2023-01-03 10:36:47 +01:00
Laurent Destailleur
e523c04ce7 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-31 14:25:11 +01:00
Laurent Destailleur
751f79b672 Debug v17 2022-12-31 14:21:16 +01:00
Laurent Destailleur
377ba47763 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-30 19:53:25 +01:00
Laurent Destailleur
1fde0a70f5 Fix cast bad type 2022-12-30 19:39:08 +01:00
Laurent Destailleur
f816587cfb Fix warning 2022-12-30 19:28:05 +01:00
Laurent Destailleur
ea42fc7605 Clean code, fix warnings 2022-12-30 18:43:43 +01:00
Laurent Destailleur
6824f82cc8 Fix warnings 2022-12-28 13:58:23 +01:00
Laurent Destailleur
c6d5ea15a5
Merge pull request #23084 from lamrani002/kanbanUserGroup 
NEW|New  Add Kanban mode for listing of userGroup
 2022-12-27 00:24:36 +01:00
Lamrani Abdel
3b45f894c5 add mode Kanban to list of userGroup 2022-12-02 15:10:54 +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
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
Laurent Destailleur
293b08ab1d Debug v16 2022-06-14 11:47:56 +02:00
NASDAMI Quatadah
3d0a8dd595 running phpcs one last time 2022-06-09 13:29:49 +02:00
stickler-ci
7b3fe948a0 Fixing style errors. 2022-06-09 11:20:59 +00:00
NASDAMI Quatadah
7f86c53b3e fixing bug 20500 2022-06-09 13:15:40 +02:00
Laurent Destailleur
1838baaa5c Debug v16 2022-06-08 21:20:12 +02:00
Laurent Destailleur
3751fc92ca Clean code 2022-06-01 20:47:14 +02:00
Laurent Destailleur
5f9ef61d32 Debug v16 2022-05-19 09:36:47 +02:00
Laurent Destailleur
5736709991 Look and feel v16 2022-05-18 16:55:03 +02:00
Laurent Destailleur
ddd0848acc Look and feel v16 2022-05-17 01:21:33 +02:00
Florian HENRY
fa6d738037 NEW: Add event block on facture_rec #20870 2022-05-13 10:46:02 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Laurent Destailleur
8023e1b0cd Debug v16 2022-04-30 20:41:18 +02:00
Laurent Destailleur
822a0a37f3 Fix phpunit 2022-04-28 22:37:21 +02:00
Laurent Destailleur
ebe68350d1 IP for last and previous login is now saved inuser table 2022-04-28 17:34:04 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
 2022-04-11 21:14:51 +02:00
Laurent Destailleur
3a2815a9c0 Debug and clean v16 2022-04-07 23:44:57 +02:00
Florian HENRY
798c7a8a0b try with tzserver 2022-04-06 14:09:44 +02:00
atm-steve
4fa656be96
Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-30 12:13:17 +02:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
 2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +01:00
Steve
cb17f2029e wip: add ref_employee and national_registration_number fields 2022-03-02 11:20:07 +01:00
Laurent Destailleur
9dfdce03aa Work on generic reporting tool. 2022-02-21 19:09:26 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Laurent Destailleur
3b18462a62 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-02-07 15:51:01 +01:00
Laurent Destailleur
31ca78acda Sync transifex. 
Fix install.
 2022-02-07 14:25:20 +01:00
Regis Houssin
ed9346dfb9 Works on replace MAIN_DB_PREFIX by $db->prefix() 2022-01-27 10:00:26 +01:00
Laurent Destailleur
34e930d952
Merge pull request #19737 from aspangaro/16a6 
NEW Add possibility with constant MAIN_LOGIN_BADCHARUNAUTHORIZED to define bad character unauthorized into login name
 2022-01-25 16:04:11 +01:00
Laurent Destailleur
05ff99f2e6
Update user.class.php 2022-01-25 16:03:30 +01:00
Laurent Destailleur
6677eccf45
Update user.class.php 2022-01-25 16:01:50 +01:00