71061 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laurent Destailleur	4946de9533	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/setup/codesniffer/ruleset.xml	2018-11-09 01:32:47 +01:00
Laurent Destailleur	9bced281db	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-09 01:28:47 +01:00
Laurent Destailleur	d827601857	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-09 01:25:35 +01:00
Laurent Destailleur	aad0b700d4	Fix travis	2018-11-09 01:22:56 +01:00
Laurent Destailleur	f889c9994b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-11-09 01:21:13 +01:00
Laurent Destailleur	0d6709c9f7	Update phpcs config	2018-11-09 01:20:57 +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	8a89da25c6	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/margin/tabs/thirdpartyMargins.php	2018-11-08 20:18:13 +01:00
Laurent Destailleur	400b48bd9b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-08 20:14:59 +01:00
Laurent Destailleur	9012f6ecc5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-08 20:14:40 +01:00
Laurent Destailleur	1b8649be6f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-08 20:14:02 +01:00
Laurent Destailleur	d6bd325f70	Merge pull request #9980 from atm-john/fix_supplier_order_list_socid ... FIX supplier order list keep socid	2018-11-08 20:13:52 +01:00
Laurent Destailleur	b26867c027	Merge pull request #9977 from ptibogxiv/patch-89 ... FIX API for document download	2018-11-08 20:09:08 +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	f919e6ddb0	Merge pull request #9971 from atm-gauthier/FIX_langs_projet ... FIX : OppStatusShort doesn't exists	2018-11-08 20:00:49 +01:00
Laurent Destailleur	76ac3bd457	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-08 19:57:42 +01:00
Laurent Destailleur	be788e6167	FIX responsive	2018-11-08 19:57:31 +01:00
Laurent Destailleur	b45ead7038	Merge pull request #9970 from OPEN-DSI/search-contact-by-town ... New Search Contact by Town	2018-11-08 19:55:51 +01:00
Laurent Destailleur	50bd8bc4ce	Merge pull request #9969 from grandoc/new_branch_07_11_2018 ... fix : missing translation	2018-11-08 19:55:25 +01:00
Laurent Destailleur	7430a35533	Merge pull request #9966 from madx666/contrib ... Fix public ticket website	2018-11-08 19:54:36 +01:00
Laurent Destailleur	e84e7f02c8	Merge pull request #9963 from atm-john/fix_marge_sign ... FIX marge sign	2018-11-08 19:37:52 +01:00
Laurent Destailleur	01baddb096	Merge pull request #9959 from hregis/8.0_bug ... FIX export only prices of the current entity !	2018-11-08 19:26:09 +01:00
Laurent Destailleur	d1aabf9566	Merge pull request #9976 from atm-john/fix_warning ... FIX Warning: count()	2018-11-08 19:25:32 +01:00
Laurent Destailleur	b6ffca01d2	Merge pull request #9973 from AXeL-dev/patch-2 ... remove useless line of code	2018-11-08 19:25:00 +01:00
Laurent Destailleur	ed76fef860	Merge pull request #9954 from LaurentBouquet/feature/product-search-barcode ... NEW Add product search from barcode via REST api.	2018-11-08 19:18:41 +01:00
Laurent Destailleur	5e705ae209	Merge pull request #9950 from grandoc/new_branch_04_11_2018 ... Clean and update code	2018-11-08 19:16:25 +01:00
Laurent Destailleur	78778e4c58	Merge pull request #9948 from frederic34/patch-9 ... FIX mode is only customer in stats fichinter	2018-11-08 19:16:00 +01:00
Laurent Destailleur	a50eb014ee	Merge pull request #9946 from ptibogxiv/patch-88 ... Fix with new stripe payment function	2018-11-08 19:13:38 +01:00
Laurent Destailleur	588de2cc86	Fix filter on entity on project	2018-11-08 18:45:02 +01:00
Laurent Destailleur	27dcf18637	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-08 18:43:31 +01:00
ptibogxiv	cf688a894b	Update api_documents.class.php	2018-11-08 17:20:12 +01:00
Laurent Destailleur	e92a63ba73	FIX If we change customer/supplier rule we can't edit old thirdparty.	2018-11-08 17:15:35 +01:00
Laurent BOUQUET	320e7adef7	Fix blank lines and whitespace at end of lines	2018-11-08 17:09:54 +01:00
Laurent BOUQUET	b03a91213f	Merge branch 'develop' into feature/product-search-barcode	2018-11-08 16:57:49 +01:00
Laurent BOUQUET	43aad33713	Merge remote-tracking branch 'upstream/develop' into develop	2018-11-08 16:57:09 +01:00
Laurent BOUQUET	360eb6eed6	Fix syntax error in 'htdocs\accountancy\admin\export.php' : Delete 'aZ09' text in line 45	2018-11-08 16:24:31 +01:00
Laurent Destailleur	6401a7ab06	Fix css	2018-11-08 16:03:10 +01:00
John BOTELLA	98548337ae	FIX supplier order list keep socid	2018-11-08 15:38:25 +01:00
ptibogxiv	8727435216	Update API for download ... more infos for easiest & better use of the generated file by API	2018-11-08 13:58:37 +01:00
Frédéric FRANCE	8bb1545ed0	Update index.php	2018-11-08 12:16:05 +01:00
Frédéric FRANCE	670eed1e68	Update index.php	2018-11-08 12:13:07 +01:00
John BOTELLA	7c4dad2728	FIX Warning: count()	2018-11-08 12:12:45 +01:00
Laurent Destailleur	224d37cfeb	Add bootstrap-iso class	2018-11-08 12:12:08 +01:00
Laurent Destailleur	c55f83b0b7	Fix multicompany filter missing	2018-11-08 11:25:29 +01:00
Laurent Destailleur	22170ac1c1	FIX Crop of large files was selecting wrong image area.	2018-11-08 10:45:39 +01:00
Laurent Destailleur	5bbf7e8f1d	Fix look and feel v8	2018-11-08 10:21:43 +01:00
Laurent Destailleur	c74ad61365	Fix look and feel v8	2018-11-08 10:04:25 +01:00
Laurent Destailleur	976516a796	Fix look and feel v8	2018-11-08 09:51:46 +01:00