dolibarr

Author	SHA1	Message	Date
Maxime Kohlhaas	8c13c87429	Fix path for user photo	2018-12-01 16:55:42 +01:00
Inovea Conseil	18281d9d43	FIX #6580 FIX #6580	2018-12-01 16:48:50 +01:00
Maxime Kohlhaas	748dd12e4d	Merge pull request #9056 from ATM-Nicolas/fix_default_preselected_mail_model FIX : Select first mail model by default	2018-12-01 16:39:22 +01:00
florian HENRY	faf7ea345f	fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/commonobject.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0	2018-12-01 15:23:46 +01:00
florian HENRY	dacc959937	fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/comment.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0	2018-12-01 15:18:51 +01:00
ATM John BOTELLA	c6f4879575	Fix issue from scrutinizer	2018-12-01 12:04:34 +01:00
Laurent Destailleur	c5bd11951f	Fix bar not visible on some screen	2018-11-29 02:09:07 +01:00
Marc de Lima Lucio	c13cc5d697	FIX: form actions: select_type_actions could be too small + bad init	2018-11-28 15:46:27 +01:00
Laurent Destailleur	780a538fe0	Fix multicompany not accessible from website.	2018-11-27 17:37:39 +01:00
IJ	825f41bfda	Add Access Keys in Navigation Tooltips	2018-11-27 00:22:21 +00:00
Laurent Destailleur	f0ab6e60ec	FIX Loading translation of cron tasks	2018-11-26 13:31:05 +01:00
Laurent Destailleur	82b4b3ccb3	Merge pull request #10047 from frederic34/patch-9 doc cmail class	2018-11-24 11:20:49 +01:00
wdammak	5c9d5bb6ad	order by category	2018-11-23 21:30:34 +01:00
wdammak	5c3daf4a6a	order by category	2018-11-23 21:27:22 +01:00
wdammak	064816242a	Order by category	2018-11-23 21:26:10 +01:00
Laurent Destailleur	1d4c756783	FIX Remote ip detection was wrong with proxy (example: cloudflare)	2018-11-22 11:44:37 +01:00
Laurent Destailleur	b6dac7da20	FIX Remote ip detection was wrong with proxy (example: cloudflare)	2018-11-21 15:40:15 +01:00
Frédéric FRANCE	4e60e48f34	Update CMailFile.class.php	2018-11-19 23:43:58 +01:00
Frédéric FRANCE	2179e2011e	doc cmail class	2018-11-19 23:38:07 +01:00
Frédéric FRANCE	32706f570d	reduce complexity of htmlformmail class	2018-11-19 21:19:39 +01:00
Laurent Destailleur	e020597ba7	Fix deletion for class build with modulebuilder	2018-11-19 21:11:26 +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	8191df4857	Merge pull request #9962 from atm-john/fix_extrafield_view FIX hidden extrafield	2018-11-19 18:37:18 +01:00
Laurent Destailleur	8535844737	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-19 18:27:00 +01:00
Laurent Destailleur	1931fd33eb	Merge pull request #10041 from atm-ph/fix_8.0_optional_param Fix new params has been added not optional	2018-11-19 18:26:21 +01:00
Laurent Destailleur	4bedeabc5b	FIX #10036	2018-11-19 18:02:29 +01:00
François J	37f3b8bbde	Update @since version to 9.0	2018-11-19 17:51:00 +01:00
François J	6aaf0f4655	Add afterSelectOptions hook & selectcontacts context	2018-11-19 17:40:16 +01:00
Laurent Destailleur	2f87ee6640	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-19 15:56:38 +01:00
atm-ph	129034ba76	Fix new params has been added not optional	2018-11-19 15:46:30 +01:00
Regis Houssin	7cba680f38	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2018-11-18 17:07:03 +01:00
Frédéric FRANCE	30b1db34cd	Update CMailFile.class.php	2018-11-17 11:33:01 +01:00
Laurent Destailleur	6b8a3094f0	Fix missing some keys in substitution arrays	2018-11-17 00:14:23 +01:00
Laurent Destailleur	5d596fe584	Fix trackid must contains an id of instance	2018-11-16 16:43:13 +01:00
Laurent Destailleur	6d640ab83c	Fix feature to drag and drop rows of table (not generic)	2018-11-15 19:58:06 +01:00
Regis Houssin	aaa9a4f47c	FIX use getEntity('invoice') instead getEntity('facture')	2018-11-15 17:27:49 +01:00
Laurent Destailleur	f3228dc4f8	Merge pull request #10010 from atm-john/Fix_cat_photo_upload Fix event message on upload category picture fail	2018-11-15 16:43:59 +01:00
Laurent Destailleur	3ca45e0e40	Fix double dot in sql filename	2018-11-15 10:59:55 +01:00
John BOTELLA	c6cf748ba7	Fix envent message on upload category picture	2018-11-13 14:44:10 +01:00
John BOTELLA	500bb7bc96	best conditions testing	2018-11-13 10:20:34 +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	9d15f83f4c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-08 20:19:45 +01:00
Laurent Destailleur	3e844db74f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fichinter/stats/index.php	2018-11-08 20:19:28 +01:00
Laurent Destailleur	4ced94f5fd	Merge pull request #9974 from frederic34/previewimage can click on image to preview in doc list	2018-11-08 20:06:38 +01:00
Laurent Destailleur	9a31a61c9d	FIX #9971	2018-11-08 20:05:01 +01:00
Laurent Destailleur	22170ac1c1	FIX Crop of large files was selecting wrong image area.	2018-11-08 10:45:39 +01:00
Frédéric FRANCE	df224e4b54	can click on image to preview in doc list	2018-11-07 21:51:05 +01:00
Laurent Destailleur	9a0b5fb599	Fix extrafields	2018-11-07 12:25:22 +01:00
John BOTELLA	4f7be36249	fix extrafield hidden	2018-11-07 09:14:29 +01:00
Laurent Destailleur	e0070bd348	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/filefunc.inc.php	2018-11-06 18:30:57 +01:00
Laurent Destailleur	7e33af6677	Fix max size	2018-11-06 17:40:59 +01:00
Laurent Destailleur	4a25317f10	Fix security on GETPOST('action'). Param must be sanitized.	2018-11-05 20:29:07 +01:00
Laurent Destailleur	4c591daab1	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/class/html.formprojet.class.php	2018-11-05 10:39:22 +01:00
Laurent Destailleur	56a70ab4e5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-05 10:23:15 +01:00
Laurent Destailleur	67fbb3dbb6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/core/class/notify.class.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php	2018-11-03 19:15:52 +01:00
Laurent Destailleur	970f501147	Debug modulebuilder	2018-10-31 20:10:20 +01:00
Laurent Destailleur	866729cd21	FIX bad link in notification	2018-10-30 22:32:42 +01:00
Regis Houssin	9589f69574	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_email Conflicts: htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php	2018-10-30 18:29:28 +01:00
Marc de Lima Lucio	2fbc305683	FIX: task time screen: last fix was overkill	2018-10-30 16:00:56 +01:00
Laurent Destailleur	2c3cd7a668	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/modSyslog.class.php	2018-10-30 15:32:09 +01:00
Laurent Destailleur	2c8b7a4a3d	Merge pull request #9905 from atm-maxime/fix_currency_change Fix changing currency in a doc was recalculating amounts in company currency #9801	2018-10-30 14:48:46 +01:00
Laurent Destailleur	68f6ebd0ff	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/core/lib/security.lib.php htdocs/modulebuilder/template/myobject_card.php	2018-10-30 14:47:39 +01:00
Laurent Destailleur	7a268d8d9f	Clean code	2018-10-30 14:27:14 +01:00
Marc de Lima Lucio	8911d72be8	FIX: task time screen: prevent users with access to all project from assigning to tasks they're not allowed to do	2018-10-30 12:28:04 +01:00
Laurent Destailleur	bddd658ba6	Merge pull request #9885 from frederic34/patch-15 code comment html form class	2018-10-30 12:27:19 +01:00
Laurent Destailleur	4ef0d2ce82	Merge branch 'develop' into 8.0_dict	2018-10-30 12:26:37 +01:00
Vaadasch	0d7dbace63	Update extrafields.class.php	2018-10-30 07:20:42 +01:00
Vaadasch	a4c7787d8c	Update extrafields.class.php	2018-10-29 22:00:08 +01:00
Laurent Destailleur	27d82d0e8e	FIX Delete of draft invoice	2018-10-29 14:41:00 +01:00
Regis Houssin	977a88363e	FIX missing multidir_output for supplier modules	2018-10-29 12:50:40 +01:00
Regis Houssin	6e2d62bea6	FIX wrong entity id	2018-10-29 12:30:36 +01:00
Laurent Destailleur	08862fb482	Log success of emails	2018-10-29 03:25:21 +01:00
Laurent Destailleur	b4600fdc06	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formmail.class.php htdocs/core/js/timesheet.js	2018-10-29 02:31:05 +01:00
Laurent Destailleur	04f80f0925	FIX Do not show check box if not applicable	2018-10-29 02:27:51 +01:00
Laurent Destailleur	553e984465	FIX Selection of addmaindocfile is lost on error	2018-10-29 02:14:41 +01:00
Laurent Destailleur	6e3822345c	Fix use setup of template for attached files in mass actions	2018-10-29 02:14:31 +01:00
Laurent Destailleur	770f8c3f3b	FIX Selection of addmaindocfile is lost on error	2018-10-29 02:11:33 +01:00
Laurent Destailleur	f8a49edf78	Fix use setup of template for attached files in mass actions	2018-10-29 00:55:55 +01:00
Maxime Kohlhaas	b68b8fe412	Fix changing currency in a doc was recalculating amounts in company currency #9801	2018-10-28 11:02:51 +01:00
Vaadasch	2b91067966	Update working chkbxlst filter Update line 1337 to make the filtering on chkbxlst working	2018-10-27 19:31:50 +02:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Frédéric FRANCE	47ac420133	code comment html form class	2018-10-26 20:12:46 +02:00
Laurent Destailleur	d3893b8b95	Debug v9	2018-10-26 19:00:24 +02:00
Laurent Destailleur	087b68948d	Fix: do not use point for graph with too many points.	2018-10-26 17:32:32 +02:00
Laurent Destailleur	4955ae03e8	Merge pull request #9867 from atm-john/develop_jflot FIX hover stability and modernize style	2018-10-26 15:33:47 +02:00
Laurent Destailleur	0e464ea4f5	Merge pull request #9866 from frederic34/emptylines Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-26 15:31:24 +02:00
Laurent Destailleur	9ccdd10a81	FIXx format (html/text) of emails sent on leave request module	2018-10-25 13:19:56 +02:00
Laurent Destailleur	25a374bd9a	NEW Notification module support expense report+holiday validation and approval event.	2018-10-25 12:45:13 +02:00
atm-john	d0dc8b2a9c	Add points to lines charts and remove shadow to improve performances	2018-10-25 00:24:25 +02:00
atm-john	b5c47f16e6	Fix hover stability and modernize style	2018-10-24 23:25:40 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Laurent Destailleur	277655b911	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-24 13:31:31 +02:00
John BOTELLA	fccea99e23	FIX translation in select unit form	2018-10-24 10:23:27 +02:00
Laurent Destailleur	65a39269d9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commondocgenerator.class.php	2018-10-24 03:39:33 +02:00
Laurent Destailleur	047d130081	Fix phpcs	2018-10-24 03:38:12 +02:00
Laurent Destailleur	01adaf253c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/class/account.class.php htdocs/product/list.php	2018-10-24 03:35:44 +02:00
Laurent Destailleur	f0dc2df526	Fix code comment	2018-10-24 03:30:06 +02:00
Laurent Destailleur	0f48cc1d0f	Merge branch 'develop' into fixpdf	2018-10-24 03:01:52 +02:00
Laurent Destailleur	f8316abfc0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/compta/bank/class/account.class.php htdocs/theme/md/style.css.php	2018-10-24 02:58:29 +02:00
Laurent Destailleur	ddd267f4c3	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-10-24 02:21:53 +02:00
Laurent Destailleur	83dacf6290	Merge pull request #9845 from frederic34/patch-22 remove deprecated form_confirm	2018-10-24 02:06:54 +02:00
Laurent Destailleur	03b93781a0	Merge pull request #9848 from bafbes/abb80038 New : parameter for getnomurl in field specification	2018-10-24 01:53:19 +02:00
Laurent Destailleur	d5285ca359	Update commonobject.class.php	2018-10-24 01:53:07 +02:00
Laurent Destailleur	f8ea9e7099	Merge pull request #9857 from atm-john/add_combo_seach_by_fourn_ref NEW hidden conf to search product by supplier ref	2018-10-24 01:48:17 +02:00
Laurent Destailleur	914e4f0501	Merge pull request #9855 from atm-john/Fix_printer FIX/ADD missing print button for delivery form	2018-10-24 01:46:20 +02:00
atm-john	82f40fb4b9	NEW hidden conf to search by supplier ref	2018-10-23 23:21:30 +02:00
atm-john	0fe2c63bc0	FIX missing print button for delivery form	2018-10-23 22:11:39 +02:00
atm-quentin	04eb9ca167	fix dont change num version	2018-10-23 17:06:21 +02:00
atm-quentin	96d0bb8f2e	FIX adapt develop	2018-10-23 14:31:58 +02:00
atm-quentin	8442b405b2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception	2018-10-23 10:27:46 +02:00
Abbes Bahfir	7e7473e7df	New : parameter for getnomurl in field dpecification	2018-10-23 01:25:38 +01:00
Abbes Bahfir	5bac6a92e6	Fix:empty value instead of 0 for empty links	2018-10-23 00:03:34 +01:00
Frédéric FRANCE	90b85c1106	Update html.form.class.php	2018-10-22 22:23:43 +02:00
Frédéric FRANCE	4aec343b24	Update html.form.class.php	2018-10-22 22:13:54 +02:00
Frédéric FRANCE	570ee200d8	Merge remote-tracking branch 'upstream/develop' into fixpdf	2018-10-22 20:19:28 +02:00
Laurent Destailleur	bf46a35a31	Fix size of key for extrafield of type select	2018-10-22 19:05:04 +02:00
ATM-Nicolas	cf28e4e442	FIX : Variable name	2018-10-22 15:19:33 +02:00
Laurent Destailleur	4e6b21881f	Fix bug reported by scrutinizer	2018-10-21 12:14:20 +02:00
Frédéric FRANCE	c811d5a371	fix new pdf	2018-10-19 18:20:06 +02:00
Laurent Destailleur	fecb6e49c6	Merge pull request #9014 from atm-john/NEW_PDF_DOCUMENT_COLUMN_new_files Experimental new pdf documents using new column system	2018-10-19 15:51:54 +02:00
Laurent Destailleur	897a2b09a7	Removed scrutinizer warning	2018-10-19 15:02:54 +02:00
Laurent Destailleur	e4b5cc154e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-19 14:46:32 +02:00
Laurent Destailleur	33cd0e84d2	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/actions_massactions.inc.php	2018-10-19 14:44:50 +02:00
Laurent Destailleur	57ad200ae5	Fix regression in creating discount	2018-10-19 14:43:10 +02:00
Laurent Destailleur	4e82a6da46	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-19 14:29:32 +02:00
Laurent Destailleur	6a6a8ae14b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-19 14:29:22 +02:00
Laurent Destailleur	5a1a5548df	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/class/discount.class.php htdocs/core/lib/payments.lib.php htdocs/product/index.php htdocs/product/list.php htdocs/societe/class/societe.class.php	2018-10-19 14:27:15 +02:00
Laurent Destailleur	b6cb16a457	Merge pull request #9783 from frederic34/patch-18 Update menubase.class.php	2018-10-19 13:44:11 +02:00
Laurent Destailleur	762d82f2fe	Move declaration into common	2018-10-19 13:38:05 +02:00
Laurent Destailleur	8af16609ca	Merge pull request #9779 from frederic34/patch-15 Update html.formmail.class.php	2018-10-19 13:02:15 +02:00
Laurent Destailleur	324f59ecc9	Merge pull request #9778 from frederic34/patch-9 add errors def to form class	2018-10-19 13:01:31 +02:00
Laurent Destailleur	44e0bc9aed	Merge pull request #9812 from frederic34/docodt add log and comment	2018-10-19 12:53:54 +02:00
Laurent Destailleur	696023c1aa	NEW Enhancement in the generic file manager	2018-10-19 12:47:59 +02:00
Frédéric FRANCE	6c85fbbc30	add log and comment	2018-10-18 21:47:10 +02:00
Frédéric FRANCE	0f7b1a04d9	Merge remote-tracking branch 'upstream/develop' into patch-15	2018-10-18 20:42:52 +02:00
Frédéric FRANCE	3437943609	Merge remote-tracking branch 'upstream/develop' into patch-9	2018-10-18 20:41:36 +02:00
Frédéric FRANCE	300f80e914	Merge remote-tracking branch 'upstream/develop' into patch-18	2018-10-18 20:39:45 +02:00
Laurent Destailleur	52840478c0	Clean code	2018-10-17 21:11:07 +02:00
gauthier	aea7299970	FIX : use discount with multicurrency	2018-10-17 15:49:08 +02:00
Laurent Destailleur	a66256a799	FIX Hover on the filemanager	2018-10-17 13:22:52 +02:00
Frédéric FRANCE	70b6c502da	Update menubase.class.php	2018-10-16 23:36:00 +02:00
Frédéric FRANCE	cf1819ea0e	Update html.formmail.class.php	2018-10-16 22:27:34 +02:00
Frédéric FRANCE	2d542d028f	Update html.formmail.class.php	2018-10-16 22:22:57 +02:00
Frédéric FRANCE	4e14c2817c	add errors def to form class	2018-10-16 22:09:11 +02:00
Laurent Destailleur	f07096ea3a	Merge pull request #9760 from frederic34/patch-19 add errors def in htmlformsms	2018-10-16 20:01:41 +02:00
Laurent Destailleur	97429aeb7a	Merge pull request #9721 from grandoc/new_branch_10_10_2018 Standardize and update code	2018-10-16 19:30:19 +02:00
Laurent Destailleur	2c1e8d6535	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/expedition/class/expeditionbatch.class.php htdocs/public/payment/newpayment.php htdocs/stripe/config.php	2018-10-16 18:47:11 +02:00
atm-ph	72dd182b1f	Fix list from 'Contacts/Addresses' on company may show duplicate value for extrafields	2018-10-16 18:22:43 +02:00
Philippe GRAND	729ff0b9bb	Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018	2018-10-16 14:20:11 +02:00
Laurent Destailleur	70366e9d91	Missing translation	2018-10-16 03:31:33 +02:00
Laurent Destailleur	35f9371343	Fix missing es translation string	2018-10-16 03:30:17 +02:00
Frédéric FRANCE	9133d97e33	add errors def in htmlformsms	2018-10-15 21:40:27 +02:00
Laurent Destailleur	5d9b770511	phpcs	2018-10-15 13:32:09 +02:00
Philippe GRAND	995e9b4f55	Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018	2018-10-12 12:16:57 +02:00
Laurent Destailleur	ded5c4c3dd	Social network module	2018-10-12 11:02:03 +02:00
Philippe GRAND	f13c38e117	Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018	2018-10-11 09:14:40 +02:00
atm-quentin	489ccc3c49	NEW list and fix conf	2018-10-10 12:19:57 +02:00
Laurent Destailleur	2b33e2a9c5	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-10 10:52:58 +02:00
Laurent Destailleur	40f89d138f	Fix height of confirm popup	2018-10-10 10:52:29 +02:00
Philippe GRAND	90cb6150c4	Standardize and update code	2018-10-10 09:16:01 +02:00
Philippe GRAND	69379dc2bb	Standardize and update code	2018-10-10 09:12:25 +02:00
atm-quentin	7ad4a7e384	NEW creation facture fourn depuis reception	2018-10-09 16:26:40 +02:00
Laurent Destailleur	0938ac4afa	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/list.php	2018-10-09 14:54:18 +02:00
Laurent Destailleur	3c8b365c3e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-09 14:53:39 +02:00
Philippe GRAND	bba6669f03	Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018	2018-10-09 08:47:26 +02:00
Laurent Destailleur	1c74dcc270	NEW Can filter on EEC, not EEC, etc... in binding step of accountancy	2018-10-09 01:47:37 +02:00
Laurent Destailleur	6ded9e843d	NEW The binding step in accountancy has a country filter like a combo	2018-10-09 01:03:46 +02:00
atm-quentin	c6ab79bad3	NEW note, contact and lines on card	2018-10-08 16:54:33 +02:00
Laurent Destailleur	0c7b7ed7f4	FIX Required extrafield value numeric should accept '0'	2018-10-08 14:26:18 +02:00
Laurent Destailleur	7be9b6d94e	Fix translation of source of proposals	2018-10-08 14:04:22 +02:00
Abbes Bahfir	f0d8a5da9a	Fix: Reminder : TODO Add Javascript code to add input fields contents to new elements urls	2018-10-08 12:39:59 +01:00
Abbes Bahfir	7d25311ce5	New : Link to create new element on linked fields	2018-10-08 10:59:01 +01:00
Laurent Destailleur	08ca85e995	Fix type	2018-10-08 02:19:32 +02:00
Laurent Destailleur	df7f218d01	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-07 21:47:32 +02:00
Laurent Destailleur	d4b6429ccd	Fix regression into backup feature	2018-10-07 21:45:20 +02:00
Laurent Destailleur	ccc6dea85c	Merge pull request #9686 from frederic34/patch-11 PEAR.NamingConventions.ValidFunctionName.NotCamelCaps	2018-10-06 12:46:54 +02:00
Laurent Destailleur	f742b0f55b	Merge pull request #9685 from frederic34/patch-9 PSR2.Classes.ClassDeclaration.CloseBraceAfterBody	2018-10-06 12:39:30 +02:00
Philippe GRAND	61daff6cb6	Standardize code	2018-10-06 12:34:51 +02:00
Philippe GRAND	83db36f9b2	Standardize code	2018-10-06 12:11:48 +02:00
atm-quentin	6a8092dfae	NEW entete reception card	2018-10-05 16:21:50 +02:00
Philippe GRAND	94df8d297d	Standardize code	2018-10-05 15:44:57 +02:00
Laurent Destailleur	4e84ed0e80	FIX Symbol of currency in substitution variables	2018-10-05 13:59:46 +02:00
Laurent Destailleur	d1ad5dd4f1	FIX Symbol of currency in substitution variables	2018-10-05 13:58:38 +02:00
Frédéric FRANCE	2fc54ccf66	PEAR.NamingConventions.ValidFunctionName.NotCamelCaps	2018-10-04 20:23:58 +02:00
Frédéric FRANCE	48a063eca4	PSR2.Classes.ClassDeclaration.CloseBraceAfterBody	2018-10-04 20:18:24 +02:00
Laurent Destailleur	29cafc78d0	Merge pull request #9634 from grandoc/new_branch_29_09_2018 add some significant info within notification mail	2018-10-04 19:31:31 +02:00
Laurent Destailleur	4fad28d360	Update notify.class.php	2018-10-04 19:30:45 +02:00
Laurent Destailleur	2232bd3944	Update notify.class.php	2018-10-04 19:30:03 +02:00
Laurent Destailleur	20f45db6b8	Merge pull request #9677 from grandoc/new_branch_04_10_2018 Standardize and update code	2018-10-04 18:33:24 +02:00
Laurent Destailleur	31916c94f0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-04 17:57:20 +02:00
Laurent Destailleur	b3b2305651	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/core/lib/pdf.lib.php	2018-10-04 17:56:56 +02:00
Laurent Destailleur	34f1691302	Merge pull request #9655 from frederic34/patch-11 group same condition into one in html.formprojet.class.php	2018-10-04 17:15:15 +02:00
Laurent Destailleur	111d589474	NEW Can mix offset before and after with rules for due date of invoices	2018-10-04 16:06:26 +02:00
Laurent Destailleur	75c968b4ae	FIX Backup of database without mysqladmin available from cron.	2018-10-04 13:10:48 +02:00
Philippe GRAND	8bee69277d	Standardize and update code	2018-10-04 09:33:30 +02:00
Philippe GRAND	d2ec703b51	Standardize and update code	2018-10-04 09:24:57 +02:00
Laurent Destailleur	fd859d3162	Add a component to select lang into a web site	2018-10-03 18:40:54 +02:00
atm-quentin	52717dbb65	NEW debut rename stock conf	2018-10-03 18:05:22 +02:00
Laurent Destailleur	2cd843acec	Fix separator too long	2018-10-03 16:02:42 +02:00
Frédéric FRANCE	e8cf59e6f6	Update html.formprojet.class.php	2018-10-01 21:03:33 +02:00
Laurent Destailleur	771922f427	Use 2 distinct left menu entries for leads and projects	2018-10-01 18:56:47 +02:00
Philippe GRAND	c22b80831d	fix regression	2018-10-01 17:14:28 +02:00
Philippe GRAND	0aae40f8aa	fix when there is no project	2018-10-01 17:05:52 +02:00
Philippe GRAND	b32a9cc50e	fix if no project linked	2018-10-01 09:13:02 +02:00
Laurent Destailleur	15780f71b4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-01 03:22:20 +02:00
Laurent Destailleur	873f43db94	Uniformize interface for tickets	2018-10-01 03:19:21 +02:00
Laurent Destailleur	1dfbb22bf8	Merge branch 'develop' into new_branch_13_09_2018	2018-10-01 02:20:16 +02:00
Laurent Destailleur	77dad1b32b	Merge pull request #9647 from frederic34/patch-17 indentation fix in commonobject class	2018-10-01 01:20:17 +02:00
Laurent Destailleur	ae62204a79	Merge pull request #9628 from grandoc/new_branch_28_09_2018 Standardize and update code	2018-10-01 01:04:36 +02:00
Frédéric FRANCE	2af15ee932	Update commonobject.class.php	2018-09-30 17:59:04 +02:00
Philippe Grand	8acddb5bab	Update notify.class.php	2018-09-29 18:43:50 +02:00
Philippe Grand	9a2fd7defe	Update notify.class.php	2018-09-29 18:41:31 +02:00
Philippe GRAND	8ef9a301b3	add some significant info within notification mail	2018-09-29 14:51:52 +02:00
Laurent Destailleur	f667270d4d	Add option to not load all object and fix so linkedObjectsIds has same content than linkedObjects	2018-09-28 17:38:29 +02:00
Philippe GRAND	15ff9f8917	Standardize and update code	2018-09-28 14:44:47 +02:00
Laurent Destailleur	224896a4dc	Code comments	2018-09-28 10:52:15 +02:00
Laurent Destailleur	c5a68d2462	Clean code	2018-09-28 10:51:55 +02:00
Laurent Destailleur	62b31df069	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/rssparser.class.php htdocs/langs/en_US/boxes.lang	2018-09-27 12:55:25 +02:00
Laurent Destailleur	575c63f87d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/class/CMailFile.class.php	2018-09-27 12:52:10 +02:00
Laurent Destailleur	291d477f65	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/class/commonobject.class.php	2018-09-27 12:47:48 +02:00
Philippe Grand	031b3b44c5	Merge branch 'develop' into new_branch_13_09_2018	2018-09-27 09:42:58 +02:00
Laurent Destailleur	4c8664b297	Merge pull request #9619 from ATM-Marc/FIX_6.0_extrafield_columns FIX: showOptionals: column mismatches	2018-09-27 09:39:51 +02:00
Laurent Destailleur	2d88b69cf6	Merge pull request #9616 from frederic34/patch-14 add try catch for swiftmailer	2018-09-27 09:34:21 +02:00
Laurent Destailleur	9630c7b5c7	Merge pull request #9614 from grandoc/new_branch_25_09_2018 Add some code comment	2018-09-27 09:31:19 +02:00
Laurent Destailleur	e72dc26532	Merge pull request #9603 from atm-john/Fix_situation_invoice_selection FIX previous situation invoice selection	2018-09-27 09:20:24 +02:00
Laurent Destailleur	b8ae88cf26	Merge pull request #9602 from grandoc/new_branch_24_09_2018 Standardize and update code	2018-09-27 09:19:59 +02:00
Laurent Destailleur	2b8ccc0c81	FIX Link template invoice to contract	2018-09-27 01:53:12 +02:00
Laurent Destailleur	9123329800	FIX Link template invoice to contract	2018-09-26 23:44:27 +02:00
Marc de Lima Lucio	af93fc7484	FIX: showOptionals: column mismatches	2018-09-26 17:19:06 +02:00
Frédéric FRANCE	1bac3a0ccf	swiftmailer is doing encodetorfc2822	2018-09-26 10:37:20 +02:00
Frédéric FRANCE	92a3faeaf7	add try catch for swiftmailer	2018-09-26 10:13:14 +02:00
Laurent Destailleur	f2d53e80e5	Optimize performance of cron that rotate logs	2018-09-26 01:45:24 +02:00
Philippe GRAND	746d73b8e6	Add some code comment	2018-09-25 17:26:57 +02:00
Laurent Destailleur	515acbfee2	FIX Bad position of hook formattachOptions call	2018-09-25 11:46:42 +02:00
Frédéric FRANCE	d15c52db3b	Update rssparser.class.php	2018-09-25 08:16:05 +02:00
Laurent Destailleur	eeda176ed6	FIX Bad position of hook formattachOptions call	2018-09-24 15:13:18 +02:00
Philippe GRAND	d7df74656e	Standardize and update code	2018-09-24 12:03:49 +02:00
Philippe GRAND	ac31b79d9d	Standardize and update code	2018-09-24 11:58:01 +02:00
Philippe GRAND	1f2493f361	Standardize and update code	2018-09-24 11:45:34 +02:00
John BOTELLA	ceccd5a510	Fix prev situation invoice selection	2018-09-24 10:16:28 +02:00
Laurent Destailleur	e277670a70	Merge pull request #9573 from grandoc/new_branch_20_09_2018 Standardize and update code from New branch 20 09 2018	2018-09-23 15:35:42 +02:00
Philippe Grand	239be3b58c	Merge branch 'develop' into new_branch_20_09_2018	2018-09-21 10:12:48 +02:00
Philippe GRAND	e8b7ad0fb5	Standardize and update code	2018-09-21 08:49:05 +02:00
Laurent Destailleur	5bd538fb2c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/core/modules/modStripe.class.php htdocs/filefunc.inc.php htdocs/projet/element.php	2018-09-20 23:43:34 +02:00
Philippe GRAND	67bbead7c1	Standardize and update code	2018-09-20 17:46:39 +02:00
Philippe GRAND	e1a03c49cf	Standardize and update code	2018-09-20 17:19:42 +02:00
Philippe GRAND	43edc64e7f	Merge remote-tracking branch 'upstream/develop' into new_branch_20_09_2018	2018-09-20 16:57:10 +02:00
Laurent Destailleur	e0dfab4c71	FIX The max size for upload file was not corectly shown	2018-09-20 16:21:36 +02:00
Laurent Destailleur	c6470d49b0	FIX The max size for upload file was not corectly shown	2018-09-20 16:21:08 +02:00
Philippe GRAND	5979db7733	Standardize and update code	2018-09-20 12:07:23 +02:00
Laurent Destailleur	12b449fe49	It's easier to select fields to show on list	2018-09-19 16:41:33 +02:00
Laurent Destailleur	4580ed0b09	Fix bad link	2018-09-18 15:31:25 +02:00
Laurent Destailleur	b67392b016	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-18 15:18:16 +02:00
Laurent Destailleur	52b6dd16da	Standardize code	2018-09-18 15:18:07 +02:00
Laurent Destailleur	61f5a2e899	Merge pull request #9533 from frederic34/trimParameters trimParameters function	2018-09-18 15:04:32 +02:00
Laurent Destailleur	1c13fbb122	Merge pull request #9532 from frederic34/patch-17 reduce complexity of commoninvoice class	2018-09-18 15:03:25 +02:00
Philippe GRAND	cd796bf682	Standardize and update code	2018-09-17 12:29:21 +02:00
Philippe GRAND	484b36c5aa	Standardize and update code	2018-09-17 09:31:32 +02:00
Laurent Destailleur	0bf540b3c1	Fix regression in edition of date	2018-09-17 09:17:11 +02:00
wdammak	b17c44c665	Update html.form.class.php Add the ability to sort products by category	2018-09-16 16:53:35 +01:00
Frédéric FRANCE	b950043618	trimParameters	2018-09-16 15:16:08 +02:00
Frédéric FRANCE	f9441d3249	Update commoninvoice.class.php	2018-09-16 14:07:11 +02:00
Laurent Destailleur	ab0f842db6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-16 12:55:44 +02:00
Laurent Destailleur	cc4fbfc3ef	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/class/commonobject.class.php	2018-09-16 12:54:39 +02:00
Laurent Destailleur	10c6bc44ca	Fix scrutinizer	2018-09-16 10:28:41 +02:00
Laurent Destailleur	d6ee00f2e7	Fix constructors does not need return value	2018-09-16 10:22:23 +02:00
Laurent Destailleur	e90a60d4ee	Remove warnings	2018-09-16 10:09:19 +02:00
Laurent Destailleur	eebd329c7c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/DolibarrModules.class.php htdocs/core/modules/modAgenda.class.php htdocs/core/modules/modFacture.class.php htdocs/langs/en_US/admin.lang htdocs/langs/en_US/main.lang htdocs/stripe/transaction.php	2018-09-16 09:50:13 +02:00
Philippe Grand	1d82825afa	Update html.formsms.class.php	2018-09-15 21:34:55 +02:00
Laurent Destailleur	69dcdcbe75	Merge pull request #9509 from grandoc/new_branch_14_09_2018 Standardize and update code	2018-09-15 17:30:14 +02:00
Laurent Destailleur	76cdbc8bf1	Merge branch 'develop' into testsqlAndScript	2018-09-15 17:01:23 +02:00
Laurent Destailleur	bbfe4462dc	NEW Add lib for multiselect with checkboxes NEW Can select several prospect level in thirdparty filter. Remove old multiselect lib that was not used by core.	2018-09-15 13:31:25 +02:00
Philippe GRAND	18f4755a90	Standardize and update code	2018-09-14 10:20:21 +02:00
John BOTELLA	ec23cd0da4	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_PDF_DOCUMENT_COLUMN_new_files	2018-09-14 09:54:14 +02:00
Philippe Grand	51ba970eaf	Update html.formsms.class.php	2018-09-14 09:33:16 +02:00
Philippe GRAND	3da762a59d	Standardize and update code	2018-09-13 15:06:06 +02:00
tarrsalah	08453a5337	FIX #9497 Extract $defaultcode and $defaulttxt from the value returned by get_default_tva function .	2018-09-13 11:04:11 +01:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Laurent Destailleur	963d5eeddf	Merge pull request #9387 from frederic34/camelCaps2 start changing phpcs:ignore	2018-09-12 21:14:34 +02:00
Laurent Destailleur	9d9e2bc3e3	Merge pull request #9405 from fmarcet/develop NEW: Highlight lines on lists when they are checked	2018-09-12 20:50:42 +02:00
Frédéric FRANCE	ce76a2e714	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 20:21:35 +02:00
Laurent Destailleur	163bc55e4a	Merge pull request #9468 from jmarsac/numericextrafields9464 Convert localized numeric extrafields value before inserting/updating	2018-09-12 19:06:43 +02:00
Laurent Destailleur	7d726f9734	Merge pull request #9457 from frederic34/selectbarcodetype Selectbarcodetype	2018-09-12 19:02:41 +02:00
Frédéric FRANCE	3e71f4e6b0	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 18:36:49 +02:00
Frédéric FRANCE	998b67fa98	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 18:32:15 +02:00
Laurent Destailleur	358bc7ab1b	Merge pull request #9454 from frederic34/patch-16 Update dolreceiptprinter.class.php	2018-09-12 18:28:10 +02:00
Laurent Destailleur	64d99dd302	Merge pull request #9459 from frederic34/patch-18 Completely comment unused code	2018-09-12 18:21:51 +02:00
Philippe GRAND	69bf43f851	Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018	2018-09-12 14:48:50 +02:00
Laurent Destailleur	fcabe67e4b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-12 13:30:28 +02:00
Laurent Destailleur	53da80a79f	FIX Missing translation in predefined email to membership renewal	2018-09-12 12:55:10 +02:00
Jean-Marie Arsac	345c24990e	Correction of variable name	2018-09-11 20:51:54 +02:00
Jean-Marie Arsac	2f2dff8155	Convert localized numeric extrafields value before inserting - add 'double' case in insertExtraFields and updateExtraFields to to convert localized value using price2num()	2018-09-11 14:57:31 +02:00
Philippe GRAND	b4cbb0561d	Standardize and update code	2018-09-11 10:36:39 +02:00
Frédéric FRANCE	2995208e5b	Completely comment unused code	2018-09-11 00:36:44 +02:00
Frédéric FRANCE	a36f41728f	deprecate formbarcode:form_barcode_type	2018-09-10 23:58:57 +02:00
Frédéric FRANCE	312a606345	deprecate formbarcode:select_barcode_type	2018-09-10 23:50:48 +02:00
Laurent Destailleur	d011204624	Fix switch of extrafields between all and only one entity	2018-09-10 17:36:46 +02:00
Frédéric FRANCE	2589b23464	Update dolreceiptprinter.class.php	2018-09-10 17:25:35 +02:00
Regis Houssin	43ac51b44c	FIX remove debug	2018-09-10 10:11:07 +02:00
Regis Houssin	8699866062	FIX better compatibility with multicompany	2018-09-10 10:08:04 +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	8249756726	replace select_date	2018-09-09 10:40:00 +02:00
Frédéric FRANCE	a3fa13994b	replace select_date	2018-09-09 09:36:12 +02:00
Frédéric FRANCE	ac8f568604	replace select_date by selectDate	2018-09-08 12:47:27 +02:00
Frédéric FRANCE	cb97a29fc0	introduce seletDate	2018-09-08 12:00:11 +02:00
Frédéric FRANCE	2b62c4ca8f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-08 10:50:27 +02:00
Frédéric FRANCE	70ba223788	move phpcs:ignore	2018-09-06 21:27:18 +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	3ecf788438	move phpcs:ignore	2018-09-06 18:29:01 +02:00
Frédéric FRANCE	4cbfa2073a	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 21:02:16 +02:00
Frédéric FRANCE	85df267a5b	move phpcs:ignore	2018-09-05 20:36:44 +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	f7c3ca9d20	move phpcs:ignore	2018-09-05 18:49:06 +02:00
Laurent Destailleur	cb89942bfb	Add option capture on input file for photo	2018-09-05 16:03:10 +02:00
Frédéric FRANCE	ecc6c118a6	move phpcs:ignore	2018-09-04 23:26:37 +02:00
Frédéric FRANCE	7799774ca1	move phpcs:ignore	2018-09-04 22:52:55 +02:00
Frédéric FRANCE	3847df1de6	move phpcs:ignore	2018-09-04 21:53:53 +02:00
Laurent Destailleur	ab8155f170	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/card.php htdocs/filefunc.inc.php	2018-09-04 21:35:43 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Frédéric FRANCE	fd6281b364	move phpcs:ignore	2018-09-04 20:00:09 +02:00
Philippe Grand	c32c67ca57	Merge branch 'develop' into develop	2018-09-04 16:58:59 +02:00
Philippe GRAND	50a26aaf16	fix merge	2018-09-04 14:33:34 +02:00
Philippe GRAND	42565e722e	Standardize and update code	2018-09-04 13:37:00 +02:00
Philippe GRAND	0492492df1	fix merge	2018-09-04 12:30:06 +02:00
Ferran Marcet	b658626e21	NEW: Highlight lines on lists when they are checked	2018-09-04 11:54:13 +02:00
Laurent Destailleur	f2ec94e9fd	FIX #9353 Bug: html error - div inside span on graphs	2018-09-04 11:13:54 +02:00
Laurent Destailleur	c59b0f95e6	FIX #9403	2018-09-04 10:10:47 +02:00
Frédéric FRANCE	d08b68e8ed	move phpcs:ignore	2018-09-03 20:38:52 +02:00
Frédéric FRANCE	7288335c6d	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-03 19:01:11 +02:00
Philippe GRAND	7a0c19485e	fix merge	2018-09-03 09:34:08 +02:00
Regis Houssin	912c05774b	FIX remove deprecated triggers USER_LOG*	2018-09-03 09:30:36 +02:00
Frédéric FRANCE	e4946cc8eb	move phpcs:ignore	2018-09-03 00:03:17 +02:00
Frédéric FRANCE	9c3352d2de	move phpcs:ignore	2018-09-02 23:44:53 +02:00
Frédéric FRANCE	47e73bfd8e	move phpcs:ignore	2018-09-02 23:01:14 +02:00
Frédéric FRANCE	2a9ef8dc05	move phpcs:ignore	2018-09-02 22:05:19 +02:00
Frédéric FRANCE	b05c175a78	Merge remote-tracking branch 'upstream/develop' into testsqlAndScript	2018-09-02 19:00:43 +02:00
Frédéric FRANCE	e13a8ec572	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-02 18:19:45 +02:00
Laurent Destailleur	a68f5cad77	Fix syntax error	2018-09-02 17:18:19 +02:00
Laurent Destailleur	887a40cf1d	Remove TODO	2018-09-02 16:46:01 +02:00
Laurent Destailleur	3d3edb19d8	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: .travis.yml htdocs/langs/en_US/commercial.lang	2018-09-02 15:48:26 +02:00
Laurent Destailleur	76d6affb27	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: .travis.yml	2018-09-02 15:46:09 +02:00
Frédéric FRANCE	04c1a7d4af	move phpcs:ignore	2018-09-02 13:38:11 +02:00
Philippe GRAND	3de16a145e	Standardize and update code	2018-09-02 11:08:41 +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
Philippe GRAND	ae2df6be11	Standardize and Update code	2018-09-01 23:04:46 +02:00
Philippe GRAND	7b0d3c32ab	Standardize and Update code	2018-09-01 22:55:10 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Frédéric FRANCE	ab9bf78ecf	replace test_sql_and_script_inject	2018-09-01 17:42:16 +02:00
Laurent Destailleur	c8912d6a4f	Merge pull request #9242 from frederic34/camelCaps mark non camelCaps function	2018-09-01 15:37:56 +02:00
Philippe GRAND	f77dd2ebc7	Standardize and update code	2018-09-01 15:13:59 +02:00
Laurent Destailleur	2301ecf1dc	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-01 14:51:20 +02:00
Philippe GRAND	8d7dfaf98c	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 14:49:42 +02:00
Laurent Destailleur	945e925399	Update html.form.class.php	2018-09-01 14:41:44 +02:00
Laurent Destailleur	e4e1bf5a1a	Merge pull request #9361 from frederic34/patch-19 Update discount.class.php	2018-09-01 14:30:16 +02:00
Philippe GRAND	17e349eba2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 14:27:53 +02:00
Laurent Destailleur	359eebbbec	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-01 14:26:48 +02:00
Laurent Destailleur	08bc81a7ab	Merge pull request #9370 from joseplluis/patch-5 NEW optional param to show a specific extrafield	2018-09-01 14:24:23 +02:00
Laurent Destailleur	bc71aef7b4	Code comment	2018-09-01 14:24:02 +02:00
Philippe GRAND	7b47c79bc3	precise label comment	2018-09-01 14:06:58 +02:00
Frédéric FRANCE	10200374ef	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 14:06:23 +02:00
Philippe GRAND	b59d49d3b3	Merge remote-tracking branch 'upstream/develop' into develop	2018-09-01 13:58:33 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Laurent Destailleur	06355f7f08	Merge pull request #9362 from frederic34/patch-20 Update ldap.class.php	2018-09-01 13:28:32 +02:00
Philippe GRAND	d8e6492e93	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 13:07:30 +02:00
Laurent Destailleur	5604f3b0c3	Merge pull request #9376 from frederic34/functionCommentMissing function Comment Missing	2018-09-01 12:59:32 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Laurent Destailleur	b863b5176d	Merge pull request #9322 from grandoc/new_branch_29_08_2018 New branch 29 08 2018	2018-09-01 12:11:01 +02:00
Frédéric FRANCE	9454f897ef	doxygen fix	2018-09-01 09:40:50 +02:00
Philippe GRAND	3a8bde227b	Standardize and update code	2018-08-31 19:26:08 +02:00
Philippe GRAND	edaa575435	Standardize and update code	2018-08-31 18:36:15 +02:00
Philippe GRAND	70ae8c6081	Standardize and update code	2018-08-31 18:27:16 +02:00
Philippe GRAND	9e880d3e72	Standardize and update code	2018-08-31 17:55:31 +02:00
Josep Lluís	78c0aa437f	NEW optional param to show a specific extrafield Using params in showOptionals you can show only a specific extrafield in a personalized form or canvas. For example: print $object->showOptionals($extrafields, 'view', array('onlykey'=>'myfield_5'));	2018-08-31 17:16:27 +02:00
atm-ph	102b698c76	Fix search company by code	2018-08-31 11:38:45 +02:00
Frédéric FRANCE	26c0244dbb	Update ldap.class.php	2018-08-30 23:13:16 +02:00
Frédéric FRANCE	4ad5201a16	Update discount.class.php	2018-08-30 23:10:09 +02:00
Philippe Grand	b3c84ac3bc	Merge branch 'develop' into new_branch_29_08_2018	2018-08-30 12:09:40 +02:00
Philippe GRAND	2e66c65650	WTF...	2018-08-30 12:03:20 +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
Frédéric FRANCE	cbdc669ba9	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-29 18:45:36 +02:00
Laurent Destailleur	86d8513138	Merge pull request #9309 from frederic34/trimtrailing2 last trimtrailing	2018-08-29 17:57:05 +02:00
Laurent Destailleur	7bf48b8d77	Fix date_start and date_end not saved on supplier invoice Conflicts: htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/facture/card.php	2018-08-29 17:26:41 +02:00
Laurent Destailleur	98356c6ed0	Fix date_start and date_end not saved on supplier invoice	2018-08-29 17:03:18 +02:00
Frédéric FRANCE	0e512cbc36	Merge remote-tracking branch 'upstream/develop' into trimtrailing2	2018-08-29 15:47:55 +02:00
Laurent Destailleur	ee204e2e64	Fix regression in php style	2018-08-29 15:37:35 +02:00
Philippe GRAND	660f02f5a6	Fix white spaces	2018-08-29 12:35:56 +02:00
Philippe GRAND	32a9e35a6a	Fix white spaces	2018-08-29 12:31:36 +02:00
Philippe Grand	6fc813254b	Update html.formmail.class.php	2018-08-28 10:43:13 +02:00
Philippe Grand	b73fd487c0	Update ctyperesource.class.php	2018-08-28 10:41:54 +02:00
Philippe Grand	1856fb8946	Update ctyperesource.class.php	2018-08-28 10:41:26 +02:00
Philippe GRAND	65af8f902f	Update and standardize code	2018-08-28 09:44:54 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Frédéric FRANCE	1182f29864	trimtrailing	2018-08-28 08:33:02 +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	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
Laurent Destailleur	1842a4bb41	Merge pull request #9278 from grandoc/new_branch_21_08_2018 Update and standardize code	2018-08-28 02:13:28 +02:00
Frédéric FRANCE	faa29f9ae0	Update antivir.class.php	2018-08-28 01:34:42 +02:00
Laurent Destailleur	004b352e8e	Merge pull request #9279 from frederic34/patch-11 FIX Error message when sending a file with .virus extension	2018-08-28 01:26:04 +02:00
Frédéric FRANCE	d8bf4a0ecf	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-25 09:07:04 +02:00
Laurent Destailleur	e67e32c023	Add forcecombo on select language	2018-08-24 15:25:18 +02:00
Laurent Destailleur	b22d9db1a5	Fix tdclass	2018-08-24 15:18:19 +02:00
Laurent Destailleur	4885e61240	Fix tdclass	2018-08-24 15:16:03 +02:00
Laurent Destailleur	9f92974e98	Fix tdclass	2018-08-24 15:13:34 +02:00
Laurent Destailleur	32bde2c375	Add tdclass to form confirm for more control	2018-08-24 15:12:47 +02:00
Laurent Destailleur	d2a7c9976b	Fix syntax error	2018-08-24 15:05:57 +02:00
Laurent Destailleur	07407f46a7	Remove colspan	2018-08-24 15:02:19 +02:00
Laurent Destailleur	7a35b560a6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-23 19:51:52 +02:00
Philippe GRAND	215677c972	Standardize and update code	2018-08-23 18:17:09 +02:00
Philippe GRAND	74ce0bfea6	Standardize and update code	2018-08-23 16:54:24 +02:00
Philippe GRAND	80b7229174	Standardize and update code	2018-08-23 11:34:55 +02:00
Philippe GRAND	9e900e583d	Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018	2018-08-23 11:13:54 +02:00
Philippe GRAND	aafa16afa5	Update and standardize code	2018-08-23 11:11:46 +02:00
Philippe Grand	e09f7bedd0	Update commonobject.class.php	2018-08-23 09:57:19 +02:00
Philippe GRAND	504b0e3d16	Update and standardize code	2018-08-22 18:34:50 +02:00
Frédéric FRANCE	96f16b7497	Update commondocgenerator.class.php	2018-08-22 17:29:05 +02:00
Laurent Destailleur	b650f7ac17	Fix tab	2018-08-22 13:37:18 +02:00
Laurent Destailleur	c7a241a5db	FIX Get templates in a forced language Conflicts: htdocs/core/class/html.formmail.class.php	2018-08-22 13:22:49 +02:00
Laurent Destailleur	c20d556265	FIX Get templates in a forced language	2018-08-22 13:16:55 +02:00
Frédéric FRANCE	d1d6d81f8f	Update antivir.class.php	2018-08-22 11:53:08 +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	d91b1fd895	Update and standardize code	2018-08-22 11:06:34 +02:00
Philippe GRAND	a669830427	Update and standardize code	2018-08-22 10:37:16 +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	0fbccce9a7	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 19:59:07 +02:00
Laurent Destailleur	db3c17668e	Fix coding style	2018-08-21 19:08:11 +02:00
Laurent Destailleur	3f4714416d	Clean comment	2018-08-21 18:58:10 +02:00
Laurent Destailleur	f8b3ec7b87	Fix PHPCS	2018-08-21 18:57:34 +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
Laurent Destailleur	289f194641	Merge pull request #9058 from defrance/patch-123 New : Add total price on dashboard	2018-08-21 13:33:33 +02:00
Laurent Destailleur	b40e32b8c3	Merge pull request #9264 from grandoc/new_branch_17_08_2018 standardize code	2018-08-21 12:52:34 +02:00
Laurent Destailleur	26d34422b0	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-19 03:01:26 +02:00
Laurent Destailleur	795b2f3d58	FIX Delete file on smartphone	2018-08-19 03:00:11 +02:00
Philippe GRAND	c48211ad70	Update and standardize code	2018-08-17 19:31:22 +02:00
Frédéric FRANCE	39462742e2	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-16 08:17:55 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Laurent Destailleur	5c712a6cd3	Merge branch 'develop' into trimtrailing	2018-08-16 00:47:09 +02:00
Laurent Destailleur	3b245f1b30	Merge pull request #9247 from frederic34/missingReturn return comment	2018-08-16 00:35:39 +02:00
Frédéric FRANCE	69a7af88e7	function declaration	2018-08-15 18:14:02 +02:00
Frédéric FRANCE	54a078149a	function declaration	2018-08-15 17:34:35 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Laurent Destailleur	ec56ad752c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2018-08-15 14:26:38 +02:00
Frédéric FRANCE	5146ab9177	trim	2018-08-14 15:34:44 +02:00
Frédéric FRANCE	d25fa61998	return comment	2018-08-14 13:14:55 +02:00
Frédéric FRANCE	a0a6afc224	return comment	2018-08-14 12:23:10 +02:00
Frédéric FRANCE	3210181a3d	rule for private function is different	2018-08-14 10:21:34 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Laurent Destailleur	33f0172603	Fix select zip/town	2018-08-13 16:44:49 +02:00
Frédéric FRANCE	1b27cca91c	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-13 08:53:07 +02:00
Laurent Destailleur	6a8ed56c3d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-13 01:23:43 +02:00
Laurent Destailleur	31c42c9a32	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/societe/canvas/actions_card_common.class.php	2018-08-13 01:23:03 +02:00
Laurent Destailleur	21555a7435	Fix firstname/lastname	2018-08-13 01:10:51 +02:00
Frédéric FRANCE	82e8efe792	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 20:14:14 +02:00
Laurent Destailleur	9fc5d39d07	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
Laurent Destailleur	dc8c4402ee	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:22 +02:00
Laurent Destailleur	0a1c6e7194	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/list.php htdocs/compta/facture/list.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php	2018-08-12 20:08:20 +02:00
Frédéric FRANCE	62db9a4022	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 19:54:03 +02:00
Frédéric FRANCE	6f74ecceaf	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 18:21:59 +02:00
Laurent Destailleur	2f559a7edb	Merge pull request #9199 from atm-quentin/FIX_hook_update_price NEW Add hook changeRoundingMode in update_price	2018-08-12 18:17:52 +02:00
Laurent Destailleur	3d4d42462c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-12 16:30:21 +02:00
Laurent Destailleur	12e21b4886	FIX update extrafields	2018-08-12 16:29:26 +02:00
Laurent Destailleur	2dbb6e258b	FIX Can filter on month in export of blockedlog FIX Fingerprint correct in popup	2018-08-09 22:29:02 +02:00
florian HENRY	9024ed9e61	Merge branch '7.0' into 7.0_fhe	2018-08-09 17:47:21 +02:00
Laurent Destailleur	61d7629ab1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php	2018-08-08 17:44:22 +02:00
Laurent Destailleur	8d54df4263	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php	2018-08-08 17:31:23 +02:00
Laurent Destailleur	d79778a67e	Fix reponsive	2018-08-08 17:00:16 +02:00
Juanjo Menent	948bb47040	Merge pull request #9207 from atm-florian/dev_showadressinthirdpartylistoption NEW: Add option to display thirdparty adress in combolist	2018-08-08 11:14:22 +02:00
Frédéric FRANCE	9025c452ef	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-07 16:40:03 +02:00
gauthier	a2a8929d0e	NEW : tag odt line_product_ref_fourn for supplier doc lines	2018-08-07 11:45:56 +02:00
ATM-Nicolas	5b15e688af	FIX : PHP warning, undefined index notnull	2018-08-07 09:38:18 +02:00
florian HENRY	45a52a955e	NEW: Add optoin to display thirdparty adress in combolist	2018-08-06 10:52:10 +02:00
florian HENRY	0d85eb52c5	Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0	2018-08-03 17:10:26 +02:00
florian HENRY	615ed11534	fix bad use of test_sql_and_script_inject return int not value tested	2018-08-03 17:09:58 +02:00
atm-quentin	c97e2db089	Merge branch '7.0' of github.com:Dolibarr/dolibarr into FIX_hook_update_price	2018-08-03 11:49:00 +02:00
atm-quentin	6662bf05ba	FIX hook on update price AND fix id on line	2018-08-03 11:47:43 +02:00
Laurent Destailleur	b01f07efda	Merge branch 'develop' into FIX_project_overview	2018-08-02 18:43:55 +02:00
Juanjo Menent	37a9a2df56	Merge pull request #9167 from frederic34/include Include and co are statements	2018-08-02 11:03:44 +02:00
gauthier	cadf931e8d	FIX : extrafieldkey	2018-07-31 15:02:51 +02:00
atm-quentin	37a4a0c488	fix for travis	2018-07-31 10:02:36 +02:00
Frédéric FRANCE	b90d125fda	trim trailing	2018-07-26 20:19:52 +02:00
Frédéric FRANCE	526ea496ee	trim trailing	2018-07-26 19:26:03 +02:00
Frédéric FRANCE	6cb0fb10d6	trim trailing	2018-07-26 19:05:34 +02:00
Frédéric FRANCE	8312d95174	trim trailing	2018-07-26 18:22:16 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
atm-quentin	1297470c99	FIX project overview (can use any fields as fk_projet)	2018-07-26 15:05:32 +02:00
Frédéric FRANCE	2dd907a8e1	extrafield totalizable	2018-07-26 09:41:44 +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
Laurent Destailleur	7e9a2c5ec7	Fix #9092	2018-07-24 17:06:41 +02:00
John BOTELLA	1e986bc39a	Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NUM' (this will throw an Error in a future version of PHP)	2018-07-20 11:51:01 +02:00
Laurent Destailleur	508133b336	Clean code	2018-07-17 13:04:54 +02:00
Laurent Destailleur	f747cefda3	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/install/upgrade2.php	2018-07-16 15:44:44 +02:00
Laurent Destailleur	45a45b0dec	NEW Can enable a module, even external module, from command line Conflicts: htdocs/install/upgrade2.php	2018-07-16 15:35:00 +02:00
Laurent Destailleur	41605ed4a7	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php	2018-07-16 11:29:47 +02:00
Laurent Destailleur	e92ab19a06	Fix var not defined	2018-07-16 11:26:23 +02:00
Laurent Destailleur	c477ca8266	Fix scrutinizer	2018-07-16 11:25:21 +02:00
Laurent Destailleur	e3d9e609d5	Fix var not defined	2018-07-16 11:20:54 +02:00
Laurent Destailleur	89cc048fff	FIX Init of contact in combo list when thirdparty not yet known	2018-07-16 10:46:10 +02:00
Laurent Destailleur	3710f95719	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/exports.lang	2018-07-16 10:01:23 +02:00
Laurent Destailleur	6846ff7d21	Fix problem in some vars as reported in #8955	2018-07-16 09:57:45 +02:00
Philippe GRAND	9ae7e55fea	fix: breaking link	2018-07-13 19:54:37 +02:00
Laurent Destailleur	5f52dfa873	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-10 14:02:40 +02:00
Laurent Destailleur	44626a3a48	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/lib/functions.lib.php	2018-07-10 13:57:24 +02:00
Laurent Destailleur	699df860d8	Code comment	2018-07-09 15:39:59 +02:00
Laurent Destailleur	e427496ddf	FIX Injection	2018-07-09 14:13:01 +02:00
Laurent Destailleur	d3d1b6d513	NEW Can enable a module, even external module, from command line	2018-07-09 13:02:01 +02:00
Regis Houssin	e8afd7e833	Fix: use "supplier" instead "reseller"	2018-07-07 08:48:26 +02:00
Regis Houssin	1522a5b22d	Fix: differentiate customer prices from supplier prices sharing	2018-07-07 08:43:59 +02:00
Laurent Destailleur	45d1a14c8e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-06 16:10:37 +02:00
Laurent Destailleur	4db7e04523	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/class/html.formactions.class.php htdocs/loan/index.php	2018-07-06 16:09:32 +02:00
Laurent Destailleur	2a676b414a	Merge pull request #9024 from atm-maxime/fix_link_create_event Fix link to create event had no socid if from thirdparty card	2018-07-06 14:26:38 +02:00
Laurent Destailleur	2113965b57	Update html.formactions.class.php	2018-07-06 14:26:21 +02:00
Laurent Destailleur	05ed721a8c	Fix name of constant for module TICKET	2018-07-06 13:09:07 +02:00
BENKE Charlene	633bf3034f	new add total price on dashboard	2018-07-05 11:52:58 +02:00
ATM-Nicolas	59220c05e4	FIX : Select first mail model by default	2018-07-05 11:18:28 +02:00
Laurent Destailleur	f7b8e09268	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: .travis.yml	2018-07-03 13:53:34 +02:00
Laurent Destailleur	f93f5bd6e0	Fix travis	2018-07-03 13:49:41 +02:00
Laurent Destailleur	12c43d7722	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-03 12:33:17 +02:00
Laurent Destailleur	7ef6b16d31	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/install/step1.php	2018-07-03 10:04:25 +02:00
Laurent Destailleur	0138b0e0b7	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/class/html.form.class.php	2018-07-03 10:01:30 +02:00
Laurent Destailleur	4e7f9b1b4d	Merge pull request #9038 from hregis/8.0_multicompany Fix: possibility to overload permissions (multicompany sharing)	2018-07-02 16:12:40 +02:00
Laurent Destailleur	63f3143718	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-02 12:18:34 +02:00
Laurent Destailleur	dc69960b00	Code comment	2018-07-02 12:17:34 +02:00
Laurent Destailleur	7bf33b1bac	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/hrm/index.php htdocs/install/mysql/tables/llx_website_account.key.sql htdocs/modulebuilder/template/myobject_card.php	2018-07-02 12:16:51 +02:00
Laurent Destailleur	11021353da	Fix text in payment area of crabe pdf	2018-07-02 11:33:33 +02:00
Regis Houssin	9709207a4f	Fix: superadmin can show all users in master entity	2018-07-02 10:18:16 +02:00
Regis Houssin	df718cca5c	Fix: better sql request with multicompany transverse mode	2018-07-02 10:09:56 +02:00
Regis Houssin	233ad2945c	Fix: missing hook parameter	2018-07-01 20:03:08 +02:00
Regis Houssin	f13dd9c9bd	Fix: missing hook parameter	2018-07-01 18:22:18 +02:00
Regis Houssin	8f124efc15	Fix: wrong mysql resource name	2018-07-01 17:48:01 +02:00
Regis Houssin	df55bee8ae	Fix: missing "$disableremove" global	2018-07-01 15:33:10 +02:00
Laurent Destailleur	d8c7c61951	Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into hregis-8.0_canvas # Conflicts: # htdocs/product/canvas/product/tpl/list.tpl.php	2018-06-30 18:29:08 +02:00
Laurent Destailleur	ee2d543781	Merge pull request #8837 from delcroip/patch-modulebuilder-supportsellist NEW support selllist in the module builder	2018-06-30 15:33:17 +02:00
Regis Houssin	62a55e10b7	Fix: remove not used list template	2018-06-30 10:58:28 +02:00
Regis Houssin	3a26443546	Fix: remove unused code Conflicts: htdocs/product/list.php	2018-06-30 10:53:40 +02:00
Laurent Destailleur	f6774de773	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-30 02:00:46 +02:00
Laurent Destailleur	c6b650a7bb	Merge pull request #8789 from defrance/patch-116 NEW Add CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY and CONTRACT_HIDE_UNSELECTABLES by SELECT_HIDE_UNSELECTABLES	2018-06-30 01:23:09 +02:00
Laurent Destailleur	292d7967c3	Merge pull request #9021 from grandoc/8.0 Fix : Notice: A non well formed numeric value encountered line 509	2018-06-29 20:02:54 +02:00
Laurent Destailleur	9004a51880	Update conf.class.php	2018-06-29 20:02:40 +02:00
Laurent Destailleur	4ace9dd12d	Merge pull request #9015 from hregis/8.0_bug Fix: remove unused and blocking field	2018-06-29 19:58:25 +02:00
Laurent Destailleur	2175a012e1	Fix lang	2018-06-29 18:23:59 +02:00
Regis Houssin	2d13b5b59d	Fix: broken feature with edit in place	2018-06-29 15:57:34 +02:00
atm-ph	41a516f1c4	New parameter to transform select into multiselect	2018-06-29 11:48:54 +02:00
Laurent Destailleur	20c72c1ae4	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/main.inc.php	2018-06-29 00:22:15 +02:00
Laurent Destailleur	198deb92f6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-29 00:09:12 +02:00
Laurent Destailleur	66f0ee9e18	Fix hack with hook to solve a problem to let a chance of external modules to be visible to android webview.	2018-06-28 22:59:53 +02:00
Laurent Destailleur	60c62895bf	WIP Can add tooltips on extrafields	2018-06-28 19:13:23 +02:00
Maxime Kohlhaas	5756955d55	Fix link to create event had no socid if from thirdparty card	2018-06-28 14:27:59 +02:00
Philippe GRAND	a4ccb47b78	Fix : Notice: A non well formed numeric value encountered line 509	2018-06-28 12:18:03 +02:00
Laurent Destailleur	055d818069	FIX dashboard with IE10 not supporting flex	2018-06-28 12:09:13 +02:00
Laurent Destailleur	6fc6a743c8	Fix template email message html/nohtml	2018-06-27 12:11:49 +02:00
Laurent Destailleur	9eaca045e4	Fix default message with online payment link must be hidden when no online payment mode exists.	2018-06-27 11:34:40 +02:00
Regis Houssin	775e11ce33	Fix: wrong table name	2018-06-27 09:33:09 +02:00
Laurent Destailleur	ac758e02a9	Fix error message with old usage of childtables	2018-06-27 01:32:54 +02:00
Laurent Destailleur	8147152ec8	Fix look and feel v8	2018-06-26 11:25:28 +02:00
John	008163628a	New pdf documents using new column system	2018-06-26 08:03:25 +02:00
Laurent Destailleur	cbe682582e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-26 01:25:24 +02:00
Laurent Destailleur	5c93fa1bfb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/journals_list.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/other.lang	2018-06-26 01:25:03 +02:00
Laurent Destailleur	36402c22ee	FIX SQL Injections reported by mu shcor (ADLab of Venustech)	2018-06-25 14:06:09 +02:00
Laurent Destailleur	97976fbb43	Fix type of parameter must be string	2018-06-25 09:19:45 +02:00
Regis Houssin	a6729b0bd1	Fix: change field name and remove obsolete data	2018-06-25 09:10:24 +02:00
Laurent Destailleur	25b1d063ae	Fix length of hidden password	2018-06-24 11:45:10 +02:00
Laurent Destailleur	00165871bd	CSS	2018-06-23 15:10:44 +02:00
Laurent Destailleur	7daee6dc6b	A lot of fix of css and look and feel v8	2018-06-23 00:07:56 +02:00
Laurent Destailleur	88d3bf0148	FIX creation of tasks must hide closed project	2018-06-21 18:47:02 +02:00
Laurent Destailleur	75dee7538b	Fix add protection to avoir fatal error 500	2018-06-19 01:15:37 +02:00
Laurent Destailleur	5d5083199f	FIX better text content for multipart email	2018-06-18 23:26:21 +02:00
Laurent Destailleur	f9f7d3655d	FIX better text content for multipart email	2018-06-18 23:24:31 +02:00
Laurent Destailleur	c3f64ed36e	FIX better text content for multipart email	2018-06-18 23:18:22 +02:00
Laurent Destailleur	7c7ee56832	Fix missing email Fix avoid warning	2018-06-17 01:50:10 +02:00
Laurent Destailleur	910652eb6d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/card.php htdocs/langs/en_US/admin.lang	2018-06-13 23:07:30 +02:00
Laurent Destailleur	4c2af6fc70	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/html.form.class.php	2018-06-13 23:04:08 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
Laurent Destailleur	e18717aa85	Update html.formprojet.class.php	2018-06-13 22:12:16 +02:00
Laurent Destailleur	933a6a5ba3	Update html.formcontract.class.php	2018-06-13 22:11:44 +02:00
Laurent Destailleur	4b84b7ccf2	Merge pull request #8926 from fappels/develop_fix_setvaluefrom FIX commonobject setValueFrom trigger	2018-06-13 20:50:26 +02:00
Laurent Destailleur	03b6bec8b8	Fix email template for test	2018-06-13 17:03:46 +02:00
Laurent Destailleur	cfa69fe93f	FIX popup confirmation deos not accept value with special chars	2018-06-13 14:51:20 +02:00
Laurent Destailleur	50aa674ebc	Fix support of 'help' field property. Fix bad td closing.	2018-06-13 13:36:40 +02:00
Laurent Destailleur	f4bef82bfa	Fix td not closed and js code duplicated (at wrong place)	2018-06-13 13:00:08 +02:00
Laurent Destailleur	5ae1395acd	Fix js when no data	2018-06-11 14:22:01 +02:00
Laurent Destailleur	485dc9a57a	Clean code	2018-06-08 15:37:25 +02:00
Laurent Destailleur	929a44d7ca	Fix dir of contract for multicompany	2018-06-06 23:56:59 +02:00
Laurent Destailleur	d10c9cf565	FIX dir for modules must not have s at end (fix contracts into contract)	2018-06-06 23:47:48 +02:00
fappels	a9f60bcdac	fix travis	2018-06-06 22:04:12 +02:00
fappels	81ef355b65	Fix trigger on setValueFrom Load updated values into object for trigger.	2018-06-06 17:10:46 +02:00
gauthier	45ecb0258b	FIX : entity test must be on product_fourn_price table and not product table	2018-06-05 12:41:38 +02:00
Laurent Destailleur	8d62c06653	css	2018-06-05 11:25:41 +02:00
Laurent Destailleur	b6955692b4	Fix autofill of password	2018-06-05 11:22:00 +02:00
Laurent Destailleur	87d073b5cd	Fix conflict with external ticketsup module	2018-06-04 21:49:29 +02:00
Laurent Destailleur	5ff3398048	Try to fix evil Google Chrome autopopulate bug	2018-06-01 18:27:17 +02:00
Laurent Destailleur	b094ae953e	Better log	2018-06-01 17:20:49 +02:00
Laurent Destailleur	7eea70ebc8	FIX #8858 #8860 Backport better compatibility fix	2018-05-29 10:13:34 +02:00
Frédéric FRANCE	e2a557aadd	limit length of lines to 500 chars	2018-05-27 15:04:12 +02:00
patrick Delcroix	ef37fccef4	Merge origin/patch-modulebuilder-supportsellist into patch-modulebuilder-supportsellist	2018-05-26 23:43:17 +02:00
patrick Delcroix	adda3144bc	Fix Show double(x,y) fields	2018-05-26 23:39:36 +02:00
Laurent Destailleur	10281169e6	Empty page first	2018-05-25 15:43:08 +02:00
Laurent Destailleur	b246034670	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-25 14:57:43 +02:00
Laurent Destailleur	823936ef87	Merge pull request #8847 from frederic34/multipriceqty NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES	2018-05-25 12:55:02 +02:00
Laurent Destailleur	bcbe28d802	Code comment	2018-05-25 12:48:33 +02:00
Laurent Destailleur	f3713844ee	Update commonobject.class.php	2018-05-25 12:38:01 +02:00
Laurent Destailleur	770e97431b	Update commonobject.class.php	2018-05-25 12:36:38 +02:00
Laurent Destailleur	86b1904a41	Update commonobject.class.php	2018-05-25 12:33:30 +02:00
Laurent Destailleur	aa65b3f9ba	Merge pull request #8830 from wdammak/patch-8 Add liste_modeles to warehouse module	2018-05-25 11:43:48 +02:00
Laurent Destailleur	3d71ce8297	Update html.formfile.class.php	2018-05-25 11:19:38 +02:00
Laurent Destailleur	520ce99e56	Merge pull request #8828 from bgenere/develop FIX : showOptionals function is now consistent with template Extrafield_view.tpl.php	2018-05-25 11:17:45 +02:00
Laurent Destailleur	a3bea8d298	Update commonobject.class.php	2018-05-25 11:17:01 +02:00
Laurent Destailleur	22b1f2574e	Merge pull request #8851 from atm-florian/develop fix : avoid Notice: Undefined property: stdClass::$MAIN_FEATURES_LEVEL on upgrade.php page where global is not yet defined	2018-05-25 11:07:18 +02:00
Laurent Destailleur	ac0570f6b2	Update translate.class.php	2018-05-25 11:07:11 +02:00
Laurent Destailleur	fbcaf8872b	Merge pull request #8808 from atm-john/Add_table_thead_and_tbody Add table thead and tbody for object lines	2018-05-25 10:42:26 +02:00
delcroix Patrick	3158fdc551	Update commonobject.class.php	2018-05-24 21:20:34 +02:00
Laurent Destailleur	e51aa68284	Fix link to warehouses for events	2018-05-24 12:16:04 +02:00
florian HENRY	436a1001b3	fix : avoid Notice: Undefined property: stdClass::$MAIN_FEATURES_LEVEL on upgrade.php page where global is not yet defined	2018-05-24 10:56:01 +02:00
Frédéric FRANCE	8547827575	Merge remote-tracking branch 'upstream/develop' into multipriceqty	2018-05-23 17:06:02 +02:00
Frédéric FRANCE	efbb053e54	PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES	2018-05-23 17:05:08 +02:00
delcroix Patrick	c85d216f8e	Merge branch 'develop' into patch-modulebuilder-supportsellist	2018-05-22 22:24:20 +02:00
patrick Delcroix	29d26b6e89	New: support sellist in modulebuilder	2018-05-22 22:16:25 +02:00
patrick Delcroix	2ccaf1ad95	New: support sellist in modulebuilder	2018-05-22 22:00:20 +02:00
Laurent Destailleur	354198b31e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/societe/contact.php	2018-05-22 20:26:09 +02:00
Laurent Destailleur	f074daae48	Fix option MAIN_MAIL_ENABLED_USER_DEST_SELECT	2018-05-22 20:17:31 +02:00
Laurent Destailleur	2a579b707a	FIX javascript showempty error FIX Contact tab not visible when using canvas	2018-05-22 19:43:28 +02:00
wdammak	1f43882bb7	Add liste_modeles to warehouse module	2018-05-22 01:09:52 +01:00
Laurent Destailleur	de84f0e687	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/actions_massactions.inc.php htdocs/filefunc.inc.php	2018-05-21 23:35:09 +02:00
Laurent Destailleur	1b20ec05d1	Save translation	2018-05-21 19:37:47 +02:00
Laurent Destailleur	c141c3ecfd	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-21 19:35:26 +02:00
Laurent Destailleur	05c2f206ff	Fix missing lang	2018-05-21 19:35:12 +02:00
bgenere	227539d647	FIX : showOptionals function is now consistent with template Extrafield_view.tpl.php for date and datetime fields The jdate function is not called when not needed.	2018-05-21 16:55:35 +02:00
Laurent Destailleur	6d0306f75a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/class/html.formfile.class.php	2018-05-18 11:52:48 +02:00
Laurent Destailleur	492b1e7169	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-05-18 11:48:08 +02:00
Laurent Destailleur	e724cfd6a2	Merge pull request #8802 from atm-john/new_avoir_situation Add credit note compatibility with situation invoice.	2018-05-18 11:34:10 +02:00
Laurent Destailleur	a279451241	Fix can use actionmsg for generic trigger	2018-05-17 17:58:29 +02:00
John	8710cf570d	Add table thead and tbody for object lines	2018-05-17 16:52:16 +02:00
John	b01893d536	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull	2018-05-16 15:29:57 +02:00
Laurent Destailleur	ad32b3098a	Too verbose log	2018-05-16 10:31:44 +02:00
BENKE Charlene	4bebc8149b	Update html.formcontract.class.php	2018-05-13 21:17:15 +02:00
BENKE Charlene	f4af9ec22f	Update html.formcontract.class.php	2018-05-13 19:38:30 +02:00
BENKE Charlene	b0757916c4	Update html.formcontract.class.php	2018-05-13 16:59:03 +02:00
BENKE Charlene	2f1800f3e2	Update html.formprojet.class.php	2018-05-13 15:34:26 +02:00
BENKE Charlene	537048a10a	Update html.formcontract.class.php	2018-05-13 15:30:32 +02:00
Laurent Destailleur	a2d485c14f	Fix management of enabled property extrafields	2018-05-13 14:27:40 +02:00
Laurent Destailleur	302d9399e2	Fix search when using special char	2018-05-13 12:42:16 +02:00
Laurent Destailleur	53b5733fb4	Fix test	2018-05-12 13:40:53 +02:00
Laurent Destailleur	ee11a46a66	Merge pull request #8766 from fmarcet/develop NEW Add Date delivery and Availability on Propals List	2018-05-10 12:18:27 +02:00
Laurent Destailleur	d020741173	Merge pull request #8757 from bafbes/abb7004 New : Translate list elements in journal selection	2018-05-10 12:15:34 +02:00
Laurent Destailleur	0bf1fe2908	Merge pull request #8753 from delcroip/patch-15 new: log message for missing translation	2018-05-10 11:56:56 +02:00
Laurent Destailleur	f476e3e304	Update translate.class.php	2018-05-10 11:56:49 +02:00
Laurent Destailleur	842c6168a2	FIX #8762	2018-05-10 11:50:35 +02:00
Laurent Destailleur	56b80d81dd	Declare hook as addreplace hook	2018-05-10 11:39:29 +02:00
Ferran Marcet	70527e64c5	New: Add Date delivery and Availability on Propals List	2018-05-08 18:15:02 +02:00
Abbes Bahfir	fd9b6365a7	New : Translate list element in journal selection	2018-05-07 09:20:19 +01:00
delcroix Patrick	5ac2b51517	new: log message for missing traduction It's often difficult to find out the missing translation	2018-05-06 17:29:30 +02:00
Laurent Destailleur	546da0ceda	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/account.php htdocs/core/modules/modStock.class.php htdocs/product/inventory/list.php	2018-05-05 14:40:39 +02:00
Laurent Destailleur	9c68b81f59	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/accountancy/admin/account.php htdocs/projet/class/task.class.php	2018-05-05 14:34:54 +02:00
TuxGasy	12440e6a7e	Do not display multicurrency cols if currency of object is same as main currency	2018-05-02 11:30:35 +02:00
Laurent Destailleur	cb76d2ce0f	Better logging	2018-05-01 18:58:19 +02:00
florian HENRY	b5d7206519	fix 6.0 accountancy multientity	2018-05-01 12:02:33 +02:00
Laurent Destailleur	d975dd507b	Revert "No display object line curreny if not necessary"	2018-05-01 11:17:47 +02:00
Laurent Destailleur	32ace6a8cf	NEW Add hook setContentSecurityPolicy	2018-04-30 15:17:38 +02:00
Laurent Destailleur	4c12369a26	Debug module ticket	2018-04-30 10:33:36 +02:00
Laurent Destailleur	2fc2c44de4	Fix phpcs	2018-04-29 20:18:50 +02:00
Laurent Destailleur	0cdfd6800a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-29 20:11:47 +02:00
Laurent Destailleur	82a8513aed	Standardize code	2018-04-29 19:52:14 +02:00
Regis Houssin	2906358383	Fix: use "socpeople" instead "societe"	2018-04-27 10:42:10 +02:00
Laurent Destailleur	659fd46b76	Merge pull request #8653 from ATM-Marc/NEW_commonObject_array NEW: work on CommonObject 'array' field typeNew common object array	2018-04-27 09:39:26 +02:00
Laurent Destailleur	36616cdd50	FIX When time is entered without hour, edit keeps this	2018-04-26 10:07:27 +02:00
Laurent Destailleur	21a18da43b	We can disable the "favorites" in select combo of countries	2018-04-25 21:06:51 +02:00
Laurent Destailleur	9d070cac87	NEW Can add product in supplier order/invoice even w/o predefined price Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY, SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old behaviour.	2018-04-24 12:57:31 +02:00
florian HENRY	67329b8805	fix commonobject double style	2018-04-24 12:33:07 +02:00
Laurent Destailleur	fb8ad77378	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2018-04-23 23:09:53 +02:00
Laurent Destailleur	fdb3a11f34	FIX extrafields price and double were lost during a failed post.	2018-04-23 22:56:40 +02:00
Laurent Destailleur	0a5e606937	FIX extrafields price and double were lost during a failed post.	2018-04-23 22:53:57 +02:00
Laurent Destailleur	e9a2894727	Fix PSR2	2018-04-22 20:59:29 +02:00
Laurent Destailleur	32511422ab	Fix PSR2	2018-04-22 20:08:29 +02:00
Philippe GRAND	410d1ee07d	Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018	2018-04-21 12:05:50 +02:00
Laurent Destailleur	cca4b1cbf5	NEW Optimize load of hooks classes (save 1-5Kb of memory)	2018-04-21 11:24:45 +02:00
Philippe GRAND	be600690cd	Fix : Bad value for modulepart	2018-04-20 16:47:49 +02:00
Marc de Lima Lucio	39e890e2d7	FIX: handle non-js users	2018-04-20 16:43:27 +02:00
Marc de Lima Lucio	2bf66780cb	FIX: travis + code readability	2018-04-20 16:38:52 +02:00
Marc de Lima Lucio	41a0727481	NEW: work on CommonObject 'array' field type	2018-04-20 16:38:52 +02:00
Laurent Destailleur	d0efc41983	New support of option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD	2018-04-20 14:50:11 +02:00
Laurent Destailleur	6b90558b7a	FIX File name not visible in email preview	2018-04-20 11:20:56 +02:00
Laurent Destailleur	5f43ff3609	Fix no pitco if bank account not defined	2018-04-20 08:47:53 +02:00
Laurent Destailleur	bbd1257222	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-20 01:50:08 +02:00
Laurent Destailleur	e621daa61d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-20 01:47:54 +02:00
Laurent Destailleur	7a703e149f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-04-20 01:39:48 +02:00
Laurent Destailleur	c6a53ca25d	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/supplier_proposal/card.php	2018-04-20 01:39:26 +02:00
Laurent Destailleur	c10c962d3a	Merge pull request #8624 from inoveaconseil/patch-1 NEW add any predefined mail content	2018-04-20 01:31:37 +02:00
Laurent Destailleur	54154343b2	Merge pull request #8643 from ATM-Marc/FIX_7.0_commonobject_default FIX: CommonObject: don't require 'notnull' field if 'default' set	2018-04-20 01:28:00 +02:00
Laurent Destailleur	2f19ba11e5	Merge pull request #8637 from hregis/develop_ticket Fix: dolibarrize	2018-04-20 01:22:19 +02:00
Laurent Destailleur	558bda5f27	Fix translation of extrafields	2018-04-19 17:45:00 +02:00
Regis Houssin	5b79b76685	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ticket Conflicts: htdocs/core/class/html.formticketsup.class.php	2018-04-19 15:58:14 +02:00
Laurent Destailleur	0358e0f29f	Debug ticketsup	2018-04-19 15:11:26 +02:00
Laurent Destailleur	8acc752195	Debug ticket module	2018-04-19 14:44:21 +02:00
Marc de Lima Lucio	893ce55852	FIX: commonobject: don't require notnull field if default set	2018-04-19 10:29:48 +02:00
Laurent Destailleur	41be1c3d3d	Removed deprecated class (method setCookie already exists for that)	2018-04-19 10:22:08 +02:00
florian HENRY	882863ab48	fix : define in conf dir_output for suipplier_proposal modules	2018-04-18 16:21:20 +02:00
Marc de Lima Lucio	e88830820a	FIX: dont print empty date in CommonObject::showOutputField	2018-04-18 11:13:18 +02:00
Regis Houssin	ff76e60c49	Fix: some bugs and warnings	2018-04-18 10:13:20 +02:00
Regis Houssin	d841abd55a	Fix: missing value when reload	2018-04-18 09:37:29 +02:00
Regis Houssin	85c93c26a9	Fix: dolibarrize	2018-04-18 09:27:54 +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	46d28acb44	Look and feel v8	2018-04-18 02:10:23 +02:00
Inovea Conseil	d032280a96	NEW add any predefined mail content	2018-04-17 16:03:12 +02:00
Laurent Destailleur	2135365e0a	Bug new extrafields architecture	2018-04-17 14:44:55 +02:00
Laurent Destailleur	7bb8078b46	Fix translation of extrafields	2018-04-17 13:52:50 +02:00
Laurent Destailleur	1e0a660d24	More font awesome picto instead of img	2018-04-16 19:57:46 +02:00
Laurent Destailleur	106fb87d0a	NEW Can sort order of files in attach tab for leave and expensereport	2018-04-16 19:25:27 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	e2838aa074	NEW Show also size in bytes in tooltip if visible unit is not bytes	2018-04-15 17:58:13 +02:00
Laurent Destailleur	9e50bbb9b1	standardize code	2018-04-15 16:35:18 +02:00
Philippe GRAND	0a6bcb2a39	fix typo and translation	2018-04-15 07:37:23 +02:00
Philippe GRAND	7943a19402	fix typo	2018-04-15 07:07:04 +02:00
Laurent Destailleur	a0e243a29b	Clean code	2018-04-13 23:11:19 +02:00
Laurent Destailleur	3b202b2255	Merge branch 'develop' into develop_bug5	2018-04-13 22:23:14 +02:00
Laurent Destailleur	6f91b8019f	Remove warnings	2018-04-13 17:54:27 +02:00
Laurent Destailleur	4251748aca	Clean code	2018-04-13 16:18:33 +02:00
Laurent Destailleur	77a853e49d	Fix remove warning	2018-04-13 14:53:40 +02:00
Laurent Destailleur	9f5eed0c9a	Code comment	2018-04-13 14:12:31 +02:00
Laurent Destailleur	be965bdbab	Clean code	2018-04-13 13:28:48 +02:00
Laurent Destailleur	b68cded9c4	Clean code	2018-04-13 13:11:07 +02:00
Laurent Destailleur	fbae4429b7	Clean code for better extrafields management	2018-04-13 12:52:23 +02:00
Regis Houssin	e6ff852226	Fix: avoid Warning: Creating default object from empty value	2018-04-13 11:20:21 +02:00
Laurent Destailleur	78fcbe9633	FIX the extrafields separator was not translated	2018-04-13 10:48:29 +02:00
Laurent Destailleur	6e288fca75	Merge pull request #8575 from all3kcis/develop-patch-16 NEW Add files management on products lot	2018-04-13 00:57:13 +02:00
Laurent Destailleur	ace55ba569	Debug usage of extrafields for ticket module	2018-04-12 23:17:46 +02:00
Laurent Destailleur	3cecfd02c7	NEW Mutualize code for action="update_extras" NEW Can use setValueFrom without user modification field FIX Exclude separators from mandatory extrafields test More code to use the new framework array for extrafields Can use text condition in extrafield visibility	2018-04-12 23:16:23 +02:00
All-3kcis	f7e58f3c73	Add files management on products lot	2018-04-12 15:10:37 +02:00
Laurent Destailleur	dd022ee423	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-12 13:31:38 +02:00
Laurent Destailleur	ea2fd67e0d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/card.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/langs/de_DE/admin.lang	2018-04-12 13:31:14 +02:00
Laurent Destailleur	3df873ee06	Merge pull request #8562 from ATM-Marc/FIX_modulebuilder FIX: various modulebuilder-related issues	2018-04-11 18:01:04 +02:00
Laurent Destailleur	9ccba03a17	Update html.form.class.php	2018-04-11 18:00:34 +02:00
Laurent Destailleur	afdd504e16	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/accountancy/journal/sellsjournal.php	2018-04-11 17:58:21 +02:00
Laurent Destailleur	698f5c165a	Merge pull request #8430 from atm-florian/dev_mailtouser NEW : Can select from the user list into send form email (For field to and CC)	2018-04-11 17:55:40 +02:00
Laurent Destailleur	d7da83ebc5	Merge pull request #8560 from atm-john/Fix_extrafield_list_from_table_entity Fix extrafield entity query filter	2018-04-11 17:31:36 +02:00
Laurent Destailleur	e4f2e0ecbd	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-04-11 17:21:14 +02:00
Laurent Destailleur	590bc2948a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/bank/card.php htdocs/core/tpl/admin_extrafields_view.tpl.php	2018-04-11 17:20:49 +02:00
Laurent Destailleur	c70e0c1cda	FIX #8475 #8540	2018-04-11 17:14:34 +02:00
Laurent Destailleur	ca6b7205ef	Update commonobject.class.php	2018-04-11 16:27:56 +02:00
Laurent Destailleur	ab43d9d675	Merge pull request #8544 from ATM-Marc/FIX_odt_cond_reglement FIX: payment term doc-specific label was not used (issue #8414)	2018-04-11 14:52:06 +02:00
Laurent Destailleur	f54113b1a1	Merge pull request #8524 from frederic34/patch-10 FIX do not fill error with success message when using SwiftMailer	2018-04-11 13:19:04 +02:00
Laurent Destailleur	273eadab43	Merge pull request #8547 from ATM-Marc/NEW_linked_objects_orderby NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked (issue #7830)	2018-04-11 13:18:10 +02:00
Marc de Lima Lucio	c966cdbd47	FIX: selectForFormsList: entity checked even is object not multi-entity managed	2018-04-11 11:43:51 +02:00

... 13 14 15 16 17 ...

7061 Commits