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
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ó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
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
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element 
doxygen
 2020-12-07 22:31:08 +01:00
Laurent Destailleur
f21fc43e7e Fix label of field 2020-12-07 14:25:49 +01:00
Frédéric FRANCE
4e18f46f28
doxygen 2020-12-05 23:53:55 +01:00
stickler-ci
e078d3005f Fixing style errors. 2020-12-05 20:13:54 +00:00
Nicolas Streng
f6eb10f6e5
Fix #15676 Hide Password when importing from LDAP 
Refers to Issue #15676
 2020-12-05 21:10:57 +01:00
stickler-ci
1c221302cd Fixing style errors. 2020-12-05 11:09:16 +00:00
Zebedeu
f035bd774d New | personal and professional titles added for employee users in vcard 
personal and professional titles added for employee users in vcard
 2020-12-05 11:59:30 +01:00
Zebedeu
6d2159e8f0 New #8472 personal and professional titles added 
personal and professional titles added for employee users
 2020-12-05 11:30:18 +01:00
Laurent Destailleur
613ed8bcfa FIX No use of $_SESSION into master.inc.php 2020-12-04 23:50:55 +01:00
Laurent Destailleur
1343fb48db Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-12-03 00:40:56 +01:00
Laurent Destailleur
9137713056 Debug v13 2020-12-03 00:40:41 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Stephane Lesage
7fbf5482fc missing db->escape 2020-11-30 11:30:42 +01:00
Stephane Lesage
c0c8aef7aa fix Users list filter by gender 2020-11-30 11:30:42 +01:00
Stephane Lesage
0046bfc53f Fix Users list filter by gender 2020-11-29 23:42:47 +01:00
Laurent Destailleur
6a8ddacb33 Prepare database to allow to disconnect other session after a password 
change
 2020-11-29 21:01:57 +01:00
stickler-ci
0b408b8012 Fixing style errors. 2020-11-28 09:32:02 +00:00
ptibogxiv
34894c15e0
New get permissions for connected user by API 2020-11-28 10:28:23 +01:00
Laurent Destailleur
57d34bc543 Fix link 2020-11-24 17:03:02 +01:00
Laurent Destailleur
a7347b89d1 Look and feel v13 2020-11-24 16:54:13 +01:00
Laurent Destailleur
551f82ef6a Fix label 2020-11-24 14:15:43 +01:00
Laurent Destailleur
ccd7ff9a01 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-23 21:56:48 +01:00
Laurent Destailleur
fabed34a99 FIX #15481 2020-11-23 21:47:51 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Laurent Destailleur
986f918436 Fix image edition when gravatar module is on 2020-11-22 01:47:17 +01:00
Laurent Destailleur
a3faa12753 Fix responsive 2020-11-22 01:28:56 +01:00
Laurent Destailleur
e5e320fd90 Fix null 2020-11-22 01:26:58 +01:00
Laurent Destailleur
6ac1f98ed0 Better responsive 2020-11-22 01:16:32 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Laurent Destailleur
83eaf16a22 Fix css 2020-11-18 16:23:08 +01:00
Laurent Destailleur
a64d907b2d
Merge pull request #15393 from frederic34/patch-14 
doxygen
 2020-11-14 00:49:46 +01:00
Frédéric FRANCE
5c159c6344
Update card.php 2020-11-13 21:57:46 +01:00
Frédéric FRANCE
c4b13b154e
doxygen 2020-11-13 21:00:23 +01:00
Laurent Destailleur
1f69f4ed5d Fix deprecated 2020-11-13 19:39:59 +01:00
Laurent Destailleur
283a42c086 Fix bad key 2020-11-13 19:38:44 +01:00
Laurent Destailleur
6d4d3c618d FIX #15369 and standardize permission "readall" 2020-11-13 09:55:53 +01:00
Laurent Destailleur
bf8de86091
Merge pull request #15354 from frederic34/patch-14 
Update adherent.class.php
 2020-11-12 12:38:39 +01:00
