Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

3112 Commits

Author SHA1 Message Date
Gauthier PC portable 024
231f809106 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-06 17:55:36 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
Laurent Destailleur
b4cfe35138 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 13:39:46 +02:00
Laurent Destailleur
123c047e29 Fix look and feel v14 2021-10-05 13:34:25 +02:00
Gauthier PC portable 024
bea17e8d78 FIX : travis + User::hasRight() function modification to take care of hrm specific rights 2021-10-05 12:42:42 +02:00
Alexandre SPANGARO
7f47df6ea4 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 11:44:48 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Laurent Destailleur
e6e224f33c Better translation 2021-09-28 11:53:00 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Anthony Berton
35707d1f4f
Update list.php 2021-09-21 09:13:01 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
96436cac3d FIX unprivileged user can attach agenda with leave. 2021-09-19 00:50:23 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
0ae8403fb4
Merge pull request #18690 from lainwir3d/add_rest_api_key_modify_right 
CLOSE #18689 REST API module: add api key generate / modify right.
 2021-09-17 12:10:03 +02:00
Laurent Destailleur
1a705adf6e
Merge pull request #18726 from cfoellmann/PR/button-classes 
add missing css classes to buttons
 2021-09-17 10:52:13 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Christian Foellmann
fd1d4d9073 add missing css classes to buttons 2021-09-16 11:33:42 +02:00
Florian HENRY
d464922d71 fix: LDAP Search LIMIT must be after ORDER BY 2021-09-13 09:44:54 +02:00
lainwir3d
2fe85f2a86 CLOSE #18689 REST API module: add api key generate / modify right. 2021-09-12 15:47:56 +04:00
Laurent Destailleur
43684f26c9
Merge pull request #18628 from lainwir3d/fix_rest_api_fix_self_user_info_read 
FIX #18627 REST API: Allow users with self read / modify rights to get own info
 2021-09-10 13:34:56 +02:00
Laurent Destailleur
b1c23b9a93
Update api_users.class.php 2021-09-10 13:31:17 +02:00
Laurent Destailleur
d4bfbc69a4
Update api_users.class.php 2021-09-10 13:30:28 +02:00
Laurent Destailleur
999ad7629f
Update api_users.class.php 2021-09-10 13:29:19 +02:00
Laurent Destailleur
17b9957197
Update api_users.class.php 2021-09-10 13:20:49 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
Laurent Destailleur
5406e3d34e Fix phpcs 2021-09-09 16:06:16 +02:00
lainwir3d
ad7a5eaf70 Merge remote-tracking branch 'origin/develop' into fix_rest_api_fix_self_user_info_read 2021-09-09 17:44:22 +04:00
Laurent Destailleur
5d5b7c3af4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/peruser.php
	htdocs/main.inc.php
 2021-09-09 15:15:26 +02: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
stickler-ci
f535a44921 Fixing style errors. 2021-09-06 13:58:23 +00:00
lainwir3d
09d1680ea0 FIX #18627 Allow users with self read / modify rights to get own info. 2021-09-06 17:52:41 +04:00
Regis Houssin
1c97393a69 FIX increase maxlength of password input 2021-09-05 15:35:06 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Laurent Destailleur
f257d4372a Fix bad test 2021-08-31 20:21:20 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
c02fb6b9a8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 03:15:47 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Laurent Destailleur
ac55a052b2 Fix warning abuot external users shown only if appropriate 2021-08-26 12:41:37 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
e0fd8b5eb8 Simplify code 2021-08-24 15:28:59 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +02:00
Laurent Destailleur
1a56fdad22 Fix type 2021-08-24 14:48:53 +02:00
Laurent Destailleur
465c9bf287 NEW Introduce method hasRight 2021-08-24 14:47:50 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
10ddd621ca Fix escape error message 2021-08-20 12:40:49 +02:00
Laurent Destailleur
f51bcf0038 Debug notification module 2021-08-17 03:20:57 +02:00
Laurent Destailleur
c377e5ea3d Fix undefined method 2021-08-08 12:09:18 +02:00
Laurent Destailleur
3f0a5cc689 Fix permission info on permissions group 2021-08-08 12:04:21 +02:00
Laurent Destailleur
fca3980dce FIX Can't remove a permission of a group 2021-08-05 15:15:03 +02:00
Laurent Destailleur
e4bb5ed008 Fix phpcs 2021-07-21 00:35:08 +02:00
Laurent Destailleur
dc7ff07517 Fix #huntr7144bb4b-338f-45f0-a70e-088ef1f4c037 2021-07-20 23:54:22 +02:00
Laurent Destailleur
e25171b9f5 Fix phpcs 2021-07-20 23:03:19 +02:00
Laurent Destailleur
b57eb8284e Fix Improper Authorization Check reported by Ahsan Aziz. 2021-07-20 22:42:23 +02:00
Laurent Destailleur
b84fc94324
Merge pull request #18104 from fappels/14_fix_php8_warning_part4 
14 fix php8 warning on user page
 2021-07-08 16:31:25 +02:00
