Commit Graph

68347 Commits

Author SHA1 Message Date
ATM-Nicolas
3d179fb7d3 FIX : Fetch function will fetch comments 2018-04-24 09:17:03 +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
f95e5078c1 FIX Can't edit option PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY 2018-04-23 21:33:49 +02:00
Laurent Destailleur
00c8ea6c31 better message 2018-04-23 16:52:50 +02:00
Laurent Destailleur
4aa822d0f6 better message 2018-04-23 16:49:27 +02:00
Philippe GRAND
9e9d52a662 clean and update code 2018-04-23 16:23:30 +02:00
Philippe GRAND
bcf5c5d78a clean code 2018-04-23 16:04:52 +02:00
Thomas OURSEL
4fd0ab3f31 Merge remote-tracking branch 'upstream/develop' into develop 2018-04-23 15:57:09 +02:00
Philippe GRAND
11d739494d clean code 2018-04-23 15:51:21 +02:00
Frédéric FRANCE
657fa48c3f Update api_products.class.php 2018-04-23 15:31:55 +02:00
Thomas OURSEL
f402753fa3 Fix french holidays (Easter related) 2018-04-23 15:14:34 +02:00
Laurent Destailleur
315d5bad39 FIX Error in ContractLigne not return to Contract 2018-04-23 15:07:50 +02:00
Laurent Destailleur
77d9ff033a FIX cron script disabled if module disabled 2018-04-23 15:07:27 +02:00
Laurent Destailleur
01f76d0e08 FIX cron script disabled if module disabled 2018-04-23 15:06:30 +02:00
TuxGasy
6d552a2ae6 Add ordersupplierdispatch hook 2018-04-23 15:05:37 +02:00
Julien BARRET
8256bd1889 Fix Year selector issue in turnover statistics page 2018-04-23 11:39:34 +02:00
Laurent Destailleur
7065d16d85 FIX Error in ContractLigne not return to Contract 2018-04-23 10:35:11 +02:00
Laurent Destailleur
743f3d60f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-22 20:59:42 +02:00
Laurent Destailleur
e9a2894727 Fix PSR2 2018-04-22 20:59:29 +02:00
Laurent Destailleur
54979bf3b3 Merge pull request #8660 from grandoc/new_branch_22_04_2018
update code
2018-04-22 20:30:59 +02:00
Laurent Destailleur
6aa2ca7462 Merge pull request #8659 from aspangaro/8.0-a24
Fix Accountancy
2018-04-22 20:30:42 +02:00
Laurent Destailleur
ffa8b7379b Merge pull request #8658 from ptibogxiv/patch-26
fix getcountry
2018-04-22 20:29:31 +02:00
Laurent Destailleur
b049cf194d Fix PSR2 2018-04-22 20:17:27 +02:00
Laurent Destailleur
32511422ab Fix PSR2 2018-04-22 20:08:29 +02:00
Laurent Destailleur
e834eff049 FIX #8650 2018-04-22 20:03:24 +02:00
Laurent Destailleur
c5a3890526 Fix travis 2018-04-22 19:48:43 +02:00
Laurent Destailleur
db665cdfcd Fix travis 2018-04-22 19:43:24 +02:00
Laurent Destailleur
4ec77d396b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-22 19:38:36 +02:00
Laurent Destailleur
f9ed228e45 Fix travis file 2018-04-22 19:38:24 +02:00
Laurent Destailleur
ac89951acd Merge pull request #8647 from fmarcet/develop
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-22 19:35:09 +02:00
Laurent Destailleur
c3728add26 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-22 19:33:00 +02:00
Laurent Destailleur
1cd1368571 Fix travis file 2018-04-22 19:32:47 +02:00
Laurent Destailleur
68a0b45141 Merge pull request #8648 from grandoc/new_branch_20_04_2018
clean and update code
2018-04-22 19:31:46 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Laurent Destailleur
f513e3a179 Fix travis 2018-04-22 19:00:18 +02:00
Laurent Destailleur
fec9303d18 Remove useless $var 2018-04-22 18:51:03 +02:00
Laurent Destailleur
21add1c10b Try to use trusty fro travis 2018-04-22 18:43:28 +02:00
Laurent Destailleur
58fa42b347 Try to use trusty fro travis 2018-04-22 18:34:33 +02:00
Laurent Destailleur
7f8f55a54b Show version in travis settings 2018-04-22 18:12:19 +02:00
Laurent Destailleur
46e448a086 Fix default agenda view 2018-04-22 17:57:20 +02:00
Laurent Destailleur
6efb9f0ae0 Back to travis ok 2018-04-22 13:38:09 +02:00
Laurent Destailleur
49fcd70c5b Try fix travis 2018-04-22 13:15:35 +02:00
Laurent Destailleur
1a8fbb9700 Show apache default file 2018-04-22 12:55:09 +02:00
Laurent Destailleur
6394996cd5 Try to use Trusty 2018-04-22 12:37:01 +02:00
Laurent Destailleur
06cbc19103 Add meta generator in install pages 2018-04-22 12:10:53 +02:00
Laurent Destailleur
338bf9b05c Show travis test of server 2018-04-22 11:47:15 +02:00
Laurent Destailleur
fc7c9adec6 Test travis 2018-04-22 11:32:05 +02:00
Laurent Destailleur
f83369d268 Remove travis warnings 2018-04-22 11:27:26 +02:00