Commit Graph

75804 Commits

Author SHA1 Message Date
Laurent Destailleur
aaeb7dc9d6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/holiday.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
2019-05-10 17:45:33 +02:00
Laurent Destailleur
eed2b97913 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-10 17:40:53 +02:00
Laurent Destailleur
069df82380 FIX javascript error when ckeditor module not enabled 2019-05-10 17:40:34 +02:00
Laurent Destailleur
24aa7a84d6
Merge pull request #11164 from hregis/develop_mc
FIX try to fix phpcs error
2019-05-10 17:09:13 +02:00
Regis Houssin
10da976b93 FIX try to fix phpcs error 2019-05-10 16:37:03 +02:00
Laurent Destailleur
7712c54eb9
Merge pull request #11162 from hregis/develop_menu
FIX wrong permissions in products/services menu
2019-05-10 16:31:20 +02:00
Laurent Destailleur
a92e29856a
Merge pull request #11158 from hregis/develop_mc
FIX possibility to override permissions (multicompany)
2019-05-10 16:30:16 +02:00
Laurent Destailleur
1c3bcea1f9
Merge pull request #11157 from ptibogxiv/patch-180
Fix img_credit_card with payment methods
2019-05-10 16:28:52 +02:00
Laurent Destailleur
14ccf152d8
Merge pull request #11156 from ptibogxiv/patch-179
Fix list of webhook for stripe
2019-05-10 16:28:25 +02:00
Laurent Destailleur
46ecdb8d4d
Merge pull request #11155 from simnandez/9.0
FIX: #11097
2019-05-10 16:27:59 +02:00
Laurent Destailleur
95326c3d63
Update list.php 2019-05-10 16:27:38 +02:00
Laurent Destailleur
02b8e77df2 Fix responsive 2019-05-10 16:14:05 +02:00
Regis Houssin
9a6029b1d9 FIX disable phpcs 2019-05-10 16:12:16 +02:00
Regis Houssin
449117ba52 FIX missing service 2019-05-10 15:53:49 +02:00
Regis Houssin
97de84d1e7 FIX wrong permissions in products/services menu 2019-05-10 15:48:48 +02:00
Laurent Destailleur
9de0e69456 FIX column project into list 2019-05-10 15:11:06 +02:00
Laurent Destailleur
22c548e80b Fix sql 2019-05-10 14:46:43 +02:00
Laurent Destailleur
14b11b3cc5 Prepare 9.0.4 2019-05-10 14:43:01 +02:00
Laurent Destailleur
5625c94c44 Fix missing label on project tooltip 2019-05-10 14:40:15 +02:00
Laurent Destailleur
0e8184332e Fix missing label on project tooltip 2019-05-10 14:39:05 +02:00
Laurent Destailleur
7d2d12348c Fix popup 2019-05-10 14:27:48 +02:00
Laurent Destailleur
0e7be8365c Fix size of box 2019-05-10 14:22:07 +02:00
Laurent Destailleur
71ba368d57 Fix phpdoc 2019-05-10 14:02:45 +02:00
Laurent Destailleur
cd8f601cdc Fix length of vat number 2019-05-10 14:01:11 +02:00
Regis Houssin
2ce96290eb FIX broken feature !! 2019-05-10 11:50:01 +02:00
Regis Houssin
de84f12b24 FIX broken feature with ldap trigger !!! 2019-05-10 11:47:44 +02:00
Regis Houssin
8a29d9f2d1 FIX possibility to override permissions (multicompany) 2019-05-10 11:23:19 +02:00
Laurent Destailleur
c12a45597d Fix move .lockdb into root dir 2019-05-10 09:57:15 +02:00
Laurent Destailleur
e87a32e92f Fix Try to fix DAV pb with some buggy clients by disabling browser 2019-05-10 09:53:10 +02:00
Laurent Destailleur
00f6265870 Fix responsive 2019-05-10 09:33:21 +02:00
ptibogxiv
f50280f13b
Fix img_credit_card with payment methods 2019-05-10 01:16:58 +02:00
ptibogxiv
5e06a2497d
Fix list of webhook for stripe 2019-05-10 00:39:34 +02:00
Laurent Destailleur
6cb96b926b Fix phpcs 2019-05-09 21:34:22 +02:00
Juanjo Menent
2df026b903 FIX: #11032 2019-05-09 20:59:22 +02:00
Juanjo Menent
e36df726a1 Merge remote-tracking branch 'upstream/9.0' into 9.0 2019-05-09 20:42:04 +02:00
Juanjo Menent
2b182c1cc1 FIX: #11097 2019-05-09 20:39:30 +02:00
Laurent Destailleur
bc49f47718 Fix phpcs 2019-05-09 19:48:13 +02:00
Laurent Destailleur
d8c1c24028 Fix syntax error 2019-05-09 19:46:10 +02:00
Laurent Destailleur
314dc26b87 Look and feel v10 2019-05-09 19:32:19 +02:00
Laurent Destailleur
acc57343a9 Trans 2019-05-09 18:34:10 +02:00
Laurent Destailleur
78c4a3cced Fix lang 2019-05-09 18:33:50 +02:00
Laurent Destailleur
2ff81cd262 Fix duplicate key 2019-05-09 18:08:23 +02:00
Laurent Destailleur
c3d80b217b Fix css 2019-05-09 18:00:40 +02:00
Laurent Destailleur
a5b1de4f6a Fix tab that should not be visible 2019-05-09 17:52:55 +02:00
Laurent Destailleur
a1f0df9a30 Debug receipt module 2019-05-09 17:45:16 +02:00
Laurent Destailleur
cdebca14a7 Fix migration 2019-05-09 17:32:13 +02:00
Laurent Destailleur
46b0545c4a Debug module reception 2019-05-09 17:26:06 +02:00
Laurent Destailleur
1c558c685c Fix class not found 2019-05-09 17:16:35 +02:00
Laurent Destailleur
a94c291b76 Dolibarization 2019-05-09 16:59:06 +02:00
Laurent Destailleur
b8f2f957bf Sync transifex 2019-05-09 16:58:31 +02:00