dolibarr

mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00

Author	SHA1	Message	Date
Laurent Destailleur	a040d7eccc	Fix bad link	2019-09-02 04:39:45 +02:00
Laurent Destailleur	621dd83a7f	Fix bad link	2019-09-02 04:38:36 +02:00
Laurent Destailleur	ac7d0b5eb6	Fix scrutinizer	2019-09-02 04:12:48 +02:00
Laurent Destailleur	a3e221468a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-31 01:15:04 +02:00
Laurent Destailleur	7942c5edf7	Fix js injection	2019-08-30 16:22:24 +02:00
ptibogxiv	4cf2c835c6	Update logout.php	2019-08-28 19:48:45 +02:00
Laurent Destailleur	54203dda1f	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/modules.php	2019-08-21 16:25:48 +02:00
Laurent Destailleur	15a765a79a	Fix responsive	2019-08-19 13:28:24 +02:00
Laurent Destailleur	d21e557100	FIX #11671 CVE-2019-15062	2019-08-17 22:16:27 +02:00
Laurent Destailleur	a746075dbe	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2019-08-16 17:04:28 +02:00
Laurent Destailleur	9692ea5faf	FIX #11671 CVE-2019-15062	2019-08-16 16:41:53 +02:00
Laurent Destailleur	8ad2081555	NEW Can select website templates from available default templates	2019-08-12 22:19:24 +02:00
John Botella	4aeaa580ea	Add color blind option	2019-08-07 11:11:47 +02:00
Laurent Destailleur	d7a41c6b72	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/admin.lang	2019-08-01 12:54:27 +02:00
Laurent Destailleur	5eb8f05061	FIX #11584	2019-08-01 12:23:02 +02:00
Alexandre SPANGARO	0af1206892	Merge branch 'develop' into 11.0_salaries	2019-07-19 23:11:06 +02:00
Alexandre SPANGARO	9ab0734415	NEW Extrafields on salaries	2019-07-19 23:08:24 +02:00
Laurent Destailleur	50480bf517	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/opensurvey/index.php	2019-07-18 18:23:24 +02:00
Laurent Destailleur	e976195777	Fix missing key for api	2019-07-18 14:08:15 +02:00
Laurent Destailleur	ee109ac568	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-05 17:44:50 +02:00
Laurent Destailleur	575dce2dff	Fix css	2019-07-05 12:17:36 +02:00
Laurent Destailleur	fa476b4994	Properties ->libelle_incoterms were renamed into ->label_incoterms	2019-06-25 13:00:02 +02:00
Laurent Destailleur	609eefaf08	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_massactions.inc.php	2019-06-24 16:36:08 +02:00
Laurent Destailleur	28024d5cd1	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/core/actions_massactions.inc.php	2019-06-24 16:28:48 +02:00
Laurent Destailleur	22b91f3693	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-22 13:28:44 +02:00
Laurent Destailleur	0f808114e5	Sync transifex Fix CSS for Left To Right Languages	2019-06-22 13:18:33 +02:00
John Botella	e5298d0666	Fix send mail ancor	2019-06-21 11:20:04 +02:00
Laurent Destailleur	4308f48cad	Merge branch 'develop' into MissingHook	2019-06-20 03:04:32 +02:00
Laurent Destailleur	b4e47d289b	Code comment	2019-06-20 02:43:56 +02:00
Nicolas ZABOURI	2e4db8c83c	Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook	2019-06-19 08:39:05 +02:00
Laurent Destailleur	663998bab1	Fix scrutinizer errors	2019-06-18 20:15:04 +02:00
Laurent Destailleur	525598f6aa	Fix scrutinizer warnings	2019-06-18 20:01:28 +02:00
Laurent Destailleur	8835b49f3f	Debug the accounting-file tool	2019-06-18 14:30:13 +02:00
ICstage	820c420ae5	FIX Missing hooks	2019-06-18 14:07:52 +02:00
Laurent Destailleur	969e139d5c	Fix parameters of accessforbidden	2019-06-04 12:21:27 +02:00
Laurent Destailleur	2900f8828a	Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop	2019-05-19 13:52:28 +02:00
Laurent Destailleur	5f23cf7e2a	CSS	2019-05-19 13:51:47 +02:00
Laurent Destailleur	3109f8e07a	Merge pull request #11217 from inoveaconseil/FIX11135 FIX #11135	2019-05-19 02:23:49 +02:00
Laurent Destailleur	4b3d0ed50c	Update user.class.php	2019-05-19 02:21:42 +02:00
Nicolas ZABOURI	61c17f8d0f	FIX #11135	2019-05-19 02:06:37 +02:00
Laurent Destailleur	c6ccb92a51	Fix table shown when there is no perm Fix edit admin status of another admin	2019-05-19 01:41:42 +02:00
Laurent Destailleur	11fea03074	Merge pull request #11026 from atm-john/new_look_and_feel_title_button NEW : look and feel title button	2019-05-18 16:04:47 +02:00
florian HENRY	fcfabd40af	fix missing cell into perms screen	2019-05-17 18:10:40 +02:00
Laurent Destailleur	a664cd6461	Fix check when uploading a non image as user photo	2019-05-10 20:09:41 +02:00
Laurent Destailleur	3def11d5c9	Standardize translation	2019-05-10 19:32:46 +02:00
Regis Houssin	10da976b93	FIX try to fix phpcs error	2019-05-10 16:37:03 +02:00
Regis Houssin	9a6029b1d9	FIX disable phpcs	2019-05-10 16:12:16 +02:00
Regis Houssin	2ce96290eb	FIX broken feature !!	2019-05-10 11:50:01 +02:00
Regis Houssin	de84f12b24	FIX broken feature with ldap trigger !!!	2019-05-10 11:47:44 +02:00
Laurent Destailleur	68d438b697	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/card.php htdocs/user/class/user.class.php	2019-04-25 01:50:48 +02:00
Regis Houssin	740fddcd42	FIX missing global $user	2019-04-24 08:22:00 +02:00
Regis Houssin	41a82023e3	FIX missing compatibility with multicompany	2019-04-24 08:17:10 +02:00
ATM john	292d9c38a5	Appli function to links	2019-04-15 00:21:58 +02:00
Laurent Destailleur	fae2983c2a	Merge branch 'develop' into new_user_hr_fields	2019-04-11 18:27:58 +02:00
Laurent Destailleur	05c14e4f2f	Look and feel v10	2019-04-10 15:54:29 +02:00
Laurent Destailleur	7b01e76d2b	Fix doxygen	2019-04-08 16:04:15 +02:00
Laurent Destailleur	fad2fa48dd	NEW Introduce a config parameter $dolibarr_main_instance_unique_id	2019-04-07 15:44:17 +02:00
Laurent Destailleur	fff9b7db9d	Fix doxygen	2019-04-04 18:33:12 +02:00
Laurent Destailleur	1b2826f476	Look and feel v10	2019-03-29 13:26:26 +01:00
Laurent Destailleur	f27f65e8bf	Responsive	2019-03-25 10:09:02 +01:00
Laurent Destailleur	c1df84a165	Fix phpcs	2019-03-22 13:17:26 +01:00
Philippe GRAND	69906b9888	translation	2019-03-22 09:38:04 +01:00
Laurent Destailleur	6e4d6c94dd	FIX phpcs	2019-03-21 20:17:31 +01:00
Laurent Destailleur	ee4150665e	Fix phpcs	2019-03-21 20:15:19 +01:00
Laurent Destailleur	5693fbfe97	Merge pull request #10898 from grandoc/new_branch_21_03_2019 add some comments	2019-03-21 18:29:11 +01:00
Mathieu Pellegrin	e0d89101df	#9480 Password link broken if login contains space	2019-03-21 18:25:00 +01:00
Laurent Destailleur	6c2bd13b58	Merge pull request #10895 from mpellegrin/develop #9480 Password link broken if login contains space	2019-03-21 18:24:21 +01:00
Philippe GRAND	efc393e13c	add some comments	2019-03-21 15:19:01 +01:00
Philippe GRAND	2ad649eaea	add some comments	2019-03-21 15:18:05 +01:00
Laurent Destailleur	5d21547854	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/extrafields.class.php htdocs/product/price.php htdocs/user/perms.php	2019-03-21 12:20:24 +01:00
Mathieu Pellegrin	e971018c71	#9480 Password link broken if login contains space	2019-03-21 12:06:43 +01:00
Laurent Destailleur	3c1d7bfbf0	FIX counter of permissions in badge was wrong	2019-03-19 16:30:40 +01:00
Laurent Destailleur	0c101f3d1b	Fix translation	2019-03-18 11:21:51 +01:00
Philippe GRAND	60e8c3d7e3	update with html5 compliant code	2019-03-17 10:30:16 +01:00
Philippe GRAND	ee675645c1	update with html5 compliant code	2019-03-17 10:29:00 +01:00
Philippe GRAND	e8c98f91cf	update with html5 compliant code	2019-03-17 10:27:54 +01:00
Maxime Kohlhaas	0a0e29a089	New fields on user object for hrm purpose	2019-03-16 08:53:06 +01:00
Frédéric FRANCE	f283782445	change visibility	2019-03-04 19:57:46 +01:00
Laurent Destailleur	8fce6e5e31	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/card.php htdocs/core/modules/mailings/xinputfile.modules.php htdocs/fourn/facture/card.php	2019-03-02 19:13:37 +01:00
Laurent Destailleur	40e923ec85	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/modules/modAgenda.class.php	2019-03-02 19:07:14 +01:00
Frédéric FRANCE	bd2e541fd6	add visibility	2019-03-01 18:28:51 +01:00
Frédéric FRANCE	c5d252fa2e	Merge remote-tracking branch 'origin/Squiz.Scope.MethodScope.Missing' into Squiz.Scope.MethodScope.Missing	2019-02-27 17:56:13 +01:00
Laurent Destailleur	b3fb0eaf5b	Merge branch 'develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 15:48:31 +01:00
Laurent Destailleur	ee3dd016e7	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-27 14:47:23 +01:00
Frédéric FRANCE	49cbaed569	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 14:21:15 +01:00
Laurent Destailleur	c4e96e9f74	Fix language	2019-02-27 13:48:13 +01:00
Laurent Destailleur	727c4b787b	Merge pull request #10617 from wdammak/patch-29 NEW Add Default Warehouse to user record (if module stock is on)	2019-02-27 13:38:55 +01:00
Laurent Destailleur	e873608d84	Update card.php	2019-02-27 13:37:53 +01:00
Frédéric FRANCE	5a4ac82880	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 08:23:29 +01:00
Frédéric FRANCE	1c07006015	wip	2019-02-25 21:36:27 +01:00
Regis Houssin	6fa016dc85	FIX wrong feature2 when user rights "group_advance" is used	2019-02-25 10:44:22 +01:00
Alexandre SPANGARO	2da1447a0b	Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin	2019-02-25 09:12:04 +01:00
Alexandre SPANGARO	acb9cfe07a	NEW: Add LinkedIn field	2019-02-25 09:07:58 +01:00
Regis Houssin	0ea7bf3b0b	FIX could not create several superadmin in transversal mode	2019-02-24 08:21:56 +01:00
Frédéric FRANCE	0255336549	fix html5 user	2019-02-16 10:29:15 +01:00
wdammak	8390ed346b	Hidden for users not using the stock module	2019-02-15 17:12:39 +01:00
wdammak	63ffb7a873	Fix backtopage url	2019-02-15 06:04:58 +01:00
wdammak	03c5e040c5	Fix backtopage url	2019-02-15 05:48:56 +01:00
wdammak	fd4f82b1b7	Fix conflict	2019-02-15 05:32:01 +01:00
wdammak	4dc4a25bb5	Add Default Warehouse to user card	2019-02-15 05:24:25 +01:00
wdammak	d31aadf5da	Add Default Warehouse to user	2019-02-15 05:20:33 +01:00
Laurent Destailleur	f1500281ef	Fix phpcs	2019-02-12 19:00:50 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Laurent Destailleur	57f81217ee	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/index.php	2019-02-03 21:14:44 +01:00
Laurent Destailleur	4d41b1b33c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-03 19:45:45 +01:00
Laurent Destailleur	a6dde3d6bd	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00
Laurent Destailleur	bd2c7092a4	Update user.class.php	2019-02-03 19:25:11 +01:00
Frédéric FRANCE	e3a5d2b839	get return array not int	2019-02-03 16:39:48 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
gauthier	bfc7265cbc	FIX : better test on fetch	2019-01-31 11:53:10 +01:00
gauthier	0c4e5a6487	FIX : better test	2019-01-31 09:30:07 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
gauthier	3477cf6bd3	FIX : must fetch member in current entity	2019-01-29 18:01:28 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +01:00
Frédéric FRANCE	b10558bacd	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
Laurent Destailleur	ecc30b8ffe	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/card.php	2019-01-27 18:27:58 +01:00
Laurent Destailleur	7a7fd657ed	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-27 18:13:20 +01:00
Laurent Destailleur	a78db45178	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-27 18:12:36 +01:00
Laurent Destailleur	d1befcb1ba	Merge pull request #10427 from EuskalMoneta/develop NEW Get the list of groups of a user with the REST API.	2019-01-27 17:58:09 +01:00
Laurent Destailleur	4f9f0fd7b5	Merge branch 'develop' into elseif	2019-01-27 17:54:06 +01:00
Frédéric FRANCE	f0cdf300d1	Squiz.Functions.FunctionDeclarationArgumentSpacing	2019-01-27 15:20:16 +01:00
Xebax	0aa98297f5	NEW Get the list of groups of a user with the REST API.	2019-01-27 13:52:08 +01:00
Xebax	94d3f038eb	FIX 'statut' is ignored when updating a user with the REST API.	2019-01-27 13:20:33 +01:00
Frédéric FRANCE	7ee086b402	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
Frédéric FRANCE	6e91b3cefc	PSR2 usage of else if is discouraged	2019-01-27 10:49:34 +01:00
Laurent Destailleur	fd192f10c4	Merge pull request #10341 from hregis/8.0_bug FIX security broken with Multicompany	2019-01-26 14:28:13 +01:00
Philippe GRAND	4bf5a52f4b	update with html5 compliant code	2019-01-21 10:12:28 +01:00
Regis Houssin	f7703235c7	FIX broken feature (better check)	2019-01-16 19:39:57 +01:00
Regis Houssin	ffeeb782b0	FIX check is moved to restrictedArea() function	2019-01-16 19:25:19 +01:00
Regis Houssin	45a7e03562	FIX a user can always read its own card	2019-01-16 19:13:21 +01:00
Laurent Destailleur	e7943ae844	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-16 16:48:52 +01:00
Laurent Destailleur	d3828130ab	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/adherents/class/adherent.class.php	2019-01-16 16:48:21 +01:00
Regis Houssin	24128ac28d	TODO security broken with Multicompany	2019-01-16 11:07:58 +01:00
Laurent Destailleur	adc4422323	Update card.php	2019-01-15 17:57:30 +01:00
Regis Houssin	7c9d85d091	FIX problem with multicompany transverse mode Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>	2019-01-15 12:18:04 +01:00
ldestailleur	bc00fb177a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-02 19:42:15 +01:00
ldestailleur	a9e8e13bb6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: ChangeLog htdocs/user/param_ihm.php	2019-01-02 19:41:39 +01:00
ldestailleur	3d8479291d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-02 19:39:35 +01:00
ldestailleur	8645a7f524	FIX Interface regression for bind people. Fix option MAIN_OPTIMIZEFORTEXTBROWSER	2019-01-02 18:58:45 +01:00
Laurent Destailleur	5c516fdae2	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php	2018-12-26 19:43:01 +01:00
Laurent Destailleur	35debd06fb	List of events show user firstname by default	2018-12-23 01:28:36 +01:00
Laurent Destailleur	85375495e5	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/class/html.form.class.php htdocs/product/class/product.class.php htdocs/public/notice.php htdocs/user/card.php	2018-12-22 19:06:58 +01:00
Laurent Destailleur	b3b7a12a16	FIX Look and feel v9	2018-12-22 18:56:29 +01:00
Laurent Destailleur	a5dccd1cc3	Enable by default the test on anti CSRF token	2018-12-22 18:09:26 +01:00
Laurent Destailleur	3fee4c3309	The delete of a user need the parameter $user	2018-12-22 17:34:27 +01:00
Laurent Destailleur	2b088a73c1	FIX CVE-2018-19998	2018-12-22 17:16:08 +01:00
Laurent Destailleur	bacd5110fb	FIX CVE-2018-19995 and CVE-2018-19998	2018-12-22 17:12:38 +01:00
Laurent Destailleur	44a6644969	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-18 21:55:53 +01:00
Laurent Destailleur	89068ffef1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/adherents/subscription.php htdocs/core/class/commonobject.class.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/langs/es_ES/companies.lang htdocs/langs/es_ES/errors.lang htdocs/product/stock/product.php htdocs/user/card.php	2018-12-18 21:55:14 +01:00
Laurent Destailleur	4b7f373802	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-12-18 21:37:34 +01:00
Laurent Destailleur	fb8c3f01a4	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/modules/project/doc/pdf_baleine.modules.php htdocs/core/modules/project/doc/pdf_beluga.modules.php	2018-12-18 21:35:30 +01:00
atm-ph	1aadcc50f1	Fix attached files from user mail form don't work	2018-12-17 15:48:27 +01:00
Laurent Destailleur	527ad04ae8	FIX Mandatory field feature should works on textarea Conflicts: htdocs/core/lib/functions.lib.php	2018-12-15 18:13:30 +01:00
Laurent Destailleur	6188156c52	FIX Mandatory field feature should works on textarea	2018-12-15 18:11:40 +01:00
Laurent Destailleur	f55db6dd84	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/resources/dbmodel/dolibarr_schema.mwb	2018-12-15 14:09:16 +01:00
Laurent Destailleur	2011afe6fb	Merge branch 'develop' into actionrefused	2018-12-14 15:48:24 +01:00
Laurent Destailleur	611ccc4a9a	Merge branch 'develop' into fieldlabel	2018-12-14 15:42:01 +01:00
Laurent Destailleur	5dabefe227	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-13 20:49:55 +01:00
Juanjo Menent	d1eed14488	FIX: #10218 Bad redirection after deleting a user or group	2018-12-11 13:25:33 +01:00
Laurent Destailleur	3f912ebfff	FIX restore security event login/logout	2018-12-10 11:19:52 +01:00
Maxime Kohlhaas	42c97cf7d5	Fix #6610	2018-12-02 17:59:11 +01:00
Maxime Kohlhaas	8c13c87429	Fix path for user photo	2018-12-01 16:55:42 +01:00
Laurent Destailleur	ef3a280f40	Merge pull request #10082 from grandoc/new_branch_26_11_2018 fix typo error	2018-11-29 10:57:48 +01:00
Laurent Destailleur	d59c81cfe4	Fix missing or	2018-11-28 11:47:24 +01:00
Laurent Destailleur	bb565d33f9	FIX Several fixes in fetchAll	2018-11-27 16:39:08 +01:00
Philippe GRAND	a59a4c60e0	FIX : Typo errors	2018-11-26 16:09:05 +01:00
Frédéric FRANCE	ce6b7adaa0	Merge remote-tracking branch 'upstream/develop' into actionrefused	2018-11-15 22:15:45 +01:00
Frédéric FRANCE	12dcda7e02	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-15 22:01:36 +01:00
Laurent Destailleur	b51004e809	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-15 17:34:36 +01:00
Laurent Destailleur	2d6f7f926c	FIX xss injection on user address	2018-11-15 17:34:11 +01:00
Laurent Destailleur	e1407c8289	Merge pull request #10012 from hregis/develop_mc FIX compatibility between proposal sharing and proposalnumber sharing	2018-11-15 17:19:28 +01:00
Laurent Destailleur	8a97ba4ba9	Update card.php	2018-11-15 16:56:12 +01:00
David Beniamine	01947288fb	Fix issue #9956 User can edit some of their data without permissons	2018-11-14 18:29:15 +01:00
Regis Houssin	2bc25fc008	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2018-11-14 15:24:41 +01:00
Laurent Destailleur	df2aa2e2f6	Fix column balance	2018-11-14 13:52:43 +01:00
Laurent Destailleur	ba22ae45e7	Fix column balance	2018-11-14 13:45:20 +01:00
Laurent Destailleur	0201939ebe	Fix column balance	2018-11-14 13:43:39 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +01:00
Regis Houssin	04edcaa89c	FIX compatibility between proposal sharing and proposalnumber sharing	2018-11-13 20:20:46 +01:00
Frédéric FRANCE	09efde4901	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-09 18:13:59 +01:00
Regis Houssin	89389baeac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email	2018-11-09 15:37:29 +01:00
Laurent Destailleur	c74ad61365	Fix look and feel v8	2018-11-08 10:04:25 +01:00
Laurent Destailleur	66ffcf287a	Fix filter on extrafields	2018-11-07 12:49:17 +01:00
Laurent Destailleur	4a25317f10	Fix security on GETPOST('action'). Param must be sanitized.	2018-11-05 20:29:07 +01:00
Laurent Destailleur	c0f4ec5a3e	FIX sanitize param $action	2018-11-05 17:53:31 +01:00
Frédéric FRANCE	42a9abad56	remove fieldlabel and add fieldeditkey	2018-10-27 17:45:29 +02:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Laurent Destailleur	3ef32a24a4	Look and feel	2018-10-17 00:34:39 +02:00
Laurent Destailleur	00dc78dd01	Fix responsive	2018-10-16 21:58:33 +02:00
Philippe GRAND	ba40ad4aab	Standardize and update code	2018-10-12 12:23:45 +02:00
Laurent Destailleur	82c89f739d	social network module	2018-10-12 11:29:47 +02:00
Laurent Destailleur	cb53e18aa4	Social network module	2018-10-12 11:19:18 +02:00
Laurent Destailleur	ded5c4c3dd	Social network module	2018-10-12 11:02:03 +02:00
Laurent Destailleur	46ad7de5dd	Merge pull request #9709 from bafbes/abb80031 NEW Category filter on user list	2018-10-09 15:38:00 +02:00
Laurent Destailleur	0938ac4afa	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/list.php	2018-10-09 14:54:18 +02:00
Laurent Destailleur	3c8b365c3e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-09 14:53:39 +02:00
Abbes Bahfir	073914572c	Fix: users categories type is Categorie::TYPE_USER	2018-10-09 14:24:41 +02:00
Laurent Destailleur	966e97617d	Merge pull request #9708 from bafbes/abb80030 FIX users categories type is Categorie::TYPE_USER	2018-10-09 14:24:21 +02:00
Laurent Destailleur	f365a987c4	FIX restore last seach criteria FIX filter on employee	2018-10-09 14:20:53 +02:00
Abbes Bahfir	603c70ffc7	Fix: Searching on employee field disables employee mode	2018-10-09 14:10:04 +02:00
Laurent Destailleur	362c226ad6	Merge pull request #9710 from bafbes/abb80032 Fix: Searching on employee field disables employee mode	2018-10-09 14:09:23 +02:00
Philippe GRAND	bba6669f03	Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018	2018-10-09 08:47:26 +02:00
Abbes Bahfir	34da7cc731	Fix: Searching on employee field disables employee mode	2018-10-09 00:25:55 +01:00
Abbes Bahfir	06a943fc80	Fix: Category filter on user list	2018-10-09 00:02:14 +01:00
Abbes Bahfir	1e706c2e6b	Fix: users categories type is Categorie::TYPE_USER	2018-10-08 23:50:14 +01:00
gauthier	021f9552dd	FIX : when we're just admin and not super admin, if we create new user with transverse mode, we don't see it then we can't add him in usergroup	2018-10-08 15:41:31 +02:00
Laurent Destailleur	506ba30d5a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-06 20:54:14 +02:00
Laurent Destailleur	fef40439be	responsive	2018-10-06 20:05:41 +02:00
Philippe GRAND	956c7b21e2	Standardize code	2018-10-06 12:18:03 +02:00
Philippe GRAND	5890647afd	Standardize code	2018-10-06 12:04:17 +02:00
Philippe GRAND	74c86f477c	Standardize code	2018-10-06 12:01:00 +02:00
Frédéric FRANCE	4d72812129	Create index.html	2018-09-30 14:56:12 +02:00
Frédéric FRANCE	3f0162789b	Create index.html	2018-09-30 14:55:55 +02:00
Frédéric FRANCE	877184638c	add index.html in user directory	2018-09-30 14:55:15 +02:00
Laurent Destailleur	79ade6a1af	Work on website	2018-09-26 15:20:37 +02:00
Philippe GRAND	9c9f5bd3c3	Standardize and update code	2018-09-20 17:26:39 +02:00
Philippe GRAND	83871468ba	Standardize and update code	2018-09-18 17:37:08 +02:00
Frédéric FRANCE	4120d0f92c	reduce complexity of user class	2018-09-16 13:49:22 +02:00
Laurent Destailleur	80fb1e0657	NEW Each user can set its prefered default calendar	2018-09-14 11:23:15 +02:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Laurent Destailleur	963d5eeddf	Merge pull request #9387 from frederic34/camelCaps2 start changing phpcs:ignore	2018-09-12 21:14:34 +02:00
Laurent Destailleur	9d9e2bc3e3	Merge pull request #9405 from fmarcet/develop NEW: Highlight lines on lists when they are checked	2018-09-12 20:50:42 +02:00
Frédéric FRANCE	3e71f4e6b0	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 18:36:49 +02:00
Frédéric FRANCE	998b67fa98	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 18:32:15 +02:00
Laurent Destailleur	3bf296c9cf	Merge pull request #9448 from frederic34/loadfichetitre remove deprecated	2018-09-12 18:23:24 +02:00
Laurent Destailleur	fcabe67e4b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-12 13:30:28 +02:00
Frédéric FRANCE	aab617aeb3	remove deprecated	2018-09-09 18:38:48 +02:00
Frédéric FRANCE	7e0b1055db	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-09 13:36:53 +02:00
Frédéric FRANCE	f02b2f0239	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
Laurent Destailleur	700e3b9748	Standardize code for modulepart=mycompany like others modulepart.	2018-09-09 12:53:30 +02:00
Frédéric FRANCE	a3fa13994b	replace select_date	2018-09-09 09:36:12 +02:00
Frédéric FRANCE	4a7ea33008	replace select_date	2018-09-09 08:02:26 +02:00
Laurent Destailleur	0ef17fe581	FIX Problems with permissions of module to record payment of salaries	2018-09-07 13:32:56 +02:00
Frédéric FRANCE	4cbfa2073a	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 21:02:16 +02:00
Laurent Destailleur	4ac67e6409	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-05 20:31:10 +02:00
Laurent Destailleur	0bd4bc39dd	Fix responsive	2018-09-05 16:03:43 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Philippe GRAND	0492492df1	fix merge	2018-09-04 12:30:06 +02:00
Ferran Marcet	b658626e21	NEW: Highlight lines on lists when they are checked	2018-09-04 11:54:13 +02:00
Frédéric FRANCE	7288335c6d	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-03 19:01:11 +02:00
Philippe GRAND	7a0c19485e	fix merge	2018-09-03 09:34:08 +02:00
Regis Houssin	912c05774b	FIX remove deprecated triggers USER_LOG*	2018-09-03 09:30:36 +02:00
Frédéric FRANCE	35232b753a	move phpcs:ignore	2018-09-02 20:37:12 +02:00
Frédéric FRANCE	e13a8ec572	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-02 18:19:45 +02:00
Laurent Destailleur	887a40cf1d	Remove TODO	2018-09-02 16:46:01 +02:00
Frédéric FRANCE	47879d44bc	move phpcs:ignore	2018-09-02 09:57:19 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Frédéric FRANCE	10200374ef	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 14:06:23 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Philippe GRAND	d8e6492e93	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 13:07:30 +02:00
Laurent Destailleur	5604f3b0c3	Merge pull request #9376 from frederic34/functionCommentMissing function Comment Missing	2018-09-01 12:59:32 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Laurent Destailleur	482ddd548a	Merge pull request #9332 from frederic34/functionClosingBrace PSR2 FunctionClosingBrace	2018-09-01 12:06:08 +02:00
Laurent Destailleur	28fe74bf13	FIX #9371	2018-09-01 11:57:18 +02:00
Frédéric FRANCE	c2e49c82f8	function Comment Missing	2018-08-31 22:34:02 +02:00
Philippe GRAND	70ae8c6081	Standardize and update code	2018-08-31 18:27:16 +02:00
Philippe GRAND	9e880d3e72	Standardize and update code	2018-08-31 17:55:31 +02:00
Frédéric FRANCE	5100b8b7b0	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-30 10:42:47 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Laurent Destailleur	3ebfb23407	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: .travis.yml htdocs/fourn/class/fournisseur.facture.class.php htdocs/product/fournisseurs.php htdocs/ticket/class/ticket.class.php	2018-08-29 20:22:50 +02:00
Laurent Destailleur	34ceec7067	FIX #9328	2018-08-29 18:40:12 +02:00
Laurent Destailleur	4e7e290624	FIX #9328	2018-08-29 18:38:58 +02:00
Laurent Destailleur	428354303c	FIX #9328	2018-08-29 18:29:42 +02:00
Laurent Destailleur	d8bd76b8ce	FIX #9328	2018-08-29 18:27:39 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Laurent Destailleur	1842a4bb41	Merge pull request #9278 from grandoc/new_branch_21_08_2018 Update and standardize code	2018-08-28 02:13:28 +02:00
ptibogxiv	6556ace2bc	Fix sync user->member add more fields	2018-08-28 01:35:05 +02:00
Philippe GRAND	30992f2730	Standardize and update code	2018-08-23 18:52:47 +02:00
ptibogxiv	bcd7833af0	Fix sync user->member add more fields	2018-08-23 10:16:33 +02:00
Philippe GRAND	0c75c41e7b	Update and standardize code	2018-08-22 19:56:24 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration function declaration	2018-08-21 13:41:56 +02:00
Laurent Destailleur	0f1e5a78c6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-21 13:17:11 +02:00
Laurent Destailleur	27e2810e10	Fix date format	2018-08-20 17:14:03 +02:00
Laurent Destailleur	26d34422b0	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-19 03:01:26 +02:00
Laurent Destailleur	547a0aaac7	FIX Look and feel v8	2018-08-19 02:43:45 +02:00
Frédéric FRANCE	39462742e2	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-16 08:17:55 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Frédéric FRANCE	a0a6afc224	return comment	2018-08-14 12:23:10 +02:00
Frédéric FRANCE	3210181a3d	rule for private function is different	2018-08-14 10:21:34 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Laurent Destailleur	9fc5d39d07	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
Laurent Destailleur	dc8c4402ee	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:22 +02:00
Laurent Destailleur	3d4d42462c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-12 16:30:21 +02:00
Laurent Destailleur	12e21b4886	FIX update extrafields	2018-08-12 16:29:26 +02:00
Laurent Destailleur	39f4eae07e	Fix look and feel v8	2018-08-09 23:11:49 +02:00
Philippe GRAND	59cd0a5e5e	uniformize	2018-08-04 15:58:05 +02:00
Philippe GRAND	948647f3f9	comment translation	2018-08-04 14:17:51 +02:00
Juanjo Menent	37a9a2df56	Merge pull request #9167 from frederic34/include Include and co are statements	2018-08-02 11:03:44 +02:00
Juanjo Menent	738caa605f	Merge pull request #9160 from hregis/develop_api FIX compatibility with multicompany transverse mode	2018-08-02 10:57:27 +02:00
Philippe GRAND	541e919ae0	Clean and update code	2018-07-27 14:49:33 +02:00
Regis Houssin	e1877625a0	FIX clean code	2018-07-27 13:42:44 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
Regis Houssin	e48eec583d	FIX compatibility with multicompany transverse mode	2018-07-25 17:00:49 +02:00
Regis Houssin	ff733c5ad7	FIX clean code	2018-07-24 20:10:27 +02:00
Laurent Destailleur	dc2fec8f57	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-24 19:37:04 +02:00
Laurent Destailleur	438cdfc004	FIX #9141	2018-07-24 17:16:21 +02:00
Philippe GRAND	010c5af245	Clean and update code	2018-07-19 16:48:20 +02:00
Laurent Destailleur	387abf2da8	Merge pull request #9057 from inoveaconseil/checkRightOnLink ADD Check right on link	2018-07-16 09:31:21 +02:00
Laurent Destailleur	d968a61445	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-15 20:17:17 +02:00
Laurent Destailleur	f3b7bc53bd	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/tpl/extrafields_list_print_fields.tpl.php	2018-07-15 20:16:08 +02:00
atm-ph	0c252d9778	Fix user rights overrided by user group rights	2018-07-11 18:09:29 +02:00
Laurent Destailleur	31d5b739e7	Merge pull request #9048 from hregis/8.0_rights NEW possibility to add all rights of all modules in one time	2018-07-10 10:38:17 +02:00
Laurent Destailleur	fb84211714	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-06 12:45:44 +02:00
Laurent Destailleur	af3ab84ebb	Fix backward compatibility with old multicompany module	2018-07-05 22:15:55 +02:00
Inovea Conseil	30cff2bb36	ADD check user's rights	2018-07-05 11:52:41 +02:00
Regis Houssin	d796199ed0	Fix: avoid warning with multicompany tranverse mode	2018-07-04 14:48:00 +02:00
Regis Houssin	ca13d7b560	NEW possibility to add all rights of all modules in one time	2018-07-03 21:46:20 +02:00
Laurent Destailleur	fec9a96ad1	Fix travis	2018-07-02 09:34:34 +02:00
Laurent Destailleur	982a1ffbaf	NEW Automatic position of scroll when creating an extrafield	2018-06-30 14:22:05 +02:00
Laurent Destailleur	a9e78f27d9	Merge branch 'develop' into patch-115	2018-06-30 01:21:58 +02:00
Laurent Destailleur	eb88f1e5c9	Fix look and feel v8	2018-06-23 12:41:03 +02:00
Laurent Destailleur	27a27e02a1	Fix css	2018-06-22 22:53:53 +02:00
Laurent Destailleur	ad2df304b4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/customer/lines.php htdocs/fourn/commande/card.php htdocs/societe/class/societe.class.php	2018-06-18 13:31:29 +02:00
atm-ph	3c80ce501b	Fix missing hook on usercard (addMoreActionsButtons)	2018-06-15 16:05:50 +02:00
Inovea Conseil	d5a3e63e05	Fix missing paramater for generateDocument	2018-06-15 09:47:28 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
Laurent Destailleur	916424943e	Merge pull request #8942 from grandoc/new_branch_10_06_2018 New branch 10 06 2018	2018-06-13 20:48:22 +02:00
Laurent Destailleur	e983566422	Merge pull request #8947 from glu000/develop Fix for Bug #8946	2018-06-13 20:41:54 +02:00
Günter Lukas	fcbf50467e	Update user.class.php	2018-06-12 09:52:55 +02:00
Günter Lukas	3c42a282f5	Fix for Bug #8946 Add element fields to class user	2018-06-12 09:48:03 +02:00
Philippe GRAND	9a44a433b8	clean code	2018-06-07 18:32:00 +02:00
Philippe GRAND	4fd2468b6f	clean code	2018-06-07 18:13:00 +02:00
Laurent Destailleur	6e62727c37	Fix scrutinizer bug	2018-06-06 18:18:50 +02:00
Laurent Destailleur	29ee5dffc4	Clean code	2018-06-04 12:55:55 +02:00
Frédéric FRANCE	812b182680	loadlangs	2018-05-26 17:04:23 +02:00
Frédéric FRANCE	e87ff4d9b0	loadlangs	2018-05-26 16:24:54 +02:00
Laurent Destailleur	e51aa68284	Fix link to warehouses for events	2018-05-24 12:16:04 +02:00
BENKE Charlene	0dad083cb5	Update card.php	2018-05-12 18:05:06 +02:00
BENKE Charlene	caa35e0359	Update user.class.php	2018-05-12 17:59:43 +02:00
Laurent Destailleur	a9c7f90512	Missing hook after deprecated trigger	2018-05-05 13:36:20 +02:00
Laurent Destailleur	461ae46cc4	FIX When on a high page and searching for a small result, list was not visible.	2018-04-24 11:37:57 +02:00
Laurent Destailleur	bbfc4a3e17	NEW Look and feel v8 - Show Picto "+" on all links "Add record"	2018-04-18 03:26:15 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	8fbde88872	Look and feel v8	2018-04-15 17:37:49 +02:00
Laurent Destailleur	f84b74f4cc	Merge pull request #8583 from hregis/develop_ldap NEW add "printUserPasswordField" hooks	2018-04-13 23:36:20 +02:00
Laurent Destailleur	be965bdbab	Clean code	2018-04-13 13:28:48 +02:00
Laurent Destailleur	1521b0595b	Clean code	2018-04-13 11:03:03 +02:00
Regis Houssin	a317c54b66	Fix: missing right parameter	2018-04-13 09:39:02 +02:00
Regis Houssin	7c3f0be83d	Fix: missing parameters	2018-04-13 09:09:26 +02:00
Regis Houssin	7d1292d838	NEW add "printUserPasswordField" hooks	2018-04-13 09:05:17 +02:00
Laurent Destailleur	6e288fca75	Merge pull request #8575 from all3kcis/develop-patch-16 NEW Add files management on products lot	2018-04-13 00:57:13 +02:00
Regis Houssin	ee61324caf	Fix: show \r\n if description contain <br>	2018-04-12 18:57:51 +02:00
Regis Houssin	bd95e5265e	Fix: wrong permissions	2018-04-12 18:05:12 +02:00
All-3kcis	880fa55dd5	display user-friendly filesize	2018-04-12 15:29:22 +02:00
Laurent Destailleur	a8878c3f7e	FIX #6295	2018-04-12 15:17:15 +02:00
Laurent Destailleur	698f5c165a	Merge pull request #8430 from atm-florian/dev_mailtouser NEW : Can select from the user list into send form email (For field to and CC)	2018-04-11 17:55:40 +02:00
Laurent Destailleur	1feee6378f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-11 14:45:52 +02:00
Laurent Destailleur	0d15d8e0ad	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/user/card.php	2018-04-11 14:45:11 +02:00
Marc de Lima Lucio	307ede8b22	FIX: weird password autocompletion in Goocle Chrome (issue #8479 )	2018-04-10 15:03:50 +02:00
Laurent Destailleur	7108f68db9	Remove old deprecated hook insertExtraFields. Triggers must be used for action on CRUD events.	2018-04-10 12:03:01 +02:00
Laurent Destailleur	4d94327ead	Look and feel v8	2018-04-07 16:17:40 +02:00
Laurent Destailleur	d46a8eb8f0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/company.php	2018-04-07 12:30:30 +02:00
Laurent Destailleur	84426c69e3	Fix not not saved	2018-04-06 19:26:24 +02:00
Laurent Destailleur	77f2b137b5	FIX XSS	2018-04-06 19:23:41 +02:00
Laurent Destailleur	956fc2376d	FIX #8483	2018-04-06 12:27:55 +02:00
Regis Houssin	b43aca0f8d	Fix: use dol_string_nohtmltag instead (with strip_tags)	2018-04-06 08:52:02 +02:00
Regis Houssin	c5cf2e4d50	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2018-04-06 08:13:37 +02:00
Laurent Destailleur	2524a699eb	Standardize file name of lists	2018-04-06 00:36:52 +02:00
Laurent Destailleur	3dbe200163	Merge pull request #8497 from ruistrecht-alt/FIX_missing_closing_parentheses FIX: missing closing parentheses	2018-04-05 16:18:12 +02:00
Laurent Destailleur	28b00fc021	Merge pull request #8486 from hregis/develop_email Fix: avoid space in email address	2018-04-05 13:12:03 +02:00
florian HENRY	cc0fb830b8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser	2018-04-05 10:53:17 +02:00
Rui Strecht	09f8a21773	Argument should be array	2018-04-02 15:30:19 +01:00
Rui Strecht	b39f617863	Added missing parentheses	2018-04-02 15:29:58 +01:00
Regis Houssin	edaa558ef7	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2018-04-01 11:50:16 +02:00
Laurent Destailleur	43f8834b28	Uniformize code with the new module builder framework	2018-03-31 18:48:27 +02:00
Regis Houssin	8c610904ac	Fix: remove multi spaces	2018-03-30 07:36:23 +02:00
Regis Houssin	546f3f8b96	Fix: avoid space in email address	2018-03-30 07:19:42 +02:00
Regis Houssin	0e4d796f88	Fix: more complete	2018-03-29 18:47:53 +02:00
Regis Houssin	443ffe3150	Fix: remove html tags and decode html entities	2018-03-29 17:51:23 +02:00
Laurent Destailleur	ff505ba148	Work on a page dedicated for external frontend (mobile, ...)	2018-03-29 11:34:01 +02:00
Laurent Destailleur	26e2d3c4f0	Clean permissions tables	2018-03-26 16:35:50 +02:00
Laurent Destailleur	9f11cf77df	Merge ticket css in main css	2018-03-26 15:45:56 +02:00
florian HENRY	ffbeb17ec2	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser	2018-03-25 17:19:27 +02:00
Laurent Destailleur	852191010a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2018-03-25 15:29:11 +02:00
Regis Houssin	f330c5ad32	Fix: better compatibility	2018-03-23 10:52:10 +01:00
Regis Houssin	715852569b	NEW add printUserListWhere hook	2018-03-23 10:42:36 +01:00
Regis Houssin	9cf66e53f6	Fix: wrong module name	2018-03-22 16:39:47 +01:00
florian HENRY	4ebb138533	last ones	2018-03-21 23:03:22 +01:00
florian HENRY	487ef3b7c9	cealn again	2018-03-21 23:01:20 +01:00
florian HENRY	c8d309e599	clean	2018-03-21 23:00:33 +01:00
florian HENRY	dc6f4c1f4d	NEW : option to send email to salaries	2018-03-21 11:48:30 +01:00
Laurent Destailleur	7948359bf7	Unlink picto differs from delete picto	2018-03-19 19:08:35 +01:00
Laurent Destailleur	c962b89495	NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull	2018-03-15 20:46:55 +01:00
Laurent Destailleur	7e6ba51780	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/projet/tasks/comment.php	2018-03-07 13:06:29 +01:00
Laurent Destailleur	ee1a2c49fd	Merge pull request #8287 from hregis/7.0_bug3 Fix: problem to see users with transverse mode	2018-03-07 12:38:00 +01:00
Laurent Destailleur	1ca5c7083a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formother.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2018-03-07 11:54:48 +01:00
Laurent Destailleur	a0a9e12178	Fix css	2018-03-07 11:29:50 +01:00
Regis Houssin	bf4402eb89	Fix: missing superadmin	2018-03-06 19:22:59 +01:00
Regis Houssin	175971bfc1	Fix: syntax error	2018-03-06 19:12:18 +01:00
Regis Houssin	d406b28911	Fix: problem to see users with transverse mode	2018-03-06 19:08:39 +01:00
BENKE Charlene	76d8bd517d	Optimise SQL squery Just a suppress a table and fields not needed	2018-03-05 08:45:40 +01:00
Laurent Destailleur	75962f5ed1	Merge pull request #8234 from hregis/7.0_entity Fix: multicompany transverse mode is managed by the module	2018-03-02 17:43:47 +01:00
Laurent Destailleur	04934cc4aa	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/functions.lib.php htdocs/projet/tasks/time.php	2018-02-27 19:18:43 +01:00
Laurent Destailleur	0cc84ab92f	FIX Missing restore_lastsearch_values	2018-02-26 21:21:28 +01:00
Laurent Destailleur	3c552cec15	FIX Missing restore_lastsearch_values	2018-02-26 21:16:40 +01:00
Laurent Destailleur	41638e6dff	Fix back link of look and feel v7	2018-02-26 09:20:05 +01:00
Regis Houssin	60525b9c18	Fix: multicompany transverse mode is managed by the module	2018-02-25 15:35:41 +01:00
Laurent Destailleur	003827eb06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 15:01:19 +01:00
Laurent Destailleur	0262b64eb1	Merge pull request #8230 from hregis/7.0_bug4 Fix: missing hook parameters	2018-02-25 12:56:43 +01:00
Laurent Destailleur	8dceb8930f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/class/html.formactions.class.php htdocs/user/card.php	2018-02-25 12:41:17 +01:00
Regis Houssin	b216249214	Fix: missing hook parameters	2018-02-24 15:01:29 +01:00
Marc de Lima Lucio	36cc1c6ca9	FIX: solve column mismatch in user card's usergroup list + code cleanup	2018-02-23 11:59:22 +01:00
Laurent Destailleur	b4446764f8	Clean code of deprecated usage	2018-02-21 14:48:25 +01:00
Laurent Destailleur	c4130730cb	Clean code around fetch_optionals()	2018-02-20 19:38:18 +01:00
Laurent Destailleur	eccdc9a075	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php htdocs/langs/pt_PT/companies.lang	2018-02-08 15:20:24 +01:00
Regis Houssin	70a65b89eb	Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_bug	2018-02-08 08:52:45 +01:00
Laurent Destailleur	413331c7dd	Fix travis	2018-02-07 15:54:58 +01:00
Laurent Destailleur	852c4fc033	Fix context of filter not lost	2018-02-07 12:08:25 +01:00
Regis Houssin	8b7f40e15b	Fix: wrong id name	2018-02-06 19:29:16 +01:00
Laurent Destailleur	5e7d172a58	Fix look and feel v7 on ref popup	2018-02-06 19:16:15 +01:00
Laurent Destailleur	ae1641f4b9	Merge pull request #8063 from Alabate/develop NEW : Add password_hash as hash algorithm	2018-01-26 18:01:13 +01:00
Laurent Destailleur	d796f403a9	Fix sender email when sending a password remind	2018-01-24 15:43:55 +01:00
Laurent Destailleur	f1b63d7cbf	Fix css	2018-01-23 09:00:03 +01:00
Laurent Destailleur	c969d58907	Clean code	2018-01-22 23:51:24 +01:00
Laurent Destailleur	d1365c2492	Fix trackid	2018-01-22 17:15:44 +01:00
Aurélien Labate	8088d92bbb	NEW Add password_hash as hash algorithm	2018-01-15 00:33:25 +01:00
Laurent Destailleur	aad0da2513	Fix maxi debug of APIs (clean output fields)	2017-12-21 16:50:18 +01:00
Laurent Destailleur	d20062df73	Fix jquery css theme	2017-12-20 20:18:41 +01:00
Laurent Destailleur	731cb3f721	Fix editor of user signature	2017-12-19 17:00:40 +01:00
Laurent Destailleur	f504716501	Fix sync contact - external user	2017-12-19 16:16:31 +01:00
Laurent Destailleur	d4afb8300d	Fix several pb of duplicate functions in some cases	2017-12-19 00:15:22 +01:00
Laurent Destailleur	8e12551f17	Fix not employee must not appear on page to create salaries	2017-12-18 11:55:34 +01:00
Laurent Destailleur	9cdf322bfb	Fix scrutinizer bugs	2017-12-15 22:14:28 +01:00
Laurent Destailleur	5af153550d	Debug blockedlog: - Add a track into log when we disable/enable module - Add a protection to avoid disable of module when recording was started - Better compatibility with multicompany - Can filter on ref and amount - Add a permission to read the blockedlog - Add more information on payments/invoice/thirdparty into log - Reset of module data after a migration from v6 (not compatible)	2017-12-15 16:56:08 +01:00
Laurent Destailleur	af1028576d	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +01:00
Laurent Destailleur	f22e7ee24a	Fixes	2017-12-09 17:29:19 +01:00
Laurent Destailleur	df5768c176	Fix missing translation	2017-12-08 12:38:22 +01:00
Laurent Destailleur	e57c8f324d	Fix style	2017-12-02 14:57:27 +01:00
Laurent Destailleur	1ce155728f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/mailings/fraise.modules.php	2017-12-01 16:25:13 +01:00
Laurent Destailleur	ce32da6217	Fix debugs APIs	2017-12-01 15:39:18 +01:00
Laurent Destailleur	dbde97f25f	Update card.php	2017-11-29 15:07:09 +01:00
jfefe	d0ab117488	FIX : external user cannot be set as internal	2017-11-28 15:06:23 +01:00
florian HENRY	94285ae494	factorization of extrafeild into list	2017-11-27 15:24:29 +01:00
Laurent Destailleur	7d3325c087	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/dolibarr_changes.txt htdocs/user/class/api_users.class.php	2017-11-25 13:17:38 +01:00
Laurent Destailleur	77509ee37a	Removed deprecated apis	2017-11-25 13:14:28 +01:00
Laurent Destailleur	4cbcf5189a	FIX #7806	2017-11-25 01:24:24 +01:00
Laurent Destailleur	38c770ffb3	FIX #7806	2017-11-25 01:16:12 +01:00
Laurent Destailleur	836f6bf3c9	Fix search filter when using extrafields 'links'	2017-11-12 12:39:23 +01:00
Laurent Destailleur	cb03b2f307	NEW Can sort joined files on thirdparty and user card.	2017-11-10 18:14:29 +01:00
Regis Houssin	ef44dfc472	Fix: move transversal mode management in multicompany module	2017-11-04 15:40:35 +01:00
Laurent Destailleur	1b28c45e2c	PERF Links in getNomUrl use only one tag a instead of 2.	2017-11-02 15:19:14 +01:00
Regis Houssin	19f1cd7787	Fix: move some check in multicompany module	2017-11-02 13:16:00 +01:00
Laurent Destailleur	d569218162	Fix 'separate' extrafields must be visible by default. Sandardize name of list pages (must end with _list.php)	2017-10-29 11:23:20 +01:00
Laurent Destailleur	00db7e16ec	Clean code	2017-10-28 16:00:07 +02:00
Laurent Destailleur	202712be94	Work on module builder	2017-10-25 22:02:07 +02:00
Laurent Destailleur	9f0f5eb5e8	Fix translation of extrafields type	2017-10-24 18:05:43 +02:00
Laurent Destailleur	f4f47c6732	NEW Remove tooltip tipTip library replaced with standatd jquery tooltip	2017-10-22 21:15:08 +02:00
Laurent Destailleur	c6e5115d34	Set default limit to 100 on all rest api that list	2017-10-22 15:42:19 +02:00
Laurent Destailleur	4247038d01	Add phpunit test	2017-10-22 13:06:27 +02:00
Laurent Destailleur	475db3172a	NEW Remove js library fileupload that was not used by core code.	2017-10-21 19:40:17 +02:00
Laurent Destailleur	5c189449e1	Move default value for user expense report on tab expense report	2017-10-20 17:02:26 +02:00
Laurent Destailleur	d82af57b57	NEW Add tab "Expense report" on user card	2017-10-19 20:56:23 +02:00
Laurent Destailleur	f1a0e13718	Merge pull request #7646 from atm-maxime/new_hrm_detailed_user NEW hrm details output on user	2017-10-19 19:21:29 +02:00
Laurent Destailleur	7f85d73001	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/card.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/contrat/card.php htdocs/expensereport/card.php htdocs/fichinter/list.php htdocs/fourn/commande/card.php htdocs/fourn/commande/list.php htdocs/fourn/facture/card.php htdocs/fourn/paiement/card.php htdocs/livraison/card.php htdocs/modulebuilder/template/myobject_list.php htdocs/societe/rib.php htdocs/supplier_proposal/list.php htdocs/user/card.php	2017-10-18 19:51:29 +02:00
Laurent Destailleur	8626d6279a	Fix perm to delete files	2017-10-18 17:21:30 +02:00
Maxime Kohlhaas	9875d1b7cc	Missing comments	2017-10-17 19:46:06 +02:00
Maxime Kohlhaas	25fa7d0564	New : add salaries, expense reports and leave requests in HRM tab of user card	2017-10-16 21:42:57 +02:00
Maxime Kohlhaas	f7cadfbed1	Fix function declaration	2017-10-16 21:42:24 +02:00
Laurent Destailleur	4296df45af	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/projet/list.php htdocs/user/card.php	2017-10-13 22:01:56 +02:00
Laurent Destailleur	5f021990b4	Code comment	2017-10-13 17:46:16 +02:00
Scrutinizer Auto-Fixer	165741517e	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-13 11:28:26 +00:00
Laurent Destailleur	8c5cf9ea45	Fix date output	2017-10-12 18:04:47 +02:00
Laurent Destailleur	33624e1001	NEW Attaching doc automatically in email is now a parameter of template.	2017-10-08 16:34:42 +02:00
Scrutinizer Auto-Fixer	328d39bc71	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-07 11:09:31 +00:00
Laurent Destailleur	4bc7eb0ec1	Merge pull request #7520 from hregis/develop_ldap Fix: Set LDAP password when LDAP key changed	2017-10-06 13:09:28 +02:00
Laurent Destailleur	06b18a740e	NEW Add date of birth on user card. NEW Show expected worked hours on the timesheet form.	2017-10-06 12:08:01 +02:00
Laurent Destailleur	801a5180d6	Fix scrutinizer bug reports	2017-10-06 01:16:19 +02:00
Regis Houssin	723bc4d436	NEW add ldap_rename for avoid password if ldap key changed	2017-10-04 11:22:41 +02:00
Regis Houssin	feea6246c2	NEW add possibility to hide LDAP tab for non admin	2017-10-04 09:13:41 +02:00
Regis Houssin	8d3ad9ddc8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-10-04 08:43:07 +02:00
Laurent Destailleur	a501a20487	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
gauthier	8f969d61e2	FIX : invalid foreach protection	2017-10-02 09:23:04 +02:00
Regis Houssin	475c881e67	Fix: add missing ldap fields	2017-10-02 09:00:07 +02:00
Regis Houssin	c1b6f59c1b	Fix: restore possible ldap keys	2017-10-02 08:43:53 +02:00
Laurent Destailleur	88554a74a9	Merge pull request #7532 from AXeL-dev/develop Fix: payment form & user first/last name position	2017-10-02 00:37:35 +02:00
AXeL-dev	f7dcf1ca45	FIX: wrong user first name/last name position in user tooltip	2017-10-01 18:35:06 +01:00
Laurent Destailleur	3ddd5d3d3a	The default value feature is sensitive to url parameters.	2017-10-01 14:54:17 +02:00
Regis Houssin	cb9d627f02	Fix: Set LDAP password when LDAP key changed	2017-09-30 11:51:22 +02:00
Regis Houssin	46cc23c568	Fix: $this->pass is empty if DATABASE_PWD_ENCRYPTED is used	2017-09-30 10:41:35 +02:00
Laurent Destailleur	f007f9e7e5	NEW Add new property visible dy default on lists on extrafields	2017-09-29 13:26:44 +02:00
Laurent Destailleur	d7dd6ed334	Fix undefined var	2017-09-26 16:15:22 +02:00
Regis Houssin	92ff974c5b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-25 06:47:34 +02:00
Laurent Destailleur	e3da4188e2	GETPOST must not clean data for text input.	2017-09-25 00:16:52 +02:00
Regis Houssin	f550e27579	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-18 12:15:01 +02:00
Laurent Destailleur	291a0d46e6	Fix edit of categories	2017-09-18 01:39:39 +02:00
Regis Houssin	bdc425c203	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-16 21:41:55 +02:00
Regis Houssin	87b81fb2fd	NEW add members types ldap group management	2017-09-16 21:41:30 +02:00
Laurent Destailleur	a8b4d216e5	Fix PHPCS	2017-09-15 23:21:42 +02:00
Regis Houssin	7f57f737b3	New: Ping ldap server before ldap_connect for avoid waiting	2017-09-15 18:02:52 +02:00
tysauron	4f15c90aee	Pour ne pas charger les membres d'un groupe lorsque l'on charge les groupe d'un user (sinon avec 200 user et 30 groupes = 6000 objects . trop lourd)	2017-09-15 12:58:13 +02:00
Laurent Destailleur	0873260b8a	USe second parameter in GETPOST	2017-09-15 10:50:50 +02:00
Laurent Destailleur	8f5206accf	NEW The lot of a product uses the link and picto when shown into list.	2017-09-15 10:45:41 +02:00
Laurent Destailleur	149ab80b3a	The event array of an object is visible even if no event yet recorded.	2017-09-13 14:18:36 +02:00
Laurent Destailleur	cf56da8102	NEW Default filter and sort order can use partial list of query parameters to set the qualified URLs.	2017-09-11 00:02:52 +02:00
Laurent Destailleur	259cca0230	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/dict.php htdocs/admin/mails_templates.php	2017-09-08 13:30:54 +02:00
Laurent Destailleur	bde293af22	Fix filter on extrafield with type sellist	2017-09-07 15:34:25 +02:00
Laurent Destailleur	cff9ff01c8	Better disconnect with exotic connection mode	2017-09-07 13:30:18 +02:00
Laurent Destailleur	a60cd49fb0	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_sendmails.inc.php htdocs/core/class/CMailFile.class.php htdocs/filefunc.inc.php	2017-08-28 12:53:02 +02:00
Regis Houssin	0ce51fcb87	Fix: add resprint for passwordforgotten	2017-08-28 09:14:50 +02:00
Laurent Destailleur	c573df4f0e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/card.php	2017-08-26 22:33:56 +02:00
Laurent Destailleur	7030d0d596	Add combo on ldap selection	2017-08-25 15:04:55 +02:00
Laurent Destailleur	da34ea6b11	FIX field entity "edit" and "view" was in hook but not "create".	2017-08-25 13:31:55 +02:00
Laurent Destailleur	fa752348c8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/various_payment/index.php htdocs/contact/list.php htdocs/langs/en_US/errors.lang	2017-08-02 17:56:09 +02:00
Laurent Destailleur	5b1f5b0f20	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
Laurent Destailleur	b6a7ce6822	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-01 10:22:37 +02:00
Laurent Destailleur	97e694f4d9	Fix look and feel v6	2017-07-31 12:43:07 +02:00
Laurent Destailleur	612ab65b72	Fix by adding a MULTICOMPANY_BACKWARD_COMPATIBILITY option.	2017-07-31 06:01:05 +02:00
atm-ph	1f3f9e40b1	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report	2017-07-27 16:01:53 +02:00
Regis Houssin	c934f1bd13	Fix: remove unused old code	2017-07-23 12:07:20 +02:00
Laurent Destailleur	0763d15b4c	Debug journalization Debug edition of user BAN.	2017-07-15 12:37:31 +02:00
Laurent Destailleur	f106ff7e76	Fix var init	2017-07-13 23:52:02 +02:00
Laurent Destailleur	ae7797ebf2	Look and feel v6	2017-07-13 14:43:41 +02:00
Laurent Destailleur	85d9a2f790	Merge pull request #7145 from hregis/6.0_bug2 Fix: missing group name with dol_banner_tab	2017-07-13 14:36:17 +02:00
Laurent Destailleur	2870798d07	Fix remove warnings	2017-07-13 00:35:10 +02:00
Regis Houssin	d63e15f0c6	Fix: missing group name with dol_banner_tab	2017-07-12 15:52:58 +02:00
phf	b8865c425f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report	2017-07-05 10:48:01 +02:00
phf	1beec51928	New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE	2017-07-05 10:44:52 +02:00
Laurent Destailleur	63dcdc3a03	Fix API was loading definition of all APIs at each call.	2017-06-25 17:09:08 +02:00
Laurent Destailleur	bb2d27280b	Fix sort link must be disabled for computed field	2017-06-19 14:31:08 +02:00
Laurent Destailleur	86a6a83647	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/admin/tools/index.php htdocs/bookmarks/bookmarks.lib.php htdocs/compta/facture.php htdocs/core/tpl/passwordforgotten.tpl.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/main.inc.php htdocs/product/stats/card.php htdocs/public/paypal/paymentko.php	2017-06-18 21:13:48 +02:00
Laurent Destailleur	abe736c6a6	Escape hml tags	2017-06-18 19:42:59 +02:00
Regis Houssin	d1b003f3c4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-17 12:01:14 +02:00
Laurent Destailleur	5b7a8e9c90	Fix missing signature when sending email from user card	2017-06-17 10:17:36 +02:00
Regis Houssin	f0e234eef2	Fix: missing hookmanager init	2017-06-16 17:01:43 +02:00
Laurent Destailleur	faabdd3f99	Missing filter field	2017-06-14 11:34:35 +02:00
Laurent Destailleur	00bf4bba13	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/index.php	2017-06-14 10:54:34 +02:00
Laurent Destailleur	b889db997a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture.php htdocs/core/datepicker.php htdocs/core/get_menudiv.php htdocs/core/menus/standard/auguria.lib.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/search_page.php htdocs/main.inc.php htdocs/master.inc.php htdocs/product/list.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php htdocs/user/card.php htdocs/user/index.php	2017-06-14 10:48:34 +02:00
Laurent Destailleur	848f70e026	Fix bad merge	2017-06-14 10:38:34 +02:00
Laurent Destailleur	7939daa225	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/core/lib/functions.lib.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php htdocs/user/index.php	2017-06-14 10:18:24 +02:00
Laurent Destailleur	9b979e3cb7	Fix wrong warning when user is disabled	2017-06-13 13:44:18 +02:00
Laurent Destailleur	a96362e2f9	Fix #formmailbeforetitle not supported everywhere	2017-06-11 11:40:01 +02:00
Laurent Destailleur	e93cefbbf0	FIX #6985	2017-06-11 10:37:58 +02:00
Laurent Destailleur	d037515e37	FIX SQL injection on user/index.php parameter search_statut. Conflicts: htdocs/user/index.php	2017-06-10 20:10:57 +02:00
Laurent Destailleur	7c0de18ac1	Fix code comment	2017-06-10 12:56:28 +02:00
Laurent Destailleur	884c6c674d	Fix css	2017-06-09 20:08:23 +02:00
Laurent Destailleur	1af74b4c42	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/skeletons/skeleton_list.php htdocs/admin/perms.php htdocs/core/class/commonobject.class.php htdocs/core/class/hookmanager.class.php htdocs/core/lib/files.lib.php htdocs/product/class/product.class.php htdocs/product/class/service.class.php htdocs/product/index.php htdocs/product/list.php htdocs/public/members/new.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-06-09 12:50:56 +02:00
Laurent Destailleur	41586b76c0	Fix missing css	2017-06-09 11:40:35 +02:00
Laurent Destailleur	b441c62e1d	Fix syntax error	2017-06-08 14:55:12 +02:00
Laurent Destailleur	b1f93ccb0c	Fix security	2017-06-08 14:33:46 +02:00
Laurent Destailleur	543630e487	Fix missing count of nb of columns into lists	2017-06-08 14:14:06 +02:00
Laurent Destailleur	7587a3d592	Merge branch 'develop' into develop_transverse	2017-06-08 10:25:04 +02:00
Regis Houssin	b183c6e7ac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse	2017-06-07 20:23:24 +02:00
Regis Houssin	2b36135641	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-07 20:14:03 +02:00
Laurent Destailleur	1820649175	Maxi debug of v6	2017-06-07 19:28:31 +02:00
Regis Houssin	b66da3d148	New: big refactorization of multicompany transverse mode	2017-06-06 10:23:33 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
Laurent Destailleur	c71488e58b	Removed deprecated code	2017-05-29 15:09:13 +02:00
Laurent Destailleur	e667d72547	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/skeletons/build_class_from_table.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php	2017-05-29 10:41:51 +02:00
Laurent Destailleur	4a330af4bf	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-05-29 10:15:30 +02:00
Laurent Destailleur	aa0a369f06	Fix typo	2017-05-29 10:15:10 +02:00
Laurent Destailleur	70636cc59f	FIX SQL injection on user/index.php parameter search_statut.	2017-05-29 09:59:21 +02:00
Laurent Destailleur	160eb194ea	Clean REST response for user and third parties	2017-05-24 15:24:35 +02:00
Regis Houssin	a3d8da0a73	Fix: wrong SPECIMEN value	2017-05-24 11:30:11 +02:00
Laurent Destailleur	f5e29d6c86	Fix phpcs warning	2017-05-22 10:45:02 +02:00
Laurent Destailleur	b3dc73e611	Look and feel v6	2017-05-21 02:43:51 +02:00
Laurent Destailleur	4e7353f8a0	Clean code	2017-05-19 13:39:00 +02:00
Laurent Destailleur	aec4cef5de	Clean some code for type of event deprecated since 3.3	2017-05-19 12:58:38 +02:00
Laurent Destailleur	7dbe3b1da9	Merge pull request #6843 from aspangaro/6.0-multijournal Fix : Sql error on salaries index for accountancy multijournal + debug	2017-05-18 17:45:21 +02:00
Laurent Destailleur	b0f0285137	Standardize code	2017-05-16 21:29:18 +02:00
Laurent Destailleur	68e333879f	Fix var not sanitized	2017-05-16 13:27:32 +02:00
Laurent Destailleur	b29d0385e6	NEW Can send an email to a user from its card.	2017-05-15 00:15:56 +02:00
Alexandre SPANGARO	4dc7d5cd8d	Fix : tooltip on bank in customer invoice card	2017-05-14 21:20:35 +02:00
Laurent Destailleur	fa290c34fa	Fix against SQL injection. Add phpunit to detect missing escapement.	2017-05-12 16:55:11 +02:00
Laurent Destailleur	e5c898e0d6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog build/makepack-dolibarr.pl htdocs/fichinter/list.php htdocs/product/list.php htdocs/projet/tasks/list.php	2017-05-10 00:48:27 +02:00
Laurent Destailleur	6d01bd712d	FIX Better sanitizing of search all parameter.	2017-05-09 19:36:10 +02:00
Laurent Destailleur	081d0e7ec2	Debug module RH. Edition of user bank account is ok.	2017-05-09 11:09:21 +02:00
Laurent Destailleur	63259295c6	Look and feel v6	2017-05-09 10:41:03 +02:00
Laurent Destailleur	910a925167	NEW Add last activation author and ip of modules	2017-05-06 20:43:14 +02:00
Laurent Destailleur	44bdf91715	Add badge with nb of imported calendard on user tab	2017-05-06 12:43:45 +02:00
Laurent Destailleur	d53654e64f	Look and feel v6	2017-05-05 20:45:06 +02:00
Laurent Destailleur	983c72c918	Look and feel v6	2017-04-29 14:55:23 +02:00
Laurent Destailleur	defce63a24	Work on management of default values	2017-04-28 14:05:28 +02:00
Laurent Destailleur	4c056d68d8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/dict.php htdocs/commande/list.php htdocs/core/class/html.form.class.php htdocs/langs/en_US/bills.lang htdocs/societe/list.php	2017-04-15 17:02:05 +02:00
Laurent Destailleur	5931bc4068	NEW Feature to crop/resize images available on user and expense reports	2017-04-14 13:53:39 +02:00
Laurent Destailleur	846204bdb4	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 13:02:29 +02:00
Laurent Destailleur	c52f4644e1	Look and feel v6	2017-04-14 13:00:39 +02:00
Laurent Destailleur	aabfc2f0db	Perf. Do not load personal conf of user by default.	2017-04-14 12:52:32 +02:00
Laurent Destailleur	4818b1ba44	Load default values into $user->default_values	2017-04-14 12:39:11 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
Laurent Destailleur	26a9999fbf	Support of preview for pdf with several pages	2017-04-12 11:38:55 +02:00
Laurent Destailleur	2446cb5431	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/compta/facture.php htdocs/compta/facture/fiche-rec.php htdocs/contact/list.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/facture/card.php htdocs/societe/list.php htdocs/user/document.php	2017-04-11 11:43:54 +02:00
Marcos García de La Fuente	74f0ae5bbb	FIX #6623 User card shows "Return to list" link even if the user has no rights to list users Close #6623	2017-04-09 14:09:33 +02:00
Laurent Destailleur	56a4b7a1fd	Work on v6 look and feel	2017-04-08 14:03:38 +02:00
Laurent Destailleur	be439f6252	Work on look and feel v6	2017-04-07 16:16:44 +02:00
Laurent Destailleur	e2ea5945dd	Work on look and feel v6	2017-04-06 21:48:28 +02:00
Laurent Destailleur	d99b0461c7	Extrafields multilanguage support.	2017-04-03 10:56:28 +02:00
Laurent Destailleur	4902df7e3f	Work on look and feel v6	2017-04-02 19:28:38 +02:00
Laurent Destailleur	ed89852807	Work on look and feel v6	2017-04-01 13:49:17 +02:00
Laurent Destailleur	7254b54a04	Work on 6.0 look and feel	2017-04-01 00:49:06 +02:00
Laurent Destailleur	01a74a8d23	Work on 6.0 look and feel	2017-03-31 17:41:20 +02:00
Laurent Destailleur	979bcd3a9b	NEW Can add a background image on login page	2017-03-31 11:40:31 +02:00
Laurent Destailleur	da1427ef54	Work on 6.0 look and feel	2017-03-30 16:10:08 +02:00
Laurent Destailleur	4df8dcf980	Work on module modBlockedLog and modModuleBuilder	2017-03-29 21:50:15 +02:00
Laurent Destailleur	fec3a89aa5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-23 11:38:46 +01:00
Laurent Destailleur	0a35d17207	CSS enhancement	2017-03-23 10:59:13 +01:00
Laurent Destailleur	9abe0940e7	Fix bad use of showLinkedObjectBlock	2017-03-21 11:42:02 +01:00
Laurent Destailleur	4831fb4dcb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/class/adherent.class.php htdocs/filefunc.inc.php	2017-03-19 11:26:49 +01:00
arnaud	192a825de8	NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class	2017-03-14 09:25:29 +01:00
Regis Houssin	017d73792c	Fix: add md5 password for OpenLdap	2017-03-13 15:00:44 +01:00
arnaud	a796a321cc	Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects Conflicts: htdocs/core/class/html.formfile.class.php htdocs/product/admin/product.php htdocs/product/card.php	2017-03-10 12:16:55 +01:00
arnaud	4a7e3fb387	NEW odt usergroup	2017-03-08 11:34:21 +01:00
Laurent Destailleur	28ad50e059	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/langs/de_DE/bills.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/main.lang htdocs/langs/fr_FR/suppliers.lang	2017-03-03 14:31:35 +01:00
arnaud	abeba95de9	New USER odt	2017-03-02 15:13:42 +01:00
Laurent Destailleur	3c54cb5ba9	Fix avoid trigger during migration	2017-02-28 20:55:14 +01:00
Laurent Destailleur	372cb40cf9	The trigger USER_SETINGROUP and USER_REMOVEFROMGROUP has been replaced with trigger USER_MODIFY	2017-02-28 12:10:45 +01:00
Laurent Destailleur	9648f20a2e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-28 12:08:41 +01:00
Laurent Destailleur	59d2943d8d	Fix context must be provided to triggers using ->context no a dedicated property.	2017-02-28 12:07:05 +01:00
Laurent Destailleur	40b412728f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-28 11:49:10 +01:00
Laurent Destailleur	43a6366f1b	Fix security audit was not triggered.	2017-02-28 11:48:46 +01:00
Laurent Destailleur	9928f943a7	Remove hook that is duplicate code with trigger.	2017-02-28 11:40:04 +01:00
Laurent Destailleur	a71541e6de	Fix duplicate code	2017-02-28 11:16:07 +01:00
Laurent Destailleur	fb88eaf2a4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-02-23 02:55:50 +01:00
Laurent Destailleur	e981e719a1	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/comm/action/card.php	2017-02-23 02:54:40 +01:00
Laurent Destailleur	cbb80e6727	Fixfield at wrong place	2017-02-22 00:08:52 +01:00
Laurent Destailleur	32678015c9	FIX protection against infinite loop on hierarchy	2017-02-21 23:52:13 +01:00
Laurent Destailleur	a0873bad29	Fix TZ	2017-02-21 11:34:22 +01:00
Laurent Destailleur	eb70d6eea1	Debug of feature for browser notifications	2017-02-14 18:20:01 +01:00
De Coninck Laurent	294517a8e0	use already existing variable	2017-02-13 16:49:10 +01:00
Laurent Destailleur	868f2e5473	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/tools/update.php htdocs/core/lib/functions.lib.php	2017-02-13 01:36:02 +01:00
Laurent Destailleur	abffd29179	Try a fix for #6334 , #6416	2017-02-12 20:55:54 +01:00
De Coninck Laurent	b356c34dc4	[mail; password; forgotten][#6334 ] - Fix mail url Fix the mail url on password generation	2017-02-12 17:22:06 +01:00
Laurent Destailleur	70091eceed	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/expensereport/card.php	2017-01-27 01:26:11 +01:00
Laurent Destailleur	65f493ac41	Merge pull request #6321 from hregis/5.0_bug Fix: avoid numeric errors	2017-01-27 00:27:47 +01:00
Laurent Destailleur	053afe21dd	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/class/user.class.php	2017-01-26 23:40:16 +01:00
Laurent Destailleur	ca79d0c274	Fix PHPCS	2017-01-26 23:36:58 +01:00
Laurent Destailleur	c1b59b1950	Fix several security bugs on expense report	2017-01-26 18:08:00 +01:00
Regis Houssin	7980f1c999	Fix: avoid php non-numeric errors	2017-01-23 12:29:05 +01:00
Regis Houssin	0479fdb0a2	Fix: avoid non-numeric error	2017-01-23 12:25:39 +01:00
Laurent Destailleur	39151d7a74	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-22 12:14:18 +01:00
Laurent Destailleur	65f7de8f64	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
Laurent Destailleur	9a5670787f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-21 12:26:50 +01:00
Laurent Destailleur	fc4aa96cd7	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/core/class/extrafields.class.php htdocs/fichinter/card.php htdocs/fourn/commande/dispatch.php	2017-01-20 21:02:05 +01:00
Laurent Destailleur	412be59f78	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-01-20 12:09:39 +01:00
Laurent Destailleur	bb95f139a8	Fix responsive	2017-01-17 20:04:41 +01:00
Laurent Destailleur	fdbe4051f1	FIX #6230	2017-01-16 12:54:51 +01:00
Laurent Destailleur	da64d4d398	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-16 10:58:45 +01:00
Laurent Destailleur	d2b766f9f4	Fix PHP 7.1	2017-01-16 10:17:25 +01:00
arnaud	b813144edb	NEW generation ODT	2017-01-06 16:44:09 +01:00
Laurent Destailleur	088a948e5a	Merge pull request #6220 from gnovaro/patch-2 Var to public	2016-12-31 17:26:40 +01:00
Laurent Destailleur	b5c815367c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-26 15:44:31 +01:00
Gustavo Novaro	3557e4eb37	Var to public	2016-12-23 12:40:13 -03:00
Laurent Destailleur	9e44eb0d15	Fix return code REST similar for all api with POST	2016-12-23 02:08:22 +01:00
Gustavo Novaro	3542364da8	var to public Improve code style to current php practices	2016-12-20 17:11:50 -03:00
Laurent Destailleur	78bf209119	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-18 02:21:57 +01:00
Laurent Destailleur	60b8582aa9	Fix more then 30 security defects	2016-12-18 01:44:26 +01:00
Laurent Destailleur	bfb628dab6	Code comment	2016-12-12 15:37:39 +01:00
Laurent Destailleur	6c4f15df63	Fix lot of fix in css look to match v5 rules.	2016-12-11 16:11:42 +01:00
BENKE Charlie	f2eb73a101	Update info.php	2016-12-10 23:32:01 +01:00
BENKE Charlie	5bc3107c5d	Update note.php	2016-12-10 23:30:31 +01:00
BENKE Charlie	35107f1dbf	bad number rights on badge tabs	2016-12-10 23:29:43 +01:00
Laurent Destailleur	2938e01fdd	Fix a delete must be done after a fetch	2016-12-07 19:16:33 +01:00
Laurent Destailleur	3abeee2d7d	Code comment	2016-12-07 13:38:53 +01:00
Laurent Destailleur	761a795294	Maxi debug on REST APIs	2016-12-05 13:31:29 +01:00
Laurent Destailleur	ccba387691	Fix Responsive design	2016-11-27 20:18:10 +01:00
Laurent Destailleur	2c9edd4205	Maxi debug on list. Fix responsive design.	2016-11-27 13:49:46 +01:00
Laurent Destailleur	16ce156631	Fix responsive design	2016-11-25 18:32:52 +01:00
Laurent Destailleur	5acd09b2d5	Fix require_once instead of require.	2016-11-24 17:03:18 +01:00
Laurent Destailleur	5ebb86c45a	FIX #6022	2016-11-22 20:24:42 +01:00
Laurent Destailleur	dd27a52a85	Fix several problems on new REST API on project/tasks	2016-11-19 16:08:27 +01:00
Laurent Destailleur	348e004da6	Minor fixes in css	2016-11-12 16:39:08 +01:00
Laurent Destailleur	360d697fc3	Add missing field to store result of email sending	2016-11-11 13:45:18 +01:00
Laurent Destailleur	b20c4bdfe4	Responsive design	2016-11-11 12:55:03 +01:00
Laurent Destailleur	eaa2125373	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/projet/card.php htdocs/projet/class/project.class.php htdocs/projet/list.php	2016-11-10 11:40:39 +01:00
Laurent Destailleur	c45c24f80c	FIX Must use external link into a forged email content.	2016-11-08 23:18:43 +01:00
Laurent Destailleur	7fa9692458	Uniformize code. Generalize option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE.	2016-11-02 12:48:50 +01:00
Laurent Destailleur	220d81b350	Fix duplicate tooltips	2016-10-28 17:43:29 +02:00
Laurent Destailleur	43bf372cf7	Fix doxygen	2016-10-25 21:15:25 +02:00
Laurent Destailleur	f67863e1aa	NEW Can use any filter on all REST API to list.	2016-10-25 19:15:47 +02:00
Laurent Destailleur	aad4380689	Uniformise code	2016-10-24 20:52:21 +02:00
aspangaro	06c70e5a15	Better presentation for user edit card	2016-10-22 06:42:45 +02:00
Laurent Destailleur	287f9972a8	Merge branch 'new_no_default_rights' of https://github.com/atm-maxime/dolibarr into atm-maxime-new_no_default_rights Conflicts: htdocs/langs/en_US/admin.lang	2016-09-30 13:04:14 +02:00
Laurent Destailleur	e99f115a8f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/tables/llx_user.sql	2016-09-28 19:49:36 +02:00
Laurent Destailleur	2d6877ac67	Add tables to store working employee contracts	2016-09-28 19:33:51 +02:00
arnaud	f7bb7df6c7	FIX code	2016-09-28 11:23:00 +02:00
arnaud	c904b8030c	Merge branch 'NEW_user_date_employment' of github.com:atm-arnaud/dolibarr into HEAD Conflicts: htdocs/langs/en_US/users.lang	2016-09-27 15:25:29 +02:00
arnaud	b717d530cd	NEW User date of employment added	2016-09-27 15:16:16 +02:00
Laurent Destailleur	d39d7d92c9	Uniformize code.	2016-09-26 02:13:58 +02:00
Laurent Destailleur	6cae631a4f	NEW Add REST API to read users	2016-09-19 02:13:16 +02:00
Laurent Destailleur	2acce85fab	NEW Pagination available on list of users	2016-09-12 21:32:27 +02:00
Laurent Destailleur	9ff1809f85	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contrat/list.php htdocs/expedition/class/expedition.class.php htdocs/fourn/card.php htdocs/product/stock/class/productlot.class.php htdocs/theme/eldy/style.css.php	2016-09-12 02:05:38 +02:00
Laurent Destailleur	f8dbc1aa9f	Theme cleaner	2016-09-10 16:09:01 +02:00
Laurent Destailleur	3ecc82b770	Fix error message not reported	2016-09-10 13:00:31 +02:00
Laurent Destailleur	7d056f6857	NEW Use small photo of user on all user links	2016-09-01 11:29:30 +02:00
Laurent Destailleur	b8201c9f86	Fix fk_soc can be null because we can set notification for users only.	2016-08-28 23:46:12 +02:00
Laurent Destailleur	851f8369cf	Fix padd right	2016-08-05 13:22:28 +02:00
Laurent Destailleur	9ca7f2cb66	Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by default).	2016-07-28 19:02:23 +02:00
Laurent Destailleur	8b3136cb96	Merge remote-tracking branch 'origin/4.0' into develop Conflicts: htdocs/compta/facture/list.php htdocs/langs/en_US/admin.lang htdocs/langs/fr_FR/companies.lang	2016-07-27 19:04:55 +02:00
Laurent Destailleur	38471f1670	Fix: use reposition	2016-07-27 17:29:27 +02:00
Laurent Destailleur	ee0c77a305	Merge branch 'refactor-rest-api' of https://github.com/EuskalMoneta/dolibarr into EuskalMoneta-refactor-rest-api Conflicts: htdocs/api/admin/explorer.php	2016-07-27 14:06:14 +02:00
Laurent Destailleur	3d2dc3c66e	NEW Each user can select its landing page.	2016-07-26 21:12:52 +02:00
Laurent Destailleur	548411a3fb	Merge pull request #5364 from tysauron/patch-7 FIX Simplification + get real DN of user from setup of key (multi d…	2016-07-20 19:15:41 +02:00
Laurent Destailleur	5a8c08e6cc	Merge pull request #5481 from defrance/patch-12 NEW Add hook "getnomurltooltip" to replace tooltips on getNomUrl functions	2016-07-20 18:23:35 +02:00
Laurent Destailleur	135bebd9a0	Sort of sent notification by date desc	2016-07-18 11:53:13 +02:00
BENKE Charlie	05b02e7bef	Update user.class.php	2016-07-16 18:05:58 +02:00
Laurent Destailleur	9ba1ca5acb	Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 Conflicts: htdocs/langs/en_US/companies.lang	2016-07-15 17:05:12 +02:00
Laurent Destailleur	da5228aaa9	Selection of fields ok for interventions	2016-07-06 10:28:34 +02:00
Laurent Destailleur	05384b2f88	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/facture/list.php htdocs/projet/card.php htdocs/societe/consumption.php	2016-07-01 02:39:29 +02:00
Maxime Kohlhaas	aa67a29115	FIX #4383 $userid not defined	2016-06-30 16:40:38 +02:00
Laurent Destailleur	8878c73732	Fix: link to other elements must be at end everywhere	2016-06-26 12:07:24 +02:00
Laurent Destailleur	d23a8a56ea	Fix must use the constant, not hard coded value.	2016-06-25 21:40:45 +02:00
Laurent Destailleur	09a868af3f	FIX: Sync of password must follow same rule 'crypted or not' on both sides (user and member)	2016-06-25 21:28:52 +02:00
Laurent Destailleur	f021a8ca31	FIX Bad error management into trigger of mailmanspip	2016-06-25 18:48:50 +02:00
Laurent Destailleur	2e4c6597d8	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/modules/expensereport/doc/pdf_standard.modules.php	2016-06-23 21:05:00 +02:00
florian HENRY	c67fa41298	FIX : Translate group perms as it is done into user perms	2016-06-23 16:29:06 +02:00
Xebax	e12e1980fc	REST API: Add comments in the @deprecated tags.	2016-06-22 10:43:35 +02:00
Xebax	70ba8ec78d	REST API: Bring back the existing API (for backward compatibility). Bring back the existing API and mark all the operations as deprecated. Both the existing and the new API are documented and browsable with the Restler API Explorer. The existing API appears under "root".	2016-06-22 10:08:54 +02:00
Xebax	6d67303501	REST API: move the definition of /contacts/{id}/createUser from api_users.class.php to api_contacts.class.php.	2016-06-20 17:56:33 +02:00
Xebax	396d31e18e	REST API: begin the refactoring. Simplify the code that looks for the API classes and replace the /contact/ and /user/ APIs by /contacts/ and /users/.	2016-06-20 17:56:33 +02:00
Laurent Destailleur	8187dc2006	Fix css	2016-06-19 16:07:34 +02:00
tysauron	9c63350831	Simplification + reprise du vrai DN de l'utilisateur (gestion multi domaine par exemple)	2016-06-16 23:39:59 +02:00
Laurent Destailleur	9019576394	Fix css class opacitymedium was not used everywhere.	2016-06-07 15:58:02 +02:00
Laurent Destailleur	9508de85af	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-06-04 18:37:56 +02:00
Laurent Destailleur	c2e853db41	FIX A non admin user should not be able to set/unset a user as admin even if he has right to manage permission	2016-06-04 18:37:41 +02:00
jean	918ba71e7f	FIX #5014 if $user is admin and different from $object then nbadmin >=1 is ok when not in multicompany	2016-06-04 14:59:43 +02:00
Maxime Kohlhaas	d777fca0b9	Warning messages after module activation and for user with no permission	2016-06-04 13:25:39 +02:00
Sebastien Bechet	be5eb42a46	Merge remote-tracking branch 'upstream/develop' into develop	2016-06-03 16:15:12 +02:00
Sebastien Bechet	7f98b1ceff	Regression	2016-06-03 10:21:37 +02:00
Laurent Destailleur	1bc6c4ffa3	Clean code	2016-05-30 20:50:49 +02:00
Laurent Destailleur	22d6d9497e	Fix ambiguous test on ldap return of getAttributes	2016-05-29 11:20:12 +02:00
Laurent Destailleur	9c3b9a8494	NEW: Link on user in leave context reach to leave tab.	2016-05-19 13:25:16 +02:00
Laurent Destailleur	e7072185ab	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/comm/propal.php	2016-05-18 20:47:57 +02:00
Laurent Destailleur	49c2549400	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/comm/propal.php	2016-05-18 20:40:09 +02:00
Alexis Algoud	b3b064d310	FIX hook on group card called but not initialized	2016-05-14 18:58:14 +02:00
Laurent Destailleur	d1d1b824b4	Better coding of #5181 . I removed need of external lib.	2016-05-13 20:20:48 +02:00
Laurent Destailleur	8aebc37a5f	FIX Error message	2016-05-13 19:55:49 +02:00
abb	23c0a0a64e	conflict solved Merge branch 'develop' into abb-14 Conflicts: htdocs/langs/en_US/companies.lang	2016-05-02 01:28:46 +01:00
nka11	98f757a87a	New API methods add user to group get product list by category id	2016-04-27 08:59:12 +02:00
Laurent Destailleur	5bfc65676c	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: ChangeLog htdocs/commande/class/commande.class.php htdocs/filefunc.inc.php htdocs/theme/eldy/style.css.php	2016-04-22 21:02:20 +02:00
Laurent Destailleur	da329131bb	Merge pull request #4959 from nka11/api_dev API Improvements	2016-04-19 19:13:57 +02:00
Laurent Destailleur	d40e659b30	Merge pull request #4858 from marcosgdf/oop-refactor-bankaccount-tostring NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown	2016-04-19 19:11:54 +02:00
Regis Houssin	0a52abab5d	Fix: broken multicompany transverse mode authentication feature	2016-04-19 13:38:32 +02:00
nka11	39948968eb	Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev	2016-04-18 19:13:06 +02:00
Laurent Destailleur	8d46d76f96	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/facture/paiement.php	2016-04-12 15:05:18 +02:00
nka11	9ced1dc008	fixing some style and renaming Account to User API	2016-04-11 23:27:43 +02:00
Laurent Destailleur	3127432a4d	Merge pull request #4987 from marcosgdf/bug-4874 FIX #4874 SQL error when listing users	2016-04-11 19:08:56 +02:00
nka11	65e4273fdf	Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev	2016-04-10 14:00:00 +02:00
nka11	d0356d6bd0	new api class for accounts, filtering on order api	2016-04-10 13:57:53 +02:00
Marcos García de La Fuente	7acbf1dd92	FIX #4874 SQL error when listing users Close #4874	2016-04-10 01:00:27 +02:00
Marcos García de La Fuente	a41a80b8fe	Merge branch 'develop' into oop-refactor-bankaccount-tostring	2016-04-09 23:17:09 +02:00
Laurent Destailleur	5b55af4d66	NEW Mutualize code: Use one call of function "addThumbs", when possible, to generate thumbs files instead of several call of "vignette" function.	2016-04-09 14:12:21 +02:00
Laurent Destailleur	43165bab02	FIX Filter/search on extrafields on lists Conflicts: dev/skeletons/skeleton_list.php htdocs/projet/list.php htdocs/societe/list.php	2016-04-04 16:22:26 +02:00
Laurent Destailleur	592a041bc5	FIX Filter/search on extrafields on lists	2016-04-04 16:02:29 +02:00
Laurent Destailleur	6096c8c49a	Minor fix in CSS	2016-04-02 16:53:55 +02:00
Laurent Destailleur	e1bec46a34	FIX The include file for action on files should not be a template file but an action include file.	2016-04-02 14:16:16 +02:00
Laurent Destailleur	fa10f9e030	FIX #4880	2016-03-30 14:07:07 +02:00
Laurent Destailleur	83dd3081d5	FIX #4880 . Lang should not be requied to fetch a user	2016-03-29 21:07:53 +02:00
Laurent Destailleur	91caea5707	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
Laurent Destailleur	a2e9832c8d	Revert "Corrected non-static usages of Form::multiselectarray function" This reverts commit `0a53cdd88f`.	2016-03-25 15:34:43 +01:00
Laurent Destailleur	630f5a632d	Revert "Corrected non-static usages of Form::selectarray function" This reverts commit `87cd6e1e40`.	2016-03-25 15:34:37 +01:00
Laurent Destailleur	26de415b77	Revert commit that break compatibility of 100% of modules	2016-03-25 15:24:57 +01:00
Marcos García de La Fuente	5a046125db	Missing changes from previous commits	2016-03-20 14:24:49 +01:00
Marcos García de La Fuente	4d78932fe8	NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions	2016-03-20 14:15:21 +01:00
Marcos García de La Fuente	0a53cdd88f	Corrected non-static usages of Form::multiselectarray function	2016-03-20 14:15:18 +01:00
Marcos García de La Fuente	87cd6e1e40	Corrected non-static usages of Form::selectarray function	2016-03-20 14:15:17 +01:00
Marcos García de La Fuente	889c72611d	NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown	2016-03-19 23:00:33 +01:00
Laurent Destailleur	5eef373ed6	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/compta/bank/search.php htdocs/user/card.php	2016-03-18 14:56:44 +01:00
Laurent Destailleur	fb625f0ca7	FIX #4812	2016-03-18 13:58:06 +01:00
Laurent Destailleur	2b1f57f01e	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: dev/initdata/savedemo.sh htdocs/filefunc.inc.php htdocs/user/card.php	2016-03-18 11:54:14 +01:00
Laurent Destailleur	5edeeae384	FIX Bad error and style message when changing its own login	2016-03-18 11:30:15 +01:00
Laurent Destailleur	e201357907	Merge pull request #4817 from aspangaro/3.9-p19 Fix: 3.9 Problem of rowspan in edit mode on user card	2016-03-18 00:02:19 +01:00
Laurent Destailleur	18804ee929	FIX Bad color of message password changed	2016-03-18 00:01:14 +01:00
Laurent Destailleur	75ed221fb8	Fix regression with last PR: change of password was not working.	2016-03-17 23:58:04 +01:00
Regis Houssin	a2bb57e33b	Fix: use clone instead dol_clone	2016-03-17 15:22:05 +01:00
Regis Houssin	ae16d6c45c	Fix: missing color update	2016-03-17 15:11:57 +01:00
Regis Houssin	d2d38f58bf	Fix: beware with merges in conflict !!	2016-03-17 09:22:12 +01:00
aspangaro	4167663491	Fix: 3.9 Problem of rowspan in edit mode	2016-03-15 06:53:17 +01:00
Bahfir Abbes	3f9126e663	Update card.php	2016-03-14 23:29:21 +01:00
abb	e53510b0c4	new:handle user notification in notification module	2016-03-14 23:23:30 +01:00
Laurent Destailleur	d4c6c4c140	NEW Holiday is a RH module. All RH module provides by default visilibity on users of its hierarchy.	2016-03-14 21:22:49 +01:00
Laurent Destailleur	77e4fb1883	Fix style	2016-03-14 16:01:27 +01:00
Laurent Destailleur	619ebf9a3e	Enhance css of search fields	2016-03-13 20:38:16 +01:00
Laurent Destailleur	87093c79f9	Merge pull request #4708 from marcosgdf/account-constants Started using Account TYPE and STATUS constants	2016-03-04 16:23:50 +01:00
Laurent Destailleur	14ab10328c	Minor fixes	2016-03-03 20:48:11 +01:00
Laurent Destailleur	974879ea9d	NEW Disabled users are striked.	2016-03-03 20:20:04 +01:00
Marcos García de La Fuente	dcde7773a3	Started using Account TYPE and STATUS constants	2016-03-02 11:04:52 +01:00
Raphaël Doursenaud	5bb153877a	[Qual] Replaced deprecated dol_clone calls With proper clone calls.	2016-02-16 16:05:30 +01:00
Laurent Destailleur	8fb0f8d9d1	Merge branch 'patch-100' of https://github.com/defrance/dolibarr into defrance-patch-100 Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/user/card.php	2016-02-16 13:54:56 +01:00
BENKE Charlie	79b79e2acc	Update card.php	2016-02-15 09:21:21 +01:00
BENKE Charlie	5e288db0e5	add categorie user based on contact user allow to add categorie to user, the same as contact user (because user and contact are persons too)	2016-02-13 10:42:45 +01:00
BENKE Charlie	c910fd151f	add setcategorie on user class	2016-02-13 10:27:12 +01:00
aspangaro	9c20bf1b2e	Updated: User accountancy code depends on Accounting module, not Salaries module	2016-02-13 08:03:49 +01:00
Laurent Destailleur	5ea9c6dd83	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/core/class/html.formprojet.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/filefunc.inc.php htdocs/langs/en_US/accountancy.lang	2016-02-09 14:40:25 +01:00
Laurent Destailleur	e28765ff69	Fix: List of employee is by default selected on employee = yes	2016-02-07 23:07:16 +01:00
Laurent Destailleur	9da0164d90	Uniformize code for lists	2016-02-07 15:50:48 +01:00
Laurent Destailleur	84f4f2d40f	FIX The search on user/group was not using new code. Fiels used for search was not visible.	2016-02-07 02:55:56 +01:00
Laurent Destailleur	7c96194750	NEW Hidden option MAIN_LANDING_PAGE to choose the first page to show after login works as a "global" option (llx_const) and as a "per user" option (llx_user_param).	2016-01-24 17:40:07 +01:00
Laurent Destailleur	4df584e57b	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/lib/files.lib.php	2016-01-23 11:51:56 +01:00
Laurent Destailleur	dbaa43f3be	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/fourn/commande/card.php htdocs/holiday/card.php htdocs/holiday/list.php htdocs/user/card.php	2016-01-23 11:45:39 +01:00
Laurent Destailleur	dadc24462a	Fix: We must ue the "small" size of imge to show on card pages.	2016-01-22 14:14:39 +01:00
Laurent Destailleur	49a325e7ae	Fix: We must ue the "small" size of imge to show on card pages.	2016-01-22 14:10:27 +01:00
Laurent Destailleur	50b0019ead	A protection to avoid situation loosing all admin accounts	2016-01-22 11:54:14 +01:00
Laurent Destailleur	45363cbf4c	Save space on user card so groups are more visible	2016-01-21 16:10:20 +01:00
aspangaro	87f1e55bcb	Fix: SQL error on user bank tab	2016-01-10 07:08:49 +01:00
Laurent Destailleur	06c97b931b	Fix css	2016-01-09 00:06:16 +01:00
Laurent Destailleur	1e1d6d4955	Fix to be able to use dolibarr with a smartphone	2016-01-03 19:34:19 +01:00
Laurent Destailleur	52cd5d505e	Fix several bugs on css, translation or look	2016-01-01 23:44:23 +01:00
philippe grand	1eeee203d7	[Qual] comments should be in english	2015-12-22 09:37:27 +01:00
philippe grand	c740a85006	[Qual] Uniformize code	2015-12-21 14:43:21 +01:00
Laurent Destailleur	b179a193dd	Fix param for username is $username and not $login	2015-12-21 03:01:37 +01:00
philippe grand	2cd49043a6	[Qual] Close database handler should be after Footer	2015-12-11 19:37:12 +01:00
Raphaël Doursenaud	4f359616ce	[Security] Hide click to dial password	2015-12-09 18:16:08 +01:00
Laurent Destailleur	745875d21e	NEW Can choose fields to show on project list	2015-12-06 01:19:27 +01:00
Laurent Destailleur	374480043e	Add maxwidth300 on combo list for users and sale representatives	2015-12-06 00:37:58 +01:00
Laurent Destailleur	497c30d994	NEW Add thumb of users into thumbs stats on home page	2015-12-05 19:38:45 +01:00
Laurent Destailleur	9d3451b31d	NEW Add thumb of users into thumbs stats on home page	2015-12-05 19:31:32 +01:00
aspangaro	c30728326e	Merge remote-tracking branch 'Upstream/develop' into develop-bank	2015-12-04 12:41:51 +01:00
aspangaro	e1c8e6d8f6	Remove useless code	2015-12-01 20:27:29 +01:00
aspangaro	882b66c586	HRM - Add bank tab in user to pay salary or expense report	2015-12-01 06:56:26 +01:00
Laurent Destailleur	de730c9762	NEW Introduce cost price on product.	2015-11-30 21:20:45 +01:00
Laurent Destailleur	fcdb3af708	Merge pull request #4106 from aspangaro/develop-skype New: Better integration of skype for dolibarr 3.9	2015-11-28 16:31:35 +01:00
aspangaro	d12e3ca91f	Finish work on better integration of skype	2015-11-28 14:43:16 +01:00
Laurent Destailleur	88e76dcf64	Fix utf8 encoded twice	2015-11-28 14:40:23 +01:00
Raphaël Doursenaud	231196437c	Fix #4074 Properly save user theme settings	2015-11-23 14:21:25 +01:00
Laurent Destailleur	3f87b30327	Use same way to obfuscate key than password	2015-11-22 14:21:12 +01:00
Laurent Destailleur	97dc4c346b	Merge pull request #4026 from aspangaro/develop-hrm New: FR #3699 HRM Add address informations in user card	2015-11-21 00:27:29 +01:00
aspangaro	98d5f21787	Debug state	2015-11-19 06:21:37 +01:00
aspangaro	1e4d8ec104	New: HRM #3699 Add address informations in user card	2015-11-18 06:34:08 +01:00
aspangaro	ad457b416d	Use menu & add mode 'employee' in user/index.php	2015-11-17 22:51:34 +01:00
aspangaro	c7df6c15a2	Different display if employee mode	2015-11-17 21:22:45 +01:00
Laurent Destailleur	6bd6be0912	Debug and rename experimental module "supplier proposal". Still work to do: Must fix the PDF to be compliant with a request quotation to a supplier (so no need to show vat, unit price, ...).	2015-11-15 19:23:39 +01:00
Laurent Destailleur	64c783623b	NEW Framework feature. To have a page being loaded at same scrollbar level wafter a click on a href link, just add the class "reposition" on this link.	2015-11-13 03:35:55 +01:00
Laurent Destailleur	59a79442b0	Enhance code for select field list feature. Add gender and employee on user list.	2015-11-11 17:05:18 +01:00
Laurent Destailleur	13a0fa2c69	Missing css	2015-11-10 15:50:13 +01:00
Laurent Destailleur	d2fa580f5d	The code generator can generate a list.php page with all feature immediatly working (sort, extrafields, hooks, select fields to show...)	2015-11-05 13:43:22 +01:00
Laurent Destailleur	f15425be52	Include the link "Back to list" on banner of all user tabs.	2015-11-04 15:45:35 +01:00
Laurent Destailleur	3726b127a1	Remove duplicated code or useless code	2015-11-04 14:44:11 +01:00
Laurent Destailleur	0d4c5c4452	Fix missing $db->jdate	2015-11-03 15:33:45 +01:00
Laurent Destailleur	3760f247a2	NEW Can now select fields to show in product list. Extrafields are also supported.	2015-10-30 00:05:00 +01:00
Laurent Destailleur	5c4ac0bf62	NEW Merge all left menu search boxes into one.	2015-10-26 12:18:22 +01:00
Laurent Destailleur	9a4b62c279	NEW Introduce use of cache for thumbs images of users	2015-10-25 20:15:52 +01:00
Laurent Destailleur	24732cf454	Fix to avoid duplicate tooltip	2015-10-25 20:01:39 +01:00
Laurent Destailleur	d7761ece58	FIX The thumb of user into top menu was using the image in full size. This make a large download at each page call. We must use the mini thumbs.	2015-10-25 19:42:54 +01:00
Laurent Destailleur	48ed8d4408	FIX The thumb of user into top menu was using the image in full size. This make a large download at each page call. We must use the mini thumbs.	2015-10-25 19:42:00 +01:00
Laurent Destailleur	b49d63c12f	NEW Show photo of user into user list. A new function getImageFileNameForSize was also introduced to choose image best size according to usage to save bandwith.	2015-10-25 19:31:42 +01:00
Laurent Destailleur	1261ad43a1	NEW Can select which field to show into list of users.	2015-10-25 18:15:37 +01:00
Laurent Destailleur	1b8234d9fe	Bette behaviour for blind people	2015-10-25 11:09:50 +01:00
Laurent Destailleur	461771d488	Currency is on title only.	2015-10-24 21:20:32 +02:00
Laurent Destailleur	b88a28b660	Restore compatibility with old version	2015-10-24 19:45:41 +02:00
Laurent Destailleur	43c80bec7d	A better responsive menu for very small screen	2015-10-24 13:52:35 +02:00
Laurent Destailleur	016dbd39ee	Fix sql phpunit regression	2015-10-23 15:24:47 +02:00
Sergio Sanchis Climent	2a412af00b	Fix: Bug: if $this->employe no exist Fix: if this->employee no exist default 0	2015-10-23 13:04:33 +02:00
Laurent Destailleur	8df59134a9	Merge pull request #3705 from aspangaro/develop-hrm New : Module HRM	2015-10-22 19:15:49 +02:00
Laurent Destailleur	77c43ebb26	FIX #3558	2015-10-22 14:08:19 +02:00
Laurent Destailleur	5db82b8869	Merge pull request #3743 from hregis/develop_origin Fix: Parse error: syntax error, unexpected '}'	2015-10-17 10:37:03 +02:00
aspangaro	aac88519de	Merge remote-tracking branch 'Upstream/develop' into develop-hrm Conflicts: htdocs/user/card.php	2015-10-17 07:19:46 +02:00
Laurent Destailleur	b3491ef4e5	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: ChangeLog htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/admin/facture_cust_extrafields.php htdocs/compta/facture/admin/facturedet_cust_extrafields.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php	2015-10-16 10:12:36 +02:00
Regis Houssin	d44e961014	Fix: Parse error: syntax error, unexpected '}' Fix: bad indentation !!! use tabulation instead spaces please !!!	2015-10-15 16:35:05 +02:00
Regis Houssin	39d89ef9aa	Fix: Parse error: syntax error, unexpected '}'	2015-10-15 16:11:03 +02:00
Marcos García de La Fuente	87ad6e7941	Merge branch 'develop' into doactions-usercard # Conflicts: # htdocs/user/agenda_extsites.php	2015-10-13 09:49:19 +02:00
aspangaro	0b54cc4509	Merge remote-tracking branch 'Upstream/develop' into develop-hrm	2015-10-11 21:05:15 +02:00
Laurent Destailleur	3bb8eac92b	New banner tab is available on all tab of user object	2015-10-11 16:25:31 +02:00
Laurent Destailleur	b24d609ecc	New banner tab is available on all tab of user object	2015-10-11 16:12:12 +02:00
Laurent Destailleur	bd48ad265d	The new banner tab is also on user card now	2015-10-11 15:21:21 +02:00
Marcos García de La Fuente	1cd0f7263f	Merge remote-tracking branch 'upstream/develop' into doactions-usercard # Conflicts: # htdocs/user/card.php # htdocs/user/param_ihm.php	2015-10-10 22:38:02 +02:00
Marcos García de La Fuente	3fd626705f	NEW Added doActions hooks to user cards Close #3394	2015-10-10 22:31:01 +02:00
aspangaro	b571cc86ff	Add a yn form in user card to know if the user is also an employee	2015-10-09 07:30:48 +02:00
Laurent Destailleur	9f2bcf0e4f	FIX The admin flag is mising.	2015-10-05 23:53:49 +02:00
Laurent Destailleur	7b2fbdd638	FIX Can't change the admin with default setup	2015-10-05 10:04:34 +02:00
frederic34	1e8ff69267	Optioncss	2015-10-04 13:34:55 +02:00
frederic34	9a021e6de4	Optioncss not kept in list	2015-10-04 10:45:57 +02:00
Juanjo Menent	7bc6f14736	Merge pull request #3608 from All-3kcis/develop-patch-7 fix dangerous sql injection	2015-10-03 23:16:04 +02:00
All-3kcis	e17b3529ab	Correct error	2015-09-26 15:12:32 +02:00
Laurent Destailleur	62792c08eb	Merge pull request #3591 from GPCsolutions/inherited [Qual] Cleanup of inherited class properties	2015-09-26 11:23:59 +02:00
Juanjo Menent	6999ad0a4f	Merge pull request #3587 from GPCsolutions/fiche_titre [Qual] Replaced deprecated function calls.	2015-09-26 08:39:22 +02:00
All-3kcis	2a84afeee4	fix dangerous sql injection #3327	2015-09-25 16:31:55 +02:00
Raphaël Doursenaud	67ddb6c94e	[Qual] Cleanup of inherited class properties	2015-09-24 20:12:55 +02:00
Raphaël Doursenaud	631ee83745	[Qual] Replaced deprecated print_fiche_titre()	2015-09-24 18:34:58 +02:00
Raphaël Doursenaud	dabfad1529	[Qual] Replaced deprecated print_titre()	2015-09-24 18:27:13 +02:00
Raphaël Doursenaud	9f2545b95d	[Qual] Replaced deprecated dol_clone by native clone	2015-09-24 17:24:40 +02:00
Laurent Destailleur	23f6464999	Work on CSS	2015-09-22 01:25:06 +02:00
Laurent Destailleur	58a734cb17	Firstname only on login	2015-09-21 17:28:11 +02:00
Laurent Destailleur	8332609d06	Merge pull request #3539 from All-3kcis/develop-patch-6 FIX #3524	2015-09-18 20:49:27 +02:00
Laurent Destailleur	27b1f2ecc6	Merge remote-tracking branch 'origin/3.8' into develop	2015-09-17 19:52:13 +02:00
All-3kcis	31266b3c11	FIX #3524 (Fatal error: Call to undefined function getRandomPassword() in /htdocs/user/card.php on line 846)	2015-09-17 10:00:32 +02:00
Laurent Destailleur	099e3f0376	FIX Removed warnings	2015-09-17 00:47:56 +02:00
Laurent Destailleur	9cbd236c8c	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/filefunc.inc.php	2015-09-16 22:09:21 +02:00
Laurent Destailleur	7f60abdf7b	FIX #3524	2015-09-16 21:05:02 +02:00
Laurent Destailleur	a5c6582bc1	Fix duplicate translation/encoding on setEventMessage Conflicts: htdocs/ftp/index.php	2015-09-12 12:55:20 +02:00
Laurent Destailleur	c785f8cfb1	Fix duplicate translation/encoding on setEventMessage	2015-09-12 12:52:07 +02:00
Laurent Destailleur	3c91b8c890	Force to select "use personalized value" to select a personalized screen option.	2015-09-09 12:39:06 +02:00
Laurent Destailleur	5ffab9720f	More complete connexion profile	2015-09-07 12:38:39 +02:00
Laurent Destailleur	15ab9c0ecd	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/lib/security.lib.php htdocs/product/stock/mouvement.php	2015-08-20 16:08:42 +02:00
Laurent Destailleur	da8e71b2c5	Fix #3309	2015-08-20 16:05:29 +02:00
Laurent Destailleur	18f064cc69	Fix login is a mandatory field.	2015-08-20 15:18:36 +02:00
Laurent Destailleur	923203802c	fix dangerous sql injection #3327	2015-08-12 23:33:09 +02:00
Laurent Destailleur	f1e87478ff	Fix translation of printing menu	2015-08-12 23:12:15 +02:00
Juanjo Menent	e1f627ca8e	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-08-10 20:37:44 +02:00
Marcos García de La Fuente	8a1c5450c2	Fixed minor problem with error alert when creating user	2015-08-09 18:26:12 +02:00
Laurent Destailleur	747e4b5e40	Fix timezone problem with external calendar import.	2015-07-28 18:12:45 +02:00
Laurent Destailleur	9451296f6b	Fix: Missing tooltip	2015-07-28 12:11:39 +02:00
All-3kcis	d3f283a8d9	Correct api_key and error "DB_ERROR_RECORD_ALREADY_EXISTS"	2015-07-21 11:43:23 +02:00
Laurent Destailleur	2df2e8b44e	Merge remote-tracking branch 'origin/3.8' into develop	2015-07-20 00:55:30 +02:00
elarifr	80c8c30ba7	generate fake api_key to store if api module not enabled correct user role select if api module not enabled	2015-07-19 22:43:06 +02:00
Laurent Destailleur	b59b7785ee	Fix error management	2015-07-19 16:00:12 +02:00
Laurent Destailleur	cb98d6cb93	Merge remote-tracking branch 'origin/3.8' into develop	2015-07-19 15:32:20 +02:00
Laurent Destailleur	4f5e8e2480	Fix: missing context before calling trigger. Clean demo file with list of triggers.	2015-07-19 15:24:54 +02:00
aspangaro	d9dd9ff688	Merge remote-tracking branch 'Upstream/3.8' into 3.8-1	2015-07-16 12:25:37 +02:00
aspangaro	59e88590e0	Move my address email to new one	2015-07-15 20:30:33 +02:00
Regis Houssin	6f1645f2f2	Fix: check if $mc object exists	2015-07-13 10:14:04 +02:00
Regis Houssin	cf92f704d8	Fix: avoid error if $mc object not exists TODO check if user not linked with the current entity before change entity (thirdparty, invoice, etc.) !!	2015-07-13 09:54:26 +02:00
Laurent Destailleur	8eb4a208ce	Debug statistics of project module	2015-07-05 22:04:30 +02:00
Laurent Destailleur	089056f024	Filter on status on hierarchical view	2015-07-05 12:15:21 +02:00
Laurent Destailleur	4a1dfa60a5	Uniformize code	2015-06-30 13:14:19 +02:00
Laurent Destailleur	dc050d39eb	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: build/makepack-dolibarr.pl htdocs/adherents/type.php htdocs/core/boxes/box_task.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php htdocs/core/js/lib_batch.js htdocs/core/modules/modUser.class.php htdocs/fichinter/card.php htdocs/fourn/commande/card.php htdocs/societe/consumption.php htdocs/user/info.php htdocs/user/note.php htdocs/user/param_ihm.php htdocs/user/perms.php	2015-06-29 00:09:28 +02:00
Laurent Destailleur	5584acddbd	Content of popup tooltip on contact and login link	2015-06-26 17:21:03 +02:00
Laurent Destailleur	8f691138e8	NEW Can edit Background color for Top menu and Background color for table title line (works only with theme menu eldy).	2015-06-26 16:21:09 +02:00
Regis Houssin	46272cf4cd	Fix: for avoid error with function "complete_head_from_modules"	2015-06-26 15:26:08 +02:00
Laurent Destailleur	2c5ef858d0	NEW Filter "active" by default on user list. Fix label of permission of project module	2015-06-20 20:35:57 +02:00
Laurent Destailleur	40d17add22	Fix missing print	2015-06-20 19:42:07 +02:00
Laurent Destailleur	ef5ff2f218	Use the complete popup on user in user list and hierarchy view.	2015-06-16 15:08:20 +02:00
jfefe	3bf1b60be8	Add test if module enabled before showing API information	2015-06-15 14:38:02 +02:00
jfefe	190ee35e86	Merge branch 'develop' into api_rest Conflicts: htdocs/user/card.php htdocs/user/class/user.class.php	2015-06-15 14:29:34 +02:00
Laurent Destailleur	d5c26af563	Missing nohover css	2015-06-13 20:26:49 +02:00
Regis Houssin	c21156dd13	Fix: strict mode hunter	2015-06-10 18:58:42 +02:00
Laurent Destailleur	4a18b730b5	Fix: Avoid warning in expense report validation Fix: navigation in expense report	2015-06-08 13:49:09 +02:00
Laurent Destailleur	df60754e52	Merge pull request #2708 from GPCsolutions/deprecated Deprecated	2015-06-05 15:44:08 +02:00
Laurent Destailleur	331ebbdd73	Fix behaviour on grey/visible menu must be same everywhere on application.	2015-06-04 11:42:24 +02:00
Laurent Destailleur	8010cb7f33	Fix the extracss parameter was overwritten other css into textwithtooltip function. Add tooltip on THM and TJM parameter of user.	2015-06-04 10:42:12 +02:00
Raphaël Doursenaud	3f9270ea78	Qual: added deprecation hinting Added deprecation hinting for class properties Added syslog warning events for deprecated functions, methods and/or their parameters Added hinting for some constants	2015-06-01 11:00:11 +02:00
Laurent Destailleur	523b04a315	Work on finishing	2015-05-31 17:31:15 +02:00
Laurent Destailleur	ceb2622181	Merge pull request #2934 from aspangaro/develop-patch24 NEW: Add a button to purge criteria in user list	2015-05-31 02:18:43 +02:00
Laurent Destailleur	5e773d4cb6	Work on finishing of style	2015-05-31 01:06:51 +02:00
aspangaro	fa2413f45a	NEW: Add a button to purge criteria in user list	2015-05-30 21:01:37 +02:00
Laurent Destailleur	9b4ab63c7d	Fix style	2015-05-30 20:07:44 +02:00
Laurent Destailleur	36b7f1dcf3	NEW Show photo of logged user into login top right block. NEW If no photo is available for user, we show a generic photo depending on gender	2015-05-30 19:50:07 +02:00
Laurent Destailleur	bfe85cbf37	Better error management	2015-05-30 16:14:54 +02:00
Laurent Destailleur	13b78f9c17	NEW Add gender property managed on user card FIX Better error messages when uploading photo of user when permission to write are not granted	2015-05-30 02:17:05 +02:00
jfefe	a618274760	Allow modify API key from user card	2015-05-29 16:05:52 +02:00
Raphaël Doursenaud	5fe31e90c8	Remove duplicate modify button on user's card Fix #2879	2015-05-23 15:32:09 +02:00
phf	b9ed61eed4	FIX : update usergroup name	2015-05-22 16:46:28 +02:00
Laurent Destailleur	e075fce5eb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-21 01:33:16 +02:00
Laurent Destailleur	90f9a845ae	Enhance style	2015-05-21 01:32:56 +02:00
Laurent Destailleur	a258370f8a	Prepare code for generic solution where all path are forged using get_exdir.	2015-05-18 22:25:51 +02:00
Laurent Destailleur	fe3f701928	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: ChangeLog build/debian/changelog build/exe/doliwamp/doliwamp.iss htdocs/expedition/list.php htdocs/filefunc.inc.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/user/class/user.class.php	2015-05-16 17:09:42 +02:00
Laurent Destailleur	0e1cf72c43	Fix bad order for firstname, lasname	2015-05-16 13:59:48 +02:00
Laurent Destailleur	c33cbefad2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-15 11:16:29 +02:00
Laurent Destailleur	bf883e1576	Minor cosmetic changes Fix permissions and CRLF	2015-05-15 02:34:57 +02:00
Laurent Destailleur	b327b5fb9d	Save regressions	2015-05-13 09:32:54 +02:00
Laurent Destailleur	8e09f54a46	Minor fixes	2015-05-13 07:46:12 +02:00
Laurent Destailleur	b0d73ee674	FIX Bad link to login page into email for password renewal.	2015-05-12 23:47:28 +02:00
Raphaël Doursenaud	932e23ac09	[Qual] Use jQuery 'is' instead of 'prop' in conditions	2015-05-12 16:21:21 +02:00
Raphaël Doursenaud	e149d49fb8	[Qual] Use jQuery property instead of attribute to test and set disabled	2015-05-12 14:53:01 +02:00
Raphaël Doursenaud	0d8641a073	[Qual] Use jQuery property instead of attribute to test and set checked	2015-05-12 14:51:30 +02:00
Laurent Destailleur	83e4fe5d95	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: build/makepack-dolibarr.pl htdocs/fourn/facture/list.php	2015-05-12 00:09:03 +02:00
Laurent Destailleur	c2b31a37ba	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: build/makepack-dolibarr.pl htdocs/contrat/fiche.php htdocs/core/modules/expedition/modules_expedition.php htdocs/expedition/class/expedition.class.php htdocs/expedition/fiche.php htdocs/user/fiche.php	2015-05-11 23:53:38 +02:00
Raphaël Doursenaud	b8d9c20731	[Qual] Fixed HTML input form disabled attribute Dolibarr uses HTML 4.01 or HTML5 doctypes. The input form disabled attribute should not have a value.	2015-05-07 14:21:14 +02:00
Laurent Destailleur	ac4bd7d441	Uniformize code	2015-05-04 11:41:30 +02:00
Laurent Destailleur	b554d81314	Better translation	2015-05-04 10:47:26 +02:00
Laurent Destailleur	43efd76b24	Fix remove warnings	2015-04-29 23:39:34 +02:00
Laurent Destailleur	290856db1c	Fix remove warning	2015-04-29 22:37:04 +02:00
jfefe	c905f88498	Change generic and setup image title	2015-04-18 23:13:48 +02:00
Marcos García de La Fuente	e2e6049c7f	Copyright	2015-04-18 20:50:03 +02:00
Marcos García de La Fuente	dc790ff586	NEW: Feature request: A page to merge two thirdparties into one #2613	2015-04-18 20:41:09 +02:00
Laurent Destailleur	56a14da5d4	FIXME that are not bug are replaced with TODO Add control on batch movement (lot/serial is mandatory, and control eatby and sellby are same for each lot/serial)	2015-04-12 04:01:28 +02:00
Laurent Destailleur	d944c3bf17	Code cleaner when we are using multicompany	2015-04-10 11:40:24 +02:00
Laurent Destailleur	f0fb6f1b2c	Work on md theme	2015-03-24 22:24:15 +01:00
Laurent Destailleur	3844d4e6f7	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: ChangeLog htdocs/core/boxes/box_activity.php htdocs/fourn/commande/card.php htdocs/user/card.php	2015-03-23 15:16:37 +01:00
Laurent Destailleur	7ad0a32559	Fix for multicompany users.	2015-03-23 04:51:24 +01:00
Laurent Destailleur	042556a9cf	Better comments	2015-03-23 03:50:55 +01:00
Laurent Destailleur	f4b1d95b3e	Some fix for multicompany module	2015-03-23 02:39:41 +01:00
Laurent Destailleur	49824a0e56	Method colorStringToArray can accept the # Method monthArray can return short label of month	2015-03-22 18:17:25 +01:00
Scrutinizer Auto-Fixer	b693ed3f51	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2015-03-16 23:21:17 +00:00
aspangaro	d69f066735	QUAL: Traduce terms + remove <center>	2015-03-15 14:04:07 +01:00
Laurent Destailleur	84695845bb	Some fixes into translation and permissions	2015-03-09 21:20:56 +01:00
Laurent Destailleur	d119397129	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/societe/class/societe.class.php	2015-03-05 11:38:16 +01:00
Laurent Destailleur	b888a04af9	Reduce a lot of duplicate code. Move all tables of extrafields setup into a tpl file.	2015-02-28 20:14:26 +01:00
Laurent Destailleur	ef14e4e7ed	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/facture.php htdocs/fourn/class/fournisseur.product.class.php	2015-02-28 03:11:15 +01:00
aspangaro	8f388aaa9b	Merge remote-tracking branch 'Upstream/3.7' into 3.7-patch4	2015-02-26 20:48:21 +01:00
aspangaro	47c41f6a85	Add a test to enable field only when module salary is used	2015-02-26 20:47:06 +01:00
Laurent Destailleur	4bde7e9f51	Fix: Missing error management	2015-02-26 14:25:30 +01:00
Laurent Destailleur	94a5f87bd8	comment	2015-02-23 15:13:14 +01:00
Laurent Destailleur	6d3834b3b9	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/index.php htdocs/projet/class/project.class.php test/phpunit/BankAccountTest.php	2015-02-23 14:59:24 +01:00
Laurent Destailleur	d3a79c8724	Fix default entity guess	2015-02-23 14:44:24 +01:00
aspangaro	067af47955	Add accountancy field on creation mode and correct rowspan.	2015-02-22 08:35:25 +01:00
aspangaro	4bb524d55d	Also for edit user.	2015-02-22 08:12:40 +01:00
aspangaro	ce247432ee	FIXED: Remove condition to show accountancy field on user.	2015-02-22 08:05:23 +01:00
Laurent Destailleur	6d1324b463	Work on expense report module	2015-02-21 16:15:54 +01:00
Laurent Destailleur	91626cfc92	Merge pull request #2316 from mrsof/develop FIX : Update action return PHP Fatal error: Using $this when not in object context	2015-02-03 13:44:17 +01:00
Sof	493732bdc3	Update action returnb PHP Fatal error: Using $this when not in object context	2015-02-03 10:45:00 +01:00
Laurent Destailleur	968b2b433b	Better position for username	2015-02-01 01:43:19 +01:00
Laurent Destailleur	52222ecdfe	Avoid tooltip into tooltip	2015-02-01 01:28:15 +01:00
Laurent Destailleur	1e38227c2d	Reduce number of new to save memory usage. Fight table to replace with div	2015-02-01 00:54:26 +01:00
frederic34	c1943f989b	Tooltip	2015-01-31 10:58:03 +01:00
frederic34	b850b7b448	Merge remote branch 'upstream/develop' into tooltip Conflicts: htdocs/langs/en_US/sendings.lang	2015-01-30 16:45:24 +01:00
frederic34	736bee565c	Tooltip everywhere	2015-01-30 16:40:33 +01:00
Laurent Destailleur	b61c475aa8	Clean code for validate permissions. "validate" is a status to say, "now it exists, it is no more a draft", so by default we don't need this permissions (it is same than create). We keep "validate" permissions as an "advanced" permission only.	2015-01-25 21:32:40 +01:00
frederic34	f4161b457b	Add dol_escape_htmltag and start to adapt boxes	2015-01-22 00:23:55 +01:00
frederic34	1b0dd671b3	Add tooltip in getNomUrl link	2015-01-20 21:40:33 +01:00
Laurent Destailleur	007f18bcf7	Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into GPCsolutions-review Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/cashjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/comm/action/peruser.php htdocs/core/class/html.form.class.php htdocs/core/lib/accounting.lib.php htdocs/core/lib/report.lib.php	2015-01-17 15:11:12 +01:00
Laurent Destailleur	fc78d632d3	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/facture.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/company.lib.php htdocs/core/lib/functions.lib.php htdocs/main.inc.php	2015-01-09 23:09:10 +01:00
frederic34	60661ae948	Add some "classfortooltip"	2015-01-09 00:07:54 +01:00
Marcos García de La Fuente	86100758ff	Miscellaneous corrections	2014-12-28 20:13:15 +01:00
Laurent Destailleur	2a3bb96c34	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/core/lib/ecm.lib.php	2014-12-22 03:14:22 +01:00
Laurent Destailleur	8996953077	Fix: error reported by scrutinizer	2014-12-20 15:42:03 +01:00
Laurent Destailleur	711b033844	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/contrat/card.php htdocs/core/class/html.form.class.php htdocs/product/stock/card.php	2014-12-14 12:35:13 +01:00
Laurent Destailleur	c0473f0246	Fixed: when transvers_mode is on, a user is not linked to a dedicated environment (always entity 1), so we should not show info not reliable with this mode.	2014-12-11 13:13:11 +01:00
Laurent Destailleur	99e5715f28	Fixed: Length too small to see fullname.	2014-12-10 20:09:48 +01:00
Laurent Destailleur	e95160c218	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/user/agenda_extsites.php	2014-12-08 17:51:36 +01:00
Laurent Destailleur	bd91603cd8	Fixed: form outside table	2014-12-08 17:28:26 +01:00
Laurent Destailleur	01209ff844	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/product/stock/card.php	2014-11-30 14:15:38 +01:00
Laurent Destailleur	1797569a6d	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-11-29 16:44:37 +01:00
Laurent Destailleur	e118d9af22	Fixed: Protection to lock language setup in demo mode was not working	2014-11-29 12:11:12 +01:00
Laurent Destailleur	d3b32ce22f	Fixed: Bad function/picto for information messages (not a star)	2014-11-28 19:49:42 +01:00
Laurent Destailleur	d9cb9c1585	Merge pull request #2102 from aspangaro/develop-center Task 1603 - Remove <center> deprecated HTML5 tags	2014-11-27 23:58:44 +01:00
Laurent Destailleur	ab25b149c5	Fix: Download of user files	2014-11-24 15:40:40 +01:00
aspangaro	ef991e6c5d	HTML5 - <center> is deprecated - Need CSS - continue working	2014-11-24 06:43:15 +01:00
Marcos García de La Fuente	6159591a02	Fixed [ bug #1679 ] Can't sort groups by user count in user groups list	2014-11-24 01:01:33 +01:00
Marcos García de La Fuente	912384a9fa	Fixed [ bug #1679 ] Can't sort groups by user count in user groups list	2014-11-23 17:24:37 +01:00
Laurent Destailleur	e3a8041b0d	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/compta/facture.php htdocs/user/fiche.php	2014-11-16 15:46:08 +01:00
Laurent Destailleur	c186f13218	Fix: Param $action was not defined. A better fix must be done later be removing useless hooks that are duplicate with triggers.	2014-11-15 19:04:21 +01:00
Florian HENRY	00c6033e11	Fix display user signature when WYSIWYG is enabled	2014-11-14 13:28:49 +01:00
Andrelec1	5742e42689	Fix require FormOther ! If agenda module is desable	2014-11-05 14:24:02 +01:00
Laurent Destailleur	8821fbac76	Merge remote-tracking branch 'origin/3.6' into develop Conflicts: htdocs/product/fiche.php htdocs/user/class/user.class.php	2014-10-30 11:19:29 +01:00
Laurent Destailleur	8248ab4f9a	Fix: doxygen	2014-10-30 11:16:45 +01:00
Laurent Destailleur	106b4a669f	id_parent and id_children was not set. So introduce new method to return same with no risk to break current working code to address this.	2014-10-30 11:15:13 +01:00
Laurent Destailleur	0abeea059e	Uniformize and clean boxes behaviour and translation.	2014-10-27 21:48:28 +01:00
Laurent Destailleur	13590a876b	Fix: A little clean of dol_hash usage.	2014-10-18 16:08:15 +02:00
Laurent Destailleur	6bbeaee8fe	Fix: Selection of users color was not user owner of event.	2014-10-18 15:35:32 +02:00
aspangaro	b4a9e6a119	Fix :: Administrator not created on new install	2014-10-16 21:14:57 +02:00
aspangaro	c1d016a531	Add field to select color of the user in user's card	2014-10-16 06:20:54 +02:00
Laurent Destailleur	9768550696	Merge remote-tracking branch 'origin/3.6' into develop Conflicts: ChangeLog htdocs/categories/fiche.php htdocs/comm/action/index.php htdocs/comm/propal.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/class/commonobject.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/fourn/fiche.php htdocs/product/composition/fiche.php htdocs/product/price.php htdocs/projet/tasks/task.php htdocs/projet/tasks/time.php	2014-10-12 02:54:34 +02:00
Laurent Destailleur	77ed7bf5df	Merge branch 'develop-HiddenMailPasswordForgotten' of github.com:Devensys/dolibarr into Devensys-develop-HiddenMailPasswordForgotten Conflicts: htdocs/core/lib/functions.lib.php	2014-10-11 23:44:50 +02:00
Andrelec1	f4f1f45d5a	copyright and annotation	2014-10-10 15:01:10 +02:00
Andrelec1	7978b4503d	Add function hideMail and use	2014-10-10 14:57:07 +02:00
Regis Houssin	a2446e51db	New: add context "globalcard" for declaring only once all cards	2014-10-06 07:20:58 +02:00
Laurent Destailleur	97eec37f1c	Uniformize code: property "nom" for thirdparty is aliased into "name" everywhere.	2014-10-04 17:20:17 +02:00
Laurent Destailleur	8121aeb0b6	Merge pull request #1914 from aternatik/fix_ldapgrp Fix: gidNumber ldap attribute was not defined	2014-09-29 16:39:36 +02:00
Laurent Destailleur	14ab409ca9	Merge remote-tracking branch 'origin/3.6' into develop Conflicts: htdocs/admin/stock.php htdocs/admin/system/index.php htdocs/comm/fiche.php htdocs/core/lib/admin.lib.php htdocs/core/lib/holiday.lib.php htdocs/core/lib/pdf.lib.php htdocs/core/login/functions_forceuser.php htdocs/core/login/functions_http.php htdocs/core/menus/standard/auguria.lib.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/filefunc.inc.php htdocs/holiday/define_holiday.php htdocs/opensurvey/fonctions.php htdocs/societe/canvas/actions_card_common.class.php test/phpunit/CompanyBankAccountTest.php test/phpunit/ExportTest.php test/phpunit/FactureTest.php test/phpunit/FunctionsLibTest.php test/phpunit/PropalTest.php test/phpunit/SocieteTest.php test/phpunit/WebservicesInvoicesTest.php test/phpunit/WebservicesThirdpartyTest.php	2014-09-28 02:14:32 +02:00
Laurent Destailleur	e8b7c9c6bd	Fix: doxygen	2014-09-27 16:00:11 +02:00
Laurent Destailleur	a4d8739477	Qual: Clean a lot of deprecated code	2014-09-24 01:35:29 +02:00
Eden	248ef4fd46	Fix: gidNumber ldap attribute was not defined i using posixGroup objectClass	2014-09-23 00:13:51 +02:00
Laurent Destailleur	e1fec958ef	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/group/fiche.php	2014-09-22 23:43:22 +02:00
Alexis Algoud	de0d53a2bb	ADD extrafields on usergroup	2014-09-22 16:31:58 +02:00
Raphaël Doursenaud	eea9a76589	FIX: Variable might not be traversable	2014-09-19 03:07:52 +02:00
aspangaro	0b20369dd7	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00
Laurent Destailleur	4e21891f14	Add lost PR	2014-09-14 12:06:38 +02:00
Laurent Destailleur	23eee1b83a	New: Add hourly and daily amount on user card. Add weekly working hours and salary on user card.	2014-09-13 17:41:26 +02:00
Laurent Destailleur	653d9d4167	Fix: ckeditor area is at wrong place	2014-09-09 15:33:41 +02:00
Laurent Destailleur	175e3eca6b	Work on agenda view per user	2014-09-05 13:48:55 +02:00
Raphaël Doursenaud	1d5fb1320b	Fix: missing global declarations	2014-08-20 19:03:58 +02:00
Laurent Destailleur	be6f99c10e	Merge remote-tracking branch 'origin/3.6' into develop Conflicts: htdocs/admin/dict.php htdocs/core/db/mysql.class.php htdocs/core/db/mysqli.class.php htdocs/core/lib/ajax.lib.php	2014-08-17 19:34:12 +02:00
Laurent Destailleur	3f8ec47e91	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: ChangeLog	2014-08-16 17:37:37 +02:00
Laurent Destailleur	3336b5bdce	Fix: [ bug #1553 ] Saving User displays setup removes menu	2014-08-16 17:35:19 +02:00
Laurent Destailleur	7edf2eacea	New: Each user can include its own external ics calendar into dolibarr agenda view.	2014-08-15 17:08:05 +02:00
Laurent Destailleur	98f140962a	Merge remote-tracking branch 'origin/3.6' into develop	2014-08-13 19:25:55 +02:00

... 19 20 21 22 23 ...

3112 Commits