25147 Commits

Author	SHA1	Message	Date
Laurent Destailleur	ce1f8289a4	FIX #yogosha5746	2021-03-29 15:07:23 +02:00
Laurent Destailleur	e03fbda96a	Avoid to obfuscate attributes with html tags inside	2021-03-29 14:50:44 +02:00
Laurent Destailleur	4cacca413e	FIX #yogosha5757	2021-03-29 14:43:40 +02:00
Laurent Destailleur	e382d49299	Fix bad permission	2021-03-29 13:49:24 +02:00
Laurent Destailleur	b929641fe1	Look and feel v14	2021-03-29 13:00:17 +02:00
Florian HENRY	5926db2704	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft1	2021-03-29 12:10:35 +02:00
Laurent Destailleur	85f6a15678	Fix position of users in combo list	2021-03-29 11:58:51 +02:00
Laurent Destailleur	ad6f5e5a64	Fix permission export of services	2021-03-29 10:26:17 +02:00
daraelmin	8a43d65476	Copyright box_members_by_type.php	2021-03-29 07:49:15 +02:00
Laurent Destailleur	2a431d4951	Protect backtourl from using external urls	2021-03-28 21:39:18 +02:00
Laurent Destailleur	a5d84200dc	Clean code for invoice list	2021-03-28 19:22:04 +02:00
Alexandre SPANGARO	2a1cc04b66	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-03-28 06:16:33 +02:00
Laurent Destailleur	95a7e13e3a	Debug establishment	2021-03-27 14:54:09 +01:00
Laurent Destailleur	5b64a517ea	Fix label	2021-03-27 14:30:10 +01:00
Laurent Destailleur	1bb07c0eb1	Look and feel v14	2021-03-27 13:59:50 +01:00
stickler-ci	6a9d6a8634	Fixing style errors.	2021-03-27 12:44:34 +00:00
daraelmin	bad5aa6468	fix excluded member color in graph	2021-03-27 13:39:15 +01:00
Laurent Destailleur	1d48b883a7	Look and feel v14	2021-03-27 13:17:56 +01:00
daraelmin	c8a455edf4	add excluded memer on graph	2021-03-27 13:14:59 +01:00
Alexandre SPANGARO	22f809c517	Move to _PERENTITY	2021-03-27 05:23:20 +01:00
Alexandre SPANGARO	6422b0a6c0	Merge remote-tracking branch 'upstream/develop' into 14a27	2021-03-27 05:02:55 +01:00
Alexandre SPANGARO	c1ceefb70f	Update with new functionality	2021-03-27 04:44:20 +01:00
Alexandre SPANGARO	6809dab2c0	Merge remote-tracking branch 'upstream/develop' into 14a28	2021-03-27 04:12:15 +01:00
Florian HENRY	3e12820f0e	fix comment	2021-03-26 18:37:11 +01:00
Florian HENRY	f87711bf2f	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation	2021-03-26 18:30:08 +01:00
Laurent Destailleur	01c1101b29	Look and feel v14	2021-03-26 18:16:12 +01:00
lvessiller	05bf3cdab1	FIX stickler-ci errors	2021-03-26 17:59:16 +01:00
Laurent Destailleur	84ec032cc0	Look and feel v14	2021-03-26 17:58:00 +01:00
lvessiller	8a2e49d6e7	NEW date and user signature on proposal (Issue 16062)	2021-03-26 17:44:41 +01:00
Laurent Destailleur	cfd992b930	Add call of rebuild_sequence with pgsql.	2021-03-26 13:10:06 +01:00
Laurent Destailleur	02ba8810cf	Better error message	2021-03-26 12:23:42 +01:00
Laurent Destailleur	44cb9dca67	FIX must use getUrlContent to get external url in RSS module	2021-03-25 19:05:01 +01:00
Laurent Destailleur	d9108362ba	War against $_POST	2021-03-25 16:59:47 +01:00
stickler-ci	c3d8df3ab2	Fixing style errors.	2021-03-25 13:53:41 +00:00
ksar	288d8d97cc	FIX #16940 ... Update nblines after hook	2021-03-25 14:52:17 +01:00
ksar	ccd6d28f6f	FIX #16843 ... https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4 fa-mail-forward => fa-share	2021-03-25 14:39:42 +01:00
Laurent Destailleur	172b615d6c	Debug auto numbering of lot/serial.	2021-03-25 11:51:29 +01:00
Laurent Destailleur	5ddd98cd39	Move module intracomm as experimental	2021-03-25 11:24:46 +01:00
Laurent Destailleur	ff52b1ee41	Merge pull request #16620 from altairisfr/pr_batch_masks ... Define Masks for Batch Products Equipments	2021-03-25 08:36:36 +01:00
Laurent Destailleur	a4aa806e44	Merge pull request #16933 from daraelmin/daraelmin-patch-2 ... Fix #16794 V13 order by status instead of statut	2021-03-25 08:31:44 +01:00
Laurent Destailleur	5af02d96cd	Show entity for user only if different than current entity	2021-03-25 03:58:54 +01:00
Laurent Destailleur	dce3b3e7af	Rename page to avoid to have an index.html page	2021-03-25 03:47:45 +01:00
Laurent Destailleur	594c94feb2	Clean code. Allow iframes into the external frame module.	2021-03-25 03:44:38 +01:00
Laurent Destailleur	930742dadf	Merge pull request #16846 from ptibogxiv/patch-418 ... NEW auto notification with templated emails	2021-03-25 01:48:44 +01:00
Laurent Destailleur	52625325ff	Merge pull request #16922 from dolibit-ut/patch-155 ... Create index.html	2021-03-25 01:39:12 +01:00
Laurent Destailleur	6eac8ee25d	Merge pull request #16921 from dolibit-ut/patch-154 ... Create index.html	2021-03-25 01:39:03 +01:00
Laurent Destailleur	e994fbf093	Merge pull request #16923 from dolibit-ut/patch-156 ... Create index.html	2021-03-25 01:30:53 +01:00
Laurent Destailleur	36a49aacee	Merge pull request #16924 from dolibit-ut/patch-157 ... Create index.html	2021-03-25 01:30:45 +01:00
Laurent Destailleur	3f8d71d024	Merge pull request #16950 from code42fr/fix_translation_tag_#16941 ... Fix translation tag #16941	2021-03-25 00:26:48 +01:00
Laurent Destailleur	87bb84310d	Update translate.class.php	2021-03-25 00:26:16 +01:00
Laurent Destailleur	b011a67698	Fix remove var_dump	2021-03-25 00:03:31 +01:00
Laurent Destailleur	cc54b7fe29	Fix dol_string_onlythesehtmlattributes	2021-03-25 00:03:09 +01:00
Laurent Destailleur	6f01869bcb	Enhance the WAF	2021-03-24 23:14:22 +01:00
Laurent Destailleur	d1fa46089f	Removed not used page. ... Enhance the WAF	2021-03-24 22:54:40 +01:00
Laurent Destailleur	eeba9e4d50	Code comment	2021-03-24 21:58:06 +01:00
Laurent Destailleur	21a9779fe2	FIX inconsistency in margin recording with option "Force to sale price"	2021-03-24 21:49:45 +01:00
Florian HENRY	e898fbb834	almost done	2021-03-24 21:21:53 +01:00
Florian HENRY	373a52063d	add commit	2021-03-24 20:13:30 +01:00
Laurent Destailleur	a5034d44f7	$_POST war	2021-03-24 19:53:31 +01:00
Laurent Destailleur	86c7ab922a	Fix #yogosha5728	2021-03-24 18:57:23 +01:00
Alexandre SPANGARO	34abb53c25	Merge remote-tracking branch 'upstream/develop' into 14a28	2021-03-24 14:09:46 +01:00
Laurent Destailleur	1a5d129bd0	Fix #yogosha5731	2021-03-24 13:32:09 +01:00
Laurent Destailleur	211c5b53eb	NEW Can set if a ticket group is visible on public interface or not.	2021-03-24 13:16:17 +01:00
Laurent Destailleur	37c04b794f	Add property "ticket group is public" in dicitonary of ticket groups.	2021-03-24 12:13:23 +01:00
Laurent Destailleur	4ecd1def49	css	2021-03-24 11:00:26 +01:00
hugo	8a1cd3e471	FIX #16941 langs trans escape tag <i	2021-03-24 10:08:19 +01:00
Laurent Destailleur	367ff3c9f0	Look and feel v14	2021-03-24 01:53:08 +01:00
Florian HENRY	ebe0b503f6	working on attendees	2021-03-23 22:12:20 +01:00
Laurent Destailleur	4d1fdd8763	Fix #yogosha5725	2021-03-23 21:45:37 +01:00
Florian HENRY	d043c8f4ba	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation	2021-03-23 21:05:11 +01:00
Florian HENRY	cc78e7c685	add field on conf or booth tabs	2021-03-23 21:04:38 +01:00
Laurent Destailleur	02509ccbc4	Responsive	2021-03-23 20:39:11 +01:00
Laurent Destailleur	28ca2990f0	CSS	2021-03-23 20:09:26 +01:00
ATM john	4f693b86c2	shhhhhh ! There is nothing here...	2021-03-23 19:27:40 +01:00
Laurent Destailleur	3857daed94	Fix remove log	2021-03-23 18:08:44 +01:00
Laurent Destailleur	5ff9038e4e	Fix permissions on BOMs	2021-03-23 18:02:52 +01:00
Laurent Destailleur	cfa39597c3	FIX #yogosha5707	2021-03-23 17:28:38 +01:00
Laurent Destailleur	7c69b45c68	FIX #yogosha5707	2021-03-23 17:27:43 +01:00
Laurent Destailleur	053fe4831a	Fix translations	2021-03-23 16:59:12 +01:00
Laurent Destailleur	538547acfe	Add currency into combo of bank account (for a future use in js)	2021-03-23 16:26:31 +01:00
Laurent Destailleur	00e48aa922	Clean and secured code for ajax/row.php	2021-03-23 16:09:02 +01:00
Laurent Destailleur	b275789223	Fix regression	2021-03-23 12:22:30 +01:00
Laurent Destailleur	a1366da130	FIX #yogosha5715	2021-03-23 03:45:17 +01:00
Laurent Destailleur	e3b019f923	Clean code	2021-03-23 01:32:17 +01:00
Laurent Destailleur	af593099df	Clean string	2021-03-22 23:52:14 +01:00
Laurent Destailleur	f7ba0ee381	Fix set of parent company with ajax	2021-03-22 22:50:43 +01:00
Laurent Destailleur	cce4ebdb8c	Clean code	2021-03-22 18:50:47 +01:00
Laurent Destailleur	5a8d757a30	Add missing data	2021-03-22 18:23:29 +01:00
Laurent Destailleur	5d6fb0cfea	Perf: Enhance performance of VAT report	2021-03-22 18:11:44 +01:00
Laurent Destailleur	df9546662a	Fix trans	2021-03-22 16:18:31 +01:00
Laurent Destailleur	897d653144	Debug default date for vat reports	2021-03-22 16:09:18 +01:00
Laurent Destailleur	ca1715df96	Add some protection for SQL injection	2021-03-22 13:31:06 +01:00
Laurent Destailleur	6063b02bf4	Fix #ygosha5698	2021-03-22 12:47:23 +01:00
Laurent Destailleur	6a0e0f4c06	Fix #ygosha5698	2021-03-22 12:10:51 +01:00
Laurent Destailleur	15440917b1	Fix #ygosha5698	2021-03-22 11:30:18 +01:00
daraelmin	6ba878725e	Fix #16794 V13 order by status instead of statut	2021-03-22 07:28:16 +01:00
stickler-ci	5af4b4673c	Fixing style errors.	2021-03-21 22:12:36 +00:00
Alexandre SPANGARO	0c2ada4299	Merge remote-tracking branch 'upstream/develop' into 14a27	2021-03-21 23:08:01 +01:00
Alexandre SPANGARO	17e0cc4bad	Merge remote-tracking branch 'upstream/develop' into 14a28	2021-03-21 22:59:41 +01:00
Alexandre SPANGARO	ea938f64da	NEW: Add company info in dropdown login menu	2021-03-21 22:58:21 +01:00
Laurent Destailleur	4ac5d32c48	Fix picto	2021-03-21 22:27:12 +01:00
UT from dolibit	32cf5240f8	Create index.html	2021-03-21 22:17:50 +01:00
Laurent Destailleur	9d1dcccb86	Fix css	2021-03-21 22:15:37 +01:00
UT from dolibit	e6a2243627	Create index.html	2021-03-21 22:15:33 +01:00
UT from dolibit	6dc0d8202b	Create index.html	2021-03-21 22:14:13 +01:00
UT from dolibit	34b1b18a89	Create index.html	2021-03-21 22:12:19 +01:00
Laurent Destailleur	2a7b687fbf	Merge pull request #16918 from dolibit-ut/patch-151 ... Create index.html	2021-03-21 21:47:04 +01:00
Laurent Destailleur	4806d2f40b	Merge pull request #16916 from dolibit-ut/patch-149 ... Create index.html	2021-03-21 21:46:56 +01:00
Laurent Destailleur	ffb81d5acc	Merge pull request #16905 from dolibit-ut/patch-138 ... Create index.html	2021-03-21 21:46:49 +01:00
Laurent Destailleur	fa82f2161f	Merge pull request #16915 from dolibit-ut/patch-148 ... Create index.html	2021-03-21 21:46:43 +01:00
Laurent Destailleur	7f9199691a	Merge pull request #16908 from dolibit-ut/patch-141 ... Create index.html	2021-03-21 21:46:36 +01:00
Laurent Destailleur	4f025e419e	Merge pull request #16901 from dolibit-ut/patch-134 ... Create index.html	2021-03-21 21:46:29 +01:00
Laurent Destailleur	92b5d12574	Merge pull request #16903 from dolibit-ut/patch-136 ... Create index.html	2021-03-21 21:46:21 +01:00
Laurent Destailleur	2a25f3096c	Merge pull request #16902 from dolibit-ut/patch-135 ... Create index.html	2021-03-21 21:46:14 +01:00
Laurent Destailleur	449315c225	Merge pull request #16904 from dolibit-ut/patch-137 ... Create index.html	2021-03-21 21:46:07 +01:00
Laurent Destailleur	5ccbd62fc8	Merge pull request #16906 from dolibit-ut/patch-139 ... Create index.html	2021-03-21 21:45:59 +01:00
Laurent Destailleur	b798321f09	Merge pull request #16913 from dolibit-ut/patch-146 ... Create index.html	2021-03-21 21:45:53 +01:00
Laurent Destailleur	84487e4ef8	Merge pull request #16907 from dolibit-ut/patch-140 ... Create index.html	2021-03-21 21:45:46 +01:00
Laurent Destailleur	472fe901a7	Merge pull request #16909 from dolibit-ut/patch-142 ... Create index.html	2021-03-21 21:45:39 +01:00
Laurent Destailleur	ddea352092	Merge pull request #16910 from dolibit-ut/patch-143 ... Create index.html	2021-03-21 21:45:32 +01:00
Laurent Destailleur	d9ec217210	Merge pull request #16912 from dolibit-ut/patch-145 ... Create index.html	2021-03-21 21:45:25 +01:00
Laurent Destailleur	a78e62a16e	Merge pull request #16914 from dolibit-ut/patch-147 ... Create index.html	2021-03-21 21:45:18 +01:00
UT from dolibit	9eb50eee00	Create index.html	2021-03-21 21:40:37 +01:00
UT from dolibit	0241e2d449	Create index.html	2021-03-21 21:38:53 +01:00
UT from dolibit	98c2c59486	Create index.html	2021-03-21 21:36:41 +01:00
UT from dolibit	39190dc07f	Create index.html	2021-03-21 21:34:21 +01:00
UT from dolibit	5b028d192d	Create index.html	2021-03-21 21:33:39 +01:00
UT from dolibit	9925cdcbee	Create index.html	2021-03-21 21:32:35 +01:00
UT from dolibit	d0cace4f2c	Create index.html	2021-03-21 21:32:05 +01:00
UT from dolibit	50672bfe31	Create index.html	2021-03-21 21:19:54 +01:00
UT from dolibit	2a069a0a2c	Create index.html	2021-03-21 21:19:12 +01:00
UT from dolibit	4b3b4d072a	Create index.html	2021-03-21 21:17:12 +01:00
UT from dolibit	2f957667ed	Create index.html	2021-03-21 21:16:32 +01:00
UT from dolibit	163b960da9	Create index.html	2021-03-21 21:15:40 +01:00
UT from dolibit	8ec3c4a5b5	Create index.html	2021-03-21 21:14:52 +01:00
UT from dolibit	21a2b4e222	Create index.html	2021-03-21 21:13:33 +01:00
ptibogxiv	6d26b4aec3	Update notify.class.php	2021-03-21 21:11:39 +01:00
UT from dolibit	e4921fa843	Create index.html	2021-03-21 21:11:01 +01:00
UT from dolibit	c0e7800251	Create index.html	2021-03-21 21:10:13 +01:00
UT from dolibit	ae91f3be63	Create index.html	2021-03-21 21:07:25 +01:00
Laurent Destailleur	800eeef868	Clean code	2021-03-21 18:20:37 +01:00
Laurent Destailleur	3c8bf2167b	Debug permissions	2021-03-21 18:01:43 +01:00
Laurent Destailleur	af199189b3	NEW Add color and picto for direction of movement	2021-03-21 13:46:01 +01:00
Laurent Destailleur	eeb1c5d884	Replace deprecated code	2021-03-20 21:46:10 +01:00
Laurent Destailleur	2b3599dba5	Clean code	2021-03-20 21:29:36 +01:00
Laurent Destailleur	70be2dbcf0	Fix regression in tests	2021-03-20 20:51:19 +01:00
Laurent Destailleur	9900429fd0	Merge pull request #16889 from frederic34/adherent_to_member ... rename files from adherent to member	2021-03-20 20:37:44 +01:00
Laurent Destailleur	8f6f8248a3	Merge pull request #16885 from daraelmin/daraelmin-patch-4 ... #Fix #16767 unremovable attached file in mailmodel	2021-03-20 19:51:26 +01:00
Laurent Destailleur	861a5becf1	Merge pull request #16884 from daraelmin/daraelmin-patch-3 ... #Fix #16767 v13 unremovable attached file in mailmodel	2021-03-20 19:51:07 +01:00
Laurent Destailleur	e330c0f91a	Merge pull request #16883 from aspangaro/14a28 ... Uniformize information on modules	2021-03-20 19:49:33 +01:00
Laurent Destailleur	a2b3afb511	Merge branch 'develop' into 14a22	2021-03-20 19:48:43 +01:00
Laurent Destailleur	46aa01aea0	Fix permission on export of BOM and website	2021-03-20 19:15:15 +01:00
Frédéric FRANCE	d2f7d3064d	can use $conf->member	2021-03-20 19:09:49 +01:00
Frédéric FRANCE	f6e7285949	rename files from adherent to member	2021-03-20 19:06:15 +01:00
daraelmin	cb71936ccd	#Fix #16767 unremovable attached file in mailmodel ... #Fix #16767 make default attached file of a mail model selected removable	2021-03-20 14:10:56 +01:00
daraelmin	2d7f858c1a	#Fix #16767 unremovable attached file in mailmodel ... #Fix #16767 unremovable attached file in mailmodel	2021-03-20 14:04:20 +01:00
Alexandre SPANGARO	3669c374c2	Uniformize information on modules	2021-03-20 13:55:43 +01:00
Laurent Destailleur	e334e83a64	Merge branch 'develop' into 14a22	2021-03-20 13:42:54 +01:00
Laurent Destailleur	e1f23105a6	Finally try to follow install per entity instead of per instance.	2021-03-20 12:49:44 +01:00
Laurent Destailleur	65bf47b693	Merge pull request #16845 from hregis/fix_warning_php8 ... FIX avoid php8 warning with multicompany	2021-03-20 12:46:02 +01:00
stickler-ci	625f72303b	Fixing style errors.	2021-03-20 11:43:13 +00:00
Laurent Destailleur	d8aa5f5eab	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-20 12:43:07 +01:00
Laurent Destailleur	3d3a7bfd37	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/card.php htdocs/projet/card.php htdocs/projet/contact.php htdocs/projet/element.php htdocs/projet/tasks.php htdocs/projet/tasks/comment.php htdocs/projet/tasks/contact.php htdocs/projet/tasks/document.php htdocs/projet/tasks/note.php htdocs/projet/tasks/task.php htdocs/projet/tasks/time.php	2021-03-20 12:42:46 +01:00
Regis Houssin	29e090b025	FIX force to entity 0 for all entities	2021-03-20 12:35:41 +01:00
Regis Houssin	573ca669da	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_warning_php8	2021-03-20 12:11:12 +01:00
Laurent Destailleur	ee84bef3b2	Merge pull request #16828 from frederic34/membersboxfix ... fix new boxes add	2021-03-20 11:52:19 +01:00
Laurent Destailleur	2da85a9ca2	Merge pull request #16842 from hregis/fix_avoid_warning_php8 ... FIX avoid php8 warning in products list	2021-03-20 11:48:53 +01:00
Laurent Destailleur	285b166b12	Merge pull request #16849 from frederic34/ecmindex ... fix php8 warnings	2021-03-20 11:37:00 +01:00
Laurent Destailleur	3cc8a8e2ee	Merge pull request #16850 from frederic34/patch-4 ... fix php8 warning	2021-03-20 11:28:47 +01:00
Laurent Destailleur	e54ca79a8c	Merge pull request #16854 from frederic34/confglobal ... get conf global function	2021-03-20 11:26:32 +01:00
Laurent Destailleur	25f1b82c34	Merge pull request #16859 from frederic34/patch-11 ... fix doxygen	2021-03-20 11:24:50 +01:00
Laurent Destailleur	5f0a2e648b	Merge pull request #16871 from frederic34/patch-19 ... fix doxygen	2021-03-20 11:15:48 +01:00
Laurent Destailleur	685ec0bc63	Merge pull request #16872 from frederic34/patch-22 ... fix doxygen	2021-03-20 11:15:32 +01:00
Laurent Destailleur	3ce4762710	Merge pull request #16873 from frederic34/patch-23 ... fix doxygen	2021-03-20 11:15:22 +01:00
Laurent Destailleur	bc639045c0	Merge pull request #16874 from frederic34/patch-24 ... fix doxygen	2021-03-20 11:15:12 +01:00
Laurent Destailleur	810b15f73a	Merge pull request #16875 from frederic34/patch-25 ... fix doxygen	2021-03-20 11:14:57 +01:00
Laurent Destailleur	1d2b3a0967	Merge pull request #16876 from frederic34/patch-26 ... fix doxygen	2021-03-20 11:12:46 +01:00
Frédéric FRANCE	8142d76394	fix php8 warnings	2021-03-20 10:50:02 +01:00
Frédéric FRANCE	65c3dced1c	fix doxygen	2021-03-20 10:34:23 +01:00
Frédéric FRANCE	5da597d947	fix doxygen	2021-03-20 10:32:18 +01:00
Frédéric FRANCE	a8d8775328	fix doxygen	2021-03-20 10:30:26 +01:00
Frédéric FRANCE	dad7038a0d	fix doxygen	2021-03-20 10:22:34 +01:00
Frédéric FRANCE	49ff44e414	fix doxygen	2021-03-20 10:21:23 +01:00
Frédéric FRANCE	8af1f278ae	fix doxygen	2021-03-20 10:19:03 +01:00
Laurent Destailleur	b5264e978b	Merge pull request #16776 from frederic34/boxticket ... fix php8 warnings	2021-03-20 10:14:34 +01:00
Frédéric FRANCE	1a2b22def4	fix doxygen	2021-03-20 09:14:52 +01:00
Alexandre SPANGARO	17d3b85ec4	Merge remote-tracking branch 'upstream/develop' into 14a27	2021-03-20 07:47:54 +01:00
Alexandre SPANGARO	00e21caa42	NEW: Add a sub table to manage accountancy on product/company	2021-03-20 07:42:16 +01:00
Frédéric FRANCE	4c5ddc44dc	get conf global function	2021-03-19 17:58:01 +01:00
Frédéric FRANCE	93ae7a3fed	fix php8 warning	2021-03-19 17:01:14 +01:00
Frédéric FRANCE	239dae03bf	fix php8 warnings	2021-03-19 16:57:12 +01:00
Laurent Destailleur	be90f5f2de	Fix id of advanced perm	2021-03-19 15:00:22 +01:00
Laurent Destailleur	8462c4d3d3	Clean menu	2021-03-19 13:37:43 +01:00
Laurent Destailleur	aef2f1713e	FIX #yogosha5673	2021-03-19 13:25:58 +01:00
Laurent Destailleur	ebf409f831	FIX #yogosha5668	2021-03-19 12:08:40 +01:00
stickler-ci	08727a86b0	Fixing style errors.	2021-03-19 10:53:06 +00:00
ptibogxiv	d38f7f7dfe	NEW auto notification with templated emails	2021-03-19 11:50:15 +01:00
Regis Houssin	43e1dbb9ef	FIX avoid php8 warning with multicompany	2021-03-19 11:27:31 +01:00
stickler-ci	ee701bb480	Fixing style errors.	2021-03-19 09:05:20 +00:00
Regis Houssin	a1f6886e97	FIX avoid php8 warning in products list	2021-03-19 10:01:40 +01:00
Frédéric FRANCE	7183bfeb94	fix new boxes add	2021-03-19 09:15:35 +01:00
Laurent Destailleur	b9aacca771	Fix css	2021-03-19 00:04:43 +01:00
Laurent Destailleur	78aec3daae	Removed option MAIN_EXTERNAL_USERS_CAN_SEE_SUBSIDIARY_COMPANIES. The ... implmentation did not make any test on subsidiaries. It has same effect than being an internal user.	2021-03-19 00:00:06 +01:00
Laurent Destailleur	e9f9cf62af	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-18 23:59:03 +01:00
Laurent Destailleur	3785346835	Revert " fix:Handle constant MAIN_SHOW_SOCIETE2EXTERN in checkUserAccessToObject"	2021-03-18 23:57:48 +01:00
Laurent Destailleur	ce4aadba84	Merge branch 'develop' into abb120359	2021-03-18 23:54:27 +01:00
Laurent Destailleur	5ecef1bad3	Merge pull request #16739 from altairisfr/pr_searchbatch ... NEW Add search on lots or serials into quick search bar	2021-03-18 23:43:23 +01:00
Laurent Destailleur	27c7950417	Fix migration of boxes	2021-03-18 23:39:19 +01:00
Frédéric FRANCE	5b253eeb47	fix the fix	2021-03-18 23:30:42 +01:00
Laurent Destailleur	5037de49c4	Merge pull request #16773 from frederic34/patch-5 ... fix php8 warning	2021-03-18 23:19:32 +01:00
Laurent Destailleur	b66173a111	Merge pull request #16771 from frederic34/projet_task_stats ... fix php8 warnings	2021-03-18 23:15:37 +01:00
Laurent Destailleur	dc0482e98c	Merge pull request #16774 from frederic34/php8-fix-functionlib ... fix php8 warnings	2021-03-18 23:13:12 +01:00
Laurent Destailleur	0c882739e3	Merge pull request #16777 from frederic34/patch-8 ... fix php8 warning	2021-03-18 23:10:59 +01:00
Laurent Destailleur	63b78af05f	Merge pull request #16778 from frederic34/patch-9 ... fix php8 warning	2021-03-18 23:10:20 +01:00
Laurent Destailleur	1ecb2ed342	Merge pull request #16780 from frederic34/patch-11 ... fix php8 warning	2021-03-18 23:09:54 +01:00
Laurent Destailleur	a200f6f6ea	Merge pull request #16785 from frederic34/fixextrafieldsadmin ... fix php8 warning	2021-03-18 23:08:15 +01:00
Laurent Destailleur	319fe108fc	Merge pull request #16811 from frederic34/patch-19 ... fix php8 warning	2021-03-18 22:53:56 +01:00
Laurent Destailleur	f78b4b903d	Merge pull request #16795 from frederic34/patch-18 ... fix php7.4 php8 warning when upgrade reloads modules	2021-03-18 22:53:44 +01:00
Frédéric FRANCE	37fcaf2a57	fix php8 warning	2021-03-18 22:07:35 +01:00
Frédéric FRANCE	b584adf299	fix project replace projet	2021-03-18 21:10:55 +01:00
Frédéric FRANCE	c43d3dff92	fix project replace projet	2021-03-18 20:51:40 +01:00
Frédéric FRANCE	3380f740e5	need to clean glasses	2021-03-18 18:56:28 +01:00
Frédéric FRANCE	f810fffc01	fix php8 wzrning	2021-03-18 18:50:38 +01:00
Florian HENRY	df4a243f18	fix: PRODUIT_PDF_MERGE_PROPAL options do not work with new product feature	2021-03-18 17:13:34 +01:00
Alexandre SPANGARO	18d247026d	NEW: Add a sub table to manage product/societe	2021-03-18 17:08:55 +01:00
Frédéric FRANCE	1b4b48a634	fix php8 warning when upgrade reloads modules	2021-03-18 13:18:50 +01:00
Laurent Destailleur	ac6b6f22e7	Enhance sanitizing of data	2021-03-18 11:39:23 +01:00
Frédéric FRANCE	75cf5e3599	fix php8 warning	2021-03-17 23:55:46 +01:00
Frédéric FRANCE	22ac6c79b3	fix php8 warning	2021-03-17 22:29:33 +01:00
Frédéric FRANCE	00cd4cd953	fix php8 warning	2021-03-17 22:19:40 +01:00
Frédéric FRANCE	da3fcf3ca5	fix php8 warning	2021-03-17 22:16:54 +01:00
Laurent Destailleur	31478d5ac0	Look and feel v14	2021-03-17 22:01:25 +01:00
Frédéric FRANCE	0080d42b66	fix php8 warnings	2021-03-17 21:49:05 +01:00
Laurent Destailleur	35869f1449	Add function dol_string_onlythesehtmlattributes() and option ... MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES to enable it.	2021-03-17 21:39:28 +01:00
Frédéric FRANCE	9609c3095a	fix php8 warnings	2021-03-17 20:13:20 +01:00
Frédéric FRANCE	fced63e93b	fix php8 warning	2021-03-17 20:11:22 +01:00
Frédéric FRANCE	efaa2be3b8	fix php8 warnings	2021-03-17 18:38:24 +01:00
Laurent Destailleur	24576897ef	Merge pull request #16750 from frederic34/restrictiononfksoc ... fix php8 warnings	2021-03-17 17:05:23 +01:00
Laurent Destailleur	8829d42e1d	Merge pull request #16742 from frederic34/fix-php8-20210306 ... Fix php8	2021-03-17 16:58:05 +01:00
Laurent Destailleur	09f8ccd882	Merge pull request #16753 from frederic34/patch-12 ... fix php8 warning	2021-03-17 16:56:10 +01:00
Laurent Destailleur	36cb213a83	Merge pull request #16764 from hregis/fix_php_8_warning_again ... FIX avoid php 8.x warning	2021-03-17 16:50:21 +01:00
Laurent Destailleur	33c3b9d1a3	Merge pull request #16763 from hregis/fix_avoid_php_8_warning ... FIX avoid php 8 warning	2021-03-17 16:50:08 +01:00
Regis Houssin	4d149dc3fe	FIX avoid php 8.x warning	2021-03-17 15:15:51 +01:00
Regis Houssin	5fc40f2b12	FIX avoid php 8 warning	2021-03-17 14:32:25 +01:00
Regis Houssin	bb4c8d9114	FIX avoid warning with php 8	2021-03-17 12:48:59 +01:00
Laurent Destailleur	8de1b4c94e	Factorize code	2021-03-17 11:34:19 +01:00
Frédéric FRANCE	dde51a23f0	fix php8 warning ... sometimes $size == '' and cause warnings later in the code	2021-03-16 22:01:59 +01:00
Frédéric FRANCE	4e8ea5c07e	fix php8 warnings	2021-03-16 21:13:15 +01:00
Frédéric FRANCE	e1ad7013d9	fix php8	2021-03-16 17:47:24 +01:00
Christophe Battarel	f59c19b573	search on lots or serials	2021-03-16 16:50:59 +01:00
Laurent Destailleur	e366d2c379	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/admin/tools/export_files.php htdocs/compta/paiement_charge.php htdocs/compta/sociales/card.php htdocs/core/lib/functions.lib.php htdocs/cron/list.php htdocs/filefunc.inc.php test/phpunit/FilesLibTest.php	2021-03-16 14:57:04 +01:00
Laurent Destailleur	f514dec6ab	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/compta/paiement_charge.php htdocs/compta/sociales/card.php	2021-03-16 14:50:06 +01:00
Bahfir Abbes	9c51e62d0f	Update security.lib.php ... MAIN_EXTERNAL_USERS_CAN_SEE_SUBSIDIARY_COMPANIES	2021-03-16 12:25:17 +01:00
Laurent Destailleur	017120f017	Merge pull request #16697 from frederic34/patch-3 ... fix syntax	2021-03-16 10:42:49 +01:00
Laurent Destailleur	71e7f10a54	FIX #16698	2021-03-16 10:39:10 +01:00
Laurent Destailleur	87ab711a0f	Merge pull request #16707 from FHenry/dev_EventOrganisation ... new: working on conference or booth object and event type #FoundationFunding	2021-03-16 10:34:55 +01:00
Laurent Destailleur	a357ab0ee7	Merge pull request #16708 from frederic34/patch-4 ... fix php8 warning	2021-03-16 10:34:02 +01:00
Laurent Destailleur	897f4be033	Merge pull request #16712 from frederic34/patch-9 ... fix php8 warnings	2021-03-16 10:33:01 +01:00
Laurent Destailleur	401aeb8a7f	Merge pull request #16706 from frederic34/htmlforcc ... decompose code	2021-03-16 10:32:44 +01:00
Laurent Destailleur	462164a5a8	Merge pull request #16709 from frederic34/patch-5 ... fix php8 warnings	2021-03-16 10:31:53 +01:00
Florian HENRY	9d8254eff4	fix price output in commoncard	2021-03-16 09:59:45 +01:00
Alexandre SPANGARO	6e17a588bb	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-03-16 03:26:28 +01:00
Frédéric FRANCE	2d741a33f0	fix php8 warning	2021-03-15 21:03:54 +01:00
Frédéric FRANCE	f7d43ce4fb	fix php8 warnings	2021-03-15 20:55:59 +01:00
Frédéric FRANCE	a0e6f454ff	fix php8 warnings	2021-03-15 20:31:55 +01:00
Frédéric FRANCE	c437b2d5c9	fix php8 warning ... Undefined property: stdClass::$fin_validite Undefined property: stdClass::$date_cloture $dateterm, $dateclose, $late not used	2021-03-15 20:28:37 +01:00
Florian HENRY	177a6bfe4f	conference or booth card and list ok	2021-03-15 20:20:53 +01:00
Frédéric FRANCE	e89cfc3753	decompose code	2021-03-15 20:17:01 +01:00
Frédéric FRANCE	910b4f1daf	Update html.formmail.class.php	2021-03-15 18:58:35 +01:00
Frédéric FRANCE	dd4b8f2880	Update html.formmail.class.php	2021-03-15 18:22:50 +01:00
Florian HENRY	17c49e6ce9	ongoinf card and list	2021-03-15 18:06:23 +01:00
Laurent Destailleur	1e323b302e	Merge pull request #16684 from frederic34/patch-3 ... fix php8 warning	2021-03-15 17:14:42 +01:00
Laurent Destailleur	a8c34a5b05	Invert MAIN_EXTRAFIELDS_USE_SELECT2 into ... MAIN_EXTRAFIELDS_DISABLE_SELECT2	2021-03-15 14:16:55 +01:00
Frédéric FRANCE	d4eecf3eb2	fix php8 warning	2021-03-15 13:51:54 +01:00
Laurent Destailleur	3964801d40	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop	2021-03-15 13:26:20 +01:00
Laurent Destailleur	2129adf129	Add more fields to llx_oauth_token	2021-03-15 13:25:08 +01:00
Laurent Destailleur	85eaec48e1	Merge pull request #16307 from aspangaro/14a15 ... NEW: VAT report - Optimisation & collapse by rate	2021-03-15 11:56:06 +01:00
Christophe Battarel	090dc4f28a	Merge branch 'develop' into pr_batch_masks	2021-03-15 11:42:33 +01:00
Laurent Destailleur	7d1e18f5ab	Merge pull request #16625 from FHenry/dev_EventOrganisation ... new: working on conference or booth object and event type #FoundationFunding	2021-03-15 11:37:57 +01:00
Frédéric FRANCE	15c751ae89	Merge remote-tracking branch 'upstream/develop' into php8-fix	2021-03-15 11:18:41 +01:00
Laurent Destailleur	21400b96fa	Merge pull request #16656 from frederic34/patch-11 ... remove dol_buildpath	2021-03-15 11:08:01 +01:00
Laurent Destailleur	007201ea64	Merge pull request #16662 from frederic34/patch-17 ... fix php8 warning	2021-03-15 11:06:38 +01:00
Laurent Destailleur	7b61f756f8	Merge pull request #16659 from frederic34/patch-14 ... fix php8 warnings	2021-03-15 11:05:53 +01:00
Laurent Destailleur	b7c7bd8d94	Merge pull request #16666 from frederic34/patch-21 ... fix php8 warning	2021-03-15 11:03:20 +01:00
Laurent Destailleur	57f9607e3e	Update accounting.lib.php	2021-03-15 11:01:01 +01:00
Laurent Destailleur	e7205a4f79	Merge pull request #16677 from frederic34/patch-31 ... fix php8 warning	2021-03-15 10:55:01 +01:00
Laurent Destailleur	26e8a9c795	Code comment	2021-03-15 10:08:02 +01:00
Frédéric FRANCE	e8b994ece5	fix php8 warning	2021-03-15 00:40:10 +01:00
Laurent Destailleur	382b810ba1	Fix phpcs	2021-03-15 00:18:26 +01:00
Laurent Destailleur	1d2929e3f5	Clean code	2021-03-15 00:01:55 +01:00
Frédéric FRANCE	abd9a639a2	fix php8 warning	2021-03-14 23:41:06 +01:00
Laurent Destailleur	9aa8916a9c	Disallow use of &# into dol_sanitizeUrl()	2021-03-14 20:35:55 +01:00
Frédéric FRANCE	bbb0d9acc4	fix php8 warning	2021-03-14 20:31:13 +01:00
Laurent Destailleur	45579edd43	Enhance WAF and dol_sanitizeUrl	2021-03-14 18:57:18 +01:00
Frédéric FRANCE	0cbf57327b	fiw php8 warnings	2021-03-14 18:18:21 +01:00
Frédéric FRANCE	220b1539f7	Update cron.lib.php	2021-03-14 17:36:27 +01:00
Laurent Destailleur	c2a86e71be	fix phpv8	2021-03-14 16:44:11 +01:00
Laurent Destailleur	4965ce8768	Fix method to sanitize an URL	2021-03-14 16:14:24 +01:00
Laurent Destailleur	74a61d559f	FIX sanitizing with GETPOST(alphanohtml) #yogosha5629	2021-03-14 15:39:59 +01:00
Laurent Destailleur	72766c830d	FIX #Yogosha5631	2021-03-14 15:06:40 +01:00
Laurent Destailleur	95006ec94c	Fix sanitizing backtopage	2021-03-14 12:58:37 +01:00
Laurent Destailleur	cc10106a21	Fix protection on int	2021-03-14 12:20:23 +01:00
Laurent Destailleur	12f50a76d7	Fix yogosha #5627	2021-03-14 11:48:39 +01:00
Laurent Destailleur	0a542ad9f9	Fix redirect to external website. Bad sanitizing of backtopage parameter	2021-03-14 11:38:42 +01:00
Laurent Destailleur	bcfe711544	Fix redirect to extern url	2021-03-13 19:20:34 +01:00
Laurent Destailleur	5faecef0e1	Look and feel v14	2021-03-13 18:56:02 +01:00
Frédéric FRANCE	c3c03e9de3	fix php8 fatal error	2021-03-13 18:42:50 +01:00
Laurent Destailleur	0dfe79e619	CSS	2021-03-13 14:10:07 +01:00
Laurent Destailleur	8c6fe6f29b	Merge pull request #16638 from frederic34/patch-5 ... go back actioncomm create after create project	2021-03-12 20:19:30 +01:00
Laurent Destailleur	aa26f873ff	Merge pull request #16634 from mrtnnbr/develop ... Add UPC support to built-in barcode generator	2021-03-12 20:16:45 +01:00
stickler-ci	f507df994b	Fixing style errors.	2021-03-12 18:07:16 +00:00
Frédéric FRANCE	6be6e306b1	Update interface_50_modEventOrganization_EventOrganization.class.php	2021-03-12 19:05:03 +01:00
Laurent Destailleur	af5db0f5fa	Look and feel v14	2021-03-12 15:34:31 +01:00
Martin Neubauer	85eb82c8c3	Tweak offsets for UPC barcode text	2021-03-12 14:44:04 +01:00
Christophe Battarel	c339af533d	fix conflict	2021-03-12 14:15:55 +01:00
Martin Neubauer	0db65597fd	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2021-03-12 13:58:00 +01:00
Martin Neubauer	09cedb5a5e	ISBN might start with 979 these days	2021-03-12 13:55:39 +01:00
Martin Neubauer	5aaeb6742c	Add UPC support to built-in barcode generator	2021-03-12 13:54:27 +01:00
Frédéric FRANCE	7a2e28497d	fix number is already used doesn't propose new code with elephant	2021-03-12 13:14:53 +01:00
Martin Neubauer	7b59a3ac2b	Factor out generating EAN bars	2021-03-12 13:11:17 +01:00
Laurent Destailleur	777ba369c4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-12 12:44:25 +01:00
Laurent Destailleur	f9918dd51f	Code comment	2021-03-12 11:50:48 +01:00
Laurent Destailleur	aee3fda3d1	Merge pull request #16280 from bafbes/abb120358 ... New:Constant MAIN_SHOW_SOCIETE2EXTERN to allow access to any thirdparty for external users	2021-03-12 11:14:31 +01:00
Regis Houssin	5375add08c	FIX just add mp4	2021-03-12 08:41:56 +01:00
Regis Houssin	290f49a3e0	FIX wrong extension	2021-03-12 08:39:36 +01:00
Regis Houssin	05532ca6b7	FIX missing video mime	2021-03-12 08:35:13 +01:00
Florian HENRY	f17aa47ad6	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft	2021-03-11 22:03:51 +01:00
Laurent Destailleur	fc08c48bf3	Merge pull request #16591 from Givriz/dev ... Replace gender and civility by a picto	2021-03-11 21:36:16 +01:00
Laurent Destailleur	b7a66769bb	Merge pull request #16603 from FHenry/dev_EventOrganisation ... new: working on conference or booth object and event type #FoundationFunding	2021-03-11 21:35:39 +01:00
Laurent Destailleur	e8bbef8d2d	Update interface_50_modEventOrganization_EventOrganization.class.php	2021-03-11 21:35:22 +01:00
Florian HENRY	862926316a	working on list	2021-03-11 19:09:42 +01:00
Damien BENOIT	420a3a73dd	Update html.form.class.php	2021-03-11 18:15:22 +01:00
Florian HENRY	3ae93679cf	Merge branch 'dev_EventOrganisation' into dev_EventOrganisation_draft	2021-03-11 16:59:13 +01:00
Florian HENRY	6742241639	better tranaction and condition	2021-03-11 16:55:49 +01:00
stickler-ci	345fe648b3	Fixing style errors.	2021-03-11 15:37:27 +00:00
Laurent Destailleur	c596eb91a8	Merge branch 'develop' into abb120358	2021-03-11 16:35:21 +01:00
Christophe Battarel	229c581a25	try to fix sticker	2021-03-11 11:30:12 +01:00
Christophe Battarel	e8aacc7acf	try to fix sticker	2021-03-11 11:12:03 +01:00
Christophe Battarel	ba51c5dc70	differentiate masks for lot management and serial numbers management	2021-03-11 10:44:55 +01:00
lmarcouiller	9aa20585be	Fix #16617 : fix event add when removing boxes	2021-03-11 10:10:20 +01:00
Christophe Battarel	2c711f1a2d	add masks for batch	2021-03-11 10:02:31 +01:00
Bahfir Abbes	0158cbb893	Update security.lib.php	2021-03-11 04:02:30 +01:00
Laurent Destailleur	3007141b2b	Fix phpcs	2021-03-10 20:40:34 +01:00
Laurent Destailleur	82d5c7289d	Add property widgettype	2021-03-10 17:02:39 +01:00
Damien BENOIT	2b33bb2d04	Merge pull request #11 from Dolibarr/develop ... Update fork	2021-03-10 16:53:35 +01:00
Laurent Destailleur	521e3b20dc	Rename widget	2021-03-10 16:44:46 +01:00
Damien BENOIT	93675082d7	Update html.form.class.php	2021-03-10 16:42:14 +01:00
Laurent Destailleur	c2200e6ffd	Clean code	2021-03-10 16:41:48 +01:00
Givriz	6e46396b17	Ajout de picto pour le genre et la civilité	2021-03-10 16:31:50 +01:00
Laurent Destailleur	514a9fb96a	Merge pull request #16561 from Hystepik/develop#1 ... Close #15917 : Improvement to ticket module	2021-03-10 15:49:20 +01:00
Laurent Destailleur	9ed128c6fa	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/account.php htdocs/core/class/html.formaccounting.class.php htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php htdocs/langs/en_US/errors.lang htdocs/product/card.php	2021-03-10 15:35:09 +01:00
Laurent Destailleur	680f6257a0	FIX warning if setup of chart of account is not yet done.	2021-03-10 11:04:28 +01:00
Laurent Destailleur	b1f4c29fde	Fix missing alias	2021-03-09 20:12:14 +01:00
Florian HENRY	7aec2fc02b	create task	2021-03-09 18:52:52 +01:00
Laurent Destailleur	b778820fe2	Merge pull request #16596 from FHenry/dev_allowAliasInCommonObject_GetFiledList ... Dev allow alias in common object get filed list	2021-03-09 16:54:22 +01:00
Laurent Destailleur	9cb4dce485	Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN missing	2021-03-09 16:12:30 +01:00
Laurent Destailleur	1fe90091b6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-09 15:35:25 +01:00
Laurent Destailleur	cf30e90b93	Work on inventory	2021-03-09 15:35:10 +01:00
Laurent Destailleur	3cb072f67a	Update commonobject.class.php	2021-03-09 15:13:20 +01:00
Laurent Destailleur	b822f04cbb	Merge pull request #16593 from frederic34/patch-3 ... fix unknown variable	2021-03-09 15:08:11 +01:00
Laurent Destailleur	1b3aae1984	Fix regression	2021-03-09 12:17:32 +01:00
Laurent Destailleur	53f8ff060a	Fix phpcs	2021-03-09 10:40:22 +01:00
Florian HENRY	ce5324c08c	Merge HEAD, branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_allowAliasInCommonObject_GetFiledList	2021-03-09 10:24:07 +01:00
Florian HENRY	bcbf8bb72a	allow table alias into commonObject getFieldList	2021-03-09 10:21:32 +01:00
Frédéric FRANCE	de1cf54e2f	Update box_members_by_type.php	2021-03-09 00:20:28 +01:00
Laurent Destailleur	c3a047ee06	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/action/class/api_agendaevents.class.php	2021-03-08 19:31:47 +01:00
Laurent Destailleur	2f0c4038fb	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/comm/action/class/api_agendaevents.class.php htdocs/compta/sociales/card.php htdocs/societe/consumption.php	2021-03-08 19:27:34 +01:00
Laurent Destailleur	3b80b9dd75	Fix regression	2021-03-08 16:37:52 +01:00
Laurent Destailleur	a79a4e876d	Merge branch 'develop' into boxindex	2021-03-08 16:34:05 +01:00
Laurent Destailleur	24a0700426	Merge pull request #16573 from frederic34/box_index_societe ... can add box on thirparties index	2021-03-08 16:25:46 +01:00
Laurent Destailleur	1aba0c2bc9	NEW Can set order of execution of hooks	2021-03-08 15:56:41 +01:00
lmarcouiller	b71a8c5d6f	Close #15917 : boxes on ticket index	2021-03-08 15:26:35 +01:00
lmarcouiller	d8a74bad93	update for continuous integration	2021-03-08 13:58:23 +01:00
lmarcouiller	8c7764ed5d	Move of 2 graph in boxes	2021-03-08 12:18:55 +01:00
Laurent Destailleur	ab89d85095	Fix for php8	2021-03-08 11:33:07 +01:00
ksar	ec8baa6bff	Update commondocgenerator.class.php ... #16341	2021-03-08 10:00:19 +01:00
Alexandre SPANGARO	2f86971f84	Merge remote-tracking branch 'upstream/develop' into 14a15	2021-03-08 09:56:57 +01:00
Frédéric FRANCE	92754760f4	can add box on thirparties index	2021-03-06 16:38:07 +01:00
Laurent Destailleur	0a0bb92689	Fix phpcs	2021-03-06 11:37:23 +01:00
Laurent Destailleur	315e66aa5a	Merge pull request #16537 from altairisfr/pr_sn_unicity ... Unique serial number management	2021-03-06 11:22:44 +01:00
Laurent Destailleur	e5d8267786	Merge pull request #16546 from FHenry/12.0 ... fix: set class attribute at right place	2021-03-06 11:18:02 +01:00
Laurent Destailleur	cbd6357f45	Merge pull request #16556 from marc-dll/NEW_ldap_group_filter ... NEW: LDAP: usergroup search can be filtered	2021-03-06 11:08:24 +01:00
Laurent Destailleur	0816cb9c04	Merge pull request #16560 from code-chicken/patch-12 ... Don't discard previously collected data	2021-03-06 10:57:18 +01:00
Laurent Destailleur	3cbced439a	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/tools/listevents.php htdocs/compta/bank/line.php htdocs/compta/facture/class/facture-rec.class.php htdocs/compta/facture/class/facture.class.php htdocs/compta/paiement/cheque/card.php htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/core/lib/date.lib.php htdocs/core/lib/ticket.lib.php htdocs/core/modules/mailings/modules_mailings.php htdocs/core/tpl/extrafields_view.tpl.php htdocs/core/tpl/objectline_view.tpl.php htdocs/cron/list.php htdocs/expedition/card.php htdocs/mrp/mo_list.php htdocs/product/stock/productlot_card.php htdocs/public/emailing/mailing-read.php htdocs/public/emailing/mailing-unsubscribe.php htdocs/ticket/list.php test/phpunit/FactureRecTest.php	2021-03-05 19:29:09 +01:00
Laurent Destailleur	98c7814fa3	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2021-03-05 18:28:37 +01:00
Laurent Destailleur	6aa929cbf8	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2021-03-05 18:28:15 +01:00
Laurent Destailleur	1cd822bd75	Fix DOS attack on emailings wrappers	2021-03-05 14:54:17 +01:00
Rüdiger Hahn	18fc169cd0	Don't discard previously collected data ... For keeping all previously collected data (i.e. company_... values), one has to merge the array but not to assign a new one.	2021-03-05 11:32:03 +01:00
stickler-ci	06cabb35ec	Fixing style errors.	2021-03-05 10:24:28 +00:00
Marc de Lima Lucio	396fb3fae3	FIX: ldap: bad function comment	2021-03-05 11:21:04 +01:00
Marc de Lima Lucio	f731545af4	NEW: ldap: filter search on usergroups	2021-03-05 11:14:21 +01:00
Laurent Destailleur	83df996bc2	Fix english translation	2021-03-05 09:52:25 +01:00
Florian HENRY	6de6782458	fix: set class at right place	2021-03-05 08:41:04 +01:00
Laurent Destailleur	6eafc3b774	Clean code	2021-03-04 17:23:12 +01:00
Laurent Destailleur	7d20df8054	Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries ... NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording	2021-03-04 16:53:54 +01:00
Laurent Destailleur	eda0b4dc37	Merge pull request #16531 from FHenry/12.0 ... avoid warning into modulebuilder	2021-03-04 16:52:47 +01:00
Laurent Destailleur	beb8dbcc01	Update project.lib.php	2021-03-04 16:48:25 +01:00
Laurent Destailleur	dcff298c5f	FIX #16533	2021-03-04 15:57:03 +01:00
Christophe Battarel	53cf042a57	adapt tobatch import/export	2021-03-04 15:35:53 +01:00
Laurent Destailleur	98eb0fc969	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-03-04 15:34:44 +01:00
Laurent Destailleur	ffa0e6c391	FIX Timezone management for datetime on list of events	2021-03-04 15:34:29 +01:00
atm-greg	c41b59b14c	Fix : when we have got models in database attached files are cleared even if we did not have selected a model	2021-03-04 14:23:08 +01:00
Juanjo Menent	a04a4806e0	Fix: lost selecteds items in ticket creation	2021-03-04 11:50:46 +01:00
stickler-ci	47dd477c61	Fixing style errors.	2021-03-04 09:36:17 +00:00
lmarcouiller	e94f703f5d	Fix #16523 : return to backward compatibility	2021-03-04 10:33:18 +01:00
Laurent Destailleur	7bc2e1ffad	FIX Timezone management for datetime with modulebuilder and extrafields	2021-03-04 10:31:31 +01:00
Florian HENRY	bf775855f6	avoid warning into modulebuilder	2021-03-04 10:28:41 +01:00
lmarcouiller	500f192a05	Fix #16523 : New column Contact assigned	2021-03-04 10:15:41 +01:00
Laurent Destailleur	5553bae3a1	FIX Timezone management for datetime with modulebuilder	2021-03-04 09:44:01 +01:00
Laurent Destailleur	33c4180781	FIX Timezone management for datetime with modulebuilder	2021-03-04 09:36:19 +01:00
Laurent Destailleur	aa1551bf1f	FIX class not found when creating recuring invoice from invoice+discount	2021-03-03 22:46:25 +01:00
Laurent Destailleur	43e58f70a1	Merge pull request #16528 from frederic34/patch-4 ... remove unused code	2021-03-03 15:10:58 +01:00
Laurent Destailleur	d22f929779	Merge pull request #16526 from frederic34/patch-3 ... fix unknown constant and variable	2021-03-03 15:10:38 +01:00
Alexandre SPANGARO	59a2fb8ed5	Merge remote-tracking branch 'upstream/develop' into 14a15	2021-03-03 14:08:40 +01:00
Frédéric FRANCE	d05c0b749a	remove unused code	2021-03-03 13:11:10 +01:00
Frédéric FRANCE	2d9f00eb57	Update commonobject.class.php	2021-03-03 12:24:44 +01:00
Laurent Destailleur	da8b67da83	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-03-03 12:07:42 +01:00
Laurent Destailleur	5f8b52ffc9	Code comment	2021-03-03 12:05:43 +01:00
Laurent Destailleur	093eab188e	Code comment	2021-03-03 12:02:57 +01:00
Frédéric FRANCE	a8bf47b9ce	fix unknown constant and variable	2021-03-03 12:02:48 +01:00
Laurent Destailleur	f11a85a3e3	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/card.php htdocs/compta/facture/card.php htdocs/contrat/card.php htdocs/fichinter/card.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php htdocs/supplier_proposal/card.php	2021-03-03 11:37:34 +01:00
Laurent Destailleur	889a496661	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-03 11:31:55 +01:00
Laurent Destailleur	b5d1e36ece	Fix include	2021-03-03 11:31:40 +01:00
Laurent Destailleur	6fcec3e99b	Merge pull request #16522 from FHenry/13.0 ... fix: warning on install	2021-03-02 23:58:26 +01:00
Laurent Destailleur	c2f0d9f42c	Update functions.lib.php	2021-03-02 23:57:37 +01:00
Laurent Destailleur	7abf572f2d	Merge pull request #16512 from Hystepik/develop#1 ... Fix #16432 : Update of getCountriesinEEC	2021-03-02 23:56:37 +01:00
Laurent Destailleur	348b8d2ffe	More phpunit tests	2021-03-02 23:55:41 +01:00
Florian HENRY	4e5849e50b	remove debug	2021-03-02 23:13:05 +01:00
Laurent Destailleur	7eb3e324c7	FIX #16503	2021-03-02 23:09:55 +01:00
Florian HENRY	30c6e268a1	fix warning	2021-03-02 22:55:43 +01:00
Frédéric FRANCE	22bc3b879b	new box replace	2021-03-02 22:21:34 +01:00
Frédéric FRANCE	d68de8617b	new box replace	2021-03-02 22:00:09 +01:00
Frédéric FRANCE	742c12f9d6	rename new boxes	2021-03-02 20:58:21 +01:00
Frédéric FRANCE	6cf8a46095	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-03-02 20:41:01 +01:00
lvessiller	66ad8fbb24	FIX select list dependancies on common object (FIX #16510)	2021-03-02 17:21:55 +01:00
lmarcouiller	2eaa6ad6c6	Fix #16432 : Add cache use in function	2021-03-02 16:21:43 +01:00
Laurent Destailleur	c81d5ff4d0	Introduce a variable to cache some data.	2021-03-02 16:13:00 +01:00
stickler-ci	b374a8a00b	Fixing style errors.	2021-03-02 15:03:36 +00:00
lmarcouiller	fc86784cfc	Fix #16432 : update with eldy advices	2021-03-02 16:03:14 +01:00
Laurent Destailleur	8fc89b9ef1	Merge pull request #16511 from FHenry/13.0 ... fix #16510 (missing ($this->) in previous PR	2021-03-02 15:49:13 +01:00
Laurent Destailleur	7f1d61f8a8	Fix phpcs	2021-03-02 15:34:43 +01:00
Florian HENRY	373d52a562	Merge remote-tracking branch 'origin/13.0' into 13.0	2021-03-02 15:33:38 +01:00
Laurent Destailleur	a5bcc47d0d	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-02 15:29:54 +01:00
Laurent Destailleur	a82ad6a02c	Fix phpcs	2021-03-02 15:29:27 +01:00
Laurent Destailleur	42329b10c9	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: build/generate_filelist_xml.php htdocs/comm/propal/card.php htdocs/commande/card.php htdocs/compta/facture/card.php htdocs/core/class/commonobject.class.php htdocs/core/lib/modulebuilder.lib.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php htdocs/supplier_proposal/card.php htdocs/ticket/list.php	2021-03-02 15:27:20 +01:00
lmarcouiller	c5ac79e34c	Fix #16432 : Update of getCountriesinEEX	2021-03-02 15:24:55 +01:00
Florian HENRY	2c163b8163	fix #16510	2021-03-02 15:22:22 +01:00
Laurent Destailleur	495c61c231	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php	2021-03-02 15:12:41 +01:00
Laurent Destailleur	5fd341bbd3	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php	2021-03-02 15:11:18 +01:00
Laurent Destailleur	1f25f2bb7e	Fix phpcs	2021-03-02 15:09:29 +01:00
Laurent Destailleur	cdfb9254b3	Merge pull request #16510 from FHenry/13.0_fix_missing_list_dependencies_for_modulebuilder_fields ... FIX : select list dependencies now work for ModuleBuilder sellist field	2021-03-02 14:51:53 +01:00
Laurent Destailleur	3982a36a3e	Update commonobject.class.php	2021-03-02 14:47:35 +01:00
Laurent Destailleur	7144e80063	Merge pull request #16322 from FHenry/dev_new_conf_defaulteventstatus ... NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)	2021-03-02 14:45:05 +01:00
Florian HENRY	27c354567a	FIX : select list dependencies now work for ModuleBuilder sellist field	2021-03-02 14:06:11 +01:00
Laurent Destailleur	acb7b30eb0	Merge pull request #16507 from frederic34/add_rule ... Add rule	2021-03-02 12:52:03 +01:00
Laurent Destailleur	1132ed306c	Merge pull request #16506 from andreubisquerra/patch-1 ... Avoid php errors if negative var in Receipt Module	2021-03-02 12:50:57 +01:00
Frédéric FRANCE	e1ff1c736c	fix typo ... Conflicts: htdocs/core/login/functions_openid.php	2021-03-02 12:41:34 +01:00
Laurent Destailleur	25b2de4874	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-02 12:40:00 +01:00
Laurent Destailleur	ba04c94b2d	Merge pull request #16502 from frederic34/patch-3 ... fix typo	2021-03-02 12:39:26 +01:00
Laurent Destailleur	ef99b0f98c	Update modulebuilder.lib.php	2021-03-02 12:38:17 +01:00
Laurent Destailleur	a161edefb1	Look and feel v14	2021-03-02 12:33:55 +01:00
Florian HENRY	812d3279b3	Merge branch 'dev_new_conf_defaulteventstatus' of github.com:FHenry/dolibarr into dev_new_conf_defaulteventstatus	2021-03-02 11:06:52 +01:00
Florian HENRY	0f7144a391	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus	2021-03-02 11:05:20 +01:00
Florian HENRY	593ae78761	avoid php wrning	2021-03-02 10:55:23 +01:00
Frédéric FRANCE	cb507a61b9	backup with utf8mb4	2021-03-02 09:54:52 +01:00
Laurent Destailleur	7f209f7cc7	Clean code	2021-03-02 02:55:24 +01:00
Laurent Destailleur	cffea1889f	FIX #16325	2021-03-02 01:17:28 +01:00
Laurent Destailleur	f1f950e8b7	Close #16395 - Can filter on proposal source in list	2021-03-02 00:11:15 +01:00
Frédéric FRANCE	3b428004d8	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-03-02 00:09:44 +01:00
andreubisquerra	5bb7c521aa	Update dolreceiptprinter.class.php	2021-03-01 23:30:38 +01:00
andreubisquerra	15cc0f8775	Avoid php errors if negative var in Receipt Module ... Solved in develop branch with PR https://github.com/Dolibarr/dolibarr/pull/15994/files After testing we introduce it in version 13	2021-03-01 23:09:07 +01:00
Frédéric FRANCE	f2cdbf6bb2	Merge remote-tracking branch 'upstream/develop' into add_rule	2021-03-01 21:22:34 +01:00
stickler-ci	54d35fa59f	Fixing style errors.	2021-03-01 20:00:32 +00:00
Florian HENRY	32ef55cd9e	working default status/percent for event actioncomm	2021-03-01 20:58:02 +01:00
Frédéric FRANCE	a4e25359e7	add missing rule	2021-03-01 20:37:16 +01:00
Florian HENRY	f62386a6a5	set Default values as CURD classes	2021-03-01 20:36:42 +01:00
Florian HENRY	1b57d2a4a0	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus	2021-03-01 19:57:54 +01:00
Florian HENRY	7d3bd131ab	default envent status	2021-03-01 19:54:30 +01:00
Florian HENRY	0edae6e19a	add class default values	2021-03-01 18:25:23 +01:00
Frédéric FRANCE	eb62750aab	fix typo	2021-03-01 18:06:03 +01:00
Laurent Destailleur	1cdea45707	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/adherents/subscription/list.php htdocs/societe/canvas/company/tpl/card_create.tpl.php htdocs/societe/canvas/individual/tpl/card_create.tpl.php htdocs/societe/card.php	2021-03-01 17:46:36 +01:00
stickler-ci	d20ba5a665	Fixing style errors.	2021-03-01 15:38:15 +00:00
Gauthier PC portable 024	861b583668	FIX : handling $heightforinfotot when he's superior to a page height on Supplier Invoice	2021-03-01 16:34:42 +01:00
Laurent Destailleur	222012da37	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/class/paymentvarious.class.php htdocs/compta/bank/various_payment/card.php htdocs/don/card.php htdocs/langs/en_US/main.lang htdocs/public/payment/newpayment.php test/phpunit/DateLibTzFranceTest.php	2021-03-01 15:48:30 +01:00
Laurent Destailleur	b2cfc431bc	Merge pull request #16489 from aspangaro/13p7 ... FIX: Total_ht not show in contract link element	2021-03-01 14:07:29 +01:00
Frédéric FRANCE	8c45137b37	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-03-01 12:55:45 +01:00
Gauthier PC portable 024	6da28f5e44	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries	2021-03-01 11:12:03 +01:00
Alexandre SPANGARO	94a861c1c8	Code enhanced - Standardize field name	2021-03-01 04:07:31 +01:00
Alexandre SPANGARO	e35379a95d	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-03-01 03:20:25 +01:00
Alexandre SPANGARO	0d954cb1c7	FIX: Total_ht not show in contract link element	2021-03-01 03:09:36 +01:00
Frédéric FRANCE	1b046f25cf	add new rule	2021-03-01 00:19:52 +01:00
Laurent Destailleur	490faec547	FIX Timezone problems ... Conflicts: htdocs/core/lib/date.lib.php test/phpunit/DateLibTest.php	2021-02-28 22:50:21 +01:00
Laurent Destailleur	ae81ab0c7c	FIX Timezone problems	2021-02-28 22:44:11 +01:00
Alexandre SPANGARO	de241eced3	FIX: Total_ht not show in contract link element	2021-02-28 22:22:20 +01:00
Laurent Destailleur	a6bc218280	Look and feel v14	2021-02-28 21:34:27 +01:00
Alexandre SPANGARO	706aad3b68	Merge remote-tracking branch 'upstream/develop' into 14a15	2021-02-28 21:33:59 +01:00
Alexandre SPANGARO	7a3dfda8ee	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-02-28 21:30:25 +01:00
Laurent Destailleur	6294ae61a8	Look and feel v14	2021-02-28 14:26:32 +01:00
Laurent Destailleur	886cbc61c8	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php htdocs/core/boxes/box_factures_fourn.php htdocs/core/boxes/box_factures_fourn_imp.php htdocs/core/boxes/box_ficheinter.php htdocs/core/boxes/box_members.php htdocs/core/boxes/box_propales.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.formmail.class.php htdocs/core/lib/functions.lib.php htdocs/fourn/class/fournisseur.facture.class.php	2021-02-28 13:37:45 +01:00
Laurent Destailleur	2a3b3753a8	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-02-28 13:27:38 +01:00
Laurent Destailleur	0bb304ec33	Merge pull request #16473 from frederic34/patch-3 ... fix variable name	2021-02-28 13:25:20 +01:00
Laurent Destailleur	1149de1aca	FIX #16485	2021-02-28 13:15:24 +01:00
Laurent Destailleur	3a19cbb062	FIX #16420 #16423 #16488 #16477	2021-02-28 12:47:24 +01:00
Laurent Destailleur	0832c25b5b	Look and feel v14	2021-02-28 11:48:35 +01:00
Alexandre SPANGARO	ca7958f273	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-02-28 07:32:23 +01:00
Alexandre SPANGARO	ad95caac7e	Merge branch 'develop' into 14a15	2021-02-28 07:12:24 +01:00
Alexandre SPANGARO	6e1d67084d	Merge remote-tracking branch 'upstream/develop' into 14a15	2021-02-28 07:09:30 +01:00
Laurent Destailleur	753b1d1e11	FIX status on tooltip on widgets	2021-02-27 19:43:56 +01:00
Laurent Destailleur	4cf2d2317f	FIX Status in popup of member in widget	2021-02-27 19:16:14 +01:00
Laurent Destailleur	7dace2f459	Show 3 years in graph of widget by default.	2021-02-27 18:38:32 +01:00
Laurent Destailleur	9cf4222d3a	Look and feel v14	2021-02-27 17:15:40 +01:00
Laurent Destailleur	5c0ea476e1	Look and feel v14	2021-02-27 12:45:07 +01:00
Frédéric FRANCE	8bfa7565bd	Update commonobject.class.php	2021-02-27 08:52:40 +01:00
Frédéric FRANCE	2cc635fd09	FIX https://github.com/Dolibarr/dolibarr/issues/16465	2021-02-27 08:00:02 +01:00
Laurent Destailleur	34d00e5d5e	Look and feel v14	2021-02-27 02:44:52 +01:00
Laurent Destailleur	8e632d08b8	NEW Add link picto to the stock movement on the detail of production	2021-02-27 00:31:29 +01:00
Frédéric FRANCE	5d4004d3f4	fix cache	2021-02-26 23:06:33 +01:00
Frédéric FRANCE	94aa116fa8	fix variable name	2021-02-26 23:01:18 +01:00
Laurent Destailleur	e7da1d7fe4	FIX #16431	2021-02-26 19:38:18 +01:00
Laurent Destailleur	dd72a52e8f	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/balancebymonth.php htdocs/accountancy/class/accountancyexport.class.php	2021-02-26 19:23:23 +01:00
Laurent Destailleur	81c2ae325b	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-02-26 19:20:32 +01:00
Laurent Destailleur	d5566dbf8f	FIX #16431	2021-02-26 19:18:03 +01:00
Frédéric FRANCE	96b0f3a25c	code syntax directory	2021-02-26 16:19:52 +01:00
Gauthier PC portable 024	e598b49545	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries	2021-02-26 15:33:36 +01:00
Laurent Destailleur	5095e7f927	Merge pull request #16124 from hregis/fix_avoid_missing_url_and_token ... Fix avoid missing url and token	2021-02-26 15:21:56 +01:00
Laurent Destailleur	5d0a0fe341	Clean code	2021-02-26 14:53:16 +01:00
Laurent Destailleur	a5925cc2cb	Merge branch 'develop' into count_project_head	2021-02-26 13:02:54 +01:00
Laurent Destailleur	f5406d487b	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php htdocs/core/class/html.formmail.class.php htdocs/core/lib/product.lib.php htdocs/product/stock/productlot_card.php test/phpunit/SecurityTest.php	2021-02-26 12:53:06 +01:00
Laurent Destailleur	16906abc09	FIX File attachment on lots	2021-02-26 12:47:57 +01:00
Laurent Destailleur	34ed5519fd	Merge pull request #16435 from altairisfr/batchevents_pr ... add event management to batch products	2021-02-26 11:50:48 +01:00
Gauthier PC portable 024	c996871f98	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries	2021-02-26 11:50:18 +01:00
Laurent Destailleur	634d94b0b7	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-02-26 11:27:27 +01:00
Laurent Destailleur	0f44bdb90f	Fix sql error	2021-02-26 11:27:03 +01:00
Laurent Destailleur	adc0313543	Fix lang	2021-02-26 11:09:15 +01:00
Laurent Destailleur	2670d4fc17	Look and feel v14	2021-02-26 11:00:58 +01:00
Laurent Destailleur	aba43b3e35	Fix init before	2021-02-26 10:44:52 +01:00
Laurent Destailleur	67db1d4937	Merge pull request #16427 from dvdwalker/ajax-fix ... Fix: Option MAIN_DIRECT_STATUS_UPDATE broken. Ajax on/off not saving value in DB after updating to version >=12	2021-02-26 10:39:58 +01:00
Laurent Destailleur	cec9c65ab8	Merge pull request #16449 from daraelmin/daraelmin-patch-3 ... Fix #16420 undefined $model_mail_selected_id	2021-02-26 10:33:56 +01:00
Laurent Destailleur	e7ae2e65d7	Update html.formmail.class.php	2021-02-26 10:33:49 +01:00
Laurent Destailleur	e0785ac5ef	Update html.formmail.class.php	2021-02-26 10:31:02 +01:00
Laurent Destailleur	69c974800c	Update html.formmail.class.php	2021-02-26 10:30:30 +01:00
Laurent Destailleur	7b70d4b1de	Merge pull request #16415 from frederic34/core_code_syntax ... code syntax core directory	2021-02-26 10:29:23 +01:00
daraelmin	e079ceb9c3	Fix #16420 undefined $model_mail_selected_id ... Set $model_mail_selected_id to 0 when it is undefined	2021-02-26 08:51:01 +01:00
daraelmin	5d31a93bf0	Fix #16420 - undefined $model_mail_selected_id ... Set $model_mail_selected_id to 0 when it is undefined	2021-02-26 08:20:51 +01:00
Christophe Battarel	445974a003	add event management to batch products	2021-02-25 15:47:14 +01:00
Alexandre SPANGARO	85d63e05d1	Move to INNER JOIN	2021-02-25 05:07:26 +01:00
Alexandre SPANGARO	e177ac566c	Merge remote-tracking branch 'upstream/develop' into 14a15	2021-02-25 05:02:03 +01:00
stickler-ci	a31d5e8dc9	Fixing style errors.	2021-02-24 22:32:48 +00:00
dvdwalker	4c321341d4	Fix: Ajax on/off not saving value in DB after updating to version >=12 ... The issue seams to be that starting in version 12 the "[element]_UPDATE" trigger is called in file core/ajax/objectonoff.php but some properties that are required on $object are not set.	2021-02-24 19:28:47 -03:00
Laurent Destailleur	ebb4f03788	Prepare public page for autocreate contact-lead	2021-02-24 12:19:28 +01:00
Frédéric FRANCE	554e449e40	code syntax core directory	2021-02-23 22:03:23 +01:00
Regis Houssin	0a3d1ab92e	FIX use var "saved_url" instead global var "$url"	2021-02-23 16:56:45 +01:00
Regis Houssin	ec5d9983e0	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into ... fix_avoid_missing_url_and_token Conflicts: htdocs/core/js/lib_head.js.php	2021-02-23 16:55:32 +01:00
Gauthier PC portable 024	c0160a5f3b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries	2021-02-23 15:20:15 +01:00
Laurent Destailleur	b7e2c7d87a	FIX #16393 Do not sanitize <!DOCTYPE html>	2021-02-23 12:58:43 +01:00
Frédéric FRANCE	f50ce6f91f	add cache on project head	2021-02-23 12:19:49 +01:00
Laurent Destailleur	822bfc957c	Merge pull request #16368 from FHenry/dev_EventOrganisation_draft ... NEW : Tab on project for Event Organization #FoundationFunding	2021-02-23 12:09:00 +01:00
Laurent Destailleur	d2e1f9fce9	FIX #16096 #16085 Any call of ajax pages must provide the token	2021-02-23 11:13:57 +01:00
Regis Houssin	77cecf58ce	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into fix_avoid_missing_url_and_token	2021-02-23 11:10:32 +01:00
Laurent Destailleur	34dcebea78	Code comment	2021-02-23 11:03:34 +01:00
Regis Houssin	7c32e43c68	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into fix_avoid_missing_url_and_token	2021-02-23 08:19:18 +01:00
Florian HENRY	fa65956801	Merge branch 'develop' into dev_EventOrganisation_draft	2021-02-22 21:02:22 +01:00
daraelmin	29b1f10fd4	Fix #16096 #16085 missing CSRF token	2021-02-22 17:33:54 +01:00
Laurent Destailleur	9e5e31dec9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-22 16:21:33 +01:00
Laurent Destailleur	f6080d45fa	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-22 16:21:26 +01:00
Laurent Destailleur	b674ebad88	Responsive	2021-02-22 16:21:05 +01:00
Laurent Destailleur	912f9f9bdb	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/contact/card.php htdocs/core/actions_massactions.inc.php	2021-02-22 15:54:24 +01:00
Laurent Destailleur	eee936b91c	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2021-02-22 15:51:16 +01:00
Laurent Destailleur	c010cab47e	Fix translation of default value for contacts	2021-02-22 15:51:00 +01:00
Laurent Destailleur	7677edf41d	Merge pull request #16357 from bb2a/ADD_SUBSTITUTION_DELIVRY_DATE ... Add substitution for delivry date	2021-02-22 14:23:37 +01:00
Alexandre SPANGARO	d9e03e1373	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-02-22 14:10:38 +01:00
Frédéric FRANCE	84a5f69834	fix propal sqls	2021-02-22 13:14:13 +01:00
Frédéric FRANCE	58f301389c	fix box activity	2021-02-22 12:08:22 +01:00
Alexandre SPANGARO	7f4040e464	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-02-22 11:59:13 +01:00
Laurent Destailleur	122538ca51	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-22 11:51:55 +01:00
Laurent Destailleur	38465ea591	Fix website editor	2021-02-22 11:51:43 +01:00
Laurent Destailleur	0be001c70b	Merge pull request #16374 from aspangaro/14a21 ... Code enhanced - Standardize field name #14697	2021-02-22 11:40:55 +01:00
Anthony Berton	566c3ada55	Update functions.lib.php	2021-02-22 11:30:00 +01:00
Alexandre SPANGARO	22c936ba19	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-02-22 11:28:36 +01:00
Laurent Destailleur	c227275c55	Merge pull request #16379 from danielprowald/develop ... CLOSE #16378 More E-Mail Contact substitution Values for better salutation	2021-02-22 11:20:03 +01:00
Laurent Destailleur	2673e93dfc	Update card_presend.tpl.php	2021-02-22 11:19:47 +01:00
Laurent Destailleur	f99232e66e	Merge branch 'develop' into 14a21	2021-02-22 11:18:07 +01:00
Daniel	7bbf1b4841	Fix Formatting	2021-02-22 10:04:29 +01:00
Daniel	38e1264588	For more flexible salutation in some languages the folloing Variables ... are availible __CONTACT_LASTNAME_XXX__ __CONTACT_FIRSTNAME_XXX__ __CONTACT_SALUTATION_XXX__	2021-02-22 09:56:48 +01:00
Gauthier PC portable 024	939d406ab1	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries	2021-02-22 09:10:24 +01:00
Alexandre SPANGARO	267b095786	Fix import/export	2021-02-22 06:09:33 +01:00
Alexandre SPANGARO	ae4fc565e1	Widget & commonobject	2021-02-22 05:38:31 +01:00
Alexandre SPANGARO	d7993253e7	Export	2021-02-22 05:33:40 +01:00
Alexandre SPANGARO	dfb6490bb4	Fix export	2021-02-22 05:24:39 +01:00
Alexandre SPANGARO	116a491ae1	Revert "Fix export" ... This reverts commit 01e351e87e.	2021-02-22 05:23:02 +01:00
Alexandre SPANGARO	01e351e87e	Fix export	2021-02-22 05:19:48 +01:00
Alexandre SPANGARO	71ce871da6	Fix element	2021-02-22 05:13:14 +01:00
Anthony Berton	3256a17280	Update functions.lib.php	2021-02-21 23:52:22 +01:00
Alexandre SPANGARO	818a826c3e	Code enhanced - Standardize field name	2021-02-21 22:10:00 +01:00
Alexandre SPANGARO	2cd181b86d	Code enhanced - Standardize field name #14697	2021-02-21 22:07:58 +01:00
Alexandre SPANGARO	ddea3f8a92	Code enhanced - Standardize field name #14697	2021-02-21 21:47:26 +01:00
Laurent Destailleur	e3419df36e	Merge branch 'develop' into 14a20	2021-02-21 20:28:06 +01:00
Laurent Destailleur	97ce13bf84	Merge pull request #16369 from frederic34/doltrunc ... replace ... by one char in dol_trunc	2021-02-21 20:16:07 +01:00
Laurent Destailleur	c9f67b27b2	Merge pull request #16364 from frederic34/memcacheexpire ... memcached can set expire	2021-02-21 20:14:09 +01:00
Laurent Destailleur	4bf7c89d4e	Merge pull request #16363 from frederic34/patch-2 ... fix propal box	2021-02-21 19:19:08 +01:00
Laurent Destailleur	1e62a1a13f	Merge pull request #16359 from aspangaro/14a19 ... Code enhanced - Standardize field name #14697	2021-02-21 19:18:33 +01:00
Frédéric FRANCE	71d32a7422	fix tests	2021-02-21 15:59:19 +01:00
Frédéric FRANCE	5ceb8163de	fix tests	2021-02-21 15:40:03 +01:00
Laurent Destailleur	0a7e692fbf	Wip website module	2021-02-21 14:46:52 +01:00
Frédéric FRANCE	548820011a	fix tests	2021-02-21 13:39:59 +01:00
Frédéric FRANCE	6e3a1a1d41	fix tests	2021-02-21 13:32:54 +01:00
Frédéric FRANCE	d3a98c7680	replace ... by one char in dol_trunc	2021-02-21 13:00:31 +01:00
Florian HENRY	be34fb4541	tab event ok	2021-02-21 12:32:16 +01:00
Frédéric FRANCE	5096c5bf2d	cache socialnetworks array	2021-02-21 10:18:05 +01:00
Frédéric FRANCE	41b89ae677	add files and links	2021-02-21 09:50:58 +01:00
Florian HENRY	556ba2b369	statart card	2021-02-20 23:17:48 +01:00
Frédéric FRANCE	518826ad3d	add project	2021-02-20 22:03:11 +01:00
Frédéric FRANCE	65925e60b9	memcached can set expire	2021-02-20 20:48:59 +01:00
Frédéric FRANCE	da37497a38	memcached can set expire	2021-02-20 20:47:01 +01:00
Laurent Destailleur	91d0652476	Clean code of cache	2021-02-20 18:32:16 +01:00
Laurent Destailleur	1dd1dcefc5	Rename cache keys	2021-02-20 18:25:48 +01:00
Laurent Destailleur	341cd06252	Clean code for cache feature	2021-02-20 18:21:10 +01:00
Frédéric FRANCE	997dee67af	fix propal box	2021-02-20 17:42:51 +01:00
Laurent Destailleur	07578fc518	Merge branch 'develop' into countactioncomm	2021-02-20 17:24:22 +01:00
Laurent Destailleur	cfccc49235	Code comment	2021-02-20 17:23:03 +01:00
Frédéric FRANCE	57e15eb46d	try to apply the advice	2021-02-20 17:12:06 +01:00
Laurent Destailleur	4b632fb24f	Merge branch 'develop' into 14a19	2021-02-20 17:08:23 +01:00
Laurent Destailleur	c56c97b1b2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-20 17:03:44 +01:00
Laurent Destailleur	ade5d98d56	Rename script to run cron by url to avoid confusion with script from cli	2021-02-20 17:03:27 +01:00
Laurent Destailleur	7c25f06f58	Merge pull request #16353 from aspangaro/14a18 ... Code enhanced - Standardize field name #14697	2021-02-20 16:51:34 +01:00
Frédéric FRANCE	ec1dd40a8a	enhance caching	2021-02-20 15:52:45 +01:00
Frédéric FRANCE	99fa13cbad	enhance caching	2021-02-20 15:41:57 +01:00
Alexandre SPANGARO	3dcfe40e71	Code enhanced - Standardize field name #14697	2021-02-20 08:00:27 +01:00
Alexandre SPANGARO	1017d480f9	Code enhanced - Standardize field name #14697	2021-02-20 07:08:37 +01:00
Frédéric FRANCE	a63daaa8e1	Merge remote-tracking branch 'upstream/develop' into countactioncomm	2021-02-19 23:31:09 +01:00
Frédéric FRANCE	3238dbec92	Merge remote-tracking branch 'upstream/develop' into countactioncomm	2021-02-19 23:24:53 +01:00
Frédéric FRANCE	1e3ae8348a	use cache	2021-02-19 23:16:56 +01:00
Laurent Destailleur	581d137aa8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-19 22:06:56 +01:00
Laurent Destailleur	712c2f20df	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php	2021-02-19 22:06:48 +01:00
Laurent Destailleur	b167a4a0c7	FIX date selector when using reduced year (like on smartphone)	2021-02-19 22:00:44 +01:00
Alexandre SPANGARO	708a9fb453	Code enhanced - Standardize field name	2021-02-19 21:57:54 +01:00
Laurent Destailleur	eeedbccc71	Merge pull request #16351 from aspangaro/14a16 ... NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD	2021-02-19 18:20:17 +01:00
Laurent Destailleur	069cf46f16	Merge pull request #16347 from andreubisquerra/master ... NEW Can use captcha on public page to create ticket	2021-02-19 18:07:25 +01:00
Laurent Destailleur	26134930b3	Update html.formticket.class.php	2021-02-19 18:05:12 +01:00
daraelmin	52dce616b9	FIX 16165 Create customer discount without vat	2021-02-19 18:03:36 +01:00
Laurent Destailleur	5f0fd91463	Merge pull request #16340 from daraelmin/daraelmin-patch-1 ... FIX #16165 Create customer discount without vat	2021-02-19 18:03:09 +01:00
Laurent Destailleur	3a073c75e7	Too verbose	2021-02-19 18:01:47 +01:00
Florian HENRY	e46d4ee75d	fix sample product import files	2021-02-19 18:01:36 +01:00
Florian HENRY	f111302a25	fix column count	2021-02-19 18:01:25 +01:00
Florian HENRY	32a360dd2a	fix sample xls file	2021-02-19 18:01:16 +01:00
Florian HENRY	527c32d79e	with new phpoffice col start at 1 not 0	2021-02-19 18:01:04 +01:00
Laurent Destailleur	db34481cf6	Merge pull request #16345 from FHenry/13_fix_column_excelfiles ... FIX : Import Excel Failed and sample import file excel missing 1st column	2021-02-19 17:56:58 +01:00
Laurent Destailleur	fd0615b3fc	Too verbose	2021-02-19 17:56:04 +01:00
Laurent Destailleur	3ab80469ae	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-19 16:11:36 +01:00
Laurent Destailleur	574c0df427	Merge pull request #16338 from aspangaro/13p5 ... Fix module asset in development	2021-02-19 16:05:35 +01:00
Laurent Destailleur	8e799162ec	Merge pull request #16333 from FHenry/dev_new_field_product_export ... NEW Add price min and price min tcc into product export	2021-02-19 15:59:58 +01:00
Laurent Destailleur	e9f9c46cd6	Clean code. Fix nojs=1	2021-02-19 15:37:42 +01:00
Laurent Destailleur	efb32c7d0b	Fix test pages	2021-02-19 15:06:36 +01:00
Laurent Destailleur	b6211a7990	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-19 14:12:00 +01:00
Laurent Destailleur	39237ca86e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-19 14:06:07 +01:00
Laurent Destailleur	8265f7a07e	Code comment	2021-02-19 14:05:46 +01:00
Laurent Destailleur	95b859dfd5	Merge pull request #16247 from bafbes/abb120355 ... New : Hook selectForFormsListWhere	2021-02-19 12:49:42 +01:00
Laurent Destailleur	ceccf85919	Merge pull request #16342 from frederic34/patch-3 ... fix unknown variable	2021-02-19 12:40:54 +01:00
Laurent Destailleur	5340c30db3	FIX missing security test on payment page ... FIX sql error on group by on payment list	2021-02-19 12:35:26 +01:00
Anthony Berton	a858666b15	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into ADD_SUBSTITUTION_DELIVRY_DATE	2021-02-19 09:13:37 +01:00
Laurent Destailleur	485dd07f67	NEW Can show the holidays on the agenda view.	2021-02-18 23:13:55 +01:00
Alexandre SPANGARO	f462455e89	NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD	2021-02-18 21:39:25 +01:00
andreubisquerra	b8fabd90f8	NEW Use captcha on public page to create ticket	2021-02-18 19:02:16 +01:00
Frédéric FRANCE	354872b47c	Merge remote-tracking branch 'upstream/develop' into countactioncomm	2021-02-18 18:40:16 +01:00
Anthony Berton	bacafd326e	Update functions.lib.php	2021-02-18 16:13:40 +01:00
Laurent Destailleur	b607ed6259	Look and feel v14	2021-02-18 15:58:38 +01:00
Laurent Destailleur	2904cc803f	Fix selection in combo	2021-02-18 13:56:13 +01:00
Florian HENRY	6fe9b589ed	fix sample product import files	2021-02-18 12:50:15 +01:00
Florian HENRY	58a1904c15	fix column count	2021-02-18 12:48:06 +01:00
Laurent Destailleur	56d2ac274a	NEW Support color of type of event	2021-02-18 12:46:42 +01:00
Florian HENRY	de2d5c7188	fix sample xls file	2021-02-18 12:24:24 +01:00
Florian HENRY	35dc1e7d4f	with new phpoffice col start at 1 not 0	2021-02-18 11:04:37 +01:00
Frédéric FRANCE	cc6a7d4834	fix unknown variable	2021-02-18 09:05:44 +01:00
daraelmin	f5b162a992	FIX 16165 Create customer discount without vat	2021-02-18 08:10:14 +01:00
Frédéric FRANCE	45e947ee2b	count actioncomm for thirdparty tab agenda	2021-02-17 22:16:07 +01:00
Frédéric FRANCE	933a944603	count actioncomm for thirdparty tab agenda	2021-02-17 22:14:21 +01:00
stickler-ci	8673f7625f	Fixing style errors.	2021-02-17 17:36:29 +00:00
Florian HENRY	fc3cc915ee	new_add_field_product_export	2021-02-17 18:29:56 +01:00
Laurent Destailleur	36e0deba3f	Look and feel v14	2021-02-17 17:56:08 +01:00
Gauthier PC portable 024	134d7e00ec	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries	2021-02-17 16:56:50 +01:00
Laurent Destailleur	9161c34f51	Fix logs	2021-02-17 15:21:52 +01:00
Laurent Destailleur	68637c3104	Better log for hook	2021-02-17 15:17:24 +01:00
Laurent Destailleur	bfe71e8509	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-17 14:28:19 +01:00
Laurent Destailleur	c8824ccea0	Look and feel v14	2021-02-16 17:05:38 +01:00
Laurent Destailleur	a81e4d4daa	Fix bad picto	2021-02-16 13:21:18 +01:00
Laurent Destailleur	6f25f7c2cb	Clean code	2021-02-16 11:43:26 +01:00
Laurent Destailleur	d16276ea2c	Clean code	2021-02-16 11:15:42 +01:00
Alexandre SPANGARO	8079105aaf	NEW: VAT report - Optimisation & collapse by rate	2021-02-16 04:28:55 +01:00
Laurent Destailleur	54640199af	Fix deletion if permission on dir is not write.	2021-02-15 23:43:56 +01:00
Laurent Destailleur	5b42bce149	Add more complete info on change of opportunity status.	2021-02-15 22:43:27 +01:00
Laurent Destailleur	dabf9d796a	FIX Rename title of template invoice	2021-02-15 22:16:01 +01:00
Laurent Destailleur	44b3221aaf	FIX Rename title of template invoice	2021-02-15 22:15:14 +01:00
Laurent Destailleur	4ffdfe110a	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-15 22:07:11 +01:00
Laurent Destailleur	00642ffb48	Fix label of invoice	2021-02-15 22:04:35 +01:00
Laurent Destailleur	7bbb603859	Fix default template for contract can be empty	2021-02-15 21:46:07 +01:00
Laurent Destailleur	32370bf63d	Look and feel v14	2021-02-15 20:13:38 +01:00
Laurent Destailleur	be3703a05b	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php	2021-02-15 16:46:55 +01:00
Laurent Destailleur	0bac454f25	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-15 16:40:45 +01:00
Laurent Destailleur	7b383b58c6	Trans	2021-02-15 16:35:51 +01:00
Laurent Destailleur	d183a7eedf	Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage ... wip : Event Organization module - PR-1 - setup page #FoundationFunding	2021-02-15 15:59:19 +01:00
Laurent Destailleur	3ec515e106	Fix default value	2021-02-15 15:53:46 +01:00
Laurent Destailleur	9c1d76aaaa	Merge pull request #16294 from frederic34/patch-3 ... define variable for all execution paths	2021-02-15 15:53:12 +01:00
Laurent Destailleur	b98a654321	NEW The setup for mandatory field can be done on combo list too.	2021-02-15 15:37:43 +01:00
Laurent Destailleur	fd5fe5b427	Look and feel	2021-02-15 14:38:28 +01:00
Laurent Destailleur	7e7d393f30	Look and feel v14	2021-02-15 14:19:05 +01:00
Laurent Destailleur	026259ebd7	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/list.php htdocs/core/class/html.form.class.php htdocs/core/lib/ajax.lib.php htdocs/core/tpl/objectline_create.tpl.php htdocs/product/fournisseurs.php	2021-02-15 13:12:27 +01:00
Laurent Destailleur	1b69456216	Complete response	2021-02-15 13:00:21 +01:00
Laurent Destailleur	49f8ff5708	FIX #16286	2021-02-15 12:18:09 +01:00
Florian HENRY	1427f66e10	Merge branch 'dev_EventOrganisation' into dev_EventOrganisation_setuppage	2021-02-15 11:20:07 +01:00
Florian HENRY	e1f503a8cf	Merge branch 'develop' into dev_EventOrganisation	2021-02-15 11:19:08 +01:00
Frédéric FRANCE	382123b64a	define variable for all execution paths ... The variable $filelog does not seem to be defined for all execution paths leading up to this point.	2021-02-15 08:36:40 +01:00
Laurent Destailleur	25230fb4bb	Merge pull request #16284 from andreubisquerra/develop ... Improve logo printing compatibility with TakePOS connector	2021-02-14 21:41:45 +01:00
Laurent Destailleur	e802dd87f4	Merge branch 'develop' into dev_EventOrganisation_setuppage	2021-02-14 21:37:45 +01:00
Laurent Destailleur	4d526569a7	Merge pull request #16292 from frederic34/patch-5 ... Use dictionary to display social network icon	2021-02-14 21:34:13 +01:00
Laurent Destailleur	2cc4632a39	Fix js error	2021-02-14 21:32:19 +01:00
Frédéric FRANCE	917f15a781	Use dictionary to display social network icon	2021-02-14 21:30:54 +01:00
Laurent Destailleur	9e16cd5b77	Look and feel v14	2021-02-14 20:47:57 +01:00
Laurent Destailleur	66c7770146	Factorize some common code for type of event	2021-02-14 20:12:43 +01:00
abb	e6d35039c9	fix:Handle constant MAIN_SHOW_SOCIETE2EXTERN in checkUserAccessToObject	2021-02-14 18:02:30 +01:00
Florian HENRY	5958373f47	set icon fa	2021-02-14 17:31:30 +01:00
Florian HENRY	02b698c128	move files to real diredtory	2021-02-14 17:09:23 +01:00
Florian HENRY	21a8d4d470	ok for setup pages	2021-02-14 17:06:49 +01:00
Florian HENRY	b5055a5edb	config pages ok	2021-02-14 16:41:57 +01:00
Florian HENRY	07984d9a6e	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation	2021-02-14 15:02:29 +01:00
Florian HENRY	d7dfb9138a	working on setup	2021-02-14 15:00:20 +01:00
andreubisquerra	abda9eeb93	Improve compatibility with logo printing with TakePOS connector	2021-02-14 00:02:03 +01:00
abb	d82c62c40d	New:Constant MAIN_SHOW_SOCIETE2EXTERN to allow access to any thirdparty for external users	2021-02-12 23:53:45 +01:00
Laurent Destailleur	cd4d790d2b	Add parameters of batch into comment description	2021-02-12 17:15:23 +01:00
Florian HENRY	f063606f27	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation	2021-02-12 11:32:07 +01:00
Florian HENRY	9858aec6d6	on going	2021-02-12 11:31:13 +01:00
Laurent Destailleur	e37a4be1d6	Update html.form.class.php	2021-02-11 20:10:15 +01:00
Laurent Destailleur	4a2cd0d509	Merge pull request #16253 from AlexisLaurier/13.0 ... contract - uses of multidir_output for file path	2021-02-11 19:00:20 +01:00
Laurent Destailleur	1b11d9d0e9	FIX payment term label on PDF	2021-02-11 17:48:53 +01:00
Anthony Berton	d10e46adca	Update commonobject.class.php	2021-02-11 17:46:28 +01:00
Florian HENRY	256e2e1b6e	nouveau fichier : ../core/modules/modEventOrganization.class.php ... nouveau fichier : ../eventorganization/.editorconfig nouveau fichier : ../eventorganization/.gitattributes nouveau fichier : ../eventorganization/.gitignore nouveau fichier : ../eventorganization/.tx/config nouveau fichier : ../eventorganization/COPYING nouveau fichier : ../eventorganization/ChangeLog.md nouveau fichier : ../eventorganization/README.md nouveau fichier : ../eventorganization/eventorganizationindex.php nouveau fichier : ../eventorganization/lib/eventorganization.lib.php nouveau fichier : ../eventorganization/modulebuilder.txt nouveau fichier : ../eventorganization/myobject_contact.php nouveau fichier : ../../test/phpunit/EventOrganizationFunctionalTest.php	2021-02-11 17:17:02 +01:00
Florian HENRY	13522fdf5f	start module dev	2021-02-11 17:05:04 +01:00
Anthony Berton	55f8d64202	Update commonobject.class.php	2021-02-11 12:16:07 +01:00
Laurent Destailleur	ee6bc80242	Fix phpcs	2021-02-11 01:59:13 +01:00
Laurent Destailleur	a01301c500	Fix regression in color of bar for type = line	2021-02-10 18:44:09 +01:00
Laurent Destailleur	623d7b9819	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-10 18:04:23 +01:00
Laurent Destailleur	88550ab417	Look and feel v14	2021-02-10 18:03:45 +01:00
Laurent Destailleur	8b125d8076	Fix MVC. Actions must be before output.	2021-02-10 16:44:20 +01:00
Laurent Destailleur	72bfa81082	Update html.form.class.php	2021-02-10 14:14:28 +01:00
Laurent Destailleur	0849ce288c	Fix phpcs	2021-02-10 14:04:06 +01:00
Alexis LAURIER	5b2779a5f9	contract - use multidir_output	2021-02-10 13:27:42 +01:00
Alexis LAURIER	05b1171e90	Merge branch '13.0' of https://github.com/AlexisLaurier/dolibarr into 13.0	2021-02-10 13:19:47 +01:00
Alexis LAURIER	468f40743d	contract - use multidir_output	2021-02-10 13:18:55 +01:00
LAURIER Alexis	cb4295b702	dol_check_secure_access_document contrat multidir_ ... Use multidir_output for contracts document check to manage entity on each contract	2021-02-10 13:02:13 +01:00
Laurent Destailleur	4f2e7c51fc	Fix #16129 autodetect language on public pages	2021-02-10 03:20:50 +01:00
Laurent Destailleur	89154265c6	FIX #16129	2021-02-10 03:12:19 +01:00
Laurent Destailleur	4c3a96da08	FIX #16150	2021-02-10 02:57:08 +01:00
Laurent Destailleur	667963094f	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-02-10 02:17:14 +01:00
Laurent Destailleur	c875ad9a1c	FIX #16240	2021-02-10 02:17:01 +01:00
Laurent Destailleur	499ebd73b1	Merge pull request #16192 from FHenry/dev_add_hook_ecm_auto ... NEW : add hook addSectionECMAuto method to add cuistom diretory into ECM auto files	2021-02-10 01:32:29 +01:00
Laurent Destailleur	c2df267858	Merge pull request #16242 from frederic34/patch-4 ... remove deprecated	2021-02-10 01:29:47 +01:00
Laurent Destailleur	e84834d219	Merge pull request #16236 from grandoc/new_branch_09_02_2021 ... standardisation, internationalisation	2021-02-10 01:28:16 +01:00
Laurent Destailleur	2c30680157	Merge pull request #16244 from AlexisLaurier/13.0 ... fix regression of #16118 - entity not check on object in checkUserAccessToObject	2021-02-10 01:25:19 +01:00
Laurent Destailleur	afeeb40e2e	Fix show property "enabled" of extrafields	2021-02-10 00:18:00 +01:00
abb	17f77b8edb	New : Hook selectForFormsListWhere	2021-02-09 23:49:46 +01:00
LAURIER Alexis	0ae0eb5758	fix regression of #16118 - entity not check ... Entity is not anymore check for user having permission $user->rights->societe->client->voir on the current entity. Then we can open object from any entity with current permissions and the entity field of objects are not anymore checked.	2021-02-09 20:13:13 +01:00
Laurent Destailleur	0a2ace81ff	Fix phpcs	2021-02-09 18:15:32 +01:00
Frédéric FRANCE	da8c80071f	Update html.form.class.php	2021-02-09 18:09:35 +01:00
Laurent Destailleur	21558dd0a6	Debug and enhance the feature to assign tasks on project assignation	2021-02-09 17:52:33 +01:00
Frédéric FRANCE	71a2c20d4b	massaction validate invoice do not regenerate pdf	2021-02-09 14:32:04 +01:00
Philippe GRAND	66b06405d9	standardization, internationalisation	2021-02-09 14:20:10 +01:00
Philippe GRAND	44f2269764	standardization, internationalisation	2021-02-09 14:19:17 +01:00
Philippe GRAND	8fd7d3e586	standardization, internationalisation	2021-02-09 14:18:27 +01:00
Philippe GRAND	182563329f	standardization, internationalisation	2021-02-09 14:17:38 +01:00
Philippe GRAND	635260e59f	standardization, internationalisation	2021-02-09 14:16:47 +01:00
Philippe GRAND	663108d239	standardization, internationalisation	2021-02-09 14:16:17 +01:00
Philippe GRAND	8d9ae906c8	standardization, internationalisation	2021-02-09 14:15:45 +01:00
Philippe GRAND	e1bf624e45	standardization, internationalisation	2021-02-09 14:15:14 +01:00
Philippe GRAND	a2b5a3190d	standardization, internationalisation	2021-02-09 14:14:40 +01:00
Philippe GRAND	c1bbd076df	standardization, internationalisation	2021-02-09 14:13:49 +01:00
Philippe GRAND	1317b5cfac	standardization, internationalisation	2021-02-09 14:13:12 +01:00
Philippe GRAND	3e9a6818f2	standardization, internationalisation	2021-02-09 14:12:27 +01:00
Philippe GRAND	f47d5e6a69	standardization, internationalisation	2021-02-09 14:10:07 +01:00
Philippe GRAND	ef3e7fa65a	standardization, internationalisation	2021-02-09 14:09:35 +01:00
Philippe GRAND	2fc6d76029	standardization, internationalisation	2021-02-09 14:09:02 +01:00
Philippe GRAND	ee50cee862	standardization, internationalisation	2021-02-09 14:07:58 +01:00
Philippe GRAND	a50ecdd1aa	standardization, internationalisation	2021-02-09 14:06:55 +01:00
Philippe GRAND	fff2c1fbac	standardization, internationalisation	2021-02-09 14:06:22 +01:00
Philippe GRAND	4840fa8214	standardization, internationalisation	2021-02-09 14:05:19 +01:00
Philippe GRAND	858ebf5aaf	standardization, internationalisation	2021-02-09 14:04:38 +01:00
Philippe GRAND	a8b72c98a2	standardization, internationalisation	2021-02-09 14:03:13 +01:00
Philippe GRAND	ff0c105207	standardization, internationalisation	2021-02-09 14:01:50 +01:00
Philippe GRAND	55dd15cbf6	standardization, internationalisation	2021-02-09 14:01:10 +01:00
Philippe GRAND	11053fe0ed	standardization, internationalisation	2021-02-09 14:00:26 +01:00
Philippe GRAND	39c3bcd265	standardization, internationalisation	2021-02-09 13:58:26 +01:00
Laurent Destailleur	3d892bd60b	Merge pull request #15735 from FHenry/dev_new_project_task_add_contact ... NEW: When add contact/user to Project, ask to also affect on Tasks	2021-02-09 13:43:08 +01:00
Laurent Destailleur	89bda722bf	Merge pull request #16232 from frederic34/paymentvat ... use camelCaps name	2021-02-09 13:29:40 +01:00
Laurent Destailleur	5e9065390a	Merge pull request #16228 from FHenry/dev_new_autoload_product_extrafield_line_createtpl ... NEW:add hidden option to auto load input line extrafield into new lines	2021-02-09 13:24:53 +01:00
Laurent Destailleur	3b0268424b	Merge pull request #16227 from grandoc/new_branch_08_02_2021 ... Save the name of generated file as the main doc when generating a doc…	2021-02-09 13:24:02 +01:00
Laurent Destailleur	a5386246cd	Merge pull request #16225 from frederic34/facturerec ... clean deprecated modelpdf to model_pdf	2021-02-09 13:23:25 +01:00
Frédéric FRANCE	04c25a01af	deprecate non camelCaps functions	2021-02-09 13:10:11 +01:00
Gauthier PC portable 024	d106fe7e90	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries	2021-02-09 09:50:46 +01:00
Frédéric FRANCE	266b217675	add var def in commondocgenerator	2021-02-09 08:35:22 +01:00
Laurent Destailleur	401b4f641d	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php	2021-02-08 22:13:50 +01:00
Frédéric FRANCE	898bf55202	Merge remote-tracking branch 'upstream/develop' into facturerec	2021-02-08 20:21:46 +01:00
Florian HENRY	b3872ca28a	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_hook_ecm_auto	2021-02-08 20:06:08 +01:00
Laurent Destailleur	5966e63120	Fix css	2021-02-08 20:01:10 +01:00
Florian HENRY	1e6144a99d	fix indent	2021-02-08 19:59:18 +01:00
Laurent Destailleur	af4d3767ea	css	2021-02-08 19:56:38 +01:00
Florian HENRY	b6b736c402	NEW:add hidden option to auto load input line extrafield into new lines	2021-02-08 19:56:34 +01:00
Philippe GRAND	f27dd77cb6	Save the name of generated file as the main doc when generating a doc with this template	2021-02-08 19:47:31 +01:00
Philippe GRAND	62d6666927	Save the name of generated file as the main doc when generating a doc with this template	2021-02-08 19:46:09 +01:00
Philippe GRAND	d9eb727c0f	Save the name of generated file as the main doc when generating a doc with this template	2021-02-08 19:44:46 +01:00
Philippe GRAND	f80da203e0	Save the name of generated file as the main doc when generating a doc with this template	2021-02-08 19:43:36 +01:00
Philippe GRAND	6b0bb90ab2	Save the name of generated file as the main doc when generating a doc with this template	2021-02-08 19:40:27 +01:00
Frédéric FRANCE	815f3602e3	clean deprecated modelpdf to model_pdf	2021-02-08 18:30:09 +01:00
Laurent Destailleur	925d81d1b3	Merge pull request #16002 from Hystepik/develop#1 ... New update of funnel of prospection	2021-02-08 18:05:48 +01:00
Laurent Destailleur	6892ad9630	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/admin/dict.php	2021-02-08 17:25:05 +01:00
Laurent Destailleur	c0aa7e7db5	Merge pull request #16020 from atm-gauthier/NEW/add_real_payments_on_vat_objects ... NEW VAT payment request and VAT payment are 2 different steps in workflow on VAT payment recording	2021-02-08 17:19:40 +01:00
Laurent Destailleur	25823d7b90	Merge pull request #16158 from atm-lena/FIX_12.0_SUPPLIER_OBJECTLINE_CONF_DISPLAY ... Add hidden conf to display supplier in object lines	2021-02-08 16:58:28 +01:00
Laurent Destailleur	c33fb4badc	Merge pull request #16219 from FHenry/dev_fix_continue ... Add extrafileld value into return ajax	2021-02-08 16:57:03 +01:00
Florian HENRY	cb152b22df	fix ajax	2021-02-08 15:47:37 +01:00
Laurent Destailleur	8041ef641a	Merge branch 'develop' into dev_typent_jax_workcorrectly	2021-02-08 15:29:36 +01:00
Laurent Destailleur	2440c11eec	Merge pull request #16214 from FHenry/dev_fix_continue ... Various fix in dev branch	2021-02-08 15:11:32 +01:00
Laurent Destailleur	fe9d23e90b	Update functions.lib.php	2021-02-08 15:10:14 +01:00
Frédéric FRANCE	e15e8bcd05	Update functions.lib.php	2021-02-08 15:10:07 +01:00
Laurent Destailleur	7526bef3f8	Merge pull request #16211 from frederic34/patch-2 ... Update functions.lib.php	2021-02-08 15:08:46 +01:00
Laurent Destailleur	d0bbf5bf35	Update functions.lib.php	2021-02-08 15:08:24 +01:00
Laurent Destailleur	5c64173bfa	Merge pull request #16209 from frederic34/barcodepicto ... add barcode picto in left menu	2021-02-08 15:04:56 +01:00
Laurent Destailleur	026e454825	Merge pull request #16208 from frederic34/ecmpicto ... add ecm picto in left menu	2021-02-08 15:04:42 +01:00
Florian HENRY	1e8117dc8a	fix js	2021-02-08 11:49:30 +01:00
Florian HENRY	31ca17c619	fix require once	2021-02-08 11:06:21 +01:00
Gauthier PC portable 024	41af1a59f4	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries	2021-02-08 10:37:01 +01:00
Gauthier PC portable 024	e2a73e6c88	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects	2021-02-08 09:46:48 +01:00
Alexandre SPANGARO	b8ea96ba57	Fix module asset in development	2021-02-08 05:39:07 +01:00
Frédéric FRANCE	c83ccb1e0f	Update functions.lib.php	2021-02-08 00:46:46 +01:00
Frédéric FRANCE	e1a22b7209	add blockedlog picto in left menu	2021-02-07 22:18:34 +01:00
Frédéric FRANCE	3c8ddf917f	add barcode picto in left menu	2021-02-07 22:15:20 +01:00
Frédéric FRANCE	b43dfe1139	add ecm picto in left menu	2021-02-07 22:04:46 +01:00
Laurent Destailleur	fc30b91960	Fix warning	2021-02-07 21:56:57 +01:00
Laurent Destailleur	8f4bd10a8d	Merge pull request #16190 from FHenry/13_fix_checkdeposit_pdf_folder ... FIX: #16189, fix download/see check deposit PDF	2021-02-07 21:34:18 +01:00
Laurent Destailleur	1f32d4a815	Avoid warning	2021-02-07 21:21:21 +01:00
Laurent Destailleur	899ae37f42	Merge pull request #16197 from CaringDev/noAutocompleteCaptcha ... prevent browsers from storing / suggesting old captchas	2021-02-07 20:04:32 +01:00
Laurent Destailleur	92e67b2c54	Merge pull request #16195 from frederic34/morepictomodule ... add more picto for module	2021-02-07 20:01:36 +01:00
Laurent Destailleur	92d40d065a	Merge pull request #16207 from frederic34/patch-4 ... fix html	2021-02-07 20:01:03 +01:00
Laurent Destailleur	ec394a93f6	Merge pull request #16191 from grandoc/develop ... fix typo	2021-02-07 19:59:54 +01:00
Laurent Destailleur	14241148f4	Merge pull request #16193 from frederic34/phpmin ... update phpmin version	2021-02-07 19:59:35 +01:00
Laurent Destailleur	c24a8a22d5	Merge pull request #16203 from frederic34/patch-3 ... fix phpcs	2021-02-07 19:56:07 +01:00
Laurent Destailleur	45789ec21c	Fix TZ problems ... Conflicts: htdocs/core/lib/company.lib.php	2021-02-07 19:47:33 +01:00
Frédéric FRANCE	dbe5c23ed5	Update box_produits_alerte_stock.php	2021-02-07 19:45:18 +01:00
Laurent Destailleur	8c71c8335e	Fix TZ problems	2021-02-07 19:44:22 +01:00
Frédéric FRANCE	58a39a263b	Update box_produits.php	2021-02-07 19:44:09 +01:00
Frédéric FRANCE	ebe7e1464a	fix html	2021-02-07 19:38:46 +01:00
Frédéric FRANCE	b3dc87f3b7	fix phpcs	2021-02-07 18:31:31 +01:00
Laurent Destailleur	d4df62f1da	Look and feel v14	2021-02-07 17:25:41 +01:00
Frédéric FRANCE	0bfe55c3d2	add picto mail	2021-02-06 17:26:16 +01:00
Frédéric FRANCE	b96e405717	add picto member	2021-02-06 17:18:00 +01:00
Raphael Schweizer	0be168561f	prevent browsers from storing / suggesting old captchas	2021-02-06 16:10:05 +01:00
Frédéric FRANCE	3bcf795d55	add more picto for module	2021-02-06 14:44:08 +01:00
Frédéric FRANCE	eaaefe1382	5.5 to 5.6	2021-02-06 14:12:22 +01:00
Frédéric FRANCE	7860ffa28e	update phpmin version	2021-02-06 13:48:31 +01:00
Florian HENRY	377427da1d	add hook to custom directory into automatic file ECM	2021-02-06 13:25:35 +01:00
Florian HENRY	3b4f8c32f7	add hook to custom directory into automatic file ECM	2021-02-06 13:21:16 +01:00
Philippe GRAND	ce7a3ae2f0	fix typo	2021-02-06 13:11:58 +01:00
Philippe GRAND	04373fb531	fix typo	2021-02-06 13:11:08 +01:00
Philippe GRAND	bf211c6423	fix typo	2021-02-06 13:10:00 +01:00
Florian HENRY	901b3287a9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_hook_ecm_auto	2021-02-06 12:41:59 +01:00
Florian HENRY	fcb5b3900d	FIX: #16189, fix download/see check deposit PDF	2021-02-06 12:39:40 +01:00
Laurent Destailleur	7b72ac5a7a	Look and feel v14	2021-02-06 12:10:27 +01:00
Laurent Destailleur	3dedd81f37	Same width for all picto of menu	2021-02-06 11:56:27 +01:00
Laurent Destailleur	c1eba5a885	Merge pull request #16188 from frederic34/menuprefix ... modules can add prefix for menu	2021-02-06 11:41:46 +01:00
Frédéric FRANCE	b487644cb7	sample use for margin module	2021-02-06 10:52:03 +01:00
Frédéric FRANCE	df67de08b1	modules can add prefix for menu	2021-02-06 10:16:07 +01:00
Laurent Destailleur	a2a2127953	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-06 01:17:16 +01:00
Laurent Destailleur	fd3354142b	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/categories/viewcat.php	2021-02-06 01:17:05 +01:00
Laurent Destailleur	b2aab07842	Merge pull request #16180 from grandoc/new_branch_05_02_2021 ... update minimum version	2021-02-06 00:19:17 +01:00
Laurent Destailleur	f0e1c02caa	Look and feel v14 - Use placeholder on combolists	2021-02-06 00:05:24 +01:00
Philippe GRAND	b2e61aa499	fix typo	2021-02-05 18:23:17 +01:00
Philippe GRAND	47ca631193	Save the name of generated file as the main doc when generating a doc with this template and missing declarations	2021-02-05 18:09:36 +01:00
Philippe GRAND	5b5ea075e7	Save the name of generated file as the main doc when generating a doc with this template and missing declarations	2021-02-05 18:07:02 +01:00
Philippe GRAND	5856f9e5cb	Save the name of generated file as the main doc when generating a doc with this template and missing declarations	2021-02-05 18:04:46 +01:00
Philippe GRAND	4170332aee	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:58:54 +01:00
Philippe GRAND	0f196d7f19	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:56:57 +01:00
Philippe GRAND	e638c238c6	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:54:51 +01:00
Philippe GRAND	7c13428456	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:53:34 +01:00
Philippe GRAND	c03da95acb	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:52:12 +01:00
Philippe GRAND	d85c8c44fc	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:49:43 +01:00
Philippe GRAND	998c5b2ec3	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:42:33 +01:00
Philippe GRAND	c96d36cad3	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:39:22 +01:00
Laurent Destailleur	482ad20a4d	Log debug before archive logs	2021-02-05 16:14:42 +01:00
Laurent Destailleur	653fa38b06	Fix autoselect of category with 'auto'	2021-02-05 15:12:12 +01:00
Laurent Destailleur	7278a8c17f	Fix autoselect of category with 'auto'	2021-02-05 15:07:07 +01:00
Laurent Destailleur	2851bac0af	Fix param urlencode	2021-02-05 14:46:20 +01:00
Laurent Destailleur	ac83cea83a	Fix avoid to run import twice by clicking on tab step6 ... Fix timeout for real import step	2021-02-05 14:34:04 +01:00
Florian HENRY	df7f18d4d2	add hook to add directory into ECM auto files	2021-02-05 13:33:48 +01:00
Laurent Destailleur	c441b54521	NEW If not logo defined, can use squarred logo on login page	2021-02-05 12:07:39 +01:00
Gauthier PC portable 024	df8ca1ef84	Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries	2021-02-05 09:29:20 +01:00
Laurent Destailleur	21a9a69ba1	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: test/phpunit/SecurityTest.php	2021-02-04 23:38:42 +01:00
Laurent Destailleur	4a2f26415e	Fix GETPOST accept < if followed with a number	2021-02-04 23:36:41 +01:00
Laurent Destailleur	42557a0148	Memory optimization in blockedlog module	2021-02-04 23:03:09 +01:00
Laurent Destailleur	a4f6c2d0c6	More log	2021-02-04 22:03:58 +01:00
Laurent Destailleur	2a48529aea	Look and feel v14	2021-02-04 20:44:38 +01:00
Laurent Destailleur	964fa7a72d	Look and feel v14	2021-02-04 20:29:57 +01:00
Laurent Destailleur	1b7ee97082	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-04 19:49:32 +01:00
Laurent Destailleur	87a12b39b0	Fix css	2021-02-04 19:28:49 +01:00
Laurent Destailleur	726ef265f2	Look and feel v14	2021-02-04 19:21:07 +01:00
Gauthier PC portable 024	e188ec6cd7	NEW : add real payments on salaries objects	2021-02-04 17:21:08 +01:00
Laurent Destailleur	a6b08b241f	Doc	2021-02-04 17:13:00 +01:00
Laurent Destailleur	eee49b9132	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/delais.php	2021-02-04 13:50:07 +01:00
Laurent Destailleur	524b28d8c3	Fix missing tab info on holiday	2021-02-04 12:15:31 +01:00
Laurent Destailleur	eca010937f	FIX Trigger on expense report was not fired ... FIX Bad dates on info tabs	2021-02-04 11:56:53 +01:00
atm-lena	c5f73ec12a	Resolve ret	2021-02-04 10:42:42 +01:00
Florian HENRY	2d77787bba	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_typent_jax_workcorrectly	2021-02-04 09:06:36 +01:00
Florian HENRY	86e9398b79	no inner join	2021-02-04 09:05:58 +01:00
Laurent Destailleur	31e1e3e4df	Fix cookie for remind the collapse status	2021-02-03 22:37:20 +01:00
Laurent Destailleur	f301635681	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formmail.class.php	2021-02-03 21:02:32 +01:00
Laurent Destailleur	787e03a10d	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/core/class/html.formmail.class.php	2021-02-03 20:46:22 +01:00
Laurent Destailleur	4bba124c3f	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2021-02-03 20:43:32 +01:00
Laurent Destailleur	348fd0fcb5	FIX #16160	2021-02-03 19:36:10 +01:00
atm-lena	e9b5a52a4f	Add hidden conf to display supplier in object lines	2021-02-03 15:22:04 +01:00
Laurent Destailleur	2e7de1d137	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php test/phpunit/ExportTest.php	2021-02-02 16:17:53 +01:00
Laurent Destailleur	c5201b95bb	FIX Must not be able to edit vat of all lines if not draft	2021-02-02 16:12:03 +01:00
Laurent Destailleur	217989d0e2	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-02 15:37:40 +01:00
Laurent Destailleur	bd9eb4c949	FIX Assignement of actors on tasks	2021-02-02 15:36:54 +01:00
Laurent Destailleur	fed99aa3bb	FIX Assignement of actors on tasks	2021-02-02 15:35:40 +01:00
Laurent Destailleur	6b32fd33fd	Fix export with excell	2021-02-02 13:33:44 +01:00
Laurent Destailleur	4d029194d3	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/ajax.lib.php htdocs/margin/agentMargins.php htdocs/margin/customerMargins.php	2021-02-02 13:22:23 +01:00
Laurent Destailleur	85357a34c8	Fix style of injected combo to select variant	2021-02-02 13:12:12 +01:00
Laurent Destailleur	b80de4aeaf	FIX CSRF errors on margin forms	2021-02-02 13:04:41 +01:00
Laurent Destailleur	1fd2f12673	Fix responsive	2021-02-02 11:16:25 +01:00
Laurent Destailleur	3b9bd3cc40	Fix responsive	2021-02-02 11:15:16 +01:00
Laurent Destailleur	218a76ee63	FIX SQL Error with postgres or mysql strict mode	2021-02-02 11:06:58 +01:00
lvessiller	3b050c3452	FIX select default mail template	2021-02-02 10:34:33 +01:00
Laurent Destailleur	2e9656a5b2	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formactions.class.php htdocs/filefunc.inc.php	2021-02-02 03:26:20 +01:00
Laurent Destailleur	f5df3b1d69	Clean code to try to fix #16123	2021-02-02 01:30:23 +01:00
Laurent Destailleur	daf88944f8	FIX #16118 Timezone problem on some fields	2021-02-02 00:19:41 +01:00
Laurent Destailleur	e6deed1601	Fix collapse	2021-02-01 15:40:59 +01:00
Gauthier PC portable 024	1eb4968a29	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects	2021-02-01 12:00:04 +01:00
Laurent Destailleur	641885d814	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-31 19:05:27 +01:00
Laurent Destailleur	582c37c378	Code comment	2021-01-31 19:05:07 +01:00
Laurent Destailleur	3801dd34cd	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/fourn/class/fournisseur.commande.class.php	2021-01-31 19:02:57 +01:00
Laurent Destailleur	d023afb66f	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2021-01-31 18:55:11 +01:00
Laurent Destailleur	18d222f32f	Fix code comment	2021-01-31 18:06:02 +01:00
Regis Houssin	5217a38359	FIX use post instead get	2021-01-31 12:51:13 +01:00
Laurent Destailleur	7887d4cc8e	Fix price2num on all GETPOST('remise_percent')	2021-01-31 12:48:40 +01:00
Regis Houssin	74795b87e5	FIX avoid undefined url and missing token	2021-01-31 12:46:54 +01:00
Laurent Destailleur	b24aac1e6b	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/list.php htdocs/commande/list.php	2021-01-31 12:03:39 +01:00
Laurent Destailleur	ca7738c9b3	FIX #16107	2021-01-30 13:57:42 +01:00
Laurent Destailleur	6fe5c2f599	Merge pull request #16109 from grandoc/new_branch_30_01_2021 ... missing declaration	2021-01-30 13:08:56 +01:00
Philippe GRAND	e584792382	missing declaration	2021-01-30 12:57:06 +01:00
Laurent Destailleur	1063b97c22	Close #16099 Close #16098	2021-01-30 12:55:38 +01:00
Philippe GRAND	0f19a11ebe	missing declaration	2021-01-30 12:54:10 +01:00
Laurent Destailleur	06b0b0ac66	Merge pull request #16102 from bb2a/bug_PROPOSALS_WITH_PICTURE ... Bug Photo in propal	2021-01-30 12:51:33 +01:00
Anthony Berton	e48fc6c3d0	Update pdf_cyan.modules.php	2021-01-29 13:51:06 +01:00
Anthony Berton	77b0075d71	Update pdf_azur.modules.php	2021-01-29 10:50:11 +01:00
Anthony Berton	720a11877d	Update pdf_azur.modules.php	2021-01-29 10:48:58 +01:00
stickler-ci	400243a157	Fixing style errors.	2021-01-29 09:41:05 +00:00
Anthony Berton	fcf72d5e50	Update pdf_azur.modules.php	2021-01-29 10:35:48 +01:00
Laurent Destailleur	e5b4c76a26	Fix combo to select action status	2021-01-28 19:38:47 +01:00
Laurent Destailleur	db9b6b53da	NEW Can set a label as placeholder for combo lists.	2021-01-28 16:31:32 +01:00
Laurent Destailleur	9ec5ba46fb	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/functions.lib.php	2021-01-28 14:47:06 +01:00
Laurent Destailleur	3eebbc6426	NEW Add function showValueWithClipboardCPButton() to add a copy/paste ... button on a text.	2021-01-28 12:44:45 +01:00
Laurent Destailleur	ce3279c462	NEW Add function showValueWithCopyAndPasteButton() to add a copy/paste ... button on a text.	2021-01-28 12:34:54 +01:00
Laurent Destailleur	cf4a12d715	FIX Missing language ico ... Conflicts: htdocs/core/lib/functions.lib.php	2021-01-28 12:04:04 +01:00
Laurent Destailleur	1a7f3938f2	FIX Missing language ico	2021-01-28 12:02:16 +01:00
Laurent Destailleur	4fbf2fff6f	Merge pull request #16034 from Hystepik/develop#2 ... Close #16027 New Feature copy Code Client	2021-01-28 11:17:10 +01:00
Laurent Destailleur	4d5cda20e7	Update functions.lib.php	2021-01-28 11:15:11 +01:00
Laurent Destailleur	9d0945bbe2	FIX #16077	2021-01-28 10:30:09 +01:00
Gauthier PC portable 024	8a5588e518	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects	2021-01-28 10:28:36 +01:00
Laurent Destailleur	f462e353e9	FIX #16079	2021-01-28 09:59:13 +01:00
Laurent Destailleur	b488bca020	FIX 16084	2021-01-28 08:53:13 +01:00
Florian Mortgat	8dfe39258b	FIX 11.0 - when a mandatory extrafield of type sellist contains '0' it should be considered empty and trigger an error message upon insertion	2021-01-27 23:46:09 +01:00
Laurent Destailleur	8c97b55548	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-27 21:09:13 +01:00
Laurent Destailleur	a4c0459c1e	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/list.php	2021-01-27 21:09:01 +01:00
Laurent Destailleur	34ce398033	Merge pull request #16071 from atm-adrien/FIX/Linked_extrafields_alphaValue ... FIX : Linked extrafields don't work with string value	2021-01-27 19:36:13 +01:00
Laurent Destailleur	3e4a9b1bfc	Merge pull request #16070 from aspangaro/13p3 ... Fix: Fa-icon on stock movement	2021-01-27 19:24:31 +01:00
Laurent Destailleur	7b41e0d60c	Merge pull request #16069 from aspangaro/13p2 ... Fix language & translation	2021-01-27 19:23:40 +01:00
Laurent Destailleur	8f8349c671	Merge pull request #16066 from frederic34/patch-1 ... fix include	2021-01-27 19:21:12 +01:00
Frédéric FRANCE	7cd698aff9	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-26 20:19:49 +01:00
Laurent Destailleur	1637b6af7d	Look and feel v14	2021-01-26 15:16:06 +01:00
Laurent Destailleur	aa2d581b41	Fix rename of alias	2021-01-26 13:38:41 +01:00
Laurent Destailleur	d7bf173f0d	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/core/lib/functions.lib.php test/phpunit/SecurityTest.php	2021-01-26 12:12:35 +01:00
Laurent Destailleur	977e4dde86	Fix regression	2021-01-26 12:08:54 +01:00
Laurent Destailleur	8db80ff44d	Fix reponsive	2021-01-26 11:19:13 +01:00
Adrien Raze	6ab63a10d6	FIX : Linked extrafields don't work with string value	2021-01-26 09:37:28 +01:00
Alexandre SPANGARO	0ef02880eb	Fix: Fa-icon on movement	2021-01-26 08:54:21 +01:00
Alexandre SPANGARO	94d4f2da8e	Missing language key & error translation	2021-01-26 05:14:01 +01:00
Laurent Destailleur	13378897a8	FIX Report by Ricardo Matias ... Conflicts: test/phpunit/SecurityTest.php	2021-01-25 22:52:30 +01:00
Laurent Destailleur	6a12de741f	FIX Report by Ricardo Matias	2021-01-25 22:46:09 +01:00
Laurent Destailleur	b4be97ec15	Draft code	2021-01-25 18:59:04 +01:00
Frédéric FRANCE	22522f5aa2	fix include	2021-01-25 17:06:25 +01:00
Laurent Destailleur	0861c639ae	Fix sql injection	2021-01-25 12:40:52 +01:00
Laurent Destailleur	470cd5c682	Clean code	2021-01-25 12:39:44 +01:00
Laurent Destailleur	4b248263c8	Doxygen	2021-01-25 12:29:31 +01:00
Laurent Destailleur	0f5fc7353e	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/index.php htdocs/admin/mailing.php htdocs/admin/paymentbybanktransfer.php htdocs/admin/prelevement.php htdocs/modulebuilder/template/admin/setup.php	2021-01-24 15:29:53 +01:00
Laurent Destailleur	c5cda97c19	FIX Generation of aliases (main alias and alt alias into subdirs)	2021-01-24 14:34:29 +01:00
Laurent Destailleur	005292054d	FIX Generation of aliases (main alias and alt alias into subdirs)	2021-01-24 14:31:29 +01:00
Laurent Destailleur	d9908efdef	Code comment	2021-01-24 13:29:38 +01:00
Laurent Destailleur	15b818da30	Code comment	2021-01-24 13:27:52 +01:00
Laurent Destailleur	c5bbaffb50	Fix look and feel v13	2021-01-23 19:50:04 +01:00
Laurent Destailleur	452aea1d8b	Fix bad test	2021-01-23 17:59:56 +01:00
Laurent Destailleur	dd69aed27b	Fix error test	2021-01-23 17:49:08 +01:00
Laurent Destailleur	21e55d1542	NEW Can filter files in GED on status Shared/Not shared	2021-01-23 13:56:51 +01:00
Laurent Destailleur	8bd7ddee6b	Clean code	2021-01-23 13:55:56 +01:00
Laurent Destailleur	791f5f3f62	Fix css	2021-01-23 13:50:06 +01:00
lmarcouiller	cfcd51f291	style errors update	2021-01-22 17:03:39 +01:00
lmarcouiller	7685dee5f6	style changes	2021-01-22 16:59:34 +01:00
lmarcouiller	5a95cc16aa	update clipboardcopypaste with jquery	2021-01-22 16:58:47 +01:00
Laurent Destailleur	599d69b07c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-22 13:40:08 +01:00
Laurent Destailleur	e1b6f33894	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contact/card.php htdocs/contact/class/contact.class.php htdocs/langs/fr_FR/stocks.lang htdocs/modulebuilder/template/myobject_list.php	2021-01-22 13:40:00 +01:00
Laurent Destailleur	d23e6646ed	Merge pull request #16030 from atm-adrien/FIX/Linked_extrafields_10.0 ... FIX : Linked extrafields lists	2021-01-22 13:35:56 +01:00
lmarcouiller	76ce77f7ba	stickler-ci edit	2021-01-22 09:13:04 +01:00
lmarcouiller	64d08544b2	move of function showValueWithCopyPasteButton in function.lib.php	2021-01-22 09:09:46 +01:00
Laurent Destailleur	7982cab526	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/core/modules/contract/doc/pdf_strato.modules.php htdocs/ticket/card.php	2021-01-21 18:34:55 +01:00
lmarcouiller	60d6de86f1	change of line 1346 because miss remove	2021-01-21 14:31:18 +01:00
Laurent Destailleur	69479584ed	Fix $ok is not used	2021-01-21 13:50:31 +01:00
Laurent Destailleur	8e5b971c49	Merge pull request #15918 from zuiko/patch-1 ... Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.	2021-01-21 13:33:47 +01:00
Laurent Destailleur	af438624a6	Update commonobject.class.php	2021-01-21 13:21:22 +01:00
Laurent Destailleur	0a55ba32f8	Merge branch 'develop' into FIX/Linked_extrafields_10.0	2021-01-21 13:20:34 +01:00
Adrien Raze	645685d16e	FIX : Linked extrafields list	2021-01-20 18:39:18 +01:00
BlackMirror	640cf50b7f	[FM] Fix 12.0 - duplicate label, probably mistaken for ref	2021-01-20 15:20:50 +01:00
Laurent Destailleur	113ef1a02b	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/class/user.class.php	2021-01-19 16:21:53 +01:00
Laurent Destailleur	fd65a2adc1	FIX #15955	2021-01-19 16:04:21 +01:00
Laurent Destailleur	0917b37bb9	FIX #15966 #15967	2021-01-19 15:20:35 +01:00
Laurent Destailleur	7cb8d5af55	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-19 12:25:28 +01:00
Laurent Destailleur	f54efca075	Clean code	2021-01-19 12:25:05 +01:00
stickler-ci	0cdd9f8640	Fixing style errors.	2021-01-19 10:43:03 +00:00
zuiko	21fac1ff7a	Update mod_barcode_product_standard.php ... Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function. #15918 ok with @eldy Avoid sql call if no joker at the end of mask Treat EAN13 in a more evolutive code form to prepare needs for other barcodes with key	2021-01-19 11:40:53 +01:00
Frédéric FRANCE	e8c4db2188	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-19 11:36:59 +01:00
Laurent Destailleur	01996261dc	Merge pull request #15985 from frederic34/codesyntax ... code syntax	2021-01-19 11:29:18 +01:00
Laurent Destailleur	7ad7ad9bb8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-19 10:43:31 +01:00
Laurent Destailleur	2c6d11e040	When creating invoice by mass action, message has link to invoice	2021-01-19 10:42:43 +01:00
lmarcouiller	afab5a977a	dolgrap.class.php with frederic34 advices 2	2021-01-19 09:43:06 +01:00
lmarcouiller	d69e36c110	Merge branch 'develop#1' of github.com:Hystepik/dolibarr into develop#1	2021-01-19 09:11:29 +01:00
lmarcouiller	82b688a2b0	dolgrap.class.php with frederic34 advices	2021-01-19 09:10:15 +01:00
lmarcouiller	fd888be5e5	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1	2021-01-19 09:05:08 +01:00
Gauthier PC portable 024	e2abbbcece	Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects	2021-01-19 08:57:24 +01:00
Frédéric FRANCE	36eeef81bf	code syntax	2021-01-19 00:41:39 +01:00
Laurent Destailleur	6d251e6a43	Merge pull request #15963 from FHenry/13.0 ... fix thirdparty list filter type_ent can be empty	2021-01-18 19:21:58 +01:00
David Bensel	9813cb430a	FIX: type 'sellist' not handled properly in showInputField and showOutputField	2021-01-18 19:14:12 +01:00
Laurent Destailleur	2baeec1537	Merge pull request #15964 from FHenry/12.0 ... extrafeild selllist can be use with string fk	2021-01-18 18:53:01 +01:00
Laurent Destailleur	7195a6880f	Merge pull request #15992 from atm-kevin/FIX/GETPOST_param_card_presend ... FIX : missing GETPOST parameters on card_presend.tpl.php	2021-01-18 18:49:28 +01:00
Gauthier PC portable 024	2cfaf5fbd6	NEW : add real payments on vat objects	2021-01-18 17:08:17 +01:00
David Bensel	85d63891d9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2021-01-18 17:33:22 +03:00
David Bensel	b777a0660c	FIX: type 'sellist' not handled properly in showInputField and showOutputField	2021-01-18 17:31:49 +03:00
Laurent Destailleur	f95bf56c15	Fix translation	2021-01-18 15:24:50 +01:00
Laurent Destailleur	3ff720f8d0	Merge pull request #15999 from frederic34/boxdolibarrstat ... fix unknown variable	2021-01-18 15:18:07 +01:00
Laurent Destailleur	5a4ab3d00e	Fix look and feel v13	2021-01-18 12:07:40 +01:00
stickler-ci	fe01f35207	Fixing style errors.	2021-01-18 10:33:46 +00:00
lmarcouiller	383281e5f3	New update of funnel of prospection	2021-01-18 11:32:02 +01:00
Laurent Destailleur	250b530b29	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php	2021-01-18 11:07:46 +01:00
Laurent Destailleur	c69631d646	Fix css for multiselect component that are fist hidden	2021-01-18 11:05:02 +01:00
Florian HENRY	58eeb7152b	Merge branch '12.0' into 13.0	2021-01-18 09:19:05 +01:00
Florian HENRY	c4f8e81d5d	better fix	2021-01-18 09:18:42 +01:00
Florian HENRY	1cd0f71c09	Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0	2021-01-18 09:12:29 +01:00
Florian HENRY	33a0cf078c	better fix	2021-01-18 09:12:23 +01:00
Florian HENRY	014d3cc114	better fix	2021-01-18 09:08:54 +01:00
Florian HENRY	1eec6fbb8f	Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0	2021-01-18 09:05:12 +01:00
Frédéric FRANCE	83b7e3c678	fix unknown variable	2021-01-18 08:01:18 +01:00
Frédéric FRANCE	f71d803da8	Merge remote-tracking branch 'upstream/develop' into codesyntax	2021-01-17 20:21:05 +01:00
Laurent Destailleur	62300689f8	Fix look and feel v13	2021-01-17 15:59:04 +01:00
Laurent Destailleur	2859070c5c	Fix filet on extrafields date	2021-01-17 15:47:43 +01:00
Laurent Destailleur	4d42fa2a37	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formaccounting.class.php	2021-01-17 11:34:19 +01:00
Frédéric FRANCE	c8d1410e33	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-16 21:06:12 +01:00
Laurent Destailleur	a4109d3fd0	Merge pull request #15600 from Hystepik/develop#2 ... Close #15384 : New widget stat database	2021-01-16 18:42:50 +01:00
Laurent Destailleur	8b9287055e	Update functions.lib.php	2021-01-16 18:34:25 +01:00
Frédéric FRANCE	177b87da0d	Merge remote-tracking branch 'upstream/develop' into codesyntax	2021-01-16 17:58:01 +01:00
Laurent Destailleur	506d809712	FIX #15991	2021-01-16 17:50:02 +01:00
Laurent Destailleur	fdeb2d2f9c	Merge pull request #15979 from frederic34/patch-8 ... member has ref now	2021-01-16 17:26:52 +01:00
Laurent Destailleur	d67e0621dd	Merge pull request #15994 from andreubisquerra/develop ... FIX Avoid php errors if negative var in Receipt Module	2021-01-16 17:25:40 +01:00
Laurent Destailleur	f2488a399e	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-01-16 17:13:54 +01:00
Laurent Destailleur	cdcc6b7324	Merge pull request #15974 from frederic34/davadmin ... fix trans	2021-01-16 17:13:37 +01:00
Laurent Destailleur	ab1e49ab20	Merge pull request #15986 from aspangaro/13a27 ... Optimize select_auxaccount	2021-01-16 16:59:20 +01:00
Laurent Destailleur	8c8ffa3daf	Fix default limit	2021-01-16 16:56:49 +01:00
Laurent Destailleur	de6f6c9b5d	Update functions.lib.php	2021-01-16 16:51:47 +01:00
zuiko	32b5aa7790	Update functions.lib.php ... Fix #15820 function price2num add underscore and - in the pattern in instruction $amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount); as this: $amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount); in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) for example where underscore or - can be used. I don't know if other characters have to be added to this pattern.	2021-01-16 16:51:27 +01:00
Laurent Destailleur	d00eb5b533	Merge pull request #15989 from zuiko/patch-3 ... Fix #15820 Bug: Unable to edit the pricing in Sales Order	2021-01-16 16:50:49 +01:00
Laurent Destailleur	e5c932d3f4	Update functions.lib.php	2021-01-16 16:50:34 +01:00
Laurent Destailleur	2f69a380be	Fix syntax error	2021-01-16 16:06:49 +01:00
Laurent Destailleur	04e669ec96	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formfile.class.php htdocs/langs/fr_FR/other.lang	2021-01-16 15:38:34 +01:00
Laurent Destailleur	892bd432e4	Fix crop of image on invoices.	2021-01-16 15:35:15 +01:00
Frédéric FRANCE	2df0acd419	code syntax	2021-01-16 14:12:09 +01:00
Laurent Destailleur	68302d74ba	Fix look and feel v14	2021-01-16 14:10:37 +01:00
Frédéric FRANCE	216da52972	Merge remote-tracking branch 'upstream/develop' into patch-8	2021-01-16 14:00:05 +01:00
Frédéric FRANCE	871f762546	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-16 13:58:27 +01:00
Laurent Destailleur	4864808e4d	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formmail.class.php	2021-01-16 13:45:34 +01:00
Laurent Destailleur	b3d7783a29	Fix multicompany compatibility of preview of file in email form	2021-01-16 13:41:27 +01:00
Laurent Destailleur	c7c74e8ed1	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/facture/card.php	2021-01-15 19:53:46 +01:00
andreubisquerra	2f9f933ea8	FIX Avoid php errors if negative var in Receipt Module	2021-01-15 19:28:12 +01:00
Laurent Destailleur	d36c406074	Code comment	2021-01-15 19:24:53 +01:00
Laurent Destailleur	80ed651c5e	Fix GETPOST	2021-01-15 19:23:56 +01:00
Laurent Destailleur	ea266c1f2d	Fix missing alias	2021-01-15 17:59:08 +01:00
Laurent Destailleur	32bd194f8e	Sort array	2021-01-15 17:47:14 +01:00
Laurent Destailleur	4b66f6bcd3	Restrict list to customer and supplier only ... Merge 2 sql request in to 1	2021-01-15 17:43:54 +01:00
Laurent Destailleur	0e636031ba	Add option ... MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID	2021-01-15 16:07:00 +01:00
Laurent Destailleur	9350774808	Add option ... MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID	2021-01-15 16:06:22 +01:00
Laurent Destailleur	c778eafc4a	Fix very slow effect.	2021-01-15 14:54:23 +01:00
kevin	fb14f7c0b8	Modify GETPOST parameters to match with v12	2021-01-15 14:40:55 +01:00
Alexandre SPANGARO	0904212c0b	Better works	2021-01-15 14:19:41 +01:00
Laurent Destailleur	39b6f2fb6a	Revert. restore old behaviour, the picto before the input field lead to ... confusion for some users and break presentation with some pages	2021-01-15 13:36:24 +01:00
Laurent Destailleur	dc9cd28437	Look and feel v14	2021-01-15 13:14:21 +01:00
Laurent Destailleur	4c50f25c12	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-15 11:41:45 +01:00
zuiko	dd9031432a	Update functions.lib.php ... Fix #15820 function price2num add underscore and - in the pattern in instruction $amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount); as this: $amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount); in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) for example where underscore or - can be used. I don't know if other characters have to be added to this pattern.	2021-01-15 10:29:31 +01:00
Florian HENRY	cd62c9ed6d	Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0	2021-01-15 08:11:30 +01:00
Alexandre SPANGARO	e812c200c5	Optimize select_auxaccount	2021-01-15 03:37:17 +01:00
Laurent Destailleur	0d704b0714	FIX error managent and db transaction balance	2021-01-14 19:09:57 +01:00
zuiko	fd5948f716	Update functions.lib.php ... Fix #15820 Fix #15820 function price2num add underscore in the pattern in instruction $amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount); as this: $amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount); in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) where underscore is used. it seems that some constantes use also "-" so I added it in the pattern. I don't know if other characters have to be added to this pattern.	2021-01-14 15:00:53 +01:00
zuiko	727751e0c1	Update functions.lib.php ... Fix #15820 function price2num add underscore in the pattern in instruction $amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount); as this: $amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_]/', '', $amount); in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) where underscore is used. I don't know if other characters have to be added to this pattern.	2021-01-14 14:44:32 +01:00
Laurent Destailleur	aaddda9a6e	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/list.php htdocs/accountancy/bookkeeping/listbysubaccount.php htdocs/accountancy/class/accountancyexport.class.php htdocs/user/class/usergroup.class.php	2021-01-14 14:13:08 +01:00
Laurent Destailleur	d76aab4d08	Clean code and comment to have code easier to undestand.	2021-01-14 10:56:24 +01:00
Frédéric FRANCE	225c68d5e6	Update box_members.php	2021-01-13 22:00:40 +01:00
Frédéric FRANCE	923a5fe2a5	Merge remote-tracking branch 'upstream/develop' into davadmin	2021-01-13 18:45:29 +01:00
Laurent Destailleur	43161be711	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-13 17:45:38 +01:00
Laurent Destailleur	0af5c9ae91	Fix phpcs	2021-01-13 17:45:17 +01:00
Laurent Destailleur	7f04307adf	Merge branch 'develop' into develop#2	2021-01-13 17:40:21 +01:00
Frédéric FRANCE	40a45efb63	fix code	2021-01-13 16:23:54 +01:00
Frédéric FRANCE	cb7266d261	fix trans	2021-01-13 16:18:23 +01:00
Laurent Destailleur	b7402ecf3f	Merge branch 'develop' into NEW_product_customer_price_ref	2021-01-13 13:38:19 +01:00
Laurent Destailleur	015c5a028b	Doxygen	2021-01-13 12:45:23 +01:00
Laurent Destailleur	93a2edd8d9	Fix property not used	2021-01-13 12:21:26 +01:00
Laurent Destailleur	3bed2c91c7	Fix version	2021-01-13 12:20:32 +01:00
stickler-ci	432d45b289	Fixing style errors.	2021-01-13 11:19:39 +00:00
Laurent Destailleur	1571b0496c	Merge pull request #15794 from atm-gauthier/develop_new_workstation ... NEW : Workstations management	2021-01-13 12:19:38 +01:00
Laurent Destailleur	1499998a99	Debug	2021-01-13 12:17:45 +01:00
Frédéric FRANCE	e2c57584b7	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-12 23:47:24 +01:00
Frédéric FRANCE	dad329602a	Update html.formmail.class.php	2021-01-12 23:46:29 +01:00
Frédéric FRANCE	cf24fd5d85	code syntax	2021-01-12 23:30:59 +01:00
zuiko	f718a396d5	Update mod_barcode_product_standard.php ... $out .= $obj->libelle; //take the libelle corresponding to the type rowid in the database Take the libelle instead the code for the litteral value of the barcode type rowid.	2021-01-12 21:59:09 +01:00
Florian HENRY	1cc88794b5	merge from 12.0 because this bug comme from it	2021-01-12 21:48:34 +01:00
Florian HENRY	34b792e9a2	betterfix	2021-01-12 21:44:18 +01:00
zuiko	364158c35b	Update mod_barcode_product_standard.php ... Blank line after comment removed...	2021-01-12 21:24:55 +01:00
stickler-ci	14e3be630c	Fixing style errors.	2021-01-12 20:16:34 +00:00
zuiko	ff06798660	Update mod_barcode_product_standard.php ... More evolving coding by testing the type of barcode in literal form. Does not change deeply the #15918 correction principle in order to fix bug #15633.	2021-01-12 21:14:43 +01:00
Laurent Destailleur	958b255822	Fix #15949 by introducing 'alphawithlgt' as GETPOST possible param.	2021-01-12 21:06:02 +01:00
Laurent Destailleur	a7c78c2f60	Merge pull request #15960 from seblu/fix_ldap_login ... Use login from LDAP attribute	2021-01-12 20:59:46 +01:00
Florian HENRY	f30b303269	Merge branch '12.0' into 13.0	2021-01-12 17:45:54 +01:00
Florian HENRY	5b21702508	extrafeild selllist can be use with string fk	2021-01-12 17:44:22 +01:00
Marc de Lima Lucio	82b0f18378	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref	2021-01-12 15:10:15 +01:00
Laurent Destailleur	2e9f3b803d	Add some hooks to add new buttons (compensation of removal of tabs). ... Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>	2021-01-12 13:59:20 +01:00
Sébastien Luttringer	3f13dacacd	Use login from LDAP attribute ... The LDAP authentication function (check_user_password_ldap) returns the login sting when authentication is successful. The current implementation always return the provided login to the check function, instead of LDAP entry login field (as defined in the LDAP_FIELD_LOGIN). This is problematic when you expect user to log with several login, like mail, or the LDAP login doesn't match the dolibarr database. For example, the following filter allows users auth with mail and cn ldap fields: $dolibarr_main_auth_ldap_filter = '(&(objectClass=person)(|(cn=%1%)(mail=%1%)))'; but, dolibarr will not find the user when mail is provided. This patch returns the $ldap->login when LDAP_FIELD_LOGIN is configured.	2021-01-12 12:07:36 +01:00
Florian HENRY	98eff62aff	Merge branch '13_backport' into dev_fix_contact_bulk	2021-01-12 10:25:18 +01:00
Florian HENRY	e34a797899	Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_backport	2021-01-12 10:21:35 +01:00
Laurent Destailleur	3906acc951	Must use the generic version	2021-01-12 10:00:05 +01:00
Florian HENRY	21e1d5c8c9	Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_8fablab	2021-01-11 18:07:10 +01:00
Laurent Destailleur	c2187b2ff1	Merge branch 'develop' into develop_new_workstation	2021-01-11 17:59:13 +01:00
Laurent Destailleur	cae9dc3acf	Merge pull request #15925 from FHenry/dev_add_tag_contact_thirdpartycontactcreateion ... NEW : Add contact tag and bulk email status on thirparty+contact create form	2021-01-11 17:28:12 +01:00
Laurent Destailleur	df3034d13a	Merge branch 'develop' into patch-1	2021-01-11 17:15:46 +01:00
Laurent Destailleur	238fd5accb	Merge pull request #15346 from ATM-Consulting/FIX_12.0_date_extrafields_are_not_filterable_on_lists ... NEW Can filter on extrafields date on lists	2021-01-11 16:41:01 +01:00
Laurent Destailleur	307d718e82	Merge pull request #15931 from ATM-Nicolas/new_shipping_workflow ... NEW : Workflow to set a shipment as closed	2021-01-11 16:34:26 +01:00
stickler-ci	f5fa7928ca	Fixing style errors.	2021-01-11 15:29:33 +00:00
Laurent Destailleur	5ee97dfd4a	Update mod_barcode_product_standard.php	2021-01-11 16:27:37 +01:00
Laurent Destailleur	9962c182c4	Merge pull request #15805 from FHenry/dev_exfields_of_lines_into_line_tr ... NEW : Extrafields of documents lines are inside the lines, not any more on separate TR	2021-01-11 16:15:45 +01:00
Laurent Destailleur	f6de607889	Fix warning	2021-01-11 16:07:02 +01:00
Laurent Destailleur	9a5ae77615	Merge pull request #15926 from FHenry/develop ... fix : remove php warning on install pages	2021-01-11 16:04:04 +01:00
Laurent Destailleur	ed00f6bfb9	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-11 13:46:50 +01:00
Laurent Destailleur	f9f84f84ba	Fix rounding of foreign amount	2021-01-11 13:46:23 +01:00
Laurent Destailleur	5bd59cd6d1	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-11 13:37:59 +01:00
Laurent Destailleur	8debb58f7c	Fix rounding of currency unit prices	2021-01-11 13:36:53 +01:00
Laurent Destailleur	5660159a6d	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/bom/bom_card.php	2021-01-11 13:13:26 +01:00
Laurent Destailleur	c10072ccef	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-01-11 13:07:31 +01:00
Gauthier PC portable 024	6668cfa311	FIX : name in copyrights	2021-01-11 11:40:04 +01:00
Gauthier PC portable 024	e3e4f0590c	FIX : get and delete linked items with association tables methods created in common object	2021-01-11 11:36:19 +01:00
Gauthier PC portable 024	8dfb088fc5	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_workstation	2021-01-11 10:34:38 +01:00
Florian HENRY	c7cddb19be	fix stickler	2021-01-10 11:58:22 +01:00
Florian HENRY	2a3a73c831	Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop	2021-01-10 11:58:06 +01:00
Laurent Destailleur	f411b29b28	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/listbysubaccount.php htdocs/langs/en_US/main.lang htdocs/langs/fr_FR/accountancy.lang	2021-01-09 02:34:43 +01:00
Laurent Destailleur	b3461161ec	Add option MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH	2021-01-09 02:28:50 +01:00
zuiko	bcff65c3d3	Update mod_barcode_product_standard.php ... get barcode type configuration for products only if $type not set	2021-01-09 01:01:14 +01:00
ATM-Nicolas	5a6e4f54f0	NEW : Workflow to set a shipment as closed	2021-01-08 16:25:54 +01:00
Florian Mortgat	d7d44e22e3	FIX warning when filtering on date extrafield (cannot concatenate array to string)	2021-01-08 10:30:39 +01:00
Florian Mortgat	6a759b4bd0	Merge branch 'refs/heads/develop' into FIX_12.0_date_extrafields_are_not_filterable_on_lists	2021-01-08 09:21:58 +01:00
Florian Mortgat	77933de467	Merge branch '12.0' into FIX_12.0_date_extrafields_are_not_filterable_on_lists	2021-01-08 09:08:52 +01:00
Florian Mortgat	5418fcd5be	[minor fix] remove useless intval()	2021-01-08 09:05:32 +01:00
Florian HENRY	7c08e3330c	Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop	2021-01-07 17:54:49 +01:00
Florian HENRY	04d8a679a7	fix warning message on install	2021-01-07 17:51:45 +01:00
Florian HENRY	8adfe54949	bulk email management	2021-01-07 17:33:57 +01:00
Florian HENRY	9b1b755cc2	Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_8fablab	2021-01-07 17:24:53 +01:00
Florian HENRY	5c53a963e2	bulk email management	2021-01-07 17:23:02 +01:00
Laurent Destailleur	2794327e10	Update box_birthdays.php	2021-01-07 12:50:14 +01:00
Lars Wallenborn	1880e51d1c	[FIX] sort order in birthday box ... The current sort order is by date and not by day of month. This yields the following unexpected results: Given * Person A, born on 1980-01-10 * Person B, born on 1970-01-30 I expect Person A to be listed first because their birthday is before that of Person B _in January_. But without this fix, Person B would show up first because 1970 is before 1980.	2021-01-07 12:50:07 +01:00
Laurent Destailleur	a498f8dfe1	Fix sort by day	2021-01-07 12:49:54 +01:00
Laurent Destailleur	094ea841db	Fix sort by day	2021-01-07 12:49:19 +01:00
Laurent Destailleur	28cb391924	Merge pull request #15922 from larsborn/develop ... Fix sort order in birthday box	2021-01-07 12:47:30 +01:00
Laurent Destailleur	ddc3f35be1	Update box_birthdays.php	2021-01-07 12:47:16 +01:00
Laurent Destailleur	6da3ed1a51	Merge 2 exclusive options into 1	2021-01-07 12:39:51 +01:00
Lars Wallenborn	f578164b42	[FIX] sort order in birthday box ... The current sort order is by date and not by day of month. This yields the following unexpected results: Given * Person A, born on 1980-01-10 * Person B, born on 1970-01-30 I expect Person A to be listed first because their birthday is before that of Person B _in January_. But without this fix, Person B would show up first because 1970 is before 1980.	2021-01-07 11:43:11 +01:00
Laurent Destailleur	26fa8b45ac	Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product ... NEW: preload product description on selection for customer propal/order/invoice	2021-01-07 11:19:53 +01:00
Laurent Destailleur	55b46ca149	Merge pull request #15318 from bafbes/abb120353 ... New: add notification on ACTION_CREATE event	2021-01-07 11:17:33 +01:00
Laurent Destailleur	4f55d51eac	Merge pull request #15886 from FHenry/dev_add_column_propal_order ... NEW : Column shippement method, payment mode, payment term in propal and order list	2021-01-07 11:04:30 +01:00
Laurent Destailleur	3d2dc59468	Merge pull request #15897 from OPEN-DSI/add_triggers_on_object_link_managment ... NEW : Add triggers in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()	2021-01-07 10:49:06 +01:00
Laurent Destailleur	3fa5c27bc7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-07 10:41:09 +01:00
Laurent Destailleur	e53cb4b530	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-07 10:40:58 +01:00
Laurent Destailleur	a1d20ed9c2	Merge pull request #15910 from atm-john/new/unit_type_selection_limit ... NEW unit selection on object edit line	2021-01-07 10:33:07 +01:00
Laurent Destailleur	c2855d4d71	Update html.form.class.php	2021-01-07 10:32:23 +01:00
Laurent Destailleur	312f11d7b3	Update objectline_edit.tpl.php	2021-01-07 10:30:11 +01:00
Laurent Destailleur	73e69f8389	Update mod_barcode_product_standard.php	2021-01-07 10:23:38 +01:00
Laurent Destailleur	3399ab2c5d	Fix phpcs	2021-01-07 10:20:41 +01:00
Maxime Kohlhaas	1b7d194e18	Finish fix on add form values	2021-01-07 09:03:25 +01:00
stickler-ci	07ddb1fd2b	Fixing style errors.	2021-01-06 23:17:16 +00:00
zuiko	4e95108eb0	Update mod_barcode_product_standard.php ... Fix #15633	2021-01-06 23:33:04 +01:00
Laurent Destailleur	8918299364	Update commonfields_add.tpl.php	2021-01-06 21:24:37 +01:00
Maxime Kohlhaas	42e45d4a7a	Fix date and datetime type in commonfield_add.tpl	2021-01-06 21:14:40 +01:00
Frédéric FRANCE	1e8362575a	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-06 21:05:59 +01:00
Laurent Destailleur	cfc2ec63f3	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-06 21:04:13 +01:00
Laurent Destailleur	4c00167687	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/societe/card.php	2021-01-06 20:51:44 +01:00
Laurent Destailleur	07ca12b26d	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-06 20:48:23 +01:00
Laurent Destailleur	123bd81721	Trim no more required	2021-01-06 20:42:18 +01:00
Laurent Destailleur	ef8021467b	FIX #15892 #15017	2021-01-06 20:41:40 +01:00
Laurent Destailleur	679948e207	Merge pull request #15893 from atm-lena/FIX_issue_15629 ... FIX #15629	2021-01-06 20:34:31 +01:00
Laurent Destailleur	71278b173e	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-01-06 20:28:33 +01:00
Laurent Destailleur	654cf2d990	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/lib/functions.lib.php	2021-01-06 20:27:46 +01:00
Laurent Destailleur	9e50a06f2b	Merge pull request #15894 from atm-john/11.0_fix_issue_14833 ... Fix #14833 A security mecanism generates data loss	2021-01-06 20:26:19 +01:00
Laurent Destailleur	b553dbb9d2	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-06 20:23:07 +01:00
Laurent Destailleur	a955df21bf	Merge pull request #15905 from atm-quentin/FIX/issue_14501 ... FIX useless tracking number displayed on pdf if empty issue #14501	2021-01-06 20:22:43 +01:00
Laurent Destailleur	3d96c5a454	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/admin/dict.php htdocs/bom/tpl/objectline_create.tpl.php htdocs/bom/tpl/objectline_edit.tpl.php htdocs/bom/tpl/objectline_view.tpl.php htdocs/core/boxes/box_shipments.php htdocs/societe/class/societe.class.php	2021-01-06 20:20:37 +01:00
Laurent Destailleur	17306bc715	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/boxes/box_shipments.php	2021-01-06 20:12:09 +01:00
Laurent Destailleur	7372a18283	Update box_shipments.php	2021-01-06 19:56:49 +01:00
ATM john	7fb0eb5756	fix stickler	2021-01-06 17:34:04 +01:00
ATM john	dd19da66b2	fix stickler	2021-01-06 17:33:19 +01:00
ATM john	ae7b8e7f5e	Fix unit selection on object edit line	2021-01-06 15:15:51 +01:00
stickler-ci	ca557cfacd	Fixing style errors.	2021-01-06 13:22:35 +00:00
quentin	e44b14364a	FIX useless tracking number displayed on pdf if empty	2021-01-06 14:17:06 +01:00
ATM john	50b5226d10	FIX #15465 External user sees last 5 shipments to other customers in the dashboard	2021-01-06 12:40:38 +01:00
Regis Houssin	f80a476bc5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2021-01-06 11:37:56 +01:00
kamel	32109de67b	NEW : Add triggers OBJECT_LINK_INSERT, OBJECT_LINK_UPDATE et OBJECT_LINK_DELETE in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()	2021-01-06 11:14:13 +01:00
ATM john	92a4314779	Fix security mecanism generating data loss	2021-01-06 10:45:54 +01:00
atm-lena	6f15683709	FIX create ticket : thirdparty/contact notification #15629	2021-01-06 10:42:48 +01:00
Florian HENRY	6e7172887a	Merge branch '13_backport' into dev_add_column_propal_order	2021-01-05 22:58:00 +01:00
Florian HENRY	b9bb48a01f	better place and noadmininfo	2021-01-05 22:50:54 +01:00
Laurent Destailleur	ba68c958e1	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-05 19:12:57 +01:00
lmarcouiller	6aa2241617	Merge remote-tracking branch 'doligithub/develop' into develop#2	2021-01-05 18:07:34 +01:00
Marc de Lima Lucio	f03f5701f6	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref	2021-01-05 16:01:31 +01:00
Florian HENRY	f953ff0334	fix sticker	2021-01-05 15:25:47 +01:00
Florian HENRY	a2a45c6aa0	fix sticker	2021-01-05 15:22:31 +01:00
Florian HENRY	27c32560c6	Merge develop	2021-01-05 14:46:50 +01:00
Laurent Destailleur	4b45c5e723	Trans	2021-01-05 12:29:13 +01:00
Laurent Destailleur	a93227ac2f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-05 11:30:25 +01:00
Laurent Destailleur	ed25b252b9	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-05 11:30:14 +01:00
Laurent Destailleur	40645ea24d	Fix load lang	2021-01-05 10:39:53 +01:00
Regis Houssin	ec6c14beb8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2021-01-05 09:41:52 +01:00
Laurent Destailleur	7efd8add39	Merge pull request #15878 from frederic34/patch-10 ... doxygen	2021-01-05 01:41:02 +01:00
Frédéric FRANCE	eeaac549e2	doxygen	2021-01-05 00:11:19 +01:00
Frédéric FRANCE	c468db5a7c	doxygen	2021-01-04 23:41:20 +01:00
Florian HENRY	86075a4db9	review code	2021-01-04 20:00:57 +01:00
Florian HENRY	88ff52a82b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr	2021-01-04 19:20:34 +01:00
Frédéric FRANCE	8454100e7a	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-04 17:45:36 +01:00
Laurent Destailleur	c58451dbb6	Code comment	2021-01-04 16:07:54 +01:00
Laurent Destailleur	07a3367f52	Merge pull request #15624 from StephaneLesage/edit-extrafield-computed-multiline ... Create/Edit extra-field computed value with multi-line text area	2021-01-04 15:57:50 +01:00
Laurent Destailleur	e488f94af3	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-01-04 15:39:48 +01:00
Laurent Destailleur	7141fa315e	Debug v13	2021-01-04 15:32:18 +01:00
Laurent Destailleur	b3142c3250	Merge pull request #15859 from frederic34/htmlformmail_doxygen ... doxygen	2021-01-04 14:08:51 +01:00
Laurent Destailleur	4d09d3a576	Merge pull request #15860 from fappels/13_debug_shipments ... Some debug on Shipments and reception.	2021-01-04 14:06:52 +01:00
Laurent Destailleur	ef76c067e0	Add limit to 25000	2021-01-04 13:37:21 +01:00
Laurent Destailleur	8baa4c67ae	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-04 12:34:09 +01:00
Laurent Destailleur	5c104e344c	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/core/lib/admin.lib.php htdocs/ticket/list.php	2021-01-04 12:17:59 +01:00
Laurent Destailleur	66bd040d2c	Fix regression	2021-01-04 12:08:14 +01:00
Laurent Destailleur	bb22f2ccaf	Update admin.lib.php	2021-01-04 12:02:41 +01:00
Laurent Destailleur	b0738643fb	FIX Solve problem with TZ	2021-01-03 18:42:45 +01:00
Maxime Kohlhaas	e190b010d3	Fix dict contact type element list	2021-01-03 16:05:04 +01:00
Laurent Destailleur	645b7694c9	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/core/db/DoliDB.class.php	2021-01-03 15:26:31 +01:00
Florian HENRY	dfaf77b03f	merge develop	2021-01-03 15:14:34 +01:00
Laurent Destailleur	f462f68056	Code comment	2021-01-03 15:10:33 +01:00
Alexandre SPANGARO	43423650cd	NEW: Accountancy - Add closure menu in auguria menu	2021-01-03 11:57:40 +01:00
Alexandre SPANGARO	a8ecea1a89	NEW: Accountancy - Add closure menu in stable version	2021-01-03 11:54:50 +01:00
Frédéric FRANCE	7291bf34f0	boxes	2021-01-02 22:29:23 +01:00
Frédéric FRANCE	dc6c1b8d3b	boxes	2021-01-02 22:12:19 +01:00
Frédéric FRANCE	bd762bc58f	boxes	2021-01-02 21:50:58 +01:00
Frédéric FRANCE	8f3e6df3e1	transform into box	2021-01-02 21:03:04 +01:00
Frédéric FRANCE	96fbee5eaf	transform into box	2021-01-02 21:01:47 +01:00
Frédéric FRANCE	5dd0b3b1c6	can add box on user home page	2021-01-02 20:20:22 +01:00
Frédéric FRANCE	6fad38db57	can add box on member index page	2021-01-02 20:04:40 +01:00
Florian HENRY	b6d91526ee	Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr	2021-01-02 17:58:34 +01:00
Francis Appels	ade0e008e9	Some debug on Shipments. ... Wrong object status on list paging. Parameter error on link contact. nbr Linked files not shown in tab badge.	2021-01-02 17:42:33 +01:00
Regis Houssin	3b7f5a92cb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2021-01-02 17:20:24 +01:00
Frédéric FRANCE	eb937f82c8	doxygen	2021-01-02 16:58:05 +01:00
Laurent Destailleur	7f0f72ca47	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-02 16:19:18 +01:00
Laurent Destailleur	1ab459e854	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-02 16:19:08 +01:00
Laurent Destailleur	ce0abd17fe	Debug v13	2021-01-02 16:18:16 +01:00
Alexandre SPANGARO	2727fd70b7	FIX: Accountancy - Debug experimental function to validate movements	2021-01-02 14:00:24 +01:00
Regis Houssin	e36ae4ac90	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2021-01-02 13:14:30 +01:00
Frédéric FRANCE	b71e837ddd	clean code	2021-01-02 10:18:58 +01:00
Frédéric FRANCE	2894dac221	clean code	2021-01-02 10:17:11 +01:00
Frédéric FRANCE	5e692fa9db	doxygen	2021-01-02 09:47:29 +01:00
Frédéric FRANCE	4643e41282	remove unused code	2021-01-02 09:35:57 +01:00
Laurent Destailleur	b88ee6eff4	Merge pull request #15815 from FHenry/dev_add_tag_on_massaction ... NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members	2021-01-01 21:36:15 +01:00
Laurent Destailleur	0241817217	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-01 21:12:36 +01:00
Laurent Destailleur	71e4a672f5	Merge branch 'develop' into develop_patch-1	2021-01-01 20:52:43 +01:00
Laurent Destailleur	d834f6023d	Fix rounding	2020-12-31 16:06:54 +01:00
Laurent Destailleur	f756f575a3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-12-31 15:19:49 +01:00
Laurent Destailleur	e4600b2091	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-12-31 15:17:03 +01:00
Laurent Destailleur	9e8c6eb0a1	FIX #15849	2020-12-31 15:05:17 +01:00
stickler-ci	327ec211c4	Fixing style errors.	2020-12-31 09:49:27 +00:00
Frédéric FRANCE	a5e0352031	modify animation speed of tooltips	2020-12-30 21:18:12 +01:00
Regis Houssin	07dc29166e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2020-12-30 13:56:50 +01:00
Laurent Destailleur	92a88441ac	Merge pull request #15328 from FHenry/dev_multifilter_jounal_on_bookeping ... Dev multifilter jounal on bookeping	2020-12-30 13:19:27 +01:00
Laurent Destailleur	7165bd43d9	Update modAccounting.class.php	2020-12-30 13:17:57 +01:00
Laurent Destailleur	8149478c77	Merge pull request #15308 from aspangaro/14a2 ... NEW: Dictionary for availability - Add column position	2020-12-30 13:12:27 +01:00
Laurent Destailleur	17b68a30d7	Merge branch 'develop' into dev_add_tag_on_massaction	2020-12-30 13:10:02 +01:00
Regis Houssin	7832fa213f	FIX Stickler line exceeds 500 characters; contains 527 characters	2020-12-30 11:34:59 +01:00
Regis Houssin	7c5248d105	FIX and the world turn again	2020-12-30 11:27:03 +01:00
Regis Houssin	aec01a95fc	FIX again and again	2020-12-29 17:48:52 +01:00
Regis Houssin	acabb045fb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2020-12-29 17:12:18 +01:00
Laurent Destailleur	057945f693	Fix bad var	2020-12-29 17:04:39 +01:00
Laurent Destailleur	740cedeaac	Merge pull request #15824 from frederic34/scheduledjobs ... remove warnings	2020-12-29 17:03:17 +01:00
Regis Houssin	325c2b03f8	FIX step by step	2020-12-29 17:02:35 +01:00
Laurent Destailleur	cefd66c18f	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-12-29 16:56:39 +01:00
Regis Houssin	20cd9cbbc7	FIX avoid warning php 8.0	2020-12-29 16:25:29 +01:00
Regis Houssin	6e0832fb38	FIX WIP avoid warning with php 8.0	2020-12-29 15:59:39 +01:00
Alexandre SPANGARO	9f0434eb69	Merge remote-tracking branch 'upstream/develop' into 14a2	2020-12-29 04:50:32 +01:00
Laurent Destailleur	af41c06822	Fix warnings	2020-12-29 04:27:16 +01:00
Laurent Destailleur	7b93c34c0f	Fix phpunits	2020-12-29 03:48:11 +01:00
Florian HENRY	b3dae016af	fix sticker	2020-12-28 21:38:17 +01:00
Florian HENRY	1e438b686e	fix stickler	2020-12-28 21:32:46 +01:00
Florian HENRY	806b40662f	merge develop	2020-12-28 21:15:25 +01:00
Frédéric FRANCE	08bad6fc30	remove warnings	2020-12-28 20:54:29 +01:00
Laurent Destailleur	8b696ced3b	Clean code	2020-12-28 12:38:33 +01:00
Laurent Destailleur	4b3cd947f2	Fix name of function	2020-12-28 12:33:00 +01:00
Laurent Destailleur	cec96b33ae	Fix warning	2020-12-28 12:30:59 +01:00
Laurent Destailleur	4a8e72c997	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/ecm/file_card.php	2020-12-27 21:00:07 +01:00
Laurent Destailleur	4ec78d029b	Fix warning	2020-12-27 19:21:37 +01:00
Laurent Destailleur	7178918cb4	Merge pull request #15476 from StephaneLesage/fix-edit-category ... Fix edition of tag/category which used type parameter instead of object's type	2020-12-27 15:08:50 +01:00
Laurent Destailleur	1546805b9e	Merge pull request #15500 from frederic34/patch-10 ... NEW add db fields note_public note_private for ecm	2020-12-27 15:07:51 +01:00
stickler-ci	7f1d0b9dc2	Fixing style errors.	2020-12-24 14:06:55 +00:00
Florian HENRY	1b6a4fc4ae	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction	2020-12-24 15:00:15 +01:00
Florian HENRY	79fe5ee34c	actioncomm ok	2020-12-24 14:35:40 +01:00
Laurent Destailleur	a0440fbe88	Removed warnings	2020-12-24 03:06:52 +01:00
Laurent Destailleur	5ef3ffbdc6	Fix warning	2020-12-24 03:03:38 +01:00
Laurent Destailleur	6c2a17b29a	Fix warning	2020-12-24 02:59:00 +01:00
Laurent Destailleur	3586da75a2	Fix warning	2020-12-24 02:52:49 +01:00
Florian HENRY	720539ff46	on goung	2020-12-23 23:52:43 +01:00
Florian HENRY	055a2b6fec	on goung	2020-12-23 23:44:38 +01:00
Florian HENRY	26d3ea2227	on going	2020-12-23 23:32:50 +01:00
Laurent Destailleur	02daf09928	Fix for php8	2020-12-23 23:06:34 +01:00
Laurent Destailleur	4471d7d1da	FIX debug report expense/income	2020-12-23 22:18:38 +01:00
Laurent Destailleur	d65dc85a10	FIX for php 8	2020-12-23 19:16:25 +01:00
Laurent Destailleur	1c73d38093	Fix api to download for shipments	2020-12-23 19:16:15 +01:00
Laurent Destailleur	9007e7be2a	Fix sql for postgresql	2020-12-23 16:13:45 +01:00
Laurent Destailleur	70df6130b5	Fix SQL to export categories of contact ... Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 Conflicts: htdocs/product/class/product.class.php	2020-12-23 15:45:33 +01:00
Laurent Destailleur	bf606ede12	Enhance remote ip detection	2020-12-23 13:27:30 +01:00
Laurent Destailleur	335eefe620	Fix link	2020-12-23 13:26:39 +01:00
Laurent Destailleur	53c6d92b0b	Enhance remote ip detection	2020-12-23 13:17:40 +01:00
Florian HENRY	0c8939f46c	modifié : htdocs/core/tpl/objectline_create.tpl.php ... modifié : htdocs/core/tpl/objectline_edit.tpl.php	2020-12-22 22:00:51 +01:00
Florian HENRY	311a555cc0	Merge github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr	2020-12-22 12:52:14 +01:00
Florian HENRY	fefc9040ab	NEW : Display extrafields (for lines/det into line tr instead of ugly other tr	2020-12-22 12:52:01 +01:00
Florian Mortgat	64a62bf2c2	FIX (PR #15346 comment) use dol_mktime, not mktime	2020-12-22 09:37:30 +01:00
Laurent Destailleur	04d249cef0	Merge pull request #15792 from frederic34/notifications ... simplify notications class	2020-12-21 18:14:04 +01:00
Laurent Destailleur	88837df442	Merge pull request #15790 from frederic34/fixphpcs_2020_12 ... fix phpcs	2020-12-21 18:10:01 +01:00
Laurent Destailleur	dfb632f2d5	Fix phpunit	2020-12-21 17:56:31 +01:00
Laurent Destailleur	4bc0b46556	css	2020-12-21 17:33:57 +01:00
Laurent Destailleur	14223d74bd	Fix css	2020-12-21 15:00:29 +01:00
Laurent Destailleur	7d0e71165a	Clean code	2020-12-21 14:40:27 +01:00
Gauthier PC portable 024	5116337e0b	FIX : stickler feedbacks	2020-12-21 13:29:44 +01:00
Gauthier PC portable 024	7b739920a2	NEW : Workstations management	2020-12-21 12:28:45 +01:00
Laurent Destailleur	6937ab75fa	Fix test	2020-12-21 02:31:19 +01:00
Laurent Destailleur	0a19f3cf5b	css	2020-12-21 02:27:05 +01:00
Laurent Destailleur	5dc6f5b89f	Prepare 13.0	2020-12-21 01:33:06 +01:00