dolibarr

Author	SHA1	Message	Date
Laurent Destailleur	866dcf18fe	Look and feel v11	2019-10-06 15:34:22 +02:00
Laurent Destailleur	2b66282b61	NEW Code for extrafields uses the new array $extrafields->attributes	2019-10-06 14:41:52 +02:00
Frédéric FRANCE	bfd8bc839e	Update card.php	2019-10-06 10:28:09 +02:00
Laurent Destailleur	b60ee4c18c	css	2019-10-03 09:58:49 +02:00
Alexandre SPANGARO	16c6c9ae75	Merge remote-tracking branch 'upstream/develop' into 11.0_https	2019-10-01 06:12:24 +02:00
Alexandre SPANGARO	91b3bf76fd	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
Frédéric FRANCE	fec67aade4	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-30 18:44:34 +02:00
Laurent Destailleur	d3eafa86d7	Merge pull request #11988 from frederic34/patch-12 Add hook beforeAgenda in comm/action/index.php	2019-09-30 18:03:25 +02:00
Laurent Destailleur	ce7e8c83a3	Use a dedicated css imgforviewmode for button used to switch view	2019-09-30 17:08:57 +02:00
Frédéric FRANCE	4a305ec95c	Add hook beforeAgenda in comm/action/index.php	2019-09-30 15:59:05 +02:00
Laurent Destailleur	d8de78dca9	Merge pull request #11984 from fuhraih/develop Fix 11554 and 7533	2019-09-30 15:31:41 +02:00
Frédéric FRANCE	258424416e	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-30 07:49:52 +02:00
Laurent Destailleur	86e5465197	Standardize extrafields code	2019-09-28 10:55:09 +02:00
fuhraih	5757159c30	FIX #7533 Infinite loop in Agenda per user view if workinghours not set correctly Remove the spaces in the Working_hours and Working_days stored	2019-09-27 22:29:12 +02:00
Laurent Destailleur	c5e7413ed2	Merge branch 'develop' into fix-resource-event-move-check-busy	2019-09-27 15:35:14 +02:00
Laurent Destailleur	34813a931f	Merge branch 'develop' into patch-10	2019-09-27 14:45:09 +02:00
Laurent Destailleur	f90bfb54d4	Merge pull request #11913 from frederic34/actioncommcarddoaction add doaction to actioncommcard	2019-09-27 14:34:49 +02:00
Frédéric FRANCE	41cb628d05	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-25 08:06:44 +02:00
Laurent Destailleur	961f2b5165	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/categories/viewcat.php htdocs/fourn/class/fournisseur.product.class.php htdocs/takepos/invoice.php	2019-09-24 14:25:02 +02:00
Laurent Destailleur	5838fa1229	Fix az09 -> aZ09	2019-09-24 14:20:45 +02:00
Laurent Destailleur	db334a3b94	FIX Var not enough sanitized	2019-09-24 14:16:24 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
Laurent Destailleur	40f75b16d8	FIX Substitution of __PROJECT_XXX__ not done	2019-09-23 13:04:22 +02:00
VESSILLER	ea5ff59076	FIX check if a resource is in use after a drag and drop from events	2019-09-17 16:43:36 +02:00
Frédéric FRANCE	850b9fd52a	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-17 08:24:31 +02:00
Frédéric FRANCE	155e8fb500	fix syntax	2019-09-17 08:18:01 +02:00
Frédéric FRANCE	0d63c43ccd	add doaction to actioncommcard	2019-09-17 08:15:01 +02:00
Frédéric FRANCE	ecac1f9f40	wip	2019-09-17 08:02:55 +02:00
Frédéric FRANCE	a2d3cde291	some update after night	2019-09-17 07:59:46 +02:00
Frédéric FRANCE	fb7ef3cefc	Update card.php	2019-09-16 23:12:11 +02:00
Frédéric FRANCE	f369c1a80a	Update card.php	2019-09-16 20:59:13 +02:00
Frédéric FRANCE	67b73cf0e6	Update actioncomm.class.php	2019-09-16 20:57:20 +02:00
Laurent Destailleur	434ab2965a	Merge pull request #11820 from OPEN-DSI/new-resource-add-event-check-busy NEW check if a resource is in use in an event	2019-09-15 15:47:07 +02:00
Laurent Destailleur	4d0ef33471	FIX #11857	2019-09-15 15:43:03 +02:00
Frédéric FRANCE	c9c7d60fc0	Merge remote-tracking branch 'upstream/develop' into zapier	2019-09-14 16:37:10 +02:00
Laurent Destailleur	56a99f6e6d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-09-12 11:22:13 +02:00
Laurent Destailleur	db900cb5ea	FIX EDB-ID:47370	2019-09-11 17:51:50 +02:00
VESSILLER	66611f4097	FIX rename "resource" (reserved) by "dolresource"	2019-09-09 09:29:43 +02:00
Frédéric FRANCE	bd4c9a64a8	wip	2019-09-07 14:48:25 +02:00
Laurent Destailleur	bb81f66a1a	Add phpunit test for Lessc	2019-09-06 10:36:49 +02:00
VESSILLER	815d0bbc20	FIX rename "dolresource" into "resource" for compatibility with PR 11822	2019-09-05 11:57:12 +02:00
VESSILLER	9ed09db93c	FIX replace "<br />" by "<br>"	2019-09-05 09:41:15 +02:00
VESSILLER	4ef7e755ad	FIX only check on busy resources before updating an event	2019-09-05 09:29:40 +02:00
VESSILLER	b70587c150	NEW check if a resource is in use in an event	2019-09-04 15:14:16 +02:00
Laurent Destailleur	750182f9cd	Removed deprecated method actioncomm->add(), use create() instead	2019-09-04 13:54:36 +02:00
Laurent Destailleur	da3d230182	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: .stickler.yml htdocs/takepos/invoice.php	2019-09-03 17:34:49 +02:00
Laurent Destailleur	6c96478040	Removed deprecated code	2019-09-02 22:57:55 +02:00
florian HENRY	243fca9a1a	fix event list with description	2019-08-27 16:12:07 +02:00
Laurent Destailleur	d304749eca	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-19 10:19:14 +02:00
Laurent Destailleur	18886c701d	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/core/lib/company.lib.php	2019-08-19 00:02:26 +02:00
Laurent Destailleur	b1be6bf4f2	FIX #11422 Can't edit his own events with standard rights	2019-08-18 01:24:54 +02:00
John Botella	9b84987cc1	prepare new dashboard	2019-08-01 12:33:19 +02:00
Laurent Destailleur	bef3423764	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/admin.lang	2019-07-22 19:12:27 +02:00
Laurent Destailleur	9f95b10d0e	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/action/list.php htdocs/comm/action/peruser.php htdocs/compta/prelevement/card.php htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php	2019-07-22 19:11:27 +02:00
Laurent Destailleur	f39f710fd9	Merge pull request #11538 from atm-maxime/fix_agenda_list_filter Fix lost filter in action list	2019-07-22 18:44:22 +02:00
Maxime Kohlhaas	7ec8b48b18	Fix lost filter in action list	2019-07-21 22:21:11 +02:00
florian HENRY	b046bcc197	fix warning php	2019-07-20 15:19:25 +02:00
florian HENRY	d03d79222e	fix warning php	2019-07-20 15:15:48 +02:00
florian HENRY	d88fec52bf	fix warining message	2019-07-20 15:07:59 +02:00
Laurent Destailleur	fc31a1182b	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-18 18:54:50 +02:00
Laurent Destailleur	58428cefc0	Fix phpcs	2019-07-18 18:53:51 +02:00
Laurent Destailleur	50480bf517	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/opensurvey/index.php	2019-07-18 18:23:24 +02:00
Laurent Destailleur	3cffd70ed3	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/prelevement/create.php htdocs/core/class/commonobject.class.php htdocs/expedition/card.php htdocs/expedition/class/expedition.class.php htdocs/fourn/commande/dispatch.php htdocs/fourn/product/list.php htdocs/opensurvey/index.php htdocs/ticket/index.php htdocs/ticket/list.php	2019-07-18 18:09:37 +02:00
John Botella	b5d348356d	Fix socpeople assigned list in action com list	2019-07-17 16:49:41 +02:00
Laurent Destailleur	2fee41f712	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-04 12:27:00 +02:00
Laurent Destailleur	8e3620fce1	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/compta/facture/invoicetemplate_list.php	2019-07-04 12:26:17 +02:00
Laurent Destailleur	ee0a65e7fa	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/comm/action/card.php	2019-07-04 12:22:40 +02:00
Ferran Marcet	433835860c	FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized	2019-07-03 13:12:41 +02:00
Laurent Destailleur	fa476b4994	Properties ->libelle_incoterms were renamed into ->label_incoterms	2019-06-25 13:00:02 +02:00
Laurent Destailleur	18348fea93	Fix sort on date on agenda list	2019-06-22 11:34:16 +02:00
Frédéric FRANCE	f1d64ad164	Update peruser.php	2019-06-17 23:02:54 +02:00
Laurent Destailleur	e8b139d1c6	Fix repeated logs and fetch	2019-06-13 22:48:31 +02:00
Laurent Destailleur	900e860f6d	Fix list of events for BOM module	2019-06-12 19:32:29 +02:00
Laurent Destailleur	2be5e9615d	Fix look and field v10	2019-06-12 19:03:22 +02:00
Laurent Destailleur	f6d8b46b40	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/action/card.php htdocs/fichinter/card.php	2019-06-07 22:58:58 +02:00
Frédéric FRANCE	ad95b66842	Warning: A non-numeric value encountered	2019-06-06 10:12:01 +02:00
Laurent Destailleur	57cfb4b007	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/actions_massactions.inc.php htdocs/website/class/website.class.php	2019-06-02 12:36:07 +02:00
Maxime Kohlhaas	6dd01e86e9	Fix : avoid warning and uniformize var use	2019-05-31 15:53:23 +02:00
florian HENRY	ebe37df9db	scrunitizer	2019-05-18 16:19:44 +02:00
florian HENRY	47ae988b57	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2019-05-18 16:18:22 +02:00
florian HENRY	12a8008107	scrunitizer	2019-05-18 16:18:14 +02:00
Laurent Destailleur	11fea03074	Merge pull request #11026 from atm-john/new_look_and_feel_title_button NEW : look and feel title button	2019-05-18 16:04:47 +02:00
Laurent Destailleur	90a1181dc5	Debug module Ticket	2019-05-01 20:41:03 +02:00
Laurent Destailleur	ee5d50b905	css	2019-04-27 13:25:21 +02:00
Laurent Destailleur	091132de2f	Signatures of methods createFromClone() has been standardized. All methods requires the object User as first parameter.	2019-04-25 12:11:32 +02:00
Abbes Bahfir	dccc8b0be3	Fix:Same action in both cases	2019-04-24 08:48:36 +01:00
Laurent Destailleur	84ec39f043	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-04-23 12:25:53 +02:00
Laurent Destailleur	bf7fcce1b2	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-04-23 12:24:25 +02:00
Laurent Destailleur	5c53044863	Merge pull request #11024 from ATM-Marc/FIX_7.0_sort_events FIX: actioncomm: sort events by date after external calendars and hook	2019-04-16 23:28:30 +02:00
Laurent Destailleur	c0defe3965	Update index.php	2019-04-16 23:27:45 +02:00
Marc de Lima Lucio	1669d497b4	FIX: actioncomm: sort events by date after external calendars and hook	2019-04-16 17:36:27 +02:00
ATM john	292d9c38a5	Appli function to links	2019-04-15 00:21:58 +02:00
ATM john	29b31bd7ab	New title button first step	2019-04-11 00:38:44 +02:00
Laurent Destailleur	f27f65e8bf	Responsive	2019-03-25 10:09:02 +01:00
Frédéric FRANCE	013e536f32	Update actioncomm.class.php	2019-03-19 12:49:54 +01:00
Philippe Grand	7942903548	Update actioncomm.class.php	2019-03-18 12:24:16 +01:00
Philippe GRAND	198cf4af2f	add comments	2019-03-18 10:06:22 +01:00
Laurent Destailleur	d4f2a16abf	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/productaccount.php	2019-03-14 17:10:58 +01:00
John BOTELLA	31e588dbab	fix hookmanager global	2019-03-14 16:13:32 +01:00
John BOTELLA	8bc795c055	Fix missing hook for export agenda	2019-03-14 15:19:38 +01:00
Laurent Destailleur	e7cd8d690c	Remove warnings	2019-03-13 19:06:45 +01:00
Laurent Destailleur	98ca9bf17a	Reduce quantity of string to translates	2019-03-12 19:44:59 +01:00
Laurent Destailleur	6daa262779	Files for variables of themes were renamed from graph-color.php into theme_vars.inc.php to match naming convention of extension .inc.php for files to be included.	2019-03-11 20:32:25 +01:00
Lionel VESSILLER	b56cd11f02	Fix default contact id for update and clone actions in event card	2019-03-06 12:00:55 +01:00
Frédéric FRANCE	0c2a77cb53	Merge remote-tracking branch 'upstream/develop' into patch-2	2019-03-05 18:14:15 +01:00
Laurent Destailleur	b851911708	Dolibarize module ticket	2019-03-05 12:18:46 +01:00
Frédéric FRANCE	f283782445	change visibility	2019-03-04 19:57:46 +01:00
Frédéric FRANCE	9b165f6b3f	add visibility	2019-02-27 20:45:07 +01:00
Laurent Destailleur	3ec2338c2d	Look and feel v10	2019-02-26 19:37:32 +01:00
Frédéric FRANCE	c7cec4be34	Update peruser.php	2019-02-14 21:45:40 +01:00
Frédéric FRANCE	b65532c5d8	Update pertype.php	2019-02-14 21:43:46 +01:00
Frédéric FRANCE	95212e9cc1	Update ical.class.php	2019-02-13 00:44:34 +01:00
Frédéric FRANCE	3de192364b	Update ical.class.php	2019-02-13 00:12:20 +01:00
klemens	beb2791dde	spelling fixes	2019-02-10 12:59:09 +01:00
Laurent Destailleur	af92303319	Merge pull request #10487 from frederic34/psr2squizwhite psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-08 09:30:25 +01:00
Laurent Destailleur	88fb491441	Fix note output	2019-02-06 00:40:07 +01:00
Laurent Destailleur	58e6cfd635	Fix popup content	2019-02-06 00:36:11 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Laurent Destailleur	57f81217ee	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/index.php	2019-02-03 21:14:44 +01:00
Laurent Destailleur	efe5cd3dd8	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-03 21:13:06 +01:00
Laurent Destailleur	72f78ecf3b	FIX #10460 compatibility with MariaDB 10.4	2019-02-03 20:02:05 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +01:00
Frédéric FRANCE	b10558bacd	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
Laurent Destailleur	4f9f0fd7b5	Merge branch 'develop' into elseif	2019-01-27 17:54:06 +01:00
Frédéric FRANCE	f0cdf300d1	Squiz.Functions.FunctionDeclarationArgumentSpacing	2019-01-27 15:20:16 +01:00
Frédéric FRANCE	7ee086b402	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
Frédéric FRANCE	6e91b3cefc	PSR2 usage of else if is discouraged	2019-01-27 10:49:34 +01:00
Laurent Destailleur	300889f53a	# WARNING: head commit changed in the meantime Fix	2019-01-19 13:22:38 +01:00
Laurent Destailleur	2bbaae88d6	Fix standardize 'createfromclone' param when cloning	2019-01-19 12:46:38 +01:00
Marc de Lima Lucio	1cfd52e7e2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_actionlist_desc	2019-01-09 12:08:55 +01:00
Marc de Lima Lucio	de7dfd3423	NEW: actioncomm list: add description column (hidden by default)	2019-01-09 11:54:03 +01:00
Laurent Destailleur	d929d93376	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-08 14:19:35 +01:00
Laurent Destailleur	acc665a9f1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/class/html.form.class.php	2019-01-08 14:16:23 +01:00
Laurent Destailleur	1ee0d42408	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-08 14:08:22 +01:00
Marc de Lima Lucio	68802c659e	FIX: action list: add printFieldListSelect and printFieldListWhere hooks	2019-01-08 11:41:58 +01:00
Laurent Destailleur	a445e7597d	FIX Popup when having notes of events	2018-12-27 06:37:17 +01:00
Laurent Destailleur	fadc9983dc	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-27 06:18:03 +01:00
Laurent Destailleur	cd53e22d64	FIX Edit description of event	2018-12-27 06:16:54 +01:00
Laurent Destailleur	2011afe6fb	Merge branch 'develop' into actionrefused	2018-12-14 15:48:24 +01:00
Inovea Conseil	9bfcabc8c9	NEW: Add note in tooltips	2018-12-10 16:09:56 +01:00
Laurent Destailleur	6d84036f66	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/index.php htdocs/contact/list.php htdocs/core/class/html.form.class.php htdocs/expensereport/card.php htdocs/install/doctemplates/shipment/template_shipment.odt htdocs/public/payment/newpayment.php	2018-12-01 19:23:06 +01:00
florian HENRY	7a182c7880	fix #10069	2018-11-30 23:25:44 +01:00
Laurent Destailleur	3b66a2bf9c	Fix missing email in popup	2018-11-28 14:20:55 +01:00
Laurent Destailleur	5bd9c14929	Update demo data for 8.0 and 9.0	2018-11-23 14:05:45 +01:00
Frédéric FRANCE	8f17ae8df5	GETPOSTISSET has only one parameter	2018-11-19 20:28:55 +01:00
Laurent Destailleur	39621ec686	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php	2018-11-19 20:07:51 +01:00
Laurent Destailleur	25ee999d27	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-19 20:05:32 +01:00
Laurent Destailleur	5f93315097	Clean code	2018-11-19 15:14:46 +01:00
Laurent Destailleur	0886928a64	FIX Link between action and project must use field not the link table	2018-11-19 14:38:30 +01:00
Laurent Destailleur	1e1ccd4c88	Fix pagination in action/event list	2018-11-19 14:25:34 +01:00
florian HENRY	dc2f1e9812	fix list agenda extrafield visibility	2018-11-19 11:25:48 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +01:00
Laurent Destailleur	84983140b6	Merge pull request #9896 from hregis/develop_email FIX change my deprecated email	2018-11-11 17:35:35 +01:00
Laurent Destailleur	de259e9db6	Code comment	2018-11-11 14:36:35 +01:00
Regis Houssin	89389baeac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email	2018-11-09 15:37:29 +01:00
Laurent Destailleur	66ffcf287a	Fix filter on extrafields	2018-11-07 12:49:17 +01:00
Laurent Destailleur	4a25317f10	Fix security on GETPOST('action'). Param must be sanitized.	2018-11-05 20:29:07 +01:00
Laurent Destailleur	c0f4ec5a3e	FIX sanitize param $action	2018-11-05 17:53:31 +01:00
Laurent Destailleur	68ec172798	Fix setup to enable reminder b email	2018-11-03 12:37:52 +01:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Laurent Destailleur	23a9416c19	Fix deprecated field	2018-10-23 23:51:27 +02:00
Frédéric FRANCE	cab9c81ce2	Update actioncomm.class.php	2018-10-15 21:53:54 +02:00
Laurent Destailleur	1d04ce2185	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php	2018-10-09 17:07:32 +02:00
Laurent Destailleur	01c32525df	Merge	2018-10-09 17:06:08 +02:00
Laurent Destailleur	bc4ddce314	Merge pull request #9713 from frederic34/patch-9 Update index.php	2018-10-09 12:43:32 +02:00
Frédéric FRANCE	b615d03b0b	Update index.php	2018-10-09 12:17:51 +02:00
Philippe GRAND	ac214a7258	Standardize code	2018-10-09 08:53:08 +02:00
Philippe GRAND	da560289e3	Standardize code	2018-10-05 15:48:38 +02:00
atm-ph	bfaf25ca2a	Fix wrong value for module part and return access denied	2018-10-04 16:55:16 +02:00
John BOTELLA	83d3e5ec39	NEW : can add project's task to agenda on create event card	2018-09-20 10:17:43 +02:00
Laurent Destailleur	a546ef7f2d	FIX default day	2018-09-19 20:01:25 +02:00
Laurent Destailleur	92aa6929de	Fix go back on agenda view on correct page	2018-09-19 17:03:13 +02:00
Laurent Destailleur	03928a914d	Merge pull request #9537 from frederic34/patch-20 reduce complexity of actioncomm reminder class	2018-09-18 15:08:46 +02:00
Frédéric FRANCE	beb7a0609c	reduce complexity of actioncomm reminder class	2018-09-16 19:06:21 +02:00
Frédéric FRANCE	7b37c41cfb	reduce complexity of actioncomm class	2018-09-16 19:04:43 +02:00
Laurent Destailleur	80fb1e0657	NEW Each user can set its prefered default calendar	2018-09-14 11:23:15 +02:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Frédéric FRANCE	f02b2f0239	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
Frédéric FRANCE	fa895b2c2d	replace select_date	2018-09-09 11:30:40 +02:00
Frédéric FRANCE	a558c3bdac	replace select_date	2018-09-09 11:25:59 +02:00
Frédéric FRANCE	8249756726	replace select_date	2018-09-09 10:40:00 +02:00
Frédéric FRANCE	2b62c4ca8f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-08 10:50:27 +02:00
Philippe GRAND	97c740f510	Merge branch 'develop' of github.com:grandoc/dolibarr into develop	2018-09-06 19:28:10 +02:00
Frédéric FRANCE	4e619dd0ed	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 18:51:21 +02:00
Frédéric FRANCE	aa74d2ac38	Update api_agendaevents.class.php	2018-09-04 23:53:37 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Philippe Grand	c32c67ca57	Merge branch 'develop' into develop	2018-09-04 16:58:59 +02:00
Philippe GRAND	707f8b7312	fix merge	2018-09-04 14:49:56 +02:00
Philippe GRAND	7a0c19485e	fix merge	2018-09-03 09:34:08 +02:00
Frédéric FRANCE	35232b753a	move phpcs:ignore	2018-09-02 20:37:12 +02:00
Frédéric FRANCE	e13a8ec572	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-02 18:19:45 +02:00
Frédéric FRANCE	b60f7db60a	move phpcs:ignore	2018-09-02 10:43:34 +02:00
Frédéric FRANCE	e98b8e5e25	move phpcs:ignore	2018-09-02 09:27:59 +02:00
Frédéric FRANCE	71977514d7	Update actioncommreminder.class.php	2018-09-02 09:06:51 +02:00
Philippe GRAND	ae2df6be11	Standardize and Update code	2018-09-01 23:04:46 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Philippe GRAND	7354e485b0	precise label comment	2018-09-01 13:22:08 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Philippe GRAND	9e880d3e72	Standardize and update code	2018-08-31 17:55:31 +02:00
Frédéric FRANCE	5100b8b7b0	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-30 10:42:47 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Laurent Destailleur	3ebfb23407	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: .travis.yml htdocs/fourn/class/fournisseur.facture.class.php htdocs/product/fournisseurs.php htdocs/ticket/class/ticket.class.php	2018-08-29 20:22:50 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Laurent Destailleur	2349f99eb9	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-28 02:58:51 +02:00
Laurent Destailleur	9c6ce4b29d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-28 02:36:15 +02:00
Laurent Destailleur	2db84a679e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/modulebuilder/index.php	2018-08-28 02:35:45 +02:00
Laurent Destailleur	7219bac0b2	Merge pull request #9168 from frederic34/trimtrailing Trimtrailing	2018-08-28 02:30:02 +02:00
Laurent Destailleur	32ef9695a7	Merge pull request #9282 from frederic34/patch-19 Update card.php	2018-08-28 02:28:35 +02:00
Laurent Destailleur	7462a1ae1d	Update card.php	2018-08-28 02:27:56 +02:00
Laurent Destailleur	0a7ce338f9	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/class/commondocgenerator.class.php	2018-08-28 02:23:34 +02:00
Frédéric FRANCE	85ae8f3901	Update card.php	2018-08-24 09:29:17 +02:00
Philippe GRAND	2fa82edd39	Standardize and update code	2018-08-23 17:07:27 +02:00
Frédéric FRANCE	343e6ce8b3	typo	2018-08-23 14:34:27 +02:00
Philippe Grand	eeaa257f11	Update cactioncomm.class.php	2018-08-22 22:39:51 +02:00
Philippe Grand	c626dcb710	Update actioncomm.class.php	2018-08-22 22:38:00 +02:00
Philippe GRAND	449ef9c464	Update and standardize code	2018-08-22 18:12:44 +02:00
Frédéric FRANCE	0334409d18	Update card.php	2018-08-22 13:43:30 +02:00
Philippe GRAND	95349365ba	Update and standardize code	2018-08-22 11:39:37 +02:00
Philippe GRAND	0ffad50974	Update and standardize code	2018-08-22 11:24:31 +02:00
Philippe GRAND	29f15b4ae6	Update and standardize code	2018-08-22 10:51:55 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Frédéric FRANCE	aba69b94b2	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 14:03:02 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration function declaration	2018-08-21 13:41:56 +02:00
Laurent Destailleur	85eed6cf80	Merge branch 'develop' into trimtrailing	2018-08-21 13:40:04 +02:00
Philippe GRAND	da951e61f2	Update and standardize code	2018-08-17 22:29:21 +02:00
Laurent Destailleur	4e02b134da	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2018-08-16 14:50:04 +02:00
Frédéric FRANCE	54a078149a	function declaration	2018-08-15 17:34:35 +02:00
Laurent Destailleur	5a1a6ac095	Fix error message	2018-08-15 14:42:03 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Frédéric FRANCE	6113b536a0	remove superfluous spaces	2018-08-12 19:59:39 +02:00
Philippe GRAND	948647f3f9	comment translation	2018-08-04 14:17:51 +02:00
Juanjo Menent	b8efe3b239	Merge pull request #9172 from grandoc/new_branch_28_07_2018 standardize	2018-08-02 11:27:02 +02:00
Philippe GRAND	de70bf983e	standardize	2018-07-29 13:40:35 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
Laurent Destailleur	dc2fec8f57	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-24 19:37:04 +02:00
Laurent Destailleur	d871b8964f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-07-24 19:23:40 +02:00
Laurent Destailleur	20f178fdfe	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/comm/action/index.php htdocs/core/lib/functions.lib.php	2018-07-24 19:22:00 +02:00
John BOTELLA	1daba56bbc	Fix count(): Parameter must be an array or an object that implements Countable	2018-07-09 10:05:53 +02:00
Inovea Conseil	30cff2bb36	ADD check user's rights	2018-07-05 11:52:41 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
Laurent Destailleur	8aa7956b4f	Fix missing extraparams field in insert action	2018-06-07 12:53:06 +02:00
Laurent Destailleur	7a8fac4198	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/list.php	2018-06-04 15:14:26 +02:00
Laurent Destailleur	de2ffa1122	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/comm/action/listactions.php	2018-06-04 14:09:17 +02:00
Laurent Destailleur	29ee5dffc4	Clean code	2018-06-04 12:55:55 +02:00
florian HENRY	b996237142	fix: when agenda is filterd with "todo" event, do not display "not applicable" event	2018-05-30 13:37:17 +02:00
Frédéric FRANCE	d986909109	loadlangs	2018-05-26 23:52:52 +02:00
Frédéric FRANCE	f24a6ed4d6	loadlangs	2018-05-26 19:03:41 +02:00
Günter Lukas	3adfce35e2	Update card.php	2018-05-24 13:32:13 +02:00
Günter Lukas	1b237a75b9	Update card.php	2018-05-24 13:31:23 +02:00
Laurent Destailleur	e51aa68284	Fix link to warehouses for events	2018-05-24 12:16:04 +02:00
Laurent Destailleur	c9d23d3930	Merge pull request #8783 from grandoc/new_branch_12_05_2018 Clean and update code	2018-05-18 08:56:06 +02:00
Laurent Destailleur	67ed1e0841	Fix filter criteria when using backto for events	2018-05-16 20:59:45 +02:00
Laurent Destailleur	133e736801	Fix save code	2018-05-16 20:52:45 +02:00
Philippe GRAND	29c735d8bd	Clean and update code	2018-05-12 10:46:17 +02:00
Laurent Destailleur	32ace6a8cf	NEW Add hook setContentSecurityPolicy	2018-04-30 15:17:38 +02:00
Regis Houssin	2906358383	Fix: use "socpeople" instead "societe"	2018-04-27 10:42:10 +02:00
Laurent Destailleur	461ae46cc4	FIX When on a high page and searching for a small result, list was not visible.	2018-04-24 11:37:57 +02:00
Laurent Destailleur	46e448a086	Fix default agenda view	2018-04-22 17:57:20 +02:00
Laurent Destailleur	c81c744aaf	Clean deprecated var	2018-04-21 13:14:58 +02:00
Laurent Destailleur	ccd9aa8059	Fight against dolibarr warnings	2018-04-21 12:16:12 +02:00
Laurent Destailleur	38d200d8a6	Fix left menu	2018-04-20 13:23:34 +02:00
Laurent Destailleur	bbfc4a3e17	NEW Look and feel v8 - Show Picto "+" on all links "Add record"	2018-04-18 03:26:15 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	be965bdbab	Clean code	2018-04-13 13:28:48 +02:00
Laurent Destailleur	1521b0595b	Clean code	2018-04-13 11:03:03 +02:00
Laurent Destailleur	7108f68db9	Remove old deprecated hook insertExtraFields. Triggers must be used for action on CRUD events.	2018-04-10 12:03:01 +02:00
Laurent Destailleur	d46a8eb8f0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/company.php	2018-04-07 12:30:30 +02:00
Laurent Destailleur	1009a629d9	Try better Fix for #8432	2018-04-06 13:20:09 +02:00
Laurent Destailleur	2207e5e470	Fix tooltip	2018-04-05 19:23:36 +02:00
Laurent Destailleur	43f8834b28	Uniformize code with the new module builder framework	2018-03-31 18:48:27 +02:00
Laurent Destailleur	6ccdb52229	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-29 13:30:22 +02:00
Laurent Destailleur	b806b85761	Fix field filtert is set twice	2018-03-29 11:15:50 +02:00
Laurent Destailleur	6ef1dbbe0f	FIX auto open contract if one result found	2018-03-24 18:28:06 +01:00
Laurent Destailleur	6e52c896f2	Dolibarrize module ticket	2018-03-22 10:46:42 +01:00
Laurent Destailleur	e639f2a91f	Removed deprecated method classer_facturee(). Duplicate of classifyBilled	2018-03-16 10:51:12 +01:00
Laurent Destailleur	c962b89495	NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull	2018-03-15 20:46:55 +01:00
Laurent Destailleur	0258d3aeeb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-13 18:04:59 +01:00
ptibogxiv	4f6f0b302e	FIX for nondisplay of fk_element 's id in REST API response the fk_element don't display when the call is made with REST API (reason non found)	2018-03-13 10:28:44 +01:00
Laurent Destailleur	78b0585798	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/taxes.php	2018-03-12 19:09:57 +01:00
Laurent Destailleur	a3d25b24d3	FIX #8285 Extrafields now reported by /api/index.php/agendaevents/{id}	2018-03-11 19:27:03 +01:00
Laurent Destailleur	4070d78d13	Fix phpcs	2018-03-11 02:18:46 +01:00
Laurent Destailleur	7f469e9f6f	Fix PHPCS	2018-03-11 02:04:08 +01:00
Alexis Algoud	129c032118	NEW hidden conf to set nb weeks to show into user view	2018-03-10 16:46:57 +01:00
Laurent Destailleur	7e3b118257	Standardize output	2018-03-07 12:03:40 +01:00
Laurent Destailleur	1ca5c7083a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formother.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2018-03-07 11:54:48 +01:00
Laurent Destailleur	f800d50fec	WIP to show event per hours	2018-03-07 11:53:30 +01:00
Laurent Destailleur	a0a9e12178	Fix css	2018-03-07 11:29:50 +01:00
Laurent Destailleur	1a5cc4e516	Fix in edit mode, title of event is required	2018-03-07 11:06:14 +01:00
Laurent Destailleur	f3fd5f4cfa	FIX Label of event show twice	2018-03-07 11:03:35 +01:00
Laurent Destailleur	1e6a55745c	CSS	2018-03-06 11:54:05 +01:00
Laurent Destailleur	864edce665	NEW Accept anonmymous events (no user assigned) NEW Online payment now record the payment on invoices	2018-03-04 19:39:46 +01:00
Laurent Destailleur	f545d2a134	NEW Can add filter actiontype and notactiontype on event ical export	2018-02-28 20:06:28 +01:00
Laurent Destailleur	b4446764f8	Clean code of deprecated usage	2018-02-21 14:48:25 +01:00
Laurent Destailleur	c4130730cb	Clean code around fetch_optionals()	2018-02-20 19:38:18 +01:00
Laurent Destailleur	b364b2a4de	Fix selection of filter in agenda views	2018-02-06 01:16:51 +01:00
Laurent Destailleur	2fbe4637ac	Fix bad filter link	2018-02-05 23:05:37 +01:00
Laurent Destailleur	0e3d5ea9e5	Fix missing translation	2018-02-04 11:44:39 +01:00
Laurent Destailleur	59eefa46e6	Fix duplicate search field	2018-01-16 18:02:36 +01:00
Laurent Destailleur	1351a43a30	FIX Maxi debug of permission for users external or restricted to sales representatives	2017-12-18 16:13:05 +01:00
Laurent Destailleur	1251807f54	Fix several pb in links to projects on create page	2017-12-12 10:37:51 +01:00
Laurent Destailleur	95cb5025a2	Fix length of month too large More complete template	2017-12-08 16:15:41 +01:00
Laurent Destailleur	e8327fd9a1	Fix the eatby/sellby date was not visible.	2017-12-02 10:43:01 +01:00
Laurent Destailleur	0a73daba01	Security: on target=_blank, we must have rel="noopener"	2017-12-02 03:04:52 +01:00
Laurent Destailleur	670465fcd8	Fix responsive and search	2017-12-01 12:01:17 +01:00
Laurent Destailleur	c269dcc4d5	Fix scrutinizer	2017-11-29 17:58:13 +01:00
Laurent Destailleur	682afe8918	Fix scrutinizer	2017-11-29 16:25:12 +01:00
florian HENRY	94285ae494	factorization of extrafeild into list	2017-11-27 15:24:29 +01:00
Laurent Destailleur	0b9a3087ea	Fix bug reported by scrutinizer	2017-11-25 12:11:02 +01:00
Laurent Destailleur	944d666d1a	Fix bugs	2017-11-25 11:27:24 +01:00
Laurent Destailleur	4cff4c6935	Simplify and standardize code for agenda pages	2017-11-25 00:12:45 +01:00
Laurent Destailleur	c16a150a70	NEW Remove background on agenda view when event is a not busy event.	2017-11-24 20:02:46 +01:00
Regis Houssin	2a7b04e795	Fix: wrong table name and id field name	2017-11-23 12:18:49 +01:00
Laurent Destailleur	5b77fe393e	Fix: contact not preselected	2017-11-23 00:59:43 +01:00
Laurent Destailleur	adce4b5b7b	Debug multi contact on event. Prepare also code to manage properties of attendees of event	2017-11-22 14:42:47 +01:00
atm-ph	fbc761cbac	Fix rename TContactId into socpeopleassigned	2017-11-18 12:36:03 +01:00
atm-ph	15a8f2037b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-11-18 11:54:21 +01:00
Laurent Destailleur	481b810fd2	Merge pull request #7810 from frederic34/patch-1 fix trigger when module not enabled	2017-11-17 12:59:59 +01:00
Laurent Destailleur	4f25bc5e3b	NEW detection of edge browser	2017-11-16 14:44:55 +01:00
Frédéric FRANCE	0d79cc50b0	Merge remote-tracking branch 'upstream/develop' into patch-1	2017-11-16 13:41:24 +01:00
Laurent Destailleur	a7aa3ee438	Rename file	2017-11-16 12:21:21 +01:00
Laurent Destailleur	c527189088	Standardize page name	2017-11-16 12:18:25 +01:00
Laurent Destailleur	19d0283b63	Fix doxygen	2017-11-16 12:13:23 +01:00
Laurent Destailleur	c85acbfc11	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/commonobject.class.php htdocs/core/modules/import/import_xlsx.modules.php htdocs/install/repair.php	2017-11-14 19:47:33 +01:00
Laurent Destailleur	0e2f64af72	CSS	2017-11-14 12:18:02 +01:00
Laurent Destailleur	fa92c53ff6	Fix pb when showing dictionaries	2017-11-14 11:13:24 +01:00
Frédéric FRANCE	96031b0787	Update listactions.php	2017-11-14 11:05:58 +01:00
Laurent Destailleur	11cb9c0d81	Code simpler	2017-11-14 01:57:50 +01:00
Laurent Destailleur	3dc06977af	Update listactions.php	2017-11-14 01:33:44 +01:00
alexis Algoud	19a2c2fe06	Merge branch 'NEW_burger_menu_list_action' of github.com:atm-alexis/dolibarr into develop	2017-11-13 10:05:29 +01:00
Laurent Destailleur	9a8423ba5e	Start to show work on repeat events	2017-11-13 02:46:13 +01:00
Laurent Destailleur	90615a8682	Fix busy tag not set sometimes	2017-11-13 02:44:02 +01:00
Laurent Destailleur	186c8cdbf0	Fix selection of contact into creation of event	2017-11-12 13:40:05 +01:00
Alexis Algoud	7922fd0281	NEW add burger menu to list action comm	2017-11-11 18:41:35 +01:00
Laurent Destailleur	d938a56282	Clean code	2017-11-11 01:10:17 +01:00
Laurent Destailleur	a329f7dc75	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: build/exe/doliwamp/doliwamp.iss htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/list.php	2017-11-05 18:50:14 +01:00
Laurent Destailleur	048766bd24	Fix sql error	2017-11-03 17:24:14 +01:00
gauthier	03544f783a	FIX : Wrong alias sql	2017-11-02 16:16:29 +01:00
Laurent Destailleur	310bf4bde4	Update peruser.php	2017-11-02 15:51:35 +01:00
Laurent Destailleur	ec3a07cd52	Try to restore compatibility when actioncode=CODE1,CODE2,...	2017-11-02 15:50:55 +01:00
Laurent Destailleur	63a363080e	Update index.php	2017-11-02 15:48:56 +01:00
Laurent Destailleur	323a0d7d0d	Update index.php	2017-11-02 15:48:24 +01:00
Laurent Destailleur	1b28c45e2c	PERF Links in getNomUrl use only one tag a instead of 2.	2017-11-02 15:19:14 +01:00
gauthier	b7cf434ebd	FIX : Filter type on actioncomm with multiselect doesn't work	2017-11-02 14:58:33 +01:00
Laurent Destailleur	c226fc69d1	Update actioncomm.class.php	2017-11-02 10:45:27 +01:00
Laurent Destailleur	4220d02dd4	Debug module blocked log	2017-10-31 23:57:37 +01:00
Laurent Destailleur	9458c80c48	Work on reminders	2017-10-31 23:10:29 +01:00
Laurent Destailleur	b29f32171c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/comm/action/class/actioncomm.class.php htdocs/contrat/card.php htdocs/core/lib/project.lib.php htdocs/filefunc.inc.php	2017-10-30 18:22:26 +01:00
Laurent Destailleur	cd5e43483e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/contrat/card.php htdocs/core/lib/project.lib.php htdocs/expedition/card.php htdocs/projet/class/task.class.php	2017-10-28 22:08:16 +02:00
Laurent Destailleur	f02e731c67	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/core/lib/project.lib.php	2017-10-27 02:32:09 +02:00
Laurent Destailleur	708666349f	Minor fix	2017-10-26 18:35:32 +02:00
Laurent Destailleur	202712be94	Work on module builder	2017-10-25 22:02:07 +02:00
Laurent Destailleur	fb843430bf	FIX #7671	2017-10-22 03:22:31 +02:00
Juanjo Menent	75580f253e	FIX: Agenda events are not exported in the ICAL, VCAL if begin exactly with the same $datestart	2017-10-20 12:57:32 +02:00
Laurent Destailleur	7f85d73001	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/card.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/contrat/card.php htdocs/expensereport/card.php htdocs/fichinter/list.php htdocs/fourn/commande/card.php htdocs/fourn/commande/list.php htdocs/fourn/facture/card.php htdocs/fourn/paiement/card.php htdocs/livraison/card.php htdocs/modulebuilder/template/myobject_list.php htdocs/societe/rib.php htdocs/supplier_proposal/list.php htdocs/user/card.php	2017-10-18 19:51:29 +02:00
Laurent Destailleur	74b401b70d	Fix bad perm to delete file	2017-10-18 17:40:47 +02:00
Laurent Destailleur	8626d6279a	Fix perm to delete files	2017-10-18 17:21:30 +02:00
Laurent Destailleur	eb1fdca157	NEW Can create intervention from a proposal	2017-10-17 10:44:18 +02:00
Laurent Destailleur	082d59439f	Fix add missing seconds when adding event so sort order on date is ok	2017-10-17 10:43:37 +02:00
atm-ph	bab43b043e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-10-13 09:52:56 +02:00
Laurent Destailleur	85606126a9	Standardize code for events	2017-10-04 12:58:13 +02:00
Laurent Destailleur	3f3a5e0921	Merge pull request #7499 from atm-gauthier/NEW_custom_meteo New custom meteo	2017-10-02 00:48:52 +02:00
Laurent Destailleur	0e15aef44f	CSS	2017-09-30 00:30:58 +02:00
gauthier	1694737e0b	NEW : new param on load_board() function in ActionComm class to avoid duplicate code	2017-09-27 10:09:21 +02:00
Laurent Destailleur	36b199e78c	Merge pull request #7433 from tysauron/patch-11 For use ajax combobox for societe and contacts in action card create.	2017-09-26 20:13:52 +02:00
gauthier	7f938bc517	NEW : unexistant function load_state_board() on several objects	2017-09-26 12:32:58 +02:00
Laurent Destailleur	e3da4188e2	GETPOST must not clean data for text input.	2017-09-25 00:16:52 +02:00
Laurent Destailleur	e56840b9ec	Clean deprecated code	2017-09-21 11:35:18 +02:00
tysauron	5643d4e867	Rename "->fk_action" in "->type_id" (is old name)	2017-09-19 17:26:18 +02:00
tysauron	0803e03ca9	For use ajax combobox for societe and contacts in action card create.	2017-09-19 14:53:34 +02:00
Laurent Destailleur	fa18e788b5	Fix must use photo of user	2017-09-17 17:29:00 +02:00
Laurent Destailleur	0cf67944fa	Clean code	2017-09-16 13:14:46 +02:00
Laurent Destailleur	bd7c4fe940	NEW Summary of last events on a card are sorted on decreasing date.	2017-09-16 10:12:44 +02:00
Laurent Destailleur	b13dbf1f06	Clean code. Make selection of template working even if public.	2017-09-16 00:49:46 +02:00
Laurent Destailleur	5e34b121dd	Add more robust php unit to detect not escaped sql. Fix not escaped sql	2017-09-15 15:41:07 +02:00
Laurent Destailleur	c44a5ede43	FIX Several problem with the last event box on project/tasks Conflicts: htdocs/core/lib/functions2.lib.php	2017-09-13 15:16:06 +02:00
Laurent Destailleur	7767ac2aa7	FIX Several problem with the last event box on project/tasks	2017-09-13 15:12:54 +02:00
Laurent Destailleur	c5567fafd4	Enhancement for smartphone	2017-09-04 09:25:53 +02:00
atm-ph	8188abd4cd	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-08-31 11:09:02 +02:00
Laurent Destailleur	c573df4f0e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/card.php	2017-08-26 22:33:56 +02:00
Laurent Destailleur	4052e15565	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/comm/action/card.php	2017-08-26 21:58:29 +02:00
Laurent Destailleur	90afbcb034	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/bank.php htdocs/core/lib/functions.lib.php	2017-08-23 17:02:53 +02:00
Laurent Destailleur	aae24c26a3	Some fixes with smartphones	2017-08-22 20:20:34 +02:00
Regis Houssin	18ca96e285	Fix: file delete link doesn't work	2017-08-22 18:33:00 +02:00
Laurent Destailleur	2104ab9aed	Disable event reminder	2017-08-21 13:11:29 +02:00
Laurent Destailleur	8cd2235b4b	Start to introduce cron for email reminder.	2017-08-03 11:42:22 +02:00
Laurent Destailleur	5b1f5b0f20	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
Laurent Destailleur	cfebbe3cc4	Fix css	2017-07-31 03:16:28 +02:00
Laurent Destailleur	837afa0e65	Fix better way to get info for contact/thirdparty on agenda	2017-07-29 04:07:46 +02:00
Laurent Destailleur	2a36166839	Fix error method on non object	2017-07-29 02:11:45 +02:00
Laurent Destailleur	cae21d3937	Fix in agenda output per user/type (reduce memory usage)	2017-07-29 01:59:26 +02:00
Laurent Destailleur	2870798d07	Fix remove warnings	2017-07-13 00:35:10 +02:00
Laurent Destailleur	4b4dcf2e01	Fix overload with a protection for rare case with very high nb of event	2017-07-12 23:05:26 +02:00
Laurent Destailleur	10cb7b2524	Fix remove warnings	2017-07-09 20:31:27 +02:00
Laurent Destailleur	e1ba69eee0	Fix edit of automatic event should keep its type.	2017-07-08 00:19:30 +02:00
Laurent Destailleur	de1a7042d4	Fix filter on list of actions	2017-07-07 10:55:42 +02:00
phf	49b8689f2d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-07-05 11:02:39 +02:00
Laurent Destailleur	0ee93fb00c	Fix conflict between option login and logina and logint in agenda export	2017-07-04 10:29:38 +02:00
Laurent Destailleur	b6002bd1f8	Fix bad link	2017-06-28 18:29:57 +02:00
Laurent Destailleur	08af9bf365	List before	2017-06-27 10:37:00 +02:00
Laurent Destailleur	34f3552dc7	Fix missing image of user	2017-06-27 04:31:29 +02:00
Laurent Destailleur	3fdfebf7ef	Fix position of top menu does not follow 'position' field.	2017-06-27 04:25:41 +02:00
Juan Bautista Mesa Roldán	0f5dc90bae	Fixing pages warning when value is null	2017-06-24 16:45:45 +02:00
Laurent Destailleur	86a6a83647	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/admin/tools/index.php htdocs/bookmarks/bookmarks.lib.php htdocs/compta/facture.php htdocs/core/tpl/passwordforgotten.tpl.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/main.inc.php htdocs/product/stats/card.php htdocs/public/paypal/paymentko.php	2017-06-18 21:13:48 +02:00
Laurent Destailleur	e813fd2dfa	Fix missing key import_key and extraparams	2017-06-16 12:57:30 +02:00
Laurent Destailleur	5a477bdd6d	Merge pull request #7018 from hregis/develop_bug_restapi Fix: missing _cleanObjectDatas function	2017-06-16 12:53:11 +02:00
Regis Houssin	c2901ae8cd	Fix: add/remove unset unsused fields	2017-06-16 11:01:58 +02:00
Regis Houssin	9410466d72	Fix: better check and security	2017-06-15 21:51:31 +02:00
Regis Houssin	78d5520741	Fix: missing _cleanObjectDatas function	2017-06-15 21:23:35 +02:00
Regis Houssin	50aa40da3b	Fix: error when the project module not enabled	2017-06-14 07:40:11 +02:00
Laurent Destailleur	e93cefbbf0	FIX #6985	2017-06-11 10:37:58 +02:00
Laurent Destailleur	6ab47a845e	Fix look and feel v6	2017-06-10 13:54:43 +02:00
Laurent Destailleur	a8e16910c0	Fix look and feel v6	2017-06-10 13:44:20 +02:00
Laurent Destailleur	7c0de18ac1	Fix code comment	2017-06-10 12:56:28 +02:00
Laurent Destailleur	b441c62e1d	Fix syntax error	2017-06-08 14:55:12 +02:00
Laurent Destailleur	b1f93ccb0c	Fix security	2017-06-08 14:33:46 +02:00
phf	d6d451b54a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-06-08 12:03:59 +02:00
phf	711f9696aa	New multi contacts on actioncomm	2017-06-08 12:02:39 +02:00
Regis Houssin	2b36135641	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-07 20:14:03 +02:00
Laurent Destailleur	1820649175	Maxi debug of v6	2017-06-07 19:28:31 +02:00
Regis Houssin	bfd6116e5b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-06 15:03:36 +02:00
Laurent Destailleur	02b5d9e6f7	FIX #6945	2017-06-06 10:53:53 +02:00
Regis Houssin	2df33d1df3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-03 11:45:15 +02:00
Laurent Destailleur	7f18dfee0d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/skeletons/build_class_from_table.php dev/skeletons/skeleton_card.php htdocs/compta/facture/class/facture.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/projet/card.php	2017-06-03 01:55:05 +02:00
phf	31aa8bdf05	Fix week view link has wrong link	2017-06-01 16:26:32 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
David	d8c5ec2aef	FIX: REST API not possible to add agendaevents	2017-05-29 13:47:42 +02:00
Laurent Destailleur	dc246fa44c	Merge pull request #6887 from hregis/develop_new New: add REST api "dictionaryevents" for use with "agendaevents"	2017-05-29 10:16:35 +02:00
Laurent Destailleur	de1db57a9d	Merge pull request #6883 from dvasseur/develop FIX: REST API not possible to add agendaevents	2017-05-29 10:12:33 +02:00
Regis Houssin	ee2019ae37	Fix: limit to 100 by default to avoid freeze	2017-05-26 16:52:27 +02:00
David	3898cfe02f	FIX: REST API not possible to add agendaevents	2017-05-23 18:27:41 +02:00
Laurent Destailleur	f5e29d6c86	Fix phpcs warning	2017-05-22 10:45:02 +02:00
Laurent Destailleur	b3dc73e611	Look and feel v6	2017-05-21 02:43:51 +02:00
Laurent Destailleur	807c77f754	Fix inconsistent options	2017-05-19 18:03:49 +02:00
Laurent Destailleur	bb2a9f9d0e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-19 17:24:31 +02:00
Laurent Destailleur	c30dcf78cb	Show info when link has been deleted	2017-05-19 17:24:15 +02:00
Laurent Destailleur	d1c4439a0f	Merge pull request #6858 from OPEN-DSI/module_agenda_linked_object_option NEW Module Agenda: Add option - Show linked object into agenda view	2017-05-19 17:23:54 +02:00
KHELIFA	169859b708	Module Agenda: Add option - Show linked object into agenda view	2017-05-17 17:00:45 +02:00
Alexandre SPANGARO	93554b7e30	Typo searchpicto	2017-05-14 21:06:33 +02:00
Laurent Destailleur	fa290c34fa	Fix against SQL injection. Add phpunit to detect missing escapement.	2017-05-12 16:55:11 +02:00
Laurent Destailleur	d53654e64f	Look and feel v6	2017-05-05 20:45:06 +02:00
Laurent Destailleur	d7e10085b8	Clean code. Using 2 different key for a param is not more allowed.	2017-05-05 18:42:11 +02:00
Laurent Destailleur	4c056d68d8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/dict.php htdocs/commande/list.php htdocs/core/class/html.form.class.php htdocs/langs/en_US/bills.lang htdocs/societe/list.php	2017-04-15 17:02:05 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
Laurent Destailleur	a6b05bb4da	Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0	2017-04-12 14:08:58 +02:00
Laurent Destailleur	26a9999fbf	Support of preview for pdf with several pages	2017-04-12 11:38:55 +02:00
Laurent Destailleur	9b45776941	Fix responsive	2017-04-10 17:25:53 +02:00
Laurent Destailleur	e221c48997	Css	2017-04-01 00:59:21 +02:00
Laurent Destailleur	7254b54a04	Work on 6.0 look and feel	2017-04-01 00:49:06 +02:00
Laurent Destailleur	7056edf509	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-31 18:32:36 +02:00
Laurent Destailleur	6e0918dded	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-03-31 18:31:54 +02:00
Laurent Destailleur	911d5832c6	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-03-31 18:30:41 +02:00
Laurent Destailleur	b44143d24d	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9	2017-03-31 18:29:15 +02:00
Laurent Destailleur	01a74a8d23	Work on 6.0 look and feel	2017-03-31 17:41:20 +02:00
Laurent Destailleur	e416ea275e	Work on 6.0 look and feel	2017-03-28 21:04:38 +02:00
Laurent Destailleur	3740137e31	Add tooltip on label of each open item.	2017-03-28 10:44:52 +02:00
Laurent Destailleur	106d19a8af	FIX #6468 + Fix missing translation	2017-03-25 03:53:11 +01:00
hugome	38ccf7ffdd	Fix : Agenda getCalendarEvents hook Return of getCalendarEvents on agenda page : The array_merge change key of merged array.	2017-03-13 11:35:49 +01:00
Laurent Destailleur	618c27d63c	Optimize space	2017-03-10 16:26:43 +01:00
Laurent Destailleur	fb88eaf2a4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-02-23 02:55:50 +01:00
Laurent Destailleur	e981e719a1	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/comm/action/card.php	2017-02-23 02:54:40 +01:00
Laurent Destailleur	92d9eb3c5d	Several fix for a better management of #6424	2017-02-22 17:46:54 +01:00
jfefe	0a9ffa58c1	FIX : event status is not modified when assign an user	2017-02-20 09:54:20 +01:00
Laurent Destailleur	8d03f86f45	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-17 13:10:46 +01:00
De Coninck Laurent	979a5e70bf	allow the drag and drop of an event only for allowed users The drag and drop of the event didn't take into account the user rights.	2017-02-16 07:51:46 +01:00
Laurent Destailleur	809e3ce4d5	Debug browser notification	2017-01-20 20:10:16 +01:00
Juanjo Menent	2374aa351e	Merge remote-tracking branch 'upstream/develop' into develop	2017-01-20 15:55:51 +01:00
Laurent Destailleur	4ecd657f34	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-16 00:02:43 +01:00
Laurent Destailleur	d14e4dbaba	Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on	2017-01-15 20:49:20 +01:00
Juanjo Menent	6cc3ef0c99	NEW: Events notifications in browser	2017-01-13 16:08:49 +01:00
Laurent Destailleur	27c056d377	Avoid duplicate function error	2017-01-03 11:30:27 +01:00
Laurent Destailleur	82052450a6	Complete work on dol_banner	2016-12-26 18:21:18 +01:00
Laurent Destailleur	b777ec79f2	Fix contextpage implementation into skeleton	2016-12-23 10:38:27 +01:00
Laurent Destailleur	9e44eb0d15	Fix return code REST similar for all api with POST	2016-12-23 02:08:22 +01:00
Laurent Destailleur	6c4f15df63	Fix lot of fix in css look to match v5 rules.	2016-12-11 16:11:42 +01:00
Laurent Destailleur	1838670e31	Fix several security holes on api when used by external users	2016-12-07 19:02:39 +01:00
Laurent Destailleur	761a795294	Maxi debug on REST APIs	2016-12-05 13:31:29 +01:00
Laurent Destailleur	bd8f923cee	Several fixes in filter on lists	2016-11-29 22:52:16 +01:00
Laurent Destailleur	e52e17eec2	Fix Responsive design	2016-11-27 20:11:39 +01:00
Laurent Destailleur	2c9edd4205	Maxi debug on list. Fix responsive design.	2016-11-27 13:49:46 +01:00
Laurent Destailleur	16ce156631	Fix responsive design	2016-11-25 18:32:52 +01:00
Laurent Destailleur	dd27a52a85	Fix several problems on new REST API on project/tasks	2016-11-19 16:08:27 +01:00
Laurent Destailleur	ad981a0f07	FIX the key for getEntity was different for same element.	2016-11-18 12:54:08 +01:00
Laurent Destailleur	9bff6f966b	NEW Can add event from the card listing events	2016-11-08 14:08:48 +01:00
Laurent Destailleur	7a94cfc994	NEW Better filtering of automatic/manually inserted events.	2016-11-08 13:03:20 +01:00
Laurent Destailleur	4681c84e1d	Better responsive	2016-11-06 12:16:10 +01:00
Laurent Destailleur	3fbba59f69	Better management of status of events	2016-10-30 13:12:35 +01:00
Laurent Destailleur	220d81b350	Fix duplicate tooltips	2016-10-28 17:43:29 +02:00
Laurent Destailleur	f67863e1aa	NEW Can use any filter on all REST API to list.	2016-10-25 19:15:47 +02:00
Laurent Destailleur	6ef74b33c9	Uniformize code	2016-10-25 11:09:26 +02:00
Laurent Destailleur	6338b04ac0	Remove call of a deprecated function	2016-10-24 11:27:39 +02:00
Laurent Destailleur	dada679110	Uniformise code	2016-10-18 12:16:12 +02:00
Laurent Destailleur	434b3ef643	Uniformize code and look and feel	2016-10-17 17:52:58 +02:00
Laurent Destailleur	d39d7d92c9	Uniformize code.	2016-09-26 02:13:58 +02:00
Laurent Destailleur	ea09eb13da	Uniformize code	2016-09-26 00:10:29 +02:00
Laurent Destailleur	4ec7bcd23e	Rename api class to solve conflict	2016-09-22 11:36:16 +02:00
Laurent Destailleur	af28a67803	Uniformize look using dol_banner	2016-09-19 10:43:30 +02:00
Laurent Destailleur	77e2037195	NEW Add REST API to read, create and delete agenda events	2016-09-19 02:02:45 +02:00
BENKE Charlie	f6a7838c80	Update actioncomm.class.php the variable name defined on the class is type_color	2016-08-28 07:59:47 +02:00
BENKE Charlie	223eed0cba	Update index.php	2016-08-25 12:24:38 +02:00
BENKE Charlie	89e6b5a6cd	add color of type for URL background	2016-08-25 12:22:17 +02:00
Laurent Destailleur	8b3136cb96	Merge remote-tracking branch 'origin/4.0' into develop Conflicts: htdocs/compta/facture/list.php htdocs/langs/en_US/admin.lang htdocs/langs/fr_FR/companies.lang	2016-07-27 19:04:55 +02:00
aspangaro	2e4bebbaf9	FIX Presentation correction	2016-07-27 07:24:36 +02:00
BENKE Charlie	093f1da206	Some indenting and hookmanager feature	2016-07-18 15:07:35 +02:00
BENKE Charlie	427a8c5bf4	Display label and location of event on tooltip Think some additionnal info must be show on society too	2016-07-12 09:56:43 +02:00
florian HENRY	1957af52b1	fix syntax	2016-07-07 09:23:43 +02:00
Laurent Destailleur	b12bd9b070	Merge remote-tracking branch 'origin/3.9' into develop	2016-07-01 03:51:59 +02:00
Laurent Destailleur	f8b1d0d7ca	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-07-01 03:51:23 +02:00
Laurent Destailleur	15e79cf089	Merge pull request #5411 from atm-alexis/FIX_develop_compatibility FIX old method add have to return create method result	2016-07-01 03:44:18 +02:00
Laurent Destailleur	5713d293e3	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/lib/pdf.lib.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php	2016-07-01 03:22:16 +02:00
atm-geoffrey	75bb161930	FIX #4828	2016-06-30 16:20:53 +02:00
Alexis Algoud	a55a166df3	FIX old method add have to return create method result for backward compatibility	2016-06-29 16:30:47 +02:00
Laurent Destailleur	1e9cee1b07	Fix bug reported by scrutinizer	2016-06-29 11:48:28 +02:00
Alexis Algoud	7e8506e25f	FIX #5338 use of not initialized var $aphour, $apmin, etc	2016-06-28 13:25:47 +02:00
Laurent Destailleur	5db6bcd4a8	Fix contextpage lost on submitting form or sorting	2016-06-07 14:06:00 +02:00
Laurent Destailleur	c7065cc3b8	Minor esthetic fixes	2016-06-07 13:15:38 +02:00
Laurent Destailleur	645412517d	css enhancement	2016-06-06 22:07:35 +02:00
Laurent Destailleur	473ab18306	Fix link on workboard Fix warning picto is missing on task list	2016-06-06 15:48:41 +02:00
Laurent Destailleur	0e06f116a2	Fix truncation of event conente in agenda view	2016-06-06 15:13:55 +02:00
Laurent Destailleur	9b6e5196ea	Debug module resource. Filter on agenda.	2016-06-06 13:05:36 +02:00
Laurent Destailleur	b57476153f	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/admin/menus/edit.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/societe/consumption.php	2016-06-04 01:14:36 +02:00
Laurent Destailleur	9c3365aefc	FIX #5163	2016-06-04 00:52:55 +02:00
Laurent Destailleur	028ff5e84c	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/facture/card.php htdocs/langs/en_US/products.lang htdocs/societe/list.php	2016-06-01 17:59:50 +02:00
Laurent Destailleur	ed148f70b3	FIX Filter on assigned to was preselected on current user on list "All events" (instead of no filtering)	2016-05-30 18:12:27 +02:00
Laurent Destailleur	55e904bc01	Debug for expert accounting module	2016-05-12 20:45:05 +02:00
Laurent Destailleur	eaa548124b	Merge remote-tracking branch 'origin/3.9' into develop	2016-05-08 11:03:51 +02:00
Laurent Destailleur	cb4e569a5f	FIX Merge manually PR #5161 - Bad translation key	2016-05-08 10:48:55 +02:00
Laurent Destailleur	d484383467	Minor errors	2016-05-06 22:06:23 +02:00
Laurent Destailleur	9d21b63562	Beautify a page	2016-04-23 16:55:08 +02:00
Laurent Destailleur	00a658143d	NEW List of user in agenda view per user show photo thumb	2016-04-23 16:51:22 +02:00
Laurent Destailleur	c939273fd5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-22 13:38:56 +02:00
Laurent Destailleur	78d18185e4	Several css enhancements	2016-04-22 11:11:08 +02:00
Marcos García de La Fuente	84b58d27e6	NEW Renamed ActionComm::add function to ActionComm::create	2016-04-16 21:41:06 +02:00
Laurent Destailleur	b1c2198154	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/ajax/selectsearchbox.php htdocs/core/lib/price.lib.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/core/modules/modCommande.class.php htdocs/core/modules/modFacture.class.php htdocs/projet/list.php htdocs/societe/list.php	2016-04-07 20:01:52 +02:00
Laurent Destailleur	5101c96223	Restore button to create object from the project view.	2016-04-04 15:25:08 +02:00
Laurent Destailleur	cea48a8dd6	FIX bad translation language loaded FIX When changing thirdparty on event card, the showempty option of contact was lost. FIX Bad placeholder shown on combo to select a thirdparty.	2016-04-03 20:02:02 +02:00
Laurent Destailleur	e1bec46a34	FIX The include file for action on files should not be a template file but an action include file.	2016-04-02 14:16:16 +02:00
Laurent Destailleur	0d9a86db3f	Minor lool enhancement	2016-03-30 00:06:55 +02:00
Laurent Destailleur	91caea5707	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
Laurent Destailleur	630f5a632d	Revert "Corrected non-static usages of Form::selectarray function" This reverts commit `87cd6e1e40`.	2016-03-25 15:34:37 +01:00
Marcos García de La Fuente	89bd173c2f	NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate	2016-03-21 21:51:29 +01:00
Marcos García de La Fuente	5a046125db	Missing changes from previous commits	2016-03-20 14:24:49 +01:00
Marcos García de La Fuente	87cd6e1e40	Corrected non-static usages of Form::selectarray function	2016-03-20 14:15:17 +01:00
Laurent Destailleur	dae41e6dd3	FIX Only active users are visible into agenda view "per user"	2016-03-15 00:54:45 +01:00
Laurent Destailleur	bc33b19d7d	NEW Can change dynamically number of records visible into lists.	2016-02-11 20:24:15 +01:00
Laurent Destailleur	0d7f67ade5	Merge remote-tracking branch 'origin/3.9' into develop	2016-02-10 23:59:15 +01:00
Laurent Destailleur	6dbaba6973	Fix: previous and next arrow	2016-02-10 17:45:26 +01:00
Laurent Destailleur	93b2013aa7	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/compta/bank/card.php htdocs/projet/tasks/list.php	2016-01-22 03:29:55 +01:00
Laurent Destailleur	cceeefb7c2	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/societe/index.php	2016-01-22 03:25:30 +01:00
Laurent Destailleur	8e882b4cc2	NEW Add warning on tasks when they are late (add also the warning tolerance parameter)	2016-01-18 15:56:51 +01:00
Laurent Destailleur	7f4386f739	Merge remote-tracking branch 'origin/3.9' into develop	2016-01-15 01:53:21 +01:00
Laurent Destailleur	cb24f2b372	Fix missing type in list	2016-01-15 01:52:16 +01:00
Laurent Destailleur	a0fc26fbd8	Fix missing orde by	2016-01-14 17:09:59 +01:00
Laurent Destailleur	524614ded9	Start to work on a per type view of agenda	2016-01-14 16:52:46 +01:00
Laurent Destailleur	b5f057051b	Fix: Missing param into link	2016-01-14 15:45:05 +01:00
Laurent Destailleur	acf3f23de8	Merge remote-tracking branch 'origin/3.9' into develop	2016-01-14 14:15:44 +01:00
Laurent Destailleur	b8b84c67a6	Fix bad setting of default actioncode	2016-01-14 14:15:14 +01:00
phf	9b682e095f	FIX can't clone event	2016-01-13 14:41:32 +01:00
Laurent Destailleur	7fd2cbea49	Merge pull request #4257 from defrance/patch-91 add icalname on default event	2016-01-12 23:41:57 +01:00
Laurent Destailleur	cbe65fbc79	Fix: fields added into 3.8 to store email event was not enough. To late to use them. Will be done into 4.0	2016-01-08 13:05:56 +01:00
Laurent Destailleur	4e2d4a6651	Fix: the new option AGENDA_USE_EVENT_TYPE_DEFAULT was not visible. Solved this by completing tooltip info.	2016-01-07 11:01:37 +01:00
Laurent Destailleur	6f474c403c	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/filefunc.inc.php htdocs/product/list.php htdocs/societe/notify/card.php htdocs/societe/price.php	2015-12-27 19:15:20 +01:00
Marcos García de La Fuente	d30c64413d	FIX #4055 SQL error when trying to access a non-existing expedition	2015-12-24 14:27:12 +01:00
Laurent Destailleur	db7a98f0ef	Fix: When a payment mode was disabled, it was not visible on old records. Fix: init of $limit not correctly set according to 3.9 rules on most pages.	2015-12-21 13:56:59 +01:00
Laurent Destailleur	d7e9c92144	Fix bad link on category Fix cancel button on categories Css enhancement.	2015-12-19 13:55:27 +01:00
BENKE Charlie	efb1e91a23	Update index.php i have add an icalcolor test for icalevent too and made some reindentation	2015-12-19 10:29:56 +01:00
BENKE Charlie	dc0af179e9	add icalname on default event allow to manipulate it (show/hide) when we add some other calendar on main (eg fichinter calendar)	2015-12-18 01:41:30 +01:00
Laurent Destailleur	0ec62c05cc	Fix bad var name. Removed warning.	2015-12-14 09:14:34 +01:00
philippe grand	30eb08151d	[Qual] Close database handler should be after Footer	2015-12-11 14:19:38 +01:00
Laurent Destailleur	374480043e	Add maxwidth300 on combo list for users and sale representatives	2015-12-06 00:37:58 +01:00
Laurent Destailleur	5cd43d2df0	Some debug on new features	2015-12-04 20:51:34 +01:00
Laurent Destailleur	a94aedb171	Minor css fix	2015-11-22 12:33:56 +01:00
Laurent Destailleur	ab177b43af	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: ChangeLog htdocs/.gitignore htdocs/comm/mailing/card.php htdocs/commande/list.php htdocs/compta/facture.php htdocs/expedition/class/expedition.class.php	2015-11-13 12:35:10 +01:00
Laurent Destailleur	8925717bbe	Merge pull request #3966 from atm-ph/fix_38_title_actioncomm FIX mail isn't display in title on event in mode view	2015-11-12 15:07:29 +01:00
Laurent Destailleur	9a9be97c2c	Add a log to help diagnose bad usage of method ad of event	2015-11-12 14:36:35 +01:00
phf	f041c017e9	FIX mail isn't display in title on event in mode view	2015-11-12 11:30:44 +01:00
Alexis Algoud	99513ac9f3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter	2015-11-09 18:31:21 +01:00
Alexis Algoud	68cbd4699b	NEW multi event type for filter and get form in order to allow bookmark	2015-11-09 17:18:23 +01:00
philippe grand	67c9db6a51	[Qual] Uniformize code	2015-11-06 09:36:16 +01:00
Laurent Destailleur	04664c203d	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/comm/action/card.php htdocs/expedition/class/expedition.class.php htdocs/product/stock/product.php	2015-11-05 22:13:08 +01:00
Laurent Destailleur	58cac2d895	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/comm/action/card.php htdocs/expedition/class/expedition.class.php htdocs/product/stock/product.php	2015-11-05 22:09:54 +01:00
Alexis Algoud	e1ea2215a3	FIX loss data also if update was cancel by error of ended state with no end date, try a generic patch	2015-11-05 11:25:04 +01:00
Alexis Algoud	0543a31920	FIX event's data lost on user assign update	2015-11-05 11:11:03 +01:00
Laurent Destailleur	da0aa2f937	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php htdocs/langs/en_US/main.lang htdocs/product/list.php htdocs/product/stock/mouvement.php	2015-11-02 19:31:42 +01:00
philippe grand	ff5fcbbc10	[Qual] Uniformize code	2015-10-31 17:21:48 +01:00
Alexis Algoud	fa3af485ef	FIX action not appear before an update because of a lack of line in action ressource	2015-10-26 18:33:22 +01:00
philippe grand	f31ddc23aa	[Qual] Uniformize code	2015-10-17 16:18:33 +02:00
Laurent Destailleur	b3491ef4e5	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: ChangeLog htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/admin/facture_cust_extrafields.php htdocs/compta/facture/admin/facturedet_cust_extrafields.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php	2015-10-16 10:12:36 +02:00
Laurent Destailleur	e9facbf108	FIX bad property so after creating an event from calendar, filter were lost.	2015-10-14 10:53:38 +02:00
Laurent Destailleur	7b7d27920d	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/adherents/type.php htdocs/categories/class/categorie.class.php htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/core/lib/tax.lib.php htdocs/product/composition/card.php	2015-10-10 18:56:28 +02:00
Laurent Destailleur	2937ad219a	Merge pull request #3682 from tysauron/develop For not error Undefined property: stdClass::$id	2015-10-09 20:25:39 +02:00
tysauron	ea949437ab	For not error Undefined property: stdClass::$id	2015-10-07 17:17:32 +02:00
Raphaël Doursenaud	afbee44993	Fix #3667 checkbox extrafields on edit For actions and members.	2015-10-05 20:51:43 +02:00
frederic34	1108458de8	Optioncss	2015-10-04 11:45:02 +02:00
frederic34	9a021e6de4	Optioncss not kept in list	2015-10-04 10:45:57 +02:00
Laurent Destailleur	c0c0cc2415	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/compta/facture/list.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/interventions.lang htdocs/theme/md_exp/style.css.php	2015-10-03 14:28:31 +02:00
Laurent Destailleur	17a5b0a0f4	Fix css	2015-10-02 11:58:19 +02:00
Laurent Destailleur	b57c156b60	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/core/modules/modContrat.class.php htdocs/fichinter/card.php htdocs/install/upgrade2.php	2015-10-01 11:16:35 +02:00
Laurent Destailleur	60c6510fc1	NEW Can set default value of event type when creating an event (if type of event option is used).	2015-09-29 14:17:03 +02:00
Florian HENRY	766b8535ae	spacing	2015-09-29 09:47:23 +02:00
Florian HENRY	4f5e207f08	review	2015-09-29 09:45:04 +02:00
Florian HENRY	0f27edad5d	FIX : When delete actioncomm also delete actioncomm_resources	2015-09-28 10:14:19 +02:00
Laurent Destailleur	3f506552e3	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/filefunc.inc.php htdocs/theme/md_exp/style.css.php	2015-09-27 21:29:16 +02:00
Laurent Destailleur	dd88a799fb	FIX Event from ical stream should not be movable into calendar view	2015-09-26 13:54:50 +02:00
Laurent Destailleur	62792c08eb	Merge pull request #3591 from GPCsolutions/inherited [Qual] Cleanup of inherited class properties	2015-09-26 11:23:59 +02:00
Juanjo Menent	6999ad0a4f	Merge pull request #3587 from GPCsolutions/fiche_titre [Qual] Replaced deprecated function calls.	2015-09-26 08:39:22 +02:00
Raphaël Doursenaud	67ddb6c94e	[Qual] Cleanup of inherited class properties	2015-09-24 20:12:55 +02:00
Raphaël Doursenaud	631ee83745	[Qual] Replaced deprecated print_fiche_titre()	2015-09-24 18:34:58 +02:00
Raphaël Doursenaud	9f2545b95d	[Qual] Replaced deprecated dol_clone by native clone	2015-09-24 17:24:40 +02:00
Laurent Destailleur	a5c6582bc1	Fix duplicate translation/encoding on setEventMessage Conflicts: htdocs/ftp/index.php	2015-09-12 12:55:20 +02:00
Laurent Destailleur	c785f8cfb1	Fix duplicate translation/encoding on setEventMessage	2015-09-12 12:52:07 +02:00
Marcos García de La Fuente	3c8d02b865	Removed unused variable	2015-09-06 20:49:11 +02:00
Marcos García de La Fuente	9ce8024f1e	Merge remote-tracking branch 'upstream/develop' into refactor	2015-09-06 18:57:38 +02:00
Marcos García de La Fuente	f1ea19e09b	Created ActionComm:hasDelay function	2015-09-06 18:26:48 +02:00
Laurent Destailleur	10d3c41358	Fix Bad value into popup	2015-08-14 20:07:11 +02:00
Laurent Destailleur	1731b1a11b	Fix: transparency of event was lost	2015-08-14 13:01:20 +02:00
Laurent Destailleur	d19f1722a2	Fix: when there is several events on agenda view per user, we must include ref into label to have different titles.	2015-08-14 12:31:09 +02:00
Laurent Destailleur	ff8969073c	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/contrat/class/contrat.class.php htdocs/core/class/extrafields.class.php htdocs/main.inc.php	2015-07-28 18:57:13 +02:00
Laurent Destailleur	747e4b5e40	Fix timezone problem with external calendar import.	2015-07-28 18:12:45 +02:00
Gauthier	aaa9d85d07	FIX : When we add an user on event in create mode, we lose linked object	2015-07-28 17:25:33 +02:00
Laurent Destailleur	268674899e	Fix: css on current day	2015-07-21 12:30:12 +02:00
Laurent Destailleur	977d2d3463	Fix: The hook addCalendarChoice was only visible into tabs index.php	2015-07-21 12:19:21 +02:00
Laurent Destailleur	9e35fd1bc3	Doc comments	2015-07-21 11:04:01 +02:00
Laurent Destailleur	38d30b5590	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/fourn/facture/card.php	2015-07-21 00:17:11 +02:00
Laurent Destailleur	2bebb869fb	Fix bad signature of fetch. The ref_ext is missing.	2015-07-20 17:19:44 +02:00
aspangaro	59e88590e0	Move my address email to new one	2015-07-15 20:30:33 +02:00
Laurent Destailleur	6ef0b8e330	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-07-01 21:17:05 +02:00
Laurent Destailleur	b766f99acc	Uniformize look. Make code to manage link "Now" on calendar more generic.	2015-06-30 21:50:24 +02:00
Laurent Destailleur	57a267a30f	NEW Add hooks to allow an external module to complete list of events into calendar views.	2015-06-30 17:09:52 +02:00
Laurent Destailleur	ae5b779652	Uniformize code	2015-06-30 01:34:17 +02:00
Laurent Destailleur	01fbee0e06	Merge branch 'develop-patch34' of https://github.com/aspangaro/dolibarr into aspangaro-develop-patch34 Conflicts: htdocs/comm/action/class/actioncomm.class.php	2015-06-19 11:27:15 +02:00
Laurent Destailleur	44d4d23c00	Fix phpcs	2015-06-19 11:21:36 +02:00
aspangaro	0c01295016	Fix travis	2015-06-19 06:19:10 +02:00
Laurent Destailleur	d3549cc2a0	Merge branch 'add_clone_on_event_agenda' of https://github.com/atm-gauthier/dolibarr into atm-gauthier-add_clone_on_event_agenda Conflicts: htdocs/langs/en_US/agenda.lang	2015-06-16 11:41:45 +02:00
Raphaël Doursenaud	2629e47f77	Fix #3001 : the current code needs an array, not an object	2015-06-10 18:45:10 +02:00
Gauthier	dd81d3a762	NEW : add all assigned users and all extrafields data in new event when we createFromClone	2015-06-08 15:06:43 +02:00
Gauthier	053cfac262	NEW : clone action on agenda events	2015-06-08 12:39:25 +02:00
Raphaël Doursenaud	ea798c2315	Qual: deprecate dol_json_encode() and dol_json_decode() PHP > 5.3 supports json_encode() and json_decode() natively	2015-06-01 11:00:11 +02:00
Raphaël Doursenaud	3f9270ea78	Qual: added deprecation hinting Added deprecation hinting for class properties Added syslog warning events for deprecated functions, methods and/or their parameters Added hinting for some constants	2015-06-01 11:00:11 +02:00
Laurent Destailleur	01aad8516d	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/adherents/list.php htdocs/compta/dons/card.php htdocs/compta/dons/class/don.class.php htdocs/contact/list.php htdocs/contrat/list.php htdocs/core/class/html.form.class.php htdocs/core/lib/security.lib.php htdocs/main.inc.php htdocs/product/stock/massstockmove.php htdocs/public/test/test_arrays.php htdocs/public/test/test_forms.php htdocs/societe/societe.php	2015-05-31 03:30:38 +02:00
Laurent Destailleur	49f2157f2d	Little debug of module resource	2015-05-31 02:05:39 +02:00
Laurent Destailleur	5e773d4cb6	Work on finishing of style	2015-05-31 01:06:51 +02:00
Gauthier	a707d40251	FIX : when we create an agenda event with "Not applicable" status, it is automatically saved with "To do" status	2015-05-29 14:32:50 +02:00
aspangaro	e23459d53b	NEW Forms are using the tab look, even in creation mode	2015-05-20 21:50:38 +02:00
tysauron	572269bed1	For backward compatibility ON update actioncomm For backward compatibility when val=id ON update actioncomm object	2015-05-19 15:54:08 +02:00
Laurent Destailleur	c89c883d7d	Fix the new navigation style.	2015-05-17 19:37:37 +02:00
Laurent Destailleur	4408648a68	Merge pull request #2817 from GPCsolutions/jqueryfixes jQuery fixes	2015-05-12 22:36:12 +02:00
Raphaël Doursenaud	aee61aa2c4	[Qual] Fixed deprecated HTML nowrap attribute to class	2015-05-12 15:37:35 +02:00
Raphaël Doursenaud	e149d49fb8	[Qual] Use jQuery property instead of attribute to test and set disabled	2015-05-12 14:53:01 +02:00
Raphaël Doursenaud	b8d9c20731	[Qual] Fixed HTML input form disabled attribute Dolibarr uses HTML 4.01 or HTML5 doctypes. The input form disabled attribute should not have a value.	2015-05-07 14:21:14 +02:00
Raphaël Doursenaud	859d1b0df9	[Qual] Fixed HTML input form checked attribute Dolibarr uses HTML 4.01 or HTML5 doctypes. The input form checked attribute should not have a value.	2015-05-07 14:21:14 +02:00
Laurent Destailleur	b71e5a1025	Merge pull request #2673 from aternatik/fix_getentity Fix : missing getEntity calls	2015-05-07 00:48:19 +02:00
Laurent Destailleur	414404e854	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/core/class/commonobject.class.php	2015-04-26 16:30:33 +02:00
Laurent Destailleur	13b4d86064	Better fix for #2709	2015-04-24 21:29:02 +02:00
Laurent Destailleur	d925e552ca	Merge pull request #2709 from atm-alexis/3.7 FIX event not linked to contact on creation	2015-04-24 21:23:50 +02:00
Alexis Algoud	7d3482036d	FIX event not linked to contact on creation	2015-04-24 17:40:53 +02:00
Gauthier	58008cef94	NEW : display linked object in edit mode when we create an event from an order, propal...	2015-04-23 16:28:29 +02:00
Laurent Destailleur	0e141f2c1b	Fix css	2015-04-23 15:35:32 +02:00
jfefe	f5db4d5bb7	Fix: missing getEntity function	2015-04-19 03:05:37 +02:00
Marcos García de La Fuente	dc790ff586	NEW: Feature request: A page to merge two thirdparties into one #2613	2015-04-18 20:41:09 +02:00
Laurent Destailleur	56a14da5d4	FIXME that are not bug are replaced with TODO Add control on batch movement (lot/serial is mandatory, and control eatby and sellby are same for each lot/serial)	2015-04-12 04:01:28 +02:00
Laurent Destailleur	2627662f5c	fix value ust be a string	2015-04-06 11:36:31 +02:00
Juanjo Menent	4588b2bb4c	Merge pull request #2517 from frederic34/patch-12 Closes #2509 Bug: Ref is not shown in the bubble that appears when the mouse is over an agenda link	2015-04-02 00:56:42 +02:00
Laurent Destailleur	8e9c1c4747	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/commande/list.php htdocs/core/class/notify.class.php htdocs/core/login/functions_dolibarr.php htdocs/exports/export.php htdocs/langs/en_US/admin.lang	2015-04-01 16:33:39 +02:00
Laurent Destailleur	16a620f926	Fix: Deadlock situation (when order were canceled, no way to make nothing on it) Fix: Don't know how I forgot this events into trigger system.	2015-04-01 16:07:22 +02:00
Frédéric FRANCE	08e7cb2e84	Correction for tooltip	2015-03-31 21:57:48 +02:00
Frédéric FRANCE	f0ed848609	Update actioncomm.class.php	2015-03-31 21:38:38 +02:00
Frédéric FRANCE	9ee6fdd163	Tooltip of actioncomm show empty ref	2015-03-31 21:07:17 +02:00
Florian HENRY	26c29216d9	syntax	2015-03-26 16:55:13 +01:00
aspangaro	d69f066735	QUAL: Traduce terms + remove <center>	2015-03-15 14:04:07 +01:00
Laurent Destailleur	687e3d250b	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: dev/fixdosfiles.sh htdocs/core/tpl/objectline_edit.tpl.php	2015-03-13 17:46:31 +01:00
Laurent Destailleur	895b2c6e9c	Fix bad merge	2015-03-13 14:37:27 +01:00
Laurent Destailleur	a5645b626c	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/tpl/objectline_view.tpl.php htdocs/projet/element.php	2015-03-11 03:55:46 +01:00
Laurent Destailleur	0ff2a0ad9f	Merge branch 'bug-1825-37' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1825-37 Conflicts: htdocs/comm/action/index.php	2015-03-11 02:26:01 +01:00
Laurent Destailleur	78f971f3e1	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-05 11:46:48 +01:00
Laurent Destailleur	9c12c325db	Fix regression into enable/disable external calendars	2015-03-05 11:46:03 +01:00
Laurent Destailleur	d119397129	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/societe/class/societe.class.php	2015-03-05 11:38:16 +01:00
Laurent Destailleur	6c1c1fd691	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/comm/action/index.php htdocs/core/lib/agenda.lib.php htdocs/fourn/paiement/fiche.php	2015-03-05 11:35:39 +01:00
Marcos García de La Fuente	c9b3cab22b	Mytasks is not clickable	2015-03-05 10:22:33 +01:00
Marcos García de La Fuente	d549030078	Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben)	2015-03-05 10:20:32 +01:00
Marcos García de La Fuente	41c55d1913	Better fix for bug-1825. There are actually a lot to things to escape and escaped methods can make conflict with similar names so it is better to make a md5 to have a unique value	2015-03-04 11:55:17 +01:00
Laurent Destailleur	60a6d8789f	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-04 01:14:27 +01:00
Laurent Destailleur	79023cddb0	Fix external calendar for users were not visible if no global calendar was set.	2015-03-02 17:34:50 +01:00
Marcos García de La Fuente	7876238823	Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben) When an external calendar was called "mytasks", Dolibarr events were also hidden too.	2015-03-02 01:36:27 +01:00
Laurent Destailleur	ef14e4e7ed	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/facture.php htdocs/fourn/class/fournisseur.product.class.php	2015-02-28 03:11:15 +01:00
Laurent Destailleur	4bde7e9f51	Fix: Missing error management	2015-02-26 14:25:30 +01:00
Laurent Destailleur	daabc113a5	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: README.md htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/cashjournal.php	2015-02-26 13:36:07 +01:00
Laurent Destailleur	76640b6b77	Fix removed warning	2015-02-25 15:01:25 +01:00
Laurent Destailleur	6d3834b3b9	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/index.php htdocs/projet/class/project.class.php test/phpunit/BankAccountTest.php	2015-02-23 14:59:24 +01:00
Laurent Destailleur	938936b8f2	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/core/lib/agenda.lib.php htdocs/core/lib/functions.lib.php	2015-02-20 22:51:47 +01:00
Laurent Destailleur	e3713c8b6d	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/admin/tools/eaccelerator.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/dispatch.php	2015-02-19 00:01:26 +01:00
Laurent Destailleur	2d2930b421	Merge pull request #2348 from tiaris/3.7_actionclassbug fetch must contain an left join on c_actioncom for correct function	2015-02-18 23:02:44 +01:00
Laurent Destailleur	4963555669	Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into marcosgdf-misc Conflicts: htdocs/barcode/codeinit.php	2015-02-18 22:54:02 +01:00
Marcos García de La Fuente	fa55c60c35	Renamed WorkBoardResponse to WorkboardResponse	2015-02-16 23:52:49 +01:00
Marcos García de La Fuente	d5fd20e911	Renamed BoardResponse to WorkBoardResponse	2015-02-15 15:10:51 +01:00
Marcos García de La Fuente	bab0163c44	Missing Copyright info	2015-02-15 15:07:24 +01:00

... 12 13 14 15 16 ...

2342 Commits