Frédéric FRANCE
05410ebbb3
Update user.class.php 2020-11-11 09:26:13 +01:00
Frédéric FRANCE
36cd4a8d4d
Update user.class.php 2020-11-11 07:39:09 +01:00
Frédéric FRANCE
d28249d568
Update user.class.php 2020-11-11 07:35:33 +01:00
Frédéric FRANCE
b783a8775d
Update user.class.php 2020-11-11 07:31:10 +01:00
Frédéric FRANCE
0f8fc7ef2b
Update user.class.php 2020-11-10 21:46:51 +01:00
Frédéric FRANCE
fd078ef713
Update user.class.php 2020-11-10 21:43:45 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-11-09 14:18:56 +00:00
Laurent Destailleur
924923ec41 Fix warning 2020-11-07 19:48:42 +01:00
Laurent Destailleur
95c35b2dc3 Fix warning 2020-11-07 19:25:04 +01:00
Laurent Destailleur
a71d50db9e Clean code 2020-11-07 15:57:38 +01:00
Laurent Destailleur
bb2c35ae18 Fix warning 2020-11-07 15:28:10 +01:00
Laurent Destailleur
eba73101b9
Merge pull request #15210 from frederic34/zapieruser 
work on zapier
 2020-11-06 18:49:23 +01:00
Laurent Destailleur
47d0b1cd0e
Merge pull request #15312 from frederic34/patch-8 
doxygen
 2020-11-06 18:45:46 +01:00
Laurent Destailleur
28cedd3229 Fix permission to edit bank account 2020-11-06 17:31:24 +01:00
Laurent Destailleur
b8f6e7f214 Fix var not defined 2020-11-06 16:28:26 +01:00
Laurent Destailleur
ed8a0093ff Debug v13 2020-11-05 22:25:14 +01:00
Frédéric FRANCE
cbf5332f04
doxygen 2020-11-05 20:18:27 +01:00
Frédéric FRANCE
545f39aacf
add work 2020-11-05 19:00:45 +01:00
Frédéric FRANCE
5d90611795
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-05 14:42:37 +01:00
Laurent Destailleur
f27508cf2f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/class/project.class.php
 2020-11-05 09:42:07 +01:00
Laurent Destailleur
72e94edae4 Fix permission on project for external user that are external contact 2020-11-05 09:40:37 +01:00
Frédéric FRANCE
32391d211a
doxygen 2020-11-05 08:55:04 +01:00
Frédéric FRANCE
b534dd57d9
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-05 08:29:35 +01:00
Frédéric FRANCE
6e7448a1d0
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-04 19:00:10 +01:00
Laurent Destailleur
40e18741b3 Fix look and feel v13 2020-11-04 18:05:48 +01:00
Laurent Destailleur
7294a47ef5 Fix generation of user from member, contact, applications for job 2020-11-04 13:33:52 +01:00
Laurent Destailleur
5f290e0de1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-02 11:41:19 +01:00
Laurent Destailleur
83a7b19333 Look and feel v13 2020-11-02 11:41:07 +01:00
Laurent Destailleur
02fb63ac96
Merge pull request #15253 from frederic34/patch-6 
Update user.class.php
 2020-11-02 09:30:23 +01:00
Laurent Destailleur
20c70691e4 Better compatibility php8 2020-11-01 21:37:04 +01:00
Frédéric FRANCE
497e5902d6
Update user.class.php 
The variable $num does not seem to be defined for all execution paths leading up to this point.
The variable $rd does not seem to be defined for all execution paths leading up to this point.
 2020-11-01 20:54:36 +01:00
Frédéric FRANCE
e52b79d586
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-01 14:19:06 +01:00
Frédéric FRANCE
d9bf49c5dc
phpcs 2020-10-31 21:04:38 +01:00
Frédéric FRANCE
49390a596c
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 20:33:59 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
Frédéric FRANCE
be4a4cb54b
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 16:10:16 +01:00
Frédéric FRANCE
8bf2b1797c
tabs 2020-10-31 15:59:33 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
2cbbf86a5b
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-30 17:48:00 +01:00
Frédéric FRANCE
a317d71413
Update api_users.class.php 2020-10-30 15:23:05 +01:00
Frédéric FRANCE
29faf681e6
work on members 2020-10-30 14:30:25 +01:00
Frédéric FRANCE
e4af61a587
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-30 08:17:53 +01:00
Frédéric FRANCE
e049eb960d
add trigger user create 2020-10-29 20:53:28 +01:00
Frédéric FRANCE
317ffc65c9
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-29 18:41:22 +01:00
Frédéric FRANCE
9e70d7ca65
fix undefined variable 2020-10-29 18:37:52 +01:00
Frédéric FRANCE
5d0ac98c34
work on zapier 2020-10-29 00:34:41 +01:00
Frédéric FRANCE
7ef2aaf8af
Update user.class.php 2020-10-28 20:57:36 +01:00
Frédéric FRANCE
19ff2ef19e
Update user.class.php 2020-10-27 20:52:37 +01:00
Frédéric FRANCE
584373af55
Update user.class.php 2020-10-27 20:15:46 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Laurent Destailleur
7a85f5a9ab
Merge pull request #15118 from hregis/develop_bug2 
FIX avoid warning
 2020-10-25 14:49:06 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Regis Houssin