Laurent Destailleur
7870336f2a
Update card.php 2021-07-08 16:31:01 +02:00
Laurent Destailleur
1380344fdb Fix PHP 8 2021-07-08 12:17:32 +02:00
Francis Appels
a942183127 better fix for optioncss 2021-07-07 15:02:00 +02:00
Francis Appels
0e2c57fe65 Fix php 8 warning on user page 2021-07-07 14:50:10 +02:00
Laurent Destailleur
f761a2d3b8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-06 19:02:49 +02:00
Laurent Destailleur
9fc2d9fc03 Fix phpcs 2021-07-06 19:02:03 +02:00
Laurent Destailleur
82e96016cd
Merge pull request #18092 from fappels/14_fix_php8_part3 
Fix php8 warning
 2021-07-06 18:52:05 +02:00
Laurent Destailleur
a04ed363c7 Look and feel v14 2021-07-05 19:28:50 +02:00
Laurent Destailleur
e2d7de3146 css 2021-07-05 18:56:24 +02:00
Laurent Destailleur
87f9530272 Fix report by Ahsan Aziz (can reset the password of another user that 
did not request password reset).
 2021-07-05 17:29:10 +02:00
Francis Appels
5d824899e5 Fix php 8 warning on home page 2021-07-05 13:44:05 +02:00
Laurent Destailleur
dfee489e7e Fix sanitizing entity 2021-07-05 11:33:32 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
Laurent Destailleur
7fb0946022 Fix link 2021-07-03 18:09:48 +02:00
Laurent Destailleur
e35ecdf58d Fix trans 2021-07-03 17:58:37 +02:00
Laurent Destailleur
0dce34f527 Fix trans 2021-07-01 19:06:16 +02:00
lmarcouiller
cf3761eb2e Fix #17906 : fix access denied 2021-06-17 10:09:07 +02:00
Laurent Destailleur
3a5770f679 Clean code 2021-06-15 20:16:05 +02:00
Laurent Destailleur
d0173044ac css 2021-06-15 16:18:15 +02:00
Laurent Destailleur
162da2a5b1 css 2021-06-15 15:24:12 +02:00
Laurent Destailleur
83ec4cbd71 Reponsive 2021-06-15 15:19:46 +02:00
Laurent Destailleur
5f7dddbdcb Fix permissions 2021-06-15 14:49:08 +02:00
Laurent Destailleur
43c5dd2aea Fix permissions 2021-06-15 14:29:07 +02:00
Laurent Destailleur
3cd4f3e4af Fix permissions 2021-06-15 14:26:59 +02:00
Laurent Destailleur
80760d7960 Fix permissions 2021-06-15 14:18:09 +02:00
Laurent Destailleur
7f3c8b4cd5 Fix user can't edit record 2021-06-15 13:54:52 +02:00
Laurent Destailleur
d04fe12ce9 # WARNING: head commit changed in the meantime 
Clean code
 2021-06-14 15:05:54 +02:00
