Commit Graph

75850 Commits

Author SHA1 Message Date
javierybar
114ddea54f Simplify terminal variables 2019-05-14 19:58:08 +02:00
Laurent Destailleur
9f8f45d5bc FIX Payment on supplier invoice should not mix credit note and standard
invoices.
2019-05-14 12:00:58 +02:00
Laurent Destailleur
49d65710ba Fix date missing 2019-05-14 10:31:11 +02:00
Laurent Destailleur
04f7261bfc Fix field date was not visible 2019-05-13 21:34:30 +02:00
Laurent Destailleur
278d4fdb8e Fix css 2019-05-13 20:55:05 +02:00
Laurent Destailleur
b63803e8ef Fix missing dir 2019-05-13 20:42:09 +02:00
Laurent Destailleur
f576d441bc FIX #11171
Upgrade Mobile_Detect. This
2019-05-13 19:53:04 +02:00
Laurent Destailleur
94387cd0e1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-13 12:28:25 +02:00
Laurent Destailleur
75646e365d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contrat/list.php
	htdocs/contrat/services_list.php
	htdocs/expensereport/list.php
	htdocs/product/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/projet/list.php
2019-05-13 12:28:16 +02:00
Laurent Destailleur
9242c1a630 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	ChangeLog
	htdocs/contrat/services_list.php
	htdocs/core/lib/files.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
2019-05-13 12:22:14 +02:00
Laurent Destailleur
1626c9fb6e
Merge pull request #11145 from atm-gauthier/8.0_fix_filename_with_two_spaces
FIX : use dol_sanitizeFileName() function to remove double spaces in …
2019-05-13 12:01:05 +02:00
Laurent Destailleur
c67d79a4e2
Update files.lib.php 2019-05-13 12:00:13 +02:00
Laurent Destailleur
30e08d8f9c
Merge pull request #11167 from andreubisquerra/master
TakePOS as stable
2019-05-13 11:43:17 +02:00
Laurent Destailleur
f0cdaff936 Fix status of crons 2019-05-13 10:26:30 +02:00
Laurent Destailleur
39c9efbc51 Fix remove non existing status 2019-05-13 10:23:09 +02:00
Laurent Destailleur
ec8b640182 Fix remove non existing status 2019-05-13 10:22:26 +02:00
Laurent Destailleur
8b0a0352e6 Fix responsive of help center 2019-05-13 09:47:58 +02:00
Laurent Destailleur
e84003d4ff Escape param 2019-05-13 09:29:34 +02:00
Laurent Destailleur
7a75567ad9 FIX Debug ticket module 2019-05-12 16:34:49 +02:00
Laurent Destailleur
5876582030 Fix responsive 2019-05-12 15:56:29 +02:00
Juanjo Menent
072a455ca4 Prepare 8.0.6 2019-05-11 22:55:42 +02:00
Juanjo Menent
7041c3246e Prepare 8.0.5 2019-05-11 22:35:56 +02:00
andreubisquerra
166ac1b8c2 TakePOS as stable as indicated in the Changelog 2019-05-11 21:33:26 +02:00
Juanjo Menent
40229c9d96
Merge pull request #11166 from simnandez/8.0
Merge branch '7.0' into 8.0
2019-05-11 18:06:20 +02:00
Juanjo Menent
f4ca6916cd Merge remote-tracking branch 'upstream/7.0' into 8.0
# Conflicts:
#	htdocs/contrat/services_list.php
#	htdocs/expensereport/list.php
#	htdocs/projet/list.php
2019-05-11 17:31:23 +02:00
Juanjo Menent
3a99ef7319 Fix: missing GETPOST params 2019-05-11 17:04:05 +02:00
Juanjo Menent
3ae2d71ea6 Fix: missing GETPOST params 2019-05-11 17:00:55 +02:00
Juanjo Menent
91ae365588 Fix: missing GETPOST params 2019-05-11 16:58:00 +02:00
Juanjo Menent
6206519456 Fix: missing GETPOST params 2019-05-11 16:54:56 +02:00
Juanjo Menent
2e6cb2afaa Fix: missing GETPOST params 2019-05-11 16:53:16 +02:00
Juanjo Menent
dc9f8a349f Fix: missing GETPOST params 2019-05-11 16:50:31 +02:00
Laurent Destailleur
f910d5ff55 Doc 2019-05-11 16:46:46 +02:00
Laurent Destailleur
1dda59dac1 Update changelog 2019-05-11 16:46:16 +02:00
Juanjo Menent
80ef97e215 FIX: #11025 2019-05-11 16:41:01 +02:00
Juanjo Menent
759427f6ac FIX: #11025 2019-05-11 16:36:35 +02:00
Juanjo Menent
81bf7d07e3 Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-05-11 16:32:02 +02:00
Laurent Destailleur
9ea42c85cb Prepare ChangeLog v10 2019-05-11 15:11:47 +02:00
Laurent Destailleur
f91cc2e2d3 Prepare beta 2019-05-11 14:36:19 +02:00
Laurent Destailleur
a664cd6461 Fix check when uploading a non image as user photo 2019-05-10 20:09:41 +02:00
Laurent Destailleur
cc64e3e5c0 Fix responsive 2019-05-10 19:38:08 +02:00
Laurent Destailleur
3def11d5c9 Standardize translation 2019-05-10 19:32:46 +02:00
Laurent Destailleur
1206e465d9 Fix function name 2019-05-10 18:19:10 +02:00
Laurent Destailleur
0bd4c61009 Fix default setup of module workflow was not set 2019-05-10 18:15:09 +02:00
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