Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 17:13:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
95,033 Commits 37 Branches 191 Tags
c3fb7647c5f8cf4d4cd8d744af1fecc2f5e2cbed
Commit Graph

2606 Commits

Author SHA1 Message Date
Laurent Destailleur
27ef6840d5 # WARNING: head commit changed in the meantime 
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
 2022-04-14 23:01:49 +02:00
Laurent Destailleur
c4f80b4e71 Merge pull request #19424 from marc-dll/12.0_FIX_employee_tab_holiday_length 
FIX: user employee tab: offset in open days messes up holiday length calculation
 2022-04-14 22:59:20 +02:00
Laurent Destailleur
974fb46fda Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/user/card.php
 2022-04-11 20:43:20 +02:00
lvessiller
400f6b244b FIX user actions rights when mulit-company transverse mode is enabled 2022-01-11 17:29:02 +01:00
Laurent Destailleur
e76c85bc8d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-12-21 16:32:45 +01:00
Laurent Destailleur
856b010a45 FIX #19651 2021-12-21 15:56:59 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
 2021-12-08 17:56:05 +01:00
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
Marc de Lima Lucio
1129222064 FIX: user employee tab: offset in open days messes up holiday length calculation 2021-11-19 15:59:34 +01:00
Regis Houssin
303b0e7f31 FIX better sql request 2021-09-09 09:21:30 +02:00
Regis Houssin
8c95ada9fd FIX wrong users count in multicompany transverse mode 2021-09-08 10:25:27 +02:00
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
 2021-06-10 16:53:09 +02:00
Alexandre SPANGARO
a4f3792cec FIX Missing link to language file 2021-06-09 07:42:05 +02:00
atm-greg
f875bcfe09 update ->nom field if different from ->name 2021-06-02 10:30:48 +02:00
Adrien Raze
9c83bdff51 FIX : Add parameters (object and action) for user list DoActions hook 2021-05-26 17:02:34 +02:00
Laurent Destailleur
d3ece31969 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/user/class/api_users.class.php
 2021-05-17 19:29:03 +02:00
Laurent Destailleur
df2297bca3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/user/class/api_users.class.php
 2021-05-17 19:21:58 +02:00
Laurent Destailleur
a865f49d72 Fix phpcs 2021-05-17 19:19:26 +02:00
Laurent Destailleur
c54e010126 Fix perms on API user 2021-05-17 16:16:45 +02:00
stickler-ci
a3aba28c95 Fixing style errors. 2021-05-17 10:06:41 +00:00
Dorian Vabre
547f1dd370 Fix: user rest api rights 2021-05-17 11:54:53 +02:00
Laurent Destailleur
2f2ba933f8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:33:28 +02:00
Laurent Destailleur
5a15dbf545 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:29:19 +02:00
piernov
1cbe0e3f2d Fix: properly set gid for Group LDAP synchro 
Even if the gidNumber field was set in the configuration, a gid different from the Dolibarr's one was generated and stored into LDAP.
Now the gidNumber is properly set to Dolibarr's gid if gidNumber field is set in the LDAP module configuration.
 2021-05-15 18:01:34 +02:00
Laurent Destailleur
8410f4a9c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/societe/consumption.php
	htdocs/user/class/user.class.php
 2021-05-06 16:57:49 +02:00
Laurent Destailleur
f6f4968af6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/societe/consumption.php
 2021-05-06 16:52:36 +02:00
Marc de Lima Lucio
139ae3db00 FIX: pgsql: prevent 'WHERE 1' 2021-05-05 11:49:11 +02:00
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
Laurent Destailleur
52213d0ac7 Fix duplicate permissions 2021-04-09 21:15:43 +02:00
Laurent Destailleur
b50728d4fb FIX #16076 2021-01-27 21:04:48 +01:00
Laurent Destailleur
13378897a8 FIX Report by Ricardo Matias 
Conflicts:
	test/phpunit/SecurityTest.php
 2021-01-25 22:52:30 +01:00
Laurent Destailleur
b4783f69d6 Show if permission is an advanced permission 2021-01-23 18:13:50 +01:00
Laurent Destailleur
934070f14e Backport FIx #15970 2021-01-19 10:56:46 +01:00
Laurent Destailleur
446e3b9a9d css 2021-01-14 13:26:54 +01:00
Florian HENRY
77f213832e fix: update group name 2021-01-11 19:40:44 +01:00
Alexandre SPANGARO
4077565de9 Merge branch '13.0' into 13b5 2021-01-07 05:27:43 +01:00
Laurent Destailleur
f8fe7b5a0e FIX #15851 2021-01-04 16:38:09 +01:00
Alexandre SPANGARO
9300951c6e Add language file 2021-01-03 14:54:35 +01:00
Laurent Destailleur
87a452c6f4 Fix warning 2020-12-30 12:16:01 +01:00
Laurent Destailleur
af41c06822 Fix warnings 2020-12-29 04:27:16 +01:00
Laurent Destailleur
11a122176d Clean code 2020-12-24 02:33:11 +01:00
Laurent Destailleur
11b15557eb Clean code 2020-12-24 02:09:11 +01:00
Laurent Destailleur
b0d524beed Debug v13 2020-12-17 11:57:12 +01:00
Laurent Destailleur
681dc88188 Merge pull request #15731 from hregis/fix_add_passwordforgotten_hook 
NEW add doAction hook in passwordforgotten page
 2020-12-12 19:51:38 +01:00
Regis Houssin
4d0ce326c4 NEW add doAction hook in passwordforgotten page 2020-12-11 13:31:50 +01:00
Laurent Destailleur
6b1ce7c050 Fix management of photo of users 2020-12-10 18:58:11 +01:00
Laurent Destailleur
2c9eb5417a Look and feel v13 2020-12-10 00:20:22 +01:00
Laurent Destailleur
3fcfcb3e88 Fix field declaration 2020-12-09 23:38:24 +01:00
Laurent Destailleur
64e2ddbd80 Merge pull request #15666 from Zebedeu/develop 
New #8472 personal and professional titles added
 2020-12-07 22:40:01 +01:00
Laurent Destailleur
9be184aa49 Merge pull request #15677 from NicolasStr/patch-1 
Fix #15676 Hide Password when importing from LDAP
 2020-12-07 22:33:42 +01:00