2857 Commits

Author	SHA1	Message	Date
Bernard Saulme	be7714be1c	Use email model option to joint file for subscription ... Allow the adherent subscription to use the email model option to join or no joint file.	2020-11-25 18:11:36 +01:00
Givriz	dca4cf5987	Feature : ajout de la class "button-cancel" ... Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.	2020-11-23 15:12:52 +01:00
Laurent Destailleur	2f6f242d99	CSS	2020-11-23 12:29:38 +01:00
Givriz	c48129e279	Ajout de la class "button-save" ... Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)	2020-11-19 20:23:38 +01:00
Laurent Destailleur	780b8a6fb2	Fix navigation between members	2020-11-18 12:40:21 +01:00
Frédéric FRANCE	0a5e041775	Merge remote-tracking branch 'upstream/develop' into odtformembers	2020-11-14 00:56:21 +01:00
Frédéric FRANCE	4ca3c0aa95	Add odt for members	2020-11-14 00:48:13 +01:00
Frédéric FRANCE	dd2ab6f360	Update card.php	2020-11-13 21:56:17 +01:00
Frédéric FRANCE	0735993839	set ref at create	2020-11-11 12:17:23 +01:00
Frédéric FRANCE	c7557fdb8a	specimen	2020-11-11 11:12:19 +01:00
Frédéric FRANCE	4d48eb96ed	Update adherent.class.php	2020-11-11 07:16:07 +01:00
Frédéric FRANCE	d4f633ee74	check in card pdf	2020-11-10 23:41:15 +01:00
Frédéric FRANCE	016c9915ef	Update 12.0.0-13.0.0.sql ... add ref in class add ref in getNomUrl add ref on card	2020-11-10 23:03:03 +01:00
Frédéric FRANCE	2f7b445c9e	doxygen	2020-11-10 21:57:49 +01:00
Laurent Destailleur	26b8e8d2bf	More logs	2020-11-08 18:52:26 +01:00
Frédéric FRANCE	5d90611795	Merge remote-tracking branch 'upstream/develop' into zapieruser	2020-11-05 14:42:37 +01:00
Frédéric FRANCE	2dfdd98b5a	Update vcard.php	2020-11-04 20:42:16 +01:00
Frédéric FRANCE	6e7448a1d0	Merge remote-tracking branch 'upstream/develop' into zapieruser	2020-11-04 19:00:10 +01:00
Laurent Destailleur	7294a47ef5	Fix generation of user from member, contact, applications for job	2020-11-04 13:33:52 +01:00
Laurent Destailleur	f5bdc1db6d	Update card.php	2020-11-02 20:15:03 +01:00
Frédéric FRANCE	3afb577888	Update card.php	2020-11-02 18:35:39 +01:00
Laurent Destailleur	ed6925d87d	Fix label	2020-11-02 16:46:28 +01:00
Laurent Destailleur	42a3a20dfc	Fix phpcs	2020-11-02 16:37:50 +01:00
Laurent Destailleur	83a7b19333	Look and feel v13	2020-11-02 11:41:07 +01:00
Frédéric FRANCE	0e7b1ff1c7	doxygen	2020-11-01 15:39:01 +01:00
Frédéric FRANCE	e52b79d586	Merge remote-tracking branch 'upstream/develop' into zapieruser	2020-11-01 14:19:06 +01:00
Laurent Destailleur	4f09b87ec5	Merge pull request #15245 from frederic34/patch-10 ... fix vcard birthday of member	2020-11-01 13:53:14 +01:00
Laurent Destailleur	47a4d2c9f6	Merge pull request #15244 from frederic34/patch-8 ... doxygen	2020-11-01 13:52:15 +01:00
Frédéric FRANCE	7b8c05250f	fix vcard birthday of member	2020-11-01 09:13:02 +01:00
Frédéric FRANCE	26406b0f9f	Update adherent.class.php	2020-11-01 08:56:56 +01:00
Frédéric FRANCE	c2781d5551	doxygen	2020-11-01 08:54:12 +01:00
Frédéric FRANCE	07432779d9	doxygen	2020-11-01 08:48:53 +01:00
Frédéric FRANCE	49390a596c	Merge remote-tracking branch 'upstream/develop' into zapieruser	2020-10-31 20:33:59 +01:00
Scrutinizer Auto-Fixer	ab25e047c0	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-31 17:51:30 +00:00
Frédéric FRANCE	be4a4cb54b	Merge remote-tracking branch 'upstream/develop' into zapieruser	2020-10-31 16:10:16 +01:00
Scrutinizer Auto-Fixer	7f52920716	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-31 13:32:18 +00:00
Laurent Destailleur	f485ebc2cf	Removed dead code	2020-10-31 12:56:30 +01:00
Frédéric FRANCE	2cbbf86a5b	Merge remote-tracking branch 'upstream/develop' into zapieruser	2020-10-30 17:48:00 +01:00
Frédéric FRANCE	b431d99996	Update api_memberstypes.class.php	2020-10-30 16:10:23 +01:00
Frédéric FRANCE	38c2fea849	Update api_members.class.php	2020-10-30 15:21:28 +01:00
Frédéric FRANCE	6fe4f85eec	work on members	2020-10-30 08:15:37 +01:00
Frédéric FRANCE	1c9cd484ad	work on members	2020-10-30 08:10:28 +01:00
Frédéric FRANCE	ec6568ffbe	work on members	2020-10-30 08:01:58 +01:00
Frédéric FRANCE	f721338bd8	work on members	2020-10-30 07:57:53 +01:00
Frédéric FRANCE	79941a8dde	Update adherent.class.php	2020-10-28 19:10:54 +01:00
Frédéric FRANCE	b9f593b73a	Update adherent.class.php	2020-10-27 20:46:32 +01:00
Frédéric FRANCE	6d6b143011	Update adherent.class.php	2020-10-27 20:11:18 +01:00
Scrutinizer Auto-Fixer	a2a9c51e50	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-27 18:46:07 +00:00
Frédéric FRANCE	5a3780e062	end of dol_fiche_end	2020-10-27 18:19:31 +01:00
Frédéric FRANCE	d3c87dabab	display members	2020-10-26 21:51:17 +01:00
Frédéric FRANCE	42f5fd7d5f	display last members like on list	2020-10-26 21:38:16 +01:00
Laurent Destailleur	6fa174d13f	Merge pull request #15051 from laudeco/feature/11878_select_bank_account ... 11878 - select the only bank account	2020-10-25 14:56:08 +01:00
Laurent De Coninck	1d62834b2c	use the second version for default bank account	2020-10-24 17:15:48 +02:00
Frédéric FRANCE	ae3228b9e0	retrieve the spelling 🎉	2020-10-23 20:08:35 +02:00
Frédéric FRANCE	9a470fa42d	replace deprecated	2020-10-22 22:50:03 +02:00
Philippe GRAND	a2b3dbd8f8	fix : deprecated	2020-10-22 16:47:35 +02:00
Philippe GRAND	dc0d9e46b8	fix : deprecated	2020-10-22 16:46:45 +02:00
Philippe GRAND	74fc38395c	fix : deprecated	2020-10-22 16:44:26 +02:00
Laurent De Coninck	d2e2cad028	select by default, remove the show empty everywhere the field is required	2020-10-17 21:15:52 +02:00
Laurent Destailleur	a0b17635fd	NEW When creating a user from a member linked to a thirdparty, you can ... decide if it is an internal or external (default) user.	2020-10-14 14:02:07 +02:00
Scrutinizer Auto-Fixer	1512521d91	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-07 13:01:28 +00:00
Laurent Destailleur	e3542c6d4f	Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights ... NEW Show category filter on lists only when user have rights to read categories	2020-10-06 12:29:10 +02:00
Laurent Destailleur	7b3a7c9921	Add token on all url with action=delete	2020-10-01 10:50:54 +02:00
Laurent Destailleur	f442dac2c9	Add token on most GET url for admin action	2020-09-30 15:13:28 +02:00
Laurent Destailleur	29414251f5	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/lib/files.lib.php	2020-09-29 13:19:03 +02:00
Laurent Destailleur	628978be53	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/adherents/card.php	2020-09-28 21:16:25 +02:00
Sekan, Tobias	2bf15b3a92	Show category filter only on rights to read it	2020-09-28 10:42:49 +02:00
Laurent Destailleur	3ee2459dc7	Enhancement for #14835: Can filter on expiration date, add list of ... members without subscriptions	2020-09-27 16:03:20 +02:00
Laurent Destailleur	3c6dda9dd5	Clean code	2020-09-25 10:27:30 +02:00
Laurent Destailleur	e52559783f	Look and feel v13	2020-09-21 13:54:26 +02:00
Laurent Destailleur	9f41f90eeb	Fix responsive	2020-09-21 01:28:26 +02:00
daraelmin	b3d386fa54	Fix Category is lost on sorting member list ... When sorting member list filter by tag/category the criteria is lost because of one missing GET parameter Just adding a GET parameter to keep the category/tag parameter when sorting the list	2020-09-20 08:42:25 +02:00
Laurent Destailleur	216b3c885d	Fix escaping	2020-09-20 01:30:36 +02:00
Laurent Destailleur	7dd69a2b2b	Fix escape	2020-09-19 20:11:04 +02:00
Laurent Destailleur	2d38644ae1	Sanitize sortfield	2020-09-18 17:13:01 +02:00
Laurent Destailleur	cddec2f4dc	Fix XSS	2020-09-18 13:25:56 +02:00
Laurent Destailleur	b35db6b9dd	Clean code managing canvas	2020-09-18 06:02:52 +02:00
Laurent Destailleur	c4b5f5a249	Maxi clean of code	2020-09-18 01:29:17 +02:00
Laurent Destailleur	9a758b7edd	FIX #yogosha4483	2020-09-17 14:31:25 +02:00
Alexandre SPANGARO	55e3f8365e	FIX Yogosha report 4434 (backport)	2020-09-16 21:36:55 +02:00
Laurent Destailleur	bfbb217607	Fix GETPOST on 'action'	2020-09-16 19:39:50 +02:00
Laurent Destailleur	7b8a206730	FIX #yogosha	2020-09-16 17:48:59 +02:00
Laurent Destailleur	4224e5da41	Merge pull request #14729 from bafbes/abb120143 ... allow access to adherent_extrafields table fields in printFieldListWhere hook	2020-09-16 01:14:01 +02:00
Laurent Destailleur	b7d56cbfbf	Fix syntax error	2020-09-16 01:09:54 +02:00
Laurent Destailleur	b5cac258bf	Merge pull request #14739 from defrance/patch-155 ... Users can now have non-binary gender	2020-09-16 00:54:07 +02:00
Laurent Destailleur	7e941ff5ac	Merge pull request #14747 from daraelmin/develop ... FIX #14746 Historical list of subscription shows empty member type	2020-09-16 00:49:41 +02:00
Laurent Destailleur	5c31593d43	Add date of birth in candidatures	2020-09-16 00:47:44 +02:00
daraelmin	8b928a110e	FIX #14746 ... Historical list of subscription shows empty member type if not recorded	2020-09-15 22:23:22 +02:00
BENKE Charlene	1d0dc7cab0	Update list.php	2020-09-15 11:31:29 +02:00
BENKE Charlene	b01a68abef	Update card.php	2020-09-15 11:30:47 +02:00
Laurent Destailleur	b20be7074e	phpcs	2020-09-14 04:08:11 +02:00
Laurent Destailleur	dd06ff3a0d	Label	2020-09-14 03:41:18 +02:00
Laurent Destailleur	419ac91a7a	FIX #14538	2020-09-14 03:34:03 +02:00
Laurent Destailleur	59bc8ee07c	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/stats/byproperties.php htdocs/adherents/stats/geo.php htdocs/admin/system/dolibarr.php htdocs/core/class/commonobjectline.class.php htdocs/core/tpl/objectline_title.tpl.php htdocs/langs/en_US/admin.lang htdocs/product/class/product.class.php	2020-09-14 02:49:19 +02:00
Laurent Destailleur	701b83db38	FIX Bad number of subscription (forgotten when member was resiliated)	2020-09-14 02:38:12 +02:00
Laurent Destailleur	b2288ad2d9	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-09-14 02:33:00 +02:00
Laurent Destailleur	a891211f78	Fix bad link	2020-09-14 02:32:30 +02:00
bahfir abbes	c5fa6eac58	allow access to adherent_extrafields table fields in printFieldListWhere hook;	2020-09-13 21:02:04 +01:00
Laurent Destailleur	b8fe2188a6	Standardize code around model_pdf	2020-09-10 01:49:09 +02:00
Scrutinizer Auto-Fixer	b78ff67d7e	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-09-07 08:18:17 +00:00
bahfir abbes	47eee354f8	new : option to hide complementary actions	2020-09-01 19:31:44 +01:00
ptibogxiv	a64223f73d	Update api_members.class.php	2020-08-29 12:44:17 +02:00
stickler-ci	96b3474185	Fixing style errors.	2020-08-29 10:40:30 +00:00
ptibogxiv	7fe83b24ba	NEW api get member by thirdparty	2020-08-29 12:38:22 +02:00
Laurent Destailleur	9c74211873	Merge pull request #14508 from b92/develop ... NEW Add __TYPE__ substitution key	2020-08-23 18:09:49 +02:00
Bernard Saulme	d947ade7db	Update adherent.class.php ... NEW Add _TYPE__ substitution key	2020-08-19 21:19:56 +02:00
Laurent Destailleur	e65e4a6d47	Beautify for of member module	2020-08-18 11:52:00 +02:00
Laurent Destailleur	4c1aa25b32	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/admin/adherent_emails.php htdocs/core/tpl/extrafields_list_search_title.tpl.php htdocs/product/traduction.php	2020-08-04 13:51:11 +02:00
Laurent Destailleur	9a5d0ab0a2	FIX #14236	2020-08-04 13:48:11 +02:00
florian HENRY	e44a1fd33f	->error rather than dol_print_error into product	2020-07-31 16:09:38 +02:00
Laurent Destailleur	8109145fe3	Merge pull request #14162 from laurantines/develop ... Update list.php in Adherents	2020-07-03 00:24:54 +02:00
laurantines	a34c6ec7b0	Update list.php in Adherents ... Add Address in search	2020-07-01 13:12:52 +02:00
Laurent Destailleur	333d4873c3	Properties ->contactid has been renamed into ->contact_id	2020-06-25 12:17:47 +02:00
Laurent Destailleur	6d25b8630b	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/prelevement.php htdocs/core/class/rssparser.class.php	2020-06-23 11:38:20 +02:00
Laurent Destailleur	058a0d4fa7	Fix look and feel v12	2020-06-22 04:27:16 +02:00
Laurent Destailleur	77c1c46285	Merge pull request #14032 from ptibogxiv/patch-343 ... NEW convert all subscription in datetime	2020-06-12 00:47:55 +02:00
ptibogxiv	37007d6d1a	Update subscription.class.php	2020-06-07 16:12:28 +02:00
Laurent Destailleur	4e4e7a38c3	Merge pull request #14041 from bb2a/VCARD ... NEW add vcard for aderent and user	2020-06-06 20:58:37 +02:00
Laurent Destailleur	da672c8776	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/card.php htdocs/admin/translation.php htdocs/core/class/html.formfile.class.php htdocs/societe/card.php	2020-06-06 11:57:31 +02:00
Laurent Destailleur	a305c43901	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/societe/card.php htdocs/ticket/card.php	2020-06-06 11:51:39 +02:00
Laurent Destailleur	2344435416	Fix XSS CWE-ID CWE-79	2020-06-05 23:41:29 +02:00
Anthony Berton	ee10c6f10b	vcard	2020-06-05 17:57:13 +02:00
Laurent Destailleur	2836368017	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/filefunc.inc.php htdocs/takepos/css/phone.css htdocs/takepos/invoice.php	2020-05-28 20:20:39 +02:00
Laurent Destailleur	3606ed2bda	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/adherents/class/adherent.class.php	2020-05-28 20:17:26 +02:00
Florian Mortgat	d491f2cf54	[pgsql] type of llx_adherent_type.subscription is VARCHAR(3) so quotes are mandatory	2020-05-27 18:27:10 +02:00
Laurent Destailleur	ab176cd078	Merge pull request #13937 from frederic34/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword ... add new rule	2020-05-26 00:20:12 +02:00
laurantines	416d1d0301	Update list.php ... Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY	2020-05-25 22:53:03 +02:00
laurantines	962d795740	Update list.php ... Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY	2020-05-25 12:26:05 +02:00
Frédéric FRANCE	f4011520a3	add new rule	2020-05-21 09:31:49 +02:00
Frédéric FRANCE	ba8cf2b398	add new rule	2020-05-21 09:21:30 +02:00
Frédéric FRANCE	ccc859ec80	add new rule	2020-05-21 09:12:18 +02:00
Frédéric FRANCE	ccadb1ec7a	add new rule	2020-05-21 00:47:16 +02:00
Frédéric FRANCE	43dcd9beb5	add new rule	2020-05-21 00:02:33 +02:00
Laurent Destailleur	4584fa1aa6	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/asset/list.php htdocs/compta/bank/list.php htdocs/contrat/services_list.php htdocs/core/lib/date.lib.php htdocs/expensereport/list.php htdocs/fichinter/list.php htdocs/holiday/list.php htdocs/projet/tasks/list.php htdocs/supplier_proposal/list.php htdocs/user/list.php	2020-05-11 19:43:06 +02:00
Laurent Destailleur	7300b45bcd	Responsive	2020-05-11 01:19:33 +02:00
Maxime Kohlhaas	1a9afe6b20	Fix missing hook params for printFieldListValue	2020-05-08 01:40:25 +02:00
Laurent Destailleur	b426bbe758	Fix bad code	2020-04-25 17:47:41 +02:00
Laurent Destailleur	3ed11f374a	Look and feel v12	2020-04-24 23:56:57 +02:00
Laurent Destailleur	72c6ac1c72	Complete #13708, normalization of code	2020-04-23 13:21:39 +02:00
Josep Lluís	e1f1e2bf97	FIX type member extrafields are duplicated on edit ... type member extrafields are duplicated on edit, and old usage on create (without tpl)	2020-04-20 17:50:19 +02:00
Laurent Destailleur	67a7d6b77d	Look and feel v12	2020-04-20 15:57:15 +02:00
Laurent Destailleur	16e46c672c	Clean code	2020-04-20 15:06:27 +02:00
stickler-ci	2849d00b4d	Fixing style errors.	2020-04-15 16:39:15 +00:00
ptibogxiv	f6174ddf4a	NEW API filter members by category	2020-04-15 18:37:20 +02:00
Laurent Destailleur	596ba8d679	Clean deprecated code.	2020-04-13 01:10:35 +02:00
Laurent Destailleur	4bfc900798	Look and feel v12	2020-04-12 18:41:42 +02:00
Laurent Destailleur	ecd49c21c9	Look and feel v12	2020-04-12 17:32:22 +02:00
Laurent Destailleur	d75f1138ba	Fix phpcs	2020-04-10 13:00:46 +02:00
Laurent Destailleur	0845f0bcd3	Merge pull request #13523 from bb2a/patch-2 ... add in default search	2020-04-10 12:12:28 +02:00
Scrutinizer Auto-Fixer	444c293c01	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-10 08:59:32 +00:00
Anthony Berton	8abef71616	Update list.php	2020-04-10 10:50:15 +02:00
Laurent Destailleur	4ff503d20a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/stock/list.php htdocs/supplier_proposal/list.php	2020-04-10 02:07:51 +02:00
Laurent Destailleur	7fe8c7eab3	FIX #11855	2020-04-10 01:37:04 +02:00
Laurent Destailleur	f1c391363d	Fix label	2020-04-09 18:40:00 +02:00
Laurent Destailleur	03b09f1d28	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-04-05 12:14:03 +02:00
Laurent Destailleur	e838000795	responsive	2020-04-05 12:11:58 +02:00
Laurent Destailleur	5b8c50cb72	css	2020-04-05 12:07:00 +02:00
Laurent Destailleur	5ca9c71449	css	2020-04-05 12:05:27 +02:00
Laurent Destailleur	98dfc7ca71	Fix css	2020-04-05 12:01:05 +02:00
Josep Lluís	d2e35fc1f7	NEW: add addlinktonotes in members list	2020-04-02 17:49:01 +02:00
Laurent Destailleur	99ddd25ad5	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/stock/class/mouvementstock.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-04-02 16:51:50 +02:00
Laurent Destailleur	6f0071bebe	FIX sort on company on member list	2020-03-31 17:54:48 +02:00
Laurent Destailleur	a5379c7144	FIX All forms must use newToken() ... Conflicts: htdocs/commande/card.php htdocs/compta/cashcontrol/cashcontrol_card.php htdocs/supplier_proposal/card.php	2020-03-24 13:14:23 +01:00
Laurent Destailleur	1ff15e1fd9	FIX All forms must use newToken()	2020-03-24 13:10:35 +01:00
Laurent Destailleur	820a21a721	Simple setup tutorial	2020-03-23 18:35:22 +01:00
Scrutinizer Auto-Fixer	e8083e2a65	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-03-23 14:54:02 +00:00
Laurent Destailleur	8bab245c7e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/core/tpl/contacts.tpl.php	2020-03-18 18:50:55 +01:00
Laurent Destailleur	8192e9dc67	FIX Missing token in form	2020-03-14 03:02:49 +01:00
Laurent Destailleur	33c5db9cc3	Prepare code for the new pagination possibility	2020-03-13 13:07:11 +01:00
Scrutinizer Auto-Fixer	f413ce6aac	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-03-12 11:45:44 +00:00
Laurent Destailleur	6ce6dc145f	Use colors of status in donut	2020-03-12 02:20:31 +01:00
Laurent Destailleur	0bd2740779	NEW Can force position of legend of graph on right (instead of top)	2020-03-05 17:23:19 +01:00
Laurent Destailleur	fc31680bd0	Several fix for chart.js graphs	2020-03-05 02:55:06 +01:00
Laurent Destailleur	74fa8d90e7	Use status of member colors into pie chart	2020-03-05 01:38:41 +01:00
Laurent Destailleur	a6d340a22c	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/class/adherent.class.php htdocs/filefunc.inc.php	2020-03-04 19:28:15 +01:00
Laurent Destailleur	deda6252f2	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/lib/functions.lib.php htdocs/expensereport/class/expensereport.class.php	2020-03-04 19:22:30 +01:00
ptibogxiv	060df57cb1	FIX: fk_type subscription list via api REST ... v10 to dev	2020-03-03 11:58:15 +01:00
Laurent Destailleur	7431bf0592	Try formating profile	2020-02-24 22:53:14 +01:00
Laurent Destailleur	b52f458517	Clean code	2020-02-24 22:20:15 +01:00
Laurent Destailleur	3075e40f8c	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/comm/remx.php htdocs/core/boxes/box_contacts.php htdocs/core/lib/functions.lib.php htdocs/core/lib/security.lib.php	2020-02-23 23:37:46 +01:00
Laurent Destailleur	11ff3f6562	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-02-23 23:31:03 +01:00
gmilad	559fc9f61e	Update note.php ... Fix : #13168	2020-02-22 13:07:25 +01:00
gmilad	6264f78e39	Update note.php ... Bonsoir, Correction pour l'issue #13168 Cordialement, Gaëtan.	2020-02-21 23:01:16 +01:00
Scrutinizer Auto-Fixer	e44865d8b5	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-21 16:53:37 +00:00
Laurent Destailleur	f4f3efec62	Fight against $_POST	2020-02-16 19:33:58 +01:00
Laurent Destailleur	9e165a782f	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-13 11:58:23 +01:00
Laurent Destailleur	e511deb8e7	FIX #13096	2020-02-13 11:39:08 +01:00
Laurent Destailleur	4762bafb02	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/subscription/list.php htdocs/mrp/class/mo.class.php	2020-02-12 22:58:37 +01:00
Laurent Destailleur	ccced09113	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/adherents/subscription/list.php htdocs/comm/propal/list.php htdocs/core/class/html.formmail.class.php	2020-02-12 22:54:55 +01:00
Laurent Destailleur	66493672eb	Clean code	2020-02-12 15:20:37 +01:00
Laurent Destailleur	2dafbe0f91	Fix labels	2020-02-12 15:19:42 +01:00
Alexandre SPANGARO	c77169ad87	FIX : Problem with column label in subscription list	2020-02-10 16:01:09 +01:00
Laurent Destailleur	c3beb854a2	Definition of $fields for member and subscriptions	2020-02-08 13:44:31 +01:00
Scrutinizer Auto-Fixer	9781c20f84	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-02 18:34:09 +00:00
Laurent Destailleur	55388d053f	Var not defined	2020-01-30 13:01:42 +01:00
Laurent Destailleur	a88e1ac605	Better translation	2020-01-28 21:35:03 +01:00
Laurent Destailleur	936899e0e2	Merge pull request #12952 from ptibogxiv/patch-297 ... NEW: add member to validate on dashboard	2020-01-28 21:30:16 +01:00
stickler-ci	1c26139789	Fixing style errors.	2020-01-28 20:29:17 +00:00
ptibogxiv	ae1dbdd34f	Update adherent.class.php	2020-01-28 21:27:11 +01:00
Laurent Destailleur	be2d6494a7	FIX #12908	2020-01-28 21:23:05 +01:00
Laurent Destailleur	80707d6a5e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-28 17:24:26 +01:00
Laurent Destailleur	471e1d71a0	Fix send remind by email	2020-01-28 11:38:27 +01:00
Laurent Destailleur	a9790f355d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-21 11:32:40 +01:00
Laurent Destailleur	f2ed97dada	Fix default value	2020-01-21 10:29:41 +01:00
Laurent Destailleur	c203e21966	Fix default values	2020-01-21 10:28:42 +01:00
Laurent Destailleur	3f79c00542	Merge branch 'develop' into actioncomm_category	2020-01-15 14:21:06 +01:00
Laurent Destailleur	f64b3262c3	Merge pull request #12475 from ptibogxiv/patch-279 ... NEW add WYSiWYG on member type's description	2020-01-15 14:18:08 +01:00
Laurent Destailleur	e4a03e98b7	FIX Do not record resource owner of event when not defined. ... More log to track payment errors.	2020-01-01 12:47:01 +01:00
Laurent Destailleur	c0c413b219	Alignement	2019-12-31 18:32:57 +01:00
Laurent Destailleur	4e2bc6a741	Fix alignment	2019-12-31 18:23:56 +01:00
Frédéric FRANCE	90235d0528	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-31 13:57:40 +01:00
Laurent Destailleur	f44b85f557	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
Laurent Destailleur	db5672ae90	Fix creation/update of expense reports ... Fix export of accounting documents	2019-12-18 23:07:26 +01:00
Laurent Destailleur	838633d0de	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/filecheck.php htdocs/api/class/api_setup.class.php htdocs/compta/facture/card.php htdocs/compta/stats/index.php htdocs/core/actions_massactions.inc.php htdocs/install/upgrade2.php htdocs/loan/card.php htdocs/loan/document.php htdocs/loan/info.php htdocs/loan/note.php htdocs/loan/schedule.php htdocs/product/list.php htdocs/ticket/card.php htdocs/user/class/user.class.php	2019-12-14 14:53:49 +01:00
Laurent Destailleur	835d22f556	Merge branch 'develop' into doxygen_todo	2019-12-14 13:46:40 +01:00
Frédéric FRANCE	57055bad03	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-13 14:36:00 +01:00
Laurent Destailleur	a612aefab7	Fix HTML5	2019-12-12 11:11:08 +01:00
Frédéric FRANCE	307bad1d2a	doxygen todo	2019-12-11 19:11:13 +01:00
Laurent Destailleur	a4272ab947	Debug v11	2019-12-06 09:20:45 +01:00
Laurent Destailleur	cb497cb08e	Translation	2019-12-06 08:58:16 +01:00
Laurent Destailleur	93d66d8213	Debug v11	2019-12-06 08:50:26 +01:00
Florian Mortgat	3f6715a377	FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list	2019-12-05 15:34:41 +01:00
Frédéric FRANCE	4c5c6b6ff1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-03 17:56:43 +01:00
Laurent Destailleur	92070fa491	Fix name of variable $trigger_name into $triggersendname	2019-12-02 09:38:16 +01:00
Laurent Destailleur	83f7f3a6e9	Trans	2019-12-01 18:16:51 +01:00
Frédéric FRANCE	25ed2b930f	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-01 16:10:37 +01:00
Laurent Destailleur	3eec2430eb	Merge pull request #12585 from atm-john/develop_factoring_token_usage ... Factoring token usage	2019-12-01 11:37:30 +01:00
Laurent Destailleur	790fdc881c	# WARNING: head commit changed in the meantime ... Restore file for travis	2019-12-01 10:50:56 +01:00
ATM John BOTELLA	773f823748	factoring token usage	2019-12-01 10:20:11 +01:00
Laurent Destailleur	fe37983b06	Fix inversion of mime type and mime file name	2019-11-30 12:02:05 +01:00
ptibogxiv	789e751e4a	Update type.php	2019-11-20 10:55:58 +01:00
stickler-ci	54e528d659	Fixing style errors.	2019-11-20 09:38:32 +00:00
ptibogxiv	a3e7c4467a	NEW add WYSiWYG on member type's description	2019-11-20 10:36:26 +01:00
Frédéric FRANCE	d182eee4bf	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-19 23:26:00 +01:00
Laurent Destailleur	fb70893229	Fix missing class reposition	2019-11-19 21:29:49 +01:00
Frédéric FRANCE	2e5f539b2a	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-18 17:45:52 +01:00
Scrutinizer Auto-Fixer	1648fc142e	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-16 22:24:29 +00:00
Laurent Destailleur	2689f7515c	Fix pb with colspan and extrafields. ... Fix remove empty id	2019-11-16 14:38:05 +01:00
Frédéric FRANCE	6784ea9fae	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-16 09:21:57 +01:00
Laurent Destailleur	d2aa4ba54e	Update adherent_type.class.php	2019-11-16 00:41:55 +01:00
ptibogxiv	332c91aa11	Update adherent_type.class.php	2019-11-14 20:10:14 +01:00
ptibogxiv	fc2e0d4f95	Update adherent_type.class.php	2019-11-14 20:09:36 +01:00
stickler-ci	f369fa06a6	Fixing style errors.	2019-11-14 19:04:18 +00:00
ptibogxiv	892b61f1c2	Update adherent_type.class.php	2019-11-14 20:02:44 +01:00
stickler-ci	07880dd835	Fixing style errors.	2019-11-14 16:00:08 +00:00
ptibogxiv	fee8e33e2b	Update type.php	2019-11-14 16:58:17 +01:00
stickler-ci	280c0a56b6	Fixing style errors.	2019-11-14 15:37:54 +00:00
ptibogxiv	ae2ddb1f1e	Fix adherent type v11	2019-11-14 16:36:07 +01:00
Laurent Destailleur	8db4eff108	Merge pull request #12437 from Dolibarr/scrutinizer-patch-8 ... Scrutinizer Auto-Fixes	2019-11-14 12:10:44 +01:00
Scrutinizer Auto-Fixer	f197196719	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-14 11:09:46 +00:00
Scrutinizer Auto-Fixer	ddcc14dc16	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-14 11:09:15 +00:00
Frédéric FRANCE	a3e092b227	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-14 09:21:26 +01:00
Laurent Destailleur	171b94fc5c	Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 ... Scrutinizer Auto-Fixes	2019-11-14 08:50:24 +01:00
Laurent Destailleur	86094613e8	Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 ... Scrutinizer Auto-Fixes	2019-11-14 08:50:06 +01:00
Frédéric FRANCE	3bac051521	use class CONST	2019-11-14 08:07:16 +01:00
Scrutinizer Auto-Fixer	b40ecc3933	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer	ac40dd8bbe	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer	8a527631a0	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer	87585c0f2a	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 17:32:11 +00:00
Laurent Destailleur	6afc84fe72	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-12 10:20:55 +01:00
Laurent Destailleur	944a15d06b	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-11-12 10:20:16 +01:00
Laurent Destailleur	f8e8d15606	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-11-12 10:19:01 +01:00
Scrutinizer Auto-Fixer	c85e54b08c	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-12 08:46:08 +00:00
gauthier	e2680f7637	FIX : limit 20 prevent to see all products/services	2019-11-12 09:42:27 +01:00
Scrutinizer Auto-Fixer	038bda254d	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-11 22:59:36 +00:00
Philippe GRAND	d760b799d9	internationalization	2019-11-09 16:26:57 +01:00
Philippe GRAND	ab267cdf0c	internationalization	2019-11-09 16:23:06 +01:00
Philippe GRAND	1ac4bf54d2	internationalization	2019-11-09 16:16:16 +01:00
Philippe GRAND	0690467b15	internationalization	2019-11-09 16:11:37 +01:00
Philippe GRAND	86c826bd87	internationalization	2019-11-09 15:54:09 +01:00
Frédéric FRANCE	35751a80ab	100% centpercent	2019-11-05 21:24:41 +01:00
Laurent Destailleur	94bd0f71d9	Fix pb with permission	2019-11-05 19:41:30 +01:00
Laurent Destailleur	ce1dec253f	FIX #11364	2019-11-05 12:47:38 +01:00
Frédéric FRANCE	f81ac3a388	Update type.php	2019-11-04 22:57:46 +01:00
Frédéric FRANCE	b0d0e306d1	missing newtoken for csrf	2019-11-04 22:54:34 +01:00
Laurent Destailleur	1aef1c60dd	Merge pull request #11867 from frederic34/socialnetworks ... NEW add socialnetworks dictionary	2019-11-04 21:10:22 +01:00
Laurent Destailleur	bdbec58461	Merge pull request #12309 from ptibogxiv/patch-274 ... NEW change duration membertype	2019-11-04 20:53:42 +01:00
Laurent Destailleur	11500fb8d9	FIX confusion between permto... and permisstionto...	2019-11-04 15:33:49 +01:00
Frédéric FRANCE	872f58f261	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-11-03 21:48:24 +01:00
stickler-ci	8007b22030	Fixing style errors.	2019-11-03 11:37:44 +00:00
ptibogxiv	44b80fdc44	Update type.php	2019-11-03 12:35:52 +01:00
ptibogxiv	871b6d9dd6	NEW change duration membertype	2019-11-03 12:35:05 +01:00
Laurent Destailleur	25e64b0610	Merge branch 'develop' into socid	2019-11-02 12:01:06 +01:00
Laurent Destailleur	f9031cdbfd	Clean code	2019-11-02 11:36:48 +01:00
Frédéric FRANCE	77d4ca81dc	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-02 09:14:15 +01:00
Laurent Destailleur	cea2c3a9f4	Look and feel v11	2019-11-01 23:58:14 +01:00
Frédéric FRANCE	dbed10a701	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-01 21:39:20 +01:00
Laurent Destailleur	e3b5be7475	All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed ... into 'labelStatus'. All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'.	2019-11-01 12:52:03 +01:00
Frédéric FRANCE	e93aaa2a75	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
Frédéric FRANCE	f7747ed00a	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-30 20:06:43 +01:00
Laurent Destailleur	811a30c9c2	Merge pull request #12212 from frederic34/patch-3 ... Update adherent.class.php	2019-10-30 03:16:46 +01:00
Laurent Destailleur	58188423e2	Merge pull request #12227 from ptibogxiv/patch-272 ... Fix php error display	2019-10-30 03:10:02 +01:00
Frédéric FRANCE	d889d1ba7b	css	2019-10-25 18:20:48 +02:00
ptibogxiv	60f43a80c8	Fix php error display	2019-10-25 18:05:11 +02:00
Frédéric FRANCE	a43e6f96b5	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-25 08:12:54 +02:00
Frédéric FRANCE	833e761633	Update adherent.class.php	2019-10-24 16:35:48 +02:00
Laurent Destailleur	2eed48e091	Limit number of lines in statistics table	2019-10-24 15:16:26 +02:00
Laurent Destailleur	433f6918fd	Look and feel v11	2019-10-23 21:21:39 +02:00
Laurent Destailleur	7297514afb	NEW Use the gender of member for picto in member lists.	2019-10-23 21:00:29 +02:00
Laurent Destailleur	fd04729727	Fix tooltip on extrafield title was on wrong line.	2019-10-23 20:35:39 +02:00
Laurent Destailleur	b48f08dd07	Theme v11	2019-10-23 20:12:29 +02:00
Frédéric FRANCE	9ec7836387	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-20 16:37:18 +02:00
Frédéric FRANCE	360bf55f5b	clean indent	2019-10-20 01:09:11 +02:00
Frédéric FRANCE	f4540dddb8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-17 20:24:04 +02:00
Frédéric FRANCE	e75f7d448c	Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-16 20:00:01 +02:00
Frédéric FRANCE	d9ba09bec1	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-12 19:02:24 +02:00
Frédéric FRANCE	9f59656589	fix typo inspired by grandoc	2019-10-11 23:08:33 +02:00
Frédéric FRANCE	f253315c8d	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-08 18:30:58 +02:00
Laurent Destailleur	3acf7211c3	Merge pull request #11847 from ptibogxiv/patch-257 ... NEW: Option to allow to create members from third-party	2019-10-08 15:08:34 +02:00
Frédéric FRANCE	b78187c1eb	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-08 00:07:27 +02:00
Laurent Destailleur	da5890e584	Update adherent.class.php	2019-10-07 20:32:51 +02:00
ptibogxiv	ff992d996c	Update type_translation.php	2019-10-07 13:37:35 +02:00
ptibogxiv	decbdaa5af	Rename traduction.php to type_translation.php	2019-10-07 13:35:40 +02:00
Laurent Destailleur	e02794248e	Merge branch 'develop' into patch-264	2019-10-07 13:25:16 +02:00
Laurent Destailleur	c2a7ae23bc	Merge pull request #12034 from aspangaro/11_faicon ... Fix Fa-icon	2019-10-07 13:03:27 +02:00
Frédéric FRANCE	ec8569dd85	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-06 15:56:21 +02:00
Laurent Destailleur	866dcf18fe	Look and feel v11	2019-10-06 15:34:22 +02:00
Laurent Destailleur	2b66282b61	NEW Code for extrafields uses the new array $extrafields->attributes	2019-10-06 14:41:52 +02:00
Alexandre SPANGARO	ddadff5731	Add globe fa-icon	2019-10-03 21:32:55 +02:00
Frédéric FRANCE	98023353fe	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-03 17:21:31 +02:00
Sebastien Baguet	5dbf34a864	Small fix on a query	2019-10-03 13:34:47 +02:00
stickler-ci	09b423d14d	Fixing style errors.	2019-10-02 22:35:09 +00:00
Sebastien Baguet	9daffcbe07	Fix for no subscription members	2019-10-03 00:29:41 +02:00
Frédéric FRANCE	3afb4355a8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-02 18:59:18 +02:00
Laurent Destailleur	d8a8c4fbe6	Look and feel v11. Picto are fontawesome.	2019-10-02 18:36:36 +02:00
Frédéric FRANCE	aca9d92db8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-01 22:03:33 +02:00
Frédéric FRANCE	010b2723b6	work on migration script	2019-10-01 20:14:06 +02:00
Alexandre SPANGARO	16c6c9ae75	Merge remote-tracking branch 'upstream/develop' into 11.0_https	2019-10-01 06:12:24 +02:00
Alexandre SPANGARO	91b3bf76fd	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
Frédéric FRANCE	b87610adcc	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-30 19:34:35 +02:00
Laurent Destailleur	b28cd1bb57	Merge pull request #11972 from aspangaro/11.0_fa_icon ... NEW Add fa_icon on load_fiche_titre	2019-09-30 15:26:28 +02:00
Alexandre SPANGARO	aec50d3ac9	NEW Add fa_icon on load_fiche_titre	2019-09-30 10:14:55 +02:00
Frédéric FRANCE	1b151da776	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-29 11:28:54 +02:00
Laurent Destailleur	db32ca99c6	Fix translation and sql request	2019-09-28 12:36:09 +02:00
Laurent Destailleur	86e5465197	Standardize extrafields code	2019-09-28 10:55:09 +02:00
Alexandre SPANGARO	288aea190b	Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon	2019-09-28 06:09:40 +02:00
Alexandre SPANGARO	7f93f046e9	NEW Add fa_icon on load_fiche_titre	2019-09-28 06:02:25 +02:00
Frédéric FRANCE	cea3669ffa	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-28 00:35:14 +02:00
Laurent Destailleur	6858dce344	Rename table for categorie of warehouses	2019-09-27 13:28:28 +02:00
Alexandre SPANGARO	e38bb89a2e	NEW Add fa_icon on load_fiche_titre	2019-09-27 11:48:40 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
Alexandre SPANGARO	1c13a38ce9	Typo abscissa	2019-09-23 21:45:23 +02:00
Alexandre SPANGARO	1e49fd0d45	Translate	2019-09-20 15:07:58 +02:00
Alexandre SPANGARO	e32772fdc5	Translate	2019-09-20 09:44:49 +02:00
Alexandre SPANGARO	278312f38f	Translate	2019-09-20 07:02:14 +02:00
Alexandre SPANGARO	b3807bbb20	Merge branch 'develop' into 11.0_translation	2019-09-19 22:34:43 +02:00
Alexandre SPANGARO	4819414d3a	Translate and some fix	2019-09-19 22:33:26 +02:00
stickler-ci	8d8ded324d	Fixing style errors.	2019-09-17 11:56:16 +00:00
ptibogxiv	a295d57e0c	Update adherent_type.class.php	2019-09-17 13:54:17 +02:00
ptibogxiv	c01ab4ab53	Update adherent_type.class.php	2019-09-17 13:53:34 +02:00
ptibogxiv	cff6da34df	Create traduction.php	2019-09-17 13:53:06 +02:00
Frédéric FRANCE	ccaa4cc1f3	work on contact	2019-09-14 16:35:18 +02:00
Frédéric FRANCE	af63ac4051	work on contact	2019-09-14 13:31:26 +02:00
Frédéric FRANCE	1cd59cc16a	work on user	2019-09-14 11:26:31 +02:00
Frédéric FRANCE	de3a67f5bd	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-12 21:52:06 +02:00
Frédéric FRANCE	cd109d04cd	add function	2019-09-12 20:44:24 +02:00
Frédéric FRANCE	fa44af1df8	work on user	2019-09-12 20:03:28 +02:00
Frédéric FRANCE	e4a0de245a	work on user	2019-09-12 18:41:26 +02:00
Laurent Destailleur	84e197e48a	Clean code	2019-09-12 00:09:49 +02:00
Frédéric FRANCE	dc2ea3cef9	add socialnetworks dictionary	2019-09-11 23:00:14 +02:00
Frédéric FRANCE	3fddef0c9e	add socialnetworks dictionary	2019-09-11 22:27:09 +02:00
Laurent Destailleur	61cf47aa16	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-09-10 00:14:07 +02:00
Laurent Destailleur	c7bab8681a	Fix sql error #11845	2019-09-09 13:05:08 +02:00
Laurent Destailleur	1d74387125	Removed deprecated property ->numero (We must use ->num_payment)	2019-09-09 08:47:23 +02:00
ptibogxiv	a83c067081	Update card.php	2019-09-08 20:08:32 +02:00
ptibogxiv	2d3b0a7d43	Update adherent.class.php	2019-09-08 20:05:13 +02:00
Alexandre SPANGARO	3a8d8ee902	FIX #11401 Adherent unknown language key	2019-09-08 03:56:01 +02:00
Laurent Destailleur	529dd05226	Replace deprecated code	2019-09-06 10:53:05 +02:00
Laurent Destailleur	7c3b0e98c4	Fix deprecated property	2019-09-02 13:53:16 +02:00
Laurent Destailleur	7438eecc64	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/type.php	2019-09-02 04:41:43 +02:00
Laurent Destailleur	42defc31bd	FIX Look and feel v10	2019-09-02 04:39:41 +02:00
Laurent Destailleur	dbdafb86f4	FIX Look and feel v10	2019-09-02 04:38:01 +02:00
Laurent Destailleur	ac7d0b5eb6	Fix scrutinizer	2019-09-02 04:12:48 +02:00
Laurent Destailleur	92799902b6	Fix var null	2019-09-02 03:44:34 +02:00
Laurent Destailleur	64ebbec966	Fix deprecated code	2019-09-02 03:43:24 +02:00
Laurent Destailleur	733c90956f	Fix phpunit	2019-09-02 03:40:09 +02:00
Laurent Destailleur	97a1a47266	Change deprecated properties with new name	2019-09-01 22:21:48 +02:00
Laurent Destailleur	f6c2fb77ae	Fix scrutinizer	2019-09-01 22:02:48 +02:00
Laurent Destailleur	26fb5d34c4	Fix scturinizer	2019-09-01 21:53:42 +02:00
Laurent Destailleur	e57b4a8bda	Fix cast	2019-08-31 13:22:02 +02:00
Laurent Destailleur	2f49fc6a7b	Fix scrutinizer	2019-08-31 02:49:54 +02:00
Laurent Destailleur	48db5c2a44	Replace deprecated actioncomm->note into actioncomm->note_private	2019-08-31 02:46:39 +02:00
Laurent Destailleur	d5328d1cec	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-27 15:43:19 +02:00
Laurent Destailleur	478b1fea25	FIX #11711	2019-08-27 15:06:50 +02:00
John Botella	b4c4e5a662	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard	2019-08-02 14:52:01 +02:00
Laurent Destailleur	0bc90d81c8	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-02 12:05:12 +02:00
Laurent Destailleur	c01ac05aec	FIX Content of email for subscription	2019-08-02 12:04:06 +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
John Botella	9b84987cc1	prepare new dashboard	2019-08-01 12:33:19 +02:00
Laurent Destailleur	5eb8f05061	FIX #11584	2019-08-01 12:23:02 +02:00
Laurent Destailleur	34f78c555d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-30 20:55:35 +02:00
Alexandre SPANGARO	cededd97d2	FIX Language key	2019-07-29 08:52:08 +02:00
Alexandre SPANGARO	7a9f2b43c5	FIX Language key	2019-07-29 07:05:18 +02:00
Laurent Destailleur	cf00ae971a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-15 22:45:29 +02:00
Laurent Destailleur	b0d46d492f	FIX #11509	2019-07-15 18:40:42 +02:00
Laurent Destailleur	adfbd62f8b	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-14 00:44:35 +02:00
Laurent Destailleur	251d501c8e	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-07-14 00:32:46 +02:00
Laurent Destailleur	2a05164bb1	FIX Better PHP compatibility	2019-07-14 00:31:28 +02:00
Laurent Destailleur	e0095871aa	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/compta/stats/byratecountry.php htdocs/core/class/html.form.class.php	2019-07-14 00:19:56 +02:00
Laurent Destailleur	8090a8abb6	Fix param [] -> null	2019-07-14 00:07:27 +02:00
Regis Houssin	4dab57b494	FIX phpcs	2019-07-13 11:24:25 +02:00
Regis Houssin	b7df4a2cd0	FIX this function can not be private	2019-07-13 11:21:07 +02:00
Laurent Destailleur	0a7d70829f	Translation of some comments	2019-07-05 21:37:25 +02:00
Laurent Destailleur	06b3f6a62f	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/subscription/list.php	2019-06-25 13:03:54 +02:00
Laurent Destailleur	fa476b4994	Properties ->libelle_incoterms were renamed into ->label_incoterms	2019-06-25 13:00:02 +02:00
Laurent Destailleur	b6ad78fdd9	Fix sort	2019-06-25 11:25:36 +02:00
Laurent Destailleur	5031b6c06b	Fix bad id	2019-06-25 11:18:31 +02:00
Laurent Destailleur	5f17cfe462	Fix bad id	2019-06-25 11:09:13 +02:00
Laurent Destailleur	27be93f535	Fix bad id	2019-06-25 11:08:42 +02:00
Laurent Destailleur	4ed2db6d21	Fix bad id	2019-06-25 11:08:14 +02:00
Laurent Destailleur	e6b643e073	Fix syntax error	2019-06-25 11:07:14 +02:00
Laurent Destailleur	36f1527f76	Fix backward compatibility for type of members	2019-06-25 11:06:10 +02:00
Laurent Destailleur	ca3988ca73	Fix backward compatibility for type of members	2019-06-25 10:58:44 +02:00
Laurent Destailleur	732fd8a04b	Fix look and feel v10	2019-06-25 10:28:58 +02:00
Laurent Destailleur	74f61b3b9a	Fix status not loaded	2019-06-25 10:23:30 +02:00
Laurent Destailleur	7de0f5c0be	NEW Avoid wrap between picto and text on getNomUrl	2019-06-25 10:22:39 +02:00
Laurent Destailleur	6b8262bd8f	Fix status not loaded	2019-06-25 10:12:24 +02:00
Laurent Destailleur	366efff633	Merge pull request #11107 from gentooza/develop ... NEW adding 'formObjectOptions' hooks loading at card.php of adherents module	2019-06-24 19:20:36 +02:00
Laurent Destailleur	c3a109d790	Update card.php	2019-06-24 19:20:27 +02:00
Laurent Destailleur	604633afd1	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-24 18:45:15 +02:00
Laurent Destailleur	57140b79dc	Restore official text of licence	2019-06-24 18:30:07 +02:00
Laurent Destailleur	35c3eb0d7e	Fix conflict in a translation key	2019-06-24 17:59:00 +02:00
Laurent Destailleur	3c4956838e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/tpl/massactions_pre.tpl.php	2019-06-24 15:44:44 +02:00
Philippe GRAND	72c8316eb0	all http addresses should be https now	2019-06-24 09:39:58 +02:00
Laurent Destailleur	efa09301b1	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-22 20:19:14 +02:00
Laurent Destailleur	71b266b5a8	Code comment	2019-06-22 19:20:01 +02:00
Laurent Destailleur	5675e7c50e	Clean code of deprecated method	2019-06-22 18:19:40 +02:00
John Botella	ec7ebe9f39	redo backported fix and update adherent substitution methode	2019-06-21 15:32:38 +02:00
Laurent Destailleur	4308f48cad	Merge branch 'develop' into MissingHook	2019-06-20 03:04:32 +02:00
Laurent Destailleur	bf71731fc9	Fix phpcs	2019-06-19 22:28:33 +02:00
Nicolas ZABOURI	b6bd4119d9	FIX travis Public underscore in load_ldap_info	2019-06-19 09:12:01 +02:00
Nicolas ZABOURI	2e4db8c83c	Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook	2019-06-19 08:39:05 +02:00
Laurent Destailleur	525598f6aa	Fix scrutinizer warnings	2019-06-18 20:01:28 +02:00
Nicolas ZABOURI	492c3b5625	FIX hook	2019-06-18 15:13:08 +02:00
ICstage	820c420ae5	FIX Missing hooks	2019-06-18 14:07:52 +02:00
florian HENRY	cab91e75c6	add missing column adherent list	2019-06-10 10:10:16 +02:00
ptibogxiv	63e205c23f	FIX term of lang for explicit date in subscription list	2019-06-07 15:15:05 +02:00
Laurent Destailleur	2218994958	FIX Duplicate encoding on error message	2019-05-29 09:51:45 +02:00
Laurent Destailleur	e8ba312d2a	Fix phpcs	2019-05-23 14:25:16 +02:00
Laurent Destailleur	aa93e1c07b	Merge pull request #11221 from frederic34/patch-6 ... The method _load_ldap_dn() cannot be called...	2019-05-21 22:39:15 +02:00
Laurent Destailleur	c1a0e9385f	Merge pull request #11219 from frederic34/patch-2 ... dol_print_object_info return void	2019-05-21 22:38:39 +02:00
Laurent Destailleur	22e897b1a1	Clean and prepare code to fix a SQL injection	2019-05-21 17:22:38 +02:00
Frédéric FRANCE	a368a6a43e	Update adherent_type.class.php	2019-05-19 11:52:34 +02:00
Frédéric FRANCE	a09584ae4b	The method _load_ldap_dn() cannot be called... ... The method _load_ldap_dn() cannot be called from this context as it is declared private in class AdherentType.	2019-05-19 09:46:47 +02:00
Frédéric FRANCE	06421c200d	Update agenda.php	2019-05-19 09:13:46 +02:00
Laurent Destailleur	a9e96031de	Fix phpcs	2019-05-18 17:04:37 +02:00
Laurent Destailleur	1ad2c09800	Fix size of popup	2019-05-18 16:38:52 +02:00
Laurent Destailleur	5f598b1c3f	Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop	2019-05-18 16:26:03 +02:00
Laurent Destailleur	b40eb92ce7	Mass action for closing members	2019-05-18 16:25:45 +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