3fbeea15c0 FIX avoid warning 2020-10-23 15:43:48 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Francis Appels
89f00b9114 Fix user list when user module has extrafields 2020-10-22 17:54:33 +02:00
Laurent Destailleur
5b37ff0bfd Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit 
tests.
 2020-10-15 19:36:08 +02:00
Laurent Destailleur
a0b17635fd NEW When creating a user from a member linked to a thirdparty, you can 
decide if it is an internal or external (default) user.
 2020-10-14 14:02:07 +02:00
Laurent Destailleur
925f240340 Fix user 2020-10-08 17:13:51 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Laurent Destailleur
e3542c6d4f
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights 
NEW Show category filter on lists only when user have rights to read categories
 2020-10-06 12:29:10 +02:00
Laurent Destailleur
03226ad2a5
Merge pull request #14810 from TobiasSekan/FixAdminCanRemoveAllHisUserRights 
FIX that a admin can remove all his user rights
 2020-10-05 17:18:24 +02:00
Anthony Berton
533fdda848 Update vcard.php 2020-10-02 15:11:02 +02:00
Laurent Destailleur
8bfc2bed3e Fix navigation into user list 2020-10-01 16:27:17 +02:00
Laurent Destailleur
b258a848e2 NEW Can enable/disable users in bulk actions 2020-10-01 16:21:07 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Sekan, Tobias
2bf15b3a92 Show category filter only on rights to read it 2020-09-28 10:42:49 +02:00
Laurent Destailleur
e495d0459e Look and feel v13 2020-09-27 17:53:17 +02:00
stickler-ci
a88c0b97a8 Fixing style errors. 2020-09-23 11:31:17 +00:00
Sekan, Tobias
815d0c2589 Fix that a admin can remove all his user rights 2020-09-23 13:18:09 +02:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Laurent Destailleur
aee6bc173f WIP Add start/end date of validity for user/logins 2020-09-21 18:44:20 +02:00
Laurent Destailleur
718497915c Enhance the IK module 2020-09-21 16:31:51 +02:00
Laurent Destailleur
b4137392ea
Merge pull request #14789 from bafbes/abb120144 
fix:remove deleted user params
 2020-09-20 17:12:15 +02:00
Laurent Destailleur
233aa58161 Fix sanitizing 2020-09-20 03:36:02 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
14aa9c01da Neutral message if login / email exists #yohosha4542 2020-09-19 18:40:00 +02:00
bahfir abbes
09f23c1d84 fix:remove deleted user params 2020-09-19 13:14:46 +01:00
Laurent Destailleur
4a5ee7f04d Better testSqlAndScriptInject (deal htmlentities encoded signatures) 
More phpunits on GETPOST
 2020-09-19 03:25:25 +02:00