Laurent Destailleur
67e00e5cf5 Fix regression. Missing rollback. 2021-06-13 19:05:48 +02:00
Laurent Destailleur
95ee0f630d Fix phpcs 2021-06-13 18:10:04 +02:00
Laurent Destailleur
c4cba43bad FIX Broken Access Control reported by Ahsan Aziz. 2021-06-13 16:15:05 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
73a1119b26 Clean code 2021-06-11 15:21:24 +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
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Alexandre SPANGARO
a4f3792cec FIX Missing link to language file 2021-06-09 07:42:05 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
3e53ab5bfe Fix scrutinizer 2021-06-05 01:17:16 +02:00
Frédéric FRANCE
c3d58ad044
fix warning 2021-06-03 08:36:50 +02:00
Laurent Destailleur
db5bcd1b99 Fix css 2021-06-02 13:41:08 +02:00
Laurent Destailleur
b5680a91d0 css 2021-06-02 13:03:20 +02:00
atm-greg
f875bcfe09 update ->nom field if different from ->name 2021-06-02 10:30:48 +02:00
Laurent Destailleur
c19f624eb5 Code comment 2021-05-31 16:00:03 +02:00
Laurent Destailleur
ffc7ae0389 Fix missing test 2021-05-31 12:02:03 +02:00
Laurent Destailleur
61138b8210 Fix look and feel v14 2021-05-27 14:25:00 +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
673eb73d0a
Merge branch 'develop' into dev_1 2021-05-25 19:55:31 +02:00
Laurent Destailleur
bb64a25638 Fix CWE-269 - huntr - Fix set of email without edit user permission 2021-05-24 22:11:24 +02:00
Laurent Destailleur
cdf3b7f9a8 Fix responsive 2021-05-24 19:05:25 +02:00
Givriz
0c5a934e10 Compatibility phpv8 2021-05-20 17:40:44 +02:00
Laurent Destailleur
625aab34d6 Fix phpcs 2021-05-20 15:30:33 +02:00
Laurent Destailleur
4c1e6afe2c
Merge pull request #17664 from Givriz/dev_1 
Compatibility phpv8
 2021-05-20 14:29:18 +02:00
Laurent Destailleur
30ab0b05b7
Update list.php 2021-05-20 14:28:43 +02:00
Laurent Destailleur
eec1fefaa5
Update list.php 2021-05-20 14:25:54 +02:00
Laurent Destailleur
2604b8f9b5
Update list.php 2021-05-20 14:18:00 +02:00
Laurent Destailleur
026cc1b35a Debug for smartphone 2021-05-19 13:21:09 +02:00
Laurent Destailleur
58ffee193f Debug v14 2021-05-19 13:07:25 +02:00
Laurent Destailleur
e472d2d5d1 Fix bad permission position for external modules 2021-05-19 12:44:26 +02:00
Laurent Destailleur
059c286262 css 2021-05-19 12:19:18 +02:00
Laurent Destailleur
75f7ab41f0 css 2021-05-19 12:13:21 +02:00
Givriz
1cf7d0cee7 Compatibility phpv8 2021-05-18 20:13:26 +02:00
Laurent Destailleur
8e39eff180 Look and feel v14 2021-05-18 18:18:00 +02:00
Laurent Destailleur
f51e892a97 Fix phpcs 2021-05-18 02:06:35 +02:00
Laurent Destailleur
de6134965b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 19:50:19 +02:00
Laurent Destailleur
cc1f98329d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
	htdocs/ticket/card.php
	htdocs/user/class/api_users.class.php
 2021-05-17 19:50:10 +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
51a8ef8853
Merge pull request #17638 from bb2a/add_infos_user_popup 
Modif info in user popup info
 2021-05-17 16:30:41 +02:00
Laurent Destailleur
3c9d8bc931 Fix perms on API user 2021-05-17 16:17:03 +02:00
Laurent Destailleur
c54e010126 Fix perms on API user 2021-05-17 16:16:45 +02:00
Anthony Berton
9bde70feba Update user.class.php 2021-05-17 16:08:48 +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
1b25c4daa0 Fix phpcs 2021-05-17 11:29:51 +02:00
Laurent Destailleur
6a9fa11539
Merge branch 'develop' into 11.0-fix-LDAPposixAccount 2021-05-17 09:07:30 +02:00
Laurent Destailleur
4768729c09 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/core/class/rssparser.class.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/expedition/list.php
 2021-05-17 07:57:32 +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
Laurent Destailleur
7d0fa95d81
Update card.php 2021-05-17 07:08:45 +02:00
Maxime Kohlhaas
e5e317bae3 Fix entity was set to 0 on group creation 2021-05-16 09:58:34 +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
piernov
beff175de1
Fix use login for User homedir in LDAP 
posixAccount objectclass (intended to be used with the uid/gid/homedir fields) requires a homedir.
Always set a homedir in LDAP for the User class even if user does not have a firstname by using the login instead.
Additionally on Linux the login is typically used for the home directory rather than the first name.
It also avoids having accentuated or other special characters (commonly found in names) in the home directory path.
 2021-05-15 16:48:43 +02:00
