Commit Graph

89109 Commits

Author SHA1 Message Date
Laurent Destailleur
019cbc501d Report a better error message when db is offline. 2019-08-16 22:44:02 +02:00
Laurent Destailleur
db220d25c2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-16 21:48:53 +02:00
Laurent Destailleur
467ad3ed22 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/product/stock/card.php
2019-08-16 21:48:46 +02:00
Laurent Destailleur
898996da4a FIX vulenrability in uploading file found by 美创科技安全实验室 2019-08-16 21:45:13 +02:00
Laurent Destailleur
7d51a65401
Merge pull request #11629 from andreubisquerra/master
Add contextpage hidden input to preserve contexpage in customer search form
2019-08-16 17:50:52 +02:00
Laurent Destailleur
9799153171
Merge pull request #11695 from jtraulle/fix-11683
Fix #11683 Correct links to create a new product or service from search results
2019-08-16 17:49:55 +02:00
Laurent Destailleur
646094d493
Merge pull request #11698 from jtraulle/fix-11682
Fix #11682 Missing origin object ref and thirdparty ref in future bank entries
2019-08-16 17:38:03 +02:00
Laurent Destailleur
d51a651ab4 Fix phpcs 2019-08-16 17:35:12 +02:00
Laurent Destailleur
ee50c41e74 Fix phpcs 2019-08-16 17:34:23 +02:00
Laurent Destailleur
48125fd957 Fix phpcs 2019-08-16 17:32:58 +02:00
Laurent Destailleur
84f27bef23 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-16 17:04:35 +02:00
Laurent Destailleur
a746075dbe Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2019-08-16 17:04:28 +02:00
Laurent Destailleur
1e93d3d790 Prepare v10.0.2 2019-08-16 17:03:11 +02:00
Laurent Destailleur
6a5e675481
Add SECURITY.md file 2019-08-16 16:59:51 +02:00
Laurent Destailleur
b63c4b74b8 Code comment 2019-08-16 16:56:28 +02:00
Laurent Destailleur
9692ea5faf FIX #11671 CVE-2019-15062 2019-08-16 16:41:53 +02:00
Jean Traullé
13604b3571
Fix code style / CI. 2019-08-16 11:55:40 +02:00
Jean Traullé
e0310b5d9b
Fix #11682 Missing origin object ref and thirdparty ref in future bank entries 2019-08-16 11:38:42 +02:00
Laurent Destailleur
d850b8a262 More neutral color 2019-08-16 07:02:10 +02:00
Laurent Destailleur
63e590810b Still too agressive 2019-08-16 06:51:32 +02:00
Laurent Destailleur
b8cc00eb66 Colors for graph are same by defaul than flashy, but less flashy. 2019-08-16 06:43:36 +02:00
Laurent Destailleur
23b1c24bf7 Fix template 2019-08-16 06:28:25 +02:00
Laurent Destailleur
e61f883561 Color 2019-08-16 06:25:58 +02:00
Laurent Destailleur
1f2eb31e41 Set utf-8 in lowercase 2019-08-16 06:06:36 +02:00
Laurent Destailleur
318b27e084 Fix link 2019-08-16 05:33:45 +02:00
Laurent Destailleur
63520e1d9b Fix link 2019-08-16 05:32:24 +02:00
Laurent Destailleur
62438b61f0 Better error message 2019-08-16 05:14:20 +02:00
Laurent Destailleur
9a455cf1d6 Fix link 2019-08-16 05:03:48 +02:00
Laurent Destailleur
d5ce7fbaaf Fix links 2019-08-16 05:01:54 +02:00
Laurent Destailleur
7580efbd4e Fix link replacement 2019-08-16 04:32:06 +02:00
Laurent Destailleur
2510c1e5e4 Better help text 2019-08-16 03:05:55 +02:00
Laurent Destailleur
08038e5078 FIX save of empty files 2019-08-16 02:31:06 +02:00
Laurent Destailleur
d70e6e4e9a Fix record file with empty name 2019-08-16 02:17:33 +02:00
Laurent Destailleur
31c26edaf7 Fix link 2019-08-16 00:31:55 +02:00
Laurent Destailleur
bf6f92edf8 Fix template 2019-08-15 23:54:33 +02:00
Laurent Destailleur
0045428c6c Fix link 2019-08-15 23:45:28 +02:00
Laurent Destailleur
8874a0f3c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-15 23:39:11 +02:00
Laurent Destailleur
386f929fe3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/website.lib.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
2019-08-15 23:39:02 +02:00
Jean Traullé
6a2d37c5c8
Fix code style / CI. 2019-08-15 22:49:21 +02:00
Jean Traullé
4bed1b9a3d
Fix #11683 Correct links to create a new product or service from search results 2019-08-15 22:21:31 +02:00
Laurent Destailleur
b8406f842d
Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list
Fix total on list and amount opened on thirdparty card (for supplier)
2019-08-15 21:14:03 +02:00
Laurent Destailleur
6430c74793
Merge pull request #11168 from hregis/develop_menu
NEW add new function "setEntity()" and better compatibility with Multicompany
2019-08-15 21:00:05 +02:00
Laurent Destailleur
b0f0f655e9 Update doc 2019-08-15 20:46:53 +02:00
Laurent Destailleur
3defd346e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-15 20:42:58 +02:00
Laurent Destailleur
163ae6d81a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-15 20:42:51 +02:00
Laurent Destailleur
12e6dabc43 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-15 20:41:56 +02:00
Laurent Destailleur
64e52789d6 FIX #11591 FIX #11592 2019-08-15 20:39:47 +02:00
Laurent Destailleur
fa53641221
Merge pull request #11551 from atm-quentin/NEW_global_search_product
NEW Add hidden option to set fields for the quick search on products
2019-08-15 20:26:05 +02:00
Laurent Destailleur
56bc7b62ff
Update products.lang 2019-08-15 20:25:08 +02:00
Laurent Destailleur
a8afb4549a
Merge pull request #11634 from fmarcet/9.0
FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field
2019-08-15 20:22:27 +02:00