Laurent Destailleur
4e2aff2cdc Fix sql injection when forging requests with IN 2020-09-18 17:28:02 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-18 12:21:41 +02:00
Sekan, Tobias
ae8c302c19 merge variable declaration 2020-09-18 10:52:17 +02:00
Sekan, Tobias
dc4250aed7 Make button visiblity identical on most lists 2020-09-18 10:46:23 +02:00
Sekan, Tobias
1b04ef8aad Add function to all list that support $socid 2020-09-18 10:36:40 +02:00
Laurent Destailleur
a7a8ca0a6b Fix phpcs 2020-09-18 06:03:59 +02:00
Laurent Destailleur
b49211b278 Phpcs 2020-09-18 05:37:20 +02:00
Laurent Destailleur
534846c5c7 NEW Framework is ready for CSRF token protection on explicit GET URLs. 2020-09-18 04:30:24 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
d04d1d1499 Use note_private instead of note 2020-09-17 16:13:57 +02:00
Laurent Destailleur
d73642559c Fix 2020-09-17 15:31:16 +02:00
Laurent Destailleur
5a22a07637 css 2020-09-17 15:30:20 +02:00
Laurent Destailleur
dbf8ed2fec Fix output 2020-09-17 15:29:13 +02:00
Laurent Destailleur
6bcc1d65eb Always hide hash 2020-09-17 15:28:16 +02:00
Laurent Destailleur
f575c503f1 Fix css 2020-09-17 15:21:59 +02:00
Laurent Destailleur
9a758b7edd FIX #yogosha4483 2020-09-17 14:31:25 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
b5cac258bf
Merge pull request #14739 from defrance/patch-155 
Users can now have non-binary gender
 2020-09-16 00:54:07 +02:00
Laurent Destailleur
7bcf2c9089 css 2020-09-15 14:45:51 +02:00
BENKE Charlene
be704ef5e8
Update list.php 2020-09-15 10:57:48 +02:00
BENKE Charlene
0765fff355
Update card.php 2020-09-15 10:51:09 +02:00
Laurent Destailleur
c4383747a1 Look and feel v13 2020-09-11 13:57:16 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Laurent Destailleur
e8c5a1c3d6
Merge pull request #14651 from TobiasSekan/NewPermissonsIds 
NEW Show module and permission ids on user/group rights (only admin)
 2020-09-07 12:48:12 +02:00