piernov
014b34acc6
Fix default gid 65534 for User in LDAP 
posixAccount objectclass (intended to be used with the uid/gid/homedir fields) requires a gid.
Always set a gid in LDAP for the User class even if the user does not belong to any group.
By default 65534 which corresponds to the nobody group on major distributions (incl. Debian).
 2021-05-15 16:44:46 +02:00
Laurent Destailleur
a665ff5bda Copy-Paste works also for hidden fields 2021-05-12 11:51:39 +02:00
Laurent Destailleur
ce8c606132 Clean APIs 2021-05-12 11:04:22 +02:00
Laurent Destailleur
31f63442f8
Merge pull request #17516 from bb2a/filter_warehouse_users_liste 
Filter on warehouse users liste
 2021-05-07 12:24:51 +02:00
Anthony Berton
7b0d0805f2 Update list.php 2021-05-06 22:14:45 +02:00
Anthony Berton
842268df10 Update list.php 2021-05-06 22:11:41 +02:00
Laurent Destailleur
bd5e141d26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php
 2021-05-06 17:07:44 +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
Anthony Berton
2615a1f152 Update list.php 2021-05-06 15:34:45 +02:00
Laurent Destailleur
6f4e151b91 Fix permissions 2021-05-06 11:25:46 +02:00
Laurent Destailleur
644079ff00 Fix sql 2021-05-06 11:18:35 +02:00
Marc de Lima Lucio
139ae3db00 FIX: pgsql: prevent 'WHERE 1' 2021-05-05 11:49:11 +02:00
Laurent Destailleur
08dbe74643 Fix code not reachable 2021-05-04 01:10:53 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
d7e445efbd Better doc 2021-05-03 12:01:26 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
e780bae77f css 2021-04-25 15:27:10 +02:00
Laurent Destailleur
2fd2c67139 Clean edit of user card 2021-04-25 15:21:31 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Laurent Destailleur
7a37296832 css 2021-04-18 20:53:09 +02:00
Laurent Destailleur
55f114511c Debug v14 2021-04-18 16:56:55 +02:00
Laurent Destailleur
c4f27cc29f Debug module salary 2021-04-18 16:43:09 +02:00
Laurent Destailleur
01c21d2d10 Fix title of email to reset password 2021-04-17 03:32:05 +02:00
Laurent Destailleur
0d8a354934 Set default length of password to 12 car. 
FIX #yogosha5855
 2021-04-17 03:11:58 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Laurent Destailleur
9154e07689 Fix picto for tags 2021-04-14 12:33:53 +02:00
Laurent Destailleur
dcf460e248 Use css on img_picto 2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca picto_mass_actions 2021-04-14 10:20:34 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +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
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
3895142772 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2021-04-10 12:06:11 +02:00
Laurent Destailleur
52213d0ac7 Fix duplicate permissions 2021-04-09 21:15:43 +02:00
Laurent Destailleur
aef164a7ee Fix bad permission 2021-04-08 02:05:36 +02:00
Laurent Destailleur
489cff46a3 FIX #yogosha5828 2021-04-08 00:37:17 +02:00
Laurent Destailleur
6c521073ea Fix perm id and sort of modules by id. 2021-04-05 13:52:19 +02:00
Laurent Destailleur
e048d73487 Show text of permission in tooltip 2021-04-05 11:18:24 +02:00
Laurent Destailleur
fd82776f67 Fix 2021-04-04 18:00:07 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
22da450a96 FIX #yogosha5755 2021-03-29 15:49:34 +02:00
Laurent Destailleur
cd88c7ad74 Position of permission 2021-03-26 12:17:18 +01:00
Laurent Destailleur
c30c6bcf43 css 2021-03-25 08:37:59 +01:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
Laurent Destailleur
047471c220 Remove $_POST war 2021-03-24 19:06:44 +01:00
Laurent Destailleur
e79284ea29 FIX Vulnerability: Idor leading to lock admin users. 2021-03-22 13:56:19 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
6063b02bf4 Fix #ygosha5698 2021-03-22 12:47:23 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
0008e916ac Fix sql error 2021-03-20 21:36:42 +01:00
Laurent Destailleur
8df083c955 Look and feel v14 2021-03-20 18:43:44 +01:00
Laurent Destailleur
ba6f97acbc
Merge pull request #16865 from frederic34/uniformisecomment 
uniformise comments to remove nested comments
 2021-03-20 11:24:39 +01:00
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments 2021-03-20 10:00:24 +01:00
Frédéric FRANCE
ed341197ea
fix nested comments 2021-03-20 09:30:09 +01:00
Laurent Destailleur
3414511d7f Code position 2021-03-19 15:09:06 +01:00
Laurent Destailleur
7056cf7614 FIX #yogosha5675 2021-03-19 15:05:28 +01:00
Laurent Destailleur
d83d005284 FIX #yogosha5674 2021-03-19 12:44:59 +01:00
Laurent Destailleur
31478d5ac0 Look and feel v14 2021-03-17 22:01:25 +01:00
Frédéric FRANCE
6cbb400d0c
fix php8 warnings 2021-03-16 21:28:56 +01:00
Laurent Destailleur
1f4a3dee5f
Merge pull request #16696 from dolibit-ut/patch-80 
Update list.php
 2021-03-16 10:40:13 +01:00
