Commit Graph

72480 Commits

Author SHA1 Message Date
Frédéric FRANCE
9c95940bfd Update .travis.yml 2018-11-30 22:12:37 +01:00
Maxime Kohlhaas
5dcb3d2a1f Fix extrafields in import tool 2018-11-30 19:23:05 +01:00
Frédéric FRANCE
c2a9e51a80 Update .travis.yml 2018-11-30 19:09:05 +01:00
Frédéric FRANCE
49fc41661b Update .travis.yml 2018-11-30 19:01:03 +01:00
Frédéric FRANCE
3c2de0f82e check dav compatibility with php 5.4 2018-11-30 18:44:12 +01:00
Laurent Destailleur
2dc6351593 Fix website import 2018-11-30 15:16:17 +01:00
Inovea Conseil
ad7117be60 FIX mass action closed proposal 2018-11-30 15:05:28 +01:00
Inovea Conseil
46f5e7b06b Merge remote-tracking branch 'Dolibarr/develop' into MassClose 2018-11-30 15:00:25 +01:00
Laurent Destailleur
7a4c1cddc8 Fix save master file of a website 2018-11-30 14:46:44 +01:00
Laurent Destailleur
e8d29c644b Fix grab web site 2018-11-30 14:30:00 +01:00
Laurent De Coninck
0f45ed0a8c fix docker image creation + xdebug
Fix the PHP image creation + adding xdebug

[see: X]
2018-11-30 13:04:06 +01:00
Laurent Destailleur
94c2d7194c Trans Website 2018-11-30 12:41:35 +01:00
Laurent Destailleur
034c846ce2 Typo 2018-11-30 12:38:16 +01:00
Laurent Destailleur
4260d5765f Fix bad trans key 2018-11-30 11:50:32 +01:00
Laurent Destailleur
f82e97d6aa Typo 2018-11-30 11:26:15 +01:00
Laurent Destailleur
00865c6e0a Fix travis 2018-11-30 11:15:03 +01:00
Laurent Destailleur
6fbf292a95 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-11-30 11:01:36 +01:00
Laurent Destailleur
dd357d167a Update ChangeLog 2018-11-30 11:00:42 +01:00
ptibogxiv
e8bdb580ab Fix trans 2018-11-29 14:00:27 +01:00
ptibogxiv
310dc46113 Update list.php 2018-11-29 13:44:42 +01:00
ptibogxiv
31e3b82ca6 Fix duration display product/service in list.php 2018-11-29 13:44:10 +01:00
Laurent Destailleur
539d993666 Fix translation of month 2018-11-29 12:20:47 +01:00
Laurent Destailleur
bbfd134733 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-29 11:24:18 +01:00
Laurent Destailleur
ea3e58a390 Merge pull request #10090 from hregis/8.0_bug3
FIX remove constant for avoid problem
2018-11-29 11:18:29 +01:00
Laurent Destailleur
d5c28a76d8 Merge pull request #10079 from aljawaid/aljawaid-fix_payment_type
FIX: Display All Types of Payments on Expense Report Card
2018-11-29 11:17:31 +01:00
Laurent Destailleur
d8ab614efb Merge pull request #10088 from ATM-Marc/FIX_7.0_select_type_actions
FIX: form actions: select_type_actions could be too small + bad $db init
2018-11-29 11:16:57 +01:00
Laurent Destailleur
b15403207b Merge pull request #10077 from aspangaro/9.0p1
Fix create accounting account from balance
2018-11-29 11:16:27 +01:00
Laurent Destailleur
950dfeef58 Merge pull request #10081 from oscim/patch-1
Update company.lib.php
2018-11-29 11:15:52 +01:00
Laurent Destailleur
f3ce49806d Update company.lib.php 2018-11-29 11:15:27 +01:00
Laurent Destailleur
163bc3784e Merge pull request #10076 from ptibogxiv/patch-96
Fix retrieve Donation newpayment.php
2018-11-29 11:14:33 +01:00
Laurent Destailleur
9e20d9e847 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-29 11:03:16 +01:00
Laurent Destailleur
10fc0149d8 responsive 2018-11-29 11:03:02 +01:00
Laurent Destailleur
6e21b372d1 Merge pull request #10094 from defrance/patch-125
Duplicate declaration of $object
2018-11-29 10:58:36 +01:00
Laurent Destailleur
ef3a280f40 Merge pull request #10082 from grandoc/new_branch_26_11_2018
fix typo error
2018-11-29 10:57:48 +01:00
Laurent Destailleur
a460452101 Merge pull request #10086 from bafbes/abb80044
fix: Access to global $conf needed
2018-11-29 10:57:21 +01:00
Laurent Destailleur
05f1e5f16b Merge pull request #10089 from grandoc/new_branch_28_11_2018
FIX: bad URL
2018-11-29 10:57:08 +01:00
Laurent Destailleur
2808876904 Merge pull request #10084 from grandoc/new_branch_27_11_2018
fix : typo error
2018-11-29 10:56:53 +01:00
BENKE Charlene
10bf7bdc95 Duplicate declaration of $object
Already present line 126
2018-11-29 10:29:04 +01:00
Laurent Destailleur
c5bd11951f Fix bar not visible on some screen 2018-11-29 02:09:07 +01:00
Laurent Destailleur
bfc2f6e84c Add template 2018-11-29 00:48:47 +01:00
Laurent Destailleur
af2150a427 CSS 2018-11-29 00:45:15 +01:00
Laurent Destailleur
3c0ff40e43 Fix trans 2018-11-29 00:41:12 +01:00
Laurent Destailleur
619ec1f0cb Fix trans 2018-11-29 00:40:18 +01:00
Laurent Destailleur
3650543749 CSS 2018-11-28 22:51:24 +01:00
Laurent Destailleur
23126fe49a CSS 2018-11-28 17:14:13 +01:00
Regis Houssin
b4aa9ee335 FIX remove constant for avoid problem 2018-11-28 17:04:42 +01:00
Laurent Destailleur
ca1f9c7e60 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/don/class/don.class.php
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/sendings.lang
	htdocs/langs/es_ES/stocks.lang
2018-11-28 16:57:39 +01:00
Laurent Destailleur
b9c08853be CSS 2018-11-28 16:54:21 +01:00
Philippe GRAND
2b6810e2ab FIX: bad URL 2018-11-28 16:37:49 +01:00
Laurent Destailleur
28902e18ee Fix for screen with antiblue system 2018-11-28 16:32:53 +01:00