stickler-ci
84ccc91a9c Fixing style errors. 2020-09-07 10:23:15 +00:00
Sekan, Tobias
fb93b179c1 Show ids on user/group rights (only admin) 2020-09-07 12:09:58 +02:00
Laurent Destailleur
c538dfb5b2 FIX #14646 2020-09-07 10:34:44 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
stickler-ci
fcc2ad8c9b Fixing style errors. 2020-08-31 15:11:05 +00:00
ptibogxiv
c8e0bcd710
NEW API get users by email / login 2020-08-31 17:09:14 +02:00
Laurent Destailleur
ad87e753b4 Clean trim on GETPOST (already included inside GETPOST when not 'none' 2020-08-28 21:27:50 +02:00
stickler-ci
2cbb4081fe Fixing style errors. 2020-08-25 10:20:48 +00:00
Sekan, Tobias
4c851884e5 Address feedback 2020-08-25 12:16:44 +02:00
Sekan, Tobias
ba98db934d Show user on external calender events 2020-08-21 08:18:26 +02:00
Laurent Destailleur
e891250fb3 Reduce log 2020-08-17 17:40:08 +02:00
Laurent Destailleur
1bb24de555 Can set the language of a user. 2020-08-07 14:22:43 +02:00
Laurent Destailleur
e72e05d5f5 Add field default_lang for users 2020-08-07 13:31:23 +02:00
Laurent Destailleur
a46f4df147 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/clicktodial.php
 2020-07-24 00:15:56 +02:00
Laurent Destailleur
c6c1830e70 FIX ClickToDial tab of users has disappeared 2020-07-24 00:06:18 +02:00
Laurent Destailleur
276bc4f908 Fix sql error 2020-07-11 11:21:28 +02:00
Laurent Destailleur
e6b241a083 NEW Show tags and status in search list of website pages 2020-07-09 14:07:41 +02:00
Laurent Destailleur
344098fe23 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/actions_fetchobject.inc.php
	htdocs/langs/fr_FR/contracts.lang
	htdocs/langs/fr_FR/loan.lang
	htdocs/langs/fr_FR/stocks.lang
 2020-07-05 13:01:00 +02:00
Laurent Destailleur
1c19c97cf2 FIX missing setup of extrafields for MO 
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
 2020-07-04 16:14:53 +02:00
Laurent Destailleur
a6ecf6dbbc Fix syntax error 2020-06-25 12:18:57 +02:00
Laurent Destailleur
333d4873c3 Properties ->contactid has been renamed into ->contact_id 2020-06-25 12:17:47 +02:00
Laurent Destailleur
7d3039d41f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/user/card.php
 2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:02:05 +02:00
Anthony Berton
ee10c6f10b vcard 2020-06-05 17:57:13 +02:00
Maxime Kohlhaas
e19f496d62 Fix missing test on module enabled for user validators 2020-06-03 23:30:06 +02:00
Laurent Destailleur
c4bbf12e72 Fix css 2020-05-30 00:58:11 +02:00
Laurent Destailleur
af3c24d0a9 Fix css 2020-05-30 00:56:51 +02:00
Laurent Destailleur
56d3a5ecf2 Fix look and feel v12 2020-05-28 19:43:12 +02:00
Laurent Destailleur
11aedcd71a Fix look and feel v12 2020-05-28 19:42:10 +02:00
Laurent Destailleur
f8b92e507c Clean code 2020-05-28 19:10:06 +02:00
Laurent Destailleur
f66555b396 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-27 23:38:46 +02:00
Laurent Destailleur
57a753c303 Doxygen 2020-05-27 23:33:23 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
ad906fc508 Fix use SVG logo instead of PNG 2020-05-15 12:43:48 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
 2020-05-11 19:43:06 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
Laurent Destailleur
4c04ace9d8 fix reset of session 2020-05-06 15:39:07 +02:00
Laurent Destailleur
5e6b7fb6b4 Show message after pass reset 2020-05-06 15:36:14 +02:00
Laurent Destailleur
485896614b Add message during password reset 2020-05-06 15:30:00 +02:00
Laurent Destailleur
1ec8b31e46 Fix remove action param in url to allow a second try without the error 
message
 2020-05-06 15:15:12 +02:00
Laurent Destailleur
abdb0cc8c0 Fix use correct trackid 2020-05-06 15:03:57 +02:00
Laurent Destailleur
e7ae9c752e Fix missing trackid 2020-05-06 14:48:02 +02:00
Laurent Destailleur
bfd4ebd49d FIX Changing password message not visible if a background is set 2020-05-06 14:28:24 +02:00
Laurent Destailleur
6ec6a4465a FIX Setup of thirdparty or contact for external users 2020-04-29 20:21:17 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Laurent Destailleur
3ed11f374a Look and feel v12 2020-04-24 23:56:57 +02:00
Scrutinizer Auto-Fixer
548f3007cf Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-23 16:55:10 +00:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
b6786c515a picto 2020-04-22 22:12:53 +02:00
Laurent Destailleur
a7641cdb90 CSS 2020-04-22 22:02:25 +02:00
Laurent Destailleur
f52408cec1 Look and feel v12 2020-04-22 00:55:38 +02:00
Laurent Destailleur
5c573e197b Look and feel v12 2020-04-22 00:50:04 +02:00
Frédéric FRANCE
86e5713233
Update card.php 2020-04-21 16:26:02 +02:00
Frédéric FRANCE
d3c5173c5b
Update usergroup.class.php 2020-04-21 16:14:38 +02:00
Laurent Destailleur
16e46c672c Clean code 2020-04-20 15:06:27 +02:00
Laurent Destailleur
08260cb7a4 Look and feel 2020-04-19 15:52:43 +02:00
Laurent Destailleur
0a3d570583 Look and feel v12 2020-04-19 14:29:18 +02:00
Laurent Destailleur
d3598380da Fix do not use hard coded link 2020-04-19 14:23:31 +02:00
Laurent Destailleur
200c29bd14 Fix some regression with new architecture for groups 2020-04-19 14:19:34 +02:00
Laurent Destailleur
01f96b35ed Fix reposition 2020-04-18 16:50:36 +02:00
Laurent Destailleur
19815850c0 Look and feel v12 
Fix error report
 2020-04-18 16:48:49 +02:00
Laurent Destailleur
ae80b09327
Merge pull request #13598 from atm-maxime/new_fields_on_group 
New : refactor UserGroup module with new common way
 2020-04-18 16:26:58 +02:00
Laurent Destailleur
9c792060a2
Merge pull request #13623 from ptibogxiv/patch-331 
NEW API filter user by category
 2020-04-16 01:01:04 +02:00
stickler-ci
a098dab5a9 Fixing style errors. 2020-04-15 16:32:07 +00:00
ptibogxiv
be4a5ccd2f
NEW API filter user by category 2020-04-15 18:30:13 +02:00
Maxime Kohlhaas
6e96cbc98d New add personal email and phone on user card 2020-04-15 10:35:21 +02:00
Maxime Kohlhaas
a93a5bd6e1 Merge branch 'new_fields_on_group' of github.com:atm-maxime/dolibarr into new_fields_on_group 2020-04-15 08:45:10 +02:00
Maxime Kohlhaas
7fea2bc557 Update changelog + trigger name change for class UserGroup 2020-04-15 08:44:29 +02:00
stickler-ci
92b6b6e1f5 Fixing style errors. 2020-04-13 17:16:14 +00:00
Maxime Kohlhaas
b8a0b4b6e4 New class UserGroup works with common functions now 2020-04-13 19:03:48 +02:00
Laurent Destailleur
0878ee3a0f Look and feel v12 2020-04-13 17:55:25 +02:00
Laurent Destailleur
2c4bb867b3 FIX #12996 2020-04-13 17:36:12 +02:00
Maxime Kohlhaas
26befa3b93 New fields on usergroup object + card uses common tpl 2020-04-13 15:38:50 +02:00
Scrutinizer Auto-Fixer
387ea73bf3 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-13 11:24:42 +00:00
Laurent Destailleur
f69aaa242b Fix scrutinizer 2020-04-13 13:10:15 +02:00
Laurent Destailleur
596ba8d679 Clean deprecated code. 2020-04-13 01:10:35 +02:00
Laurent Destailleur
239ae78b28 Look and feel v12 2020-04-12 18:36:22 +02:00
Laurent Destailleur
92b6b1a042 Look and feel v12 2020-04-12 18:13:43 +02:00
Laurent Destailleur
e18d6bd6b8 Look and feel v12 2020-04-12 17:28:10 +02:00
stickler-ci
9744efc3ec Fixing style errors. 2020-04-11 15:12:11 +00:00
Maxime Kohlhaas
d842a436ae New display of user bank account : same way as on thirdparty 2020-04-11 17:06:50 +02:00
Laurent Destailleur
069fb27ced Look and feel v12 2020-04-10 12:27:34 +02:00
Laurent Destailleur
68022fb916 css 2020-04-10 12:08:37 +02:00
Laurent Destailleur
5ff981bf61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/perms.php
 2020-04-10 12:04:21 +02:00
Laurent Destailleur
874cbcefc7 Fix permission to close a proposal or order was not correctly used 
#13547
 2020-04-10 11:54:14 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
 2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Laurent Destailleur
6a60678186 Look and feel v12 2020-04-09 16:36:39 +02:00
Laurent Destailleur
b1c5490a74 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_add.tpl.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2020-04-05 04:03:53 +02:00
Laurent Destailleur
165df931f1 Complete fix #13491 2020-04-05 03:14:12 +02:00
Laurent Destailleur
a8710c2109
Merge pull request #13481 from frederic34/patch-6 
fix tooltip for  list.php
 2020-04-05 02:40:10 +02:00
Laurent Destailleur
98d2db440a Complete tooltip 2020-04-02 21:34:51 +02:00
Frédéric FRANCE
a55d1fca0a
Update list.php 2020-04-02 14:33:49 +02:00
Laurent Destailleur
84cda962c1 Clean dead code 2020-04-02 12:03:29 +02:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-23 14:54:02 +00:00
Laurent Destailleur
bf10ad2041
Merge pull request #13357 from dolibit-ut/patch-17 
Update
 2020-03-18 18:31:52 +01:00
Laurent Destailleur
9525289488 Fix return code of some API 2020-03-17 13:50:20 +01:00
UT from dolibit
1491414d5b
Update 
1. add   $help_url  |DE:Modul_Benutzer
2. change comment  'Creation d'un champ optionnel' -> 'Creation of an optional field'
3. change comment  'Edition d'un champ optionnel ' ->  'Editing an optional field'
 2020-03-16 13:34:12 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
054ffb7547 Depreciate variables not used by Dolibarr. 2020-03-06 14:38:06 +01:00
Laurent Destailleur
2c477c7169 Fix doxygen 2020-02-20 13:54:41 +01:00
Laurent Destailleur
dacf896f80 FIX Can read salary if permission + user under hierarchy 2020-02-18 23:44:36 +01:00
oscim
b0016764c4 Update bank.php 
For authorize line manager to see wages paid
 2020-02-18 22:59:56 +01:00
Laurent Destailleur
b9e522114e
Merge pull request #13123 from oscim/patch-21 
Update bank.php
 2020-02-18 22:56:45 +01:00
Laurent Destailleur
97b4f68e48
Update bank.php 2020-02-18 22:56:37 +01:00
Laurent Destailleur
a6b0fec90b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee FIX duplicate class name into some log lines 2020-02-17 12:34:00 +01:00
oscim
d1652ee9e3
Update bank.php 
For authorize line manager to see wages paid
 2020-02-17 11:18:34 +01:00
Laurent Destailleur
52aebce789 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-16 18:16:05 +01:00
Laurent Destailleur
7cdfc3ca65 FIX HTML Injection 2020-02-16 12:55:32 +01:00
Scrutinizer Auto-Fixer
17010478ba Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 09:44:08 +00:00
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modUser.class.php
 2020-02-12 20:30:20 +01:00
Laurent Destailleur
e74df397eb FIX #13094 2020-02-12 17:28:18 +01:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2020-02-11 16:52:58 +01:00
Laurent Destailleur
8645fd8946 FIX CVE-2019–17223 FIX #13053 2020-02-09 18:28:57 +01:00
Laurent Destailleur
716f765ce1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
 2020-02-08 16:00:06 +01:00
Laurent Destailleur
85c4013a0d Update card.php 2020-02-08 14:52:02 +01:00
Regis Houssin
45ba23da3e FIX #13028 2020-02-07 08:53:05 +01:00
Laurent Destailleur
8ab96447c7 Page of permissions is cleaner now 2020-02-05 21:31:28 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +01:00
Laurent Destailleur
c015707cbc Fix Only dolibarr logos are in root of theme 2020-02-05 14:14:59 +01:00
Laurent Destailleur
37617bbce8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 03:48:27 +01:00
Laurent Destailleur
b3a50bd4b0 FIX #12874 2020-02-03 03:47:45 +01:00
Laurent Destailleur
fc47fa5ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/element.php
 2020-02-03 02:58:45 +01:00
Laurent Destailleur
8098456f67 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 02:52:46 +01:00
Laurent Destailleur
90cde17bdb FIX #12986 2020-02-03 02:48:05 +01:00
Scrutinizer Auto-Fixer
9781c20f84 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-02 18:34:09 +00:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
be2d6494a7 FIX #12908 2020-01-28 21:23:05 +01:00
Laurent Destailleur
d3411a79ef Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:44 +01:00
Laurent Destailleur
0c666ee73b Fix reponsive 2020-01-22 12:46:01 +01:00
Laurent Destailleur
7a0bff06b9 Fix reponsive 2020-01-22 12:44:10 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
9e6fb7b2f1 Look and feel v11 2020-01-07 14:55:31 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
Laurent Destailleur
39737c7c4b Fix opacity on text with a href links inside 
Fix var not defined
 2019-12-22 13:19:14 +01:00
Laurent Destailleur
e8db3a2aa0 Fix look and feel v11 2019-12-19 10:17:20 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Laurent Destailleur
8b57e9fcf0
Merge pull request #12697 from bb2a/patch-7 
Full name in uppercase on creation and modification
 2019-12-14 14:00:09 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
stickler-ci
31b09f433f Fixing style errors. 2019-12-12 16:29:11 +00:00
Anthony Berton
68a1b12fba
Update user.class.php 2019-12-12 17:27:24 +01:00
Frédéric FRANCE
12f84d8254
doxygen 2019-12-11 23:04:27 +01:00
Frédéric FRANCE
66805a502a
doxygen 2019-12-11 22:53:57 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo 2019-12-11 19:11:13 +01:00
Laurent Destailleur
2fd6c690c0
Merge pull request #12632 from atm-florianm/FIX_10.0_restore_filter_values_when_returning_to_list_from_card 
FIX 10.0: add URL param "restore_last_search_values=1" to all backlinks pointing to lists
 2019-12-09 15:59:55 +01:00
Frédéric FRANCE
6366a2a606
doxygen 2019-12-06 18:05:16 +01:00
Laurent Destailleur
22f575dad0
Merge pull request #12633 from atm-lena/FIX_getrights_request 
FIX getrights() request
 2019-12-06 16:22:47 +01:00
Frédéric FRANCE
d9bfa62367
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-05 21:47:42 +01:00