Laurent Destailleur
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25 
Translation "Generated documents"
 2021-03-16 10:25:31 +01:00
Alexandre SPANGARO
6960f0dc25 Uniformize translation 2021-03-16 04:22:55 +01:00
Alexandre SPANGARO
03481a0197 Uniformize translation 2021-03-16 04:22:43 +01:00
Alexandre SPANGARO
4fd24c6855 Translation "Generated documents" 2021-03-16 04:04:18 +01:00
UT from dolibit
b34982866f
Update list.php 
$help_url = 'EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios|DE:Modul_Benutzer';
 2021-03-15 16:58:59 +01:00
Laurent Destailleur
8cd8bd5936
Merge pull request #16675 from frederic34/patch-29 
fix php8 warning
 2021-03-15 10:55:24 +01:00
Frédéric FRANCE
531f02c1e9
fix php8 warning 2021-03-15 00:59:07 +01:00
Frédéric FRANCE
7b99c1e8e9
fix php8 warning 2021-03-15 00:32:05 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Laurent Destailleur
af5db0f5fa Look and feel v14 2021-03-12 15:34:31 +01:00
Givriz
6e46396b17 Ajout de picto pour le genre et la civilité 2021-03-10 16:31:50 +01:00
stickler-ci
5294e10ecf Fixing style errors. 2021-03-08 18:07:15 +00:00
Givriz
fb54f6912c feature #16570 
Ajout de picto pour le genre et la civilité
 2021-03-08 18:37:03 +01:00
Laurent Destailleur
a79a4e876d
Merge branch 'develop' into boxindex 2021-03-08 16:34:05 +01:00
Gauthier PC portable 024
dd83363392 FIX : several bugs on salaries + id salary in payments list 2021-03-05 10:15:35 +01:00
Laurent Destailleur
d5e0a8be56 Fix phpcs 2021-03-04 17:24:13 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries 
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
 2021-03-04 16:53:54 +01:00
Frédéric FRANCE
6c30eca11d
user home 2021-03-02 22:41:20 +01:00
Frédéric FRANCE
6cf8a46095
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-02 20:41:01 +01:00
Laurent Destailleur
7f1d61f8a8 Fix phpcs 2021-03-02 15:34:43 +01:00
Laurent Destailleur
7144e80063
Merge pull request #16322 from FHenry/dev_new_conf_defaulteventstatus 
NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)
 2021-03-02 14:45:05 +01:00
Laurent Destailleur
3a00952cd1
Update user.class.php 2021-03-02 14:44:31 +01:00
stickler-ci
54d35fa59f Fixing style errors. 2021-03-01 20:00:32 +00:00
Frédéric FRANCE
a4e25359e7
add missing rule 2021-03-01 20:37:16 +01:00
Florian HENRY
f62386a6a5 set Default values as CURD classes 2021-03-01 20:36:42 +01:00
Frédéric FRANCE
8c45137b37
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-01 12:55:45 +01:00
Gauthier PC portable 024
e598b49545 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-26 15:33:36 +01:00
Frédéric FRANCE
b970f4eca6
code syntax user directory 2021-02-26 13:18:40 +01:00
Gauthier PC portable 024
e16bb70922 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:31:12 +01:00
Gauthier PC portable 024
79e878c26b FIX : salary date 2021-02-23 15:30:42 +01:00
Gauthier PC portable 024
4f767c0823 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:18:44 +01:00
Gauthier PC portable 024
a767bffc3a FIX : correction of payment salaries list on employee tab of user card 2021-02-23 15:08:27 +01:00
Gauthier PC portable 024
939d406ab1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:10:24 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Anthony Berton
ae9582286d Update user.class.php 2021-02-17 16:39:03 +01:00
Anthony Berton
060bfde082 20200217 2021-02-17 15:26:56 +01:00
Gauthier PC portable 024
41af1a59f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-08 10:37:01 +01:00
Laurent Destailleur
84a4d8f8f1
Merge pull request #16201 from frederic34/patch-1 
fix html
 2021-02-07 19:56:56 +01:00
Frédéric FRANCE
c3d1f3de3c
fix html 2021-02-07 19:12:26 +01:00
Frédéric FRANCE
8d49ca9f0d
fix html 2021-02-07 18:49:46 +01:00
Frédéric FRANCE
05c7bcf70f
Update perms.php 2021-02-07 18:45:34 +01:00
Frédéric FRANCE
b4e6a49930
Update card.php 2021-02-07 18:35:03 +01:00
Frédéric FRANCE
b74ea17dd2
fix html 2021-02-07 18:14:50 +01:00
Gauthier PC portable 024
df8ca1ef84 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 09:29:20 +01:00
Laurent Destailleur
726ef265f2 Look and feel v14 2021-02-04 19:21:07 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/list.php
 2021-01-27 21:09:01 +01:00
Laurent Destailleur
b50728d4fb FIX #16076 2021-01-27 21:04:48 +01:00
Frédéric FRANCE
7cd698aff9
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-26 20:19:49 +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
6a12de741f FIX Report by Ricardo Matias 2021-01-25 22:46:09 +01:00
Laurent Destailleur
0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
 2021-01-24 15:29:53 +01:00
Laurent Destailleur
b4783f69d6 Show if permission is an advanced permission 2021-01-23 18:13:50 +01:00
Laurent Destailleur
113ef1a02b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2021-01-19 16:21:53 +01:00
Frédéric FRANCE
e8c4db2188
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-19 11:36:59 +01:00
Laurent Destailleur
934070f14e Backport FIx #15970 2021-01-19 10:56:46 +01:00
Laurent Destailleur
8cd8f21fde
Update user.class.php 2021-01-19 10:53:47 +01:00
lmarcouiller
73eee33f8a redo of pull request with sql updated 2021-01-19 09:24:15 +01:00
stickler-ci
7e0f83d97e Fixing style errors. 2021-01-18 16:06:06 +00:00
lmarcouiller
7c7f80fb59 update pull request with sql in simple quotes 2021-01-18 17:05:15 +01:00
lmarcouiller
841736df87 Fix #15970 user.class.php 2021-01-18 14:20:30 +01:00
Frédéric FRANCE
c8d1410e33
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-16 21:06:12 +01:00
Laurent Destailleur
b4be544350
Merge pull request #15978 from bb2a/tel_on_list_users 
NEW Add column "Office phone" and  "User mobile" in user list
 2021-01-16 18:06:19 +01:00
Frédéric FRANCE
871f762546
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-16 13:58:27 +01:00
Laurent Destailleur
aaddda9a6e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:13:08 +01:00
Laurent Destailleur
16d98d2691 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/projet/graph_opportunities.inc.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:09:09 +01:00
Laurent Destailleur
446e3b9a9d css 2021-01-14 13:26:54 +01:00
Anthony Berton
6726d5781d Update list.php 2021-01-14 08:41:04 +01:00
Anthony Berton
2c31e0989d Update list.php 2021-01-14 08:25:57 +01:00
Anthony Berton
b143fb6b9e Update list.php 2021-01-13 18:52:27 +01:00
Frédéric FRANCE
e2c57584b7
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-12 23:47:24 +01:00
Florian HENRY
77f213832e fix: update group name 2021-01-11 19:40:44 +01:00
Laurent Destailleur
f411b29b28 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/accountancy.lang
 2021-01-09 02:34:43 +01:00
Alexandre SPANGARO
4077565de9 Merge branch '13.0' into 13b5 2021-01-07 05:27:43 +01:00
Frédéric FRANCE
1e8362575a
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-06 21:05:59 +01:00
Laurent Destailleur
ed25b252b9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:14 +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
Frédéric FRANCE
5dd0b3b1c6
can add box on user home page 2021-01-02 20:20:22 +01:00
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction 2020-12-30 13:10:02 +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
Florian HENRY
d3bdb72cc8 finish 2020-12-24 15:03:12 +01:00
Florian HENRY
1b6a4fc4ae Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction 2020-12-24 15:00:15 +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
Florian HENRY
055a2b6fec on goung 2020-12-23 23:44:38 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +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