Commit Graph

76543 Commits

Author SHA1 Message Date
Abbes Bahfir
1079535894 Fix:modulebuilder output folder 2019-06-19 17:57:17 +01:00
Laurent Destailleur
45f11f1033 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-19 15:56:23 +02:00
Laurent Destailleur
c3b8582076 Fix use of deprecated function 2019-06-19 15:55:18 +02:00
Laurent Destailleur
c5edf85bb6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-19 15:52:09 +02:00
Laurent Destailleur
daa8b43732 css 2019-06-19 15:51:48 +02:00
Laurent Destailleur
04f2fb604f Fix duplicate 'option_' in prefix 2019-06-19 15:48:37 +02:00
Laurent Destailleur
2034faf280 Fix duplicate 'option_' in prefix 2019-06-19 15:48:04 +02:00
Laurent Destailleur
a11c816a17 Fix tooltip 2019-06-19 14:24:48 +02:00
Laurent Destailleur
f32b2e9f1f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/includes/odtphp/odf.php
2019-06-19 13:18:01 +02:00
Laurent Destailleur
8e8199cc0f Fix scrutinizer 2019-06-19 13:17:02 +02:00
Laurent Destailleur
df8fff843c Standardize code 2019-06-19 13:16:46 +02:00
Laurent Destailleur
f9cc120d75 Debug module ticket 2019-06-19 12:53:28 +02:00
Laurent Destailleur
7afcdb46eb Debug module ticket 2019-06-19 12:10:05 +02:00
Laurent Destailleur
53923a8581 Fix scrutinizer warnings 2019-06-18 20:21:22 +02:00
Laurent Destailleur
663998bab1 Fix scrutinizer errors 2019-06-18 20:15:04 +02:00
Laurent Destailleur
525598f6aa Fix scrutinizer warnings 2019-06-18 20:01:28 +02:00
Laurent Destailleur
ec71a3efa3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-18 18:08:22 +02:00
Laurent Destailleur
f3703c8805 Fix phpcs 2019-06-18 18:07:47 +02:00
Laurent Destailleur
2e1eb29ca0 Fix rendering of amount 2019-06-18 17:43:08 +02:00
Laurent Destailleur
c000d897d7 Fix rendering of amount 2019-06-18 17:42:45 +02:00
Laurent Destailleur
13abfc3140 Code comment 2019-06-18 16:46:12 +02:00
Laurent Destailleur
1dc247705d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/expensereport/list.php
	htdocs/holiday/list.php
2019-06-18 16:11:16 +02:00
Laurent Destailleur
ae00743590 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-18 16:04:48 +02:00
Laurent Destailleur
81bca34a08 FIX A user may read holiday and expense report without permissions 2019-06-18 16:04:25 +02:00
Laurent Destailleur
6e9874b95a FIX A user may read holiday and expense report without permissions 2019-06-18 16:01:24 +02:00
Laurent Destailleur
6afda6a47a FIX invalid link on user.fk_user 2019-06-18 15:57:22 +02:00
Laurent Destailleur
6bda130835 Protect from dir scan 2019-06-18 14:51:57 +02:00
Laurent Destailleur
2a7ed44c72 Merge 2019-06-18 14:35:02 +02:00
Laurent Destailleur
27f52dd0bd Fix columns in csv 2019-06-18 14:32:35 +02:00
Laurent Destailleur
ad20a5158c Fix columns in csv 2019-06-18 14:32:28 +02:00
Laurent Destailleur
8835b49f3f Debug the accounting-file tool 2019-06-18 14:30:13 +02:00
Laurent Destailleur
3b69fe1707 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-17 18:45:10 +02:00
Laurent Destailleur
0123a18ff8 Look and feel v10 2019-06-17 18:44:08 +02:00
Laurent Destailleur
42e58d9ea5 Fix preview of interventions 2019-06-17 18:38:14 +02:00
Laurent Destailleur
a6d4475aff Fix scrutinizer 2019-06-17 18:24:45 +02:00
Laurent Destailleur
bde49e05e7 Fix doc 2019-06-17 18:23:38 +02:00
Laurent Destailleur
4acc48eec9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-17 18:17:09 +02:00
Laurent Destailleur
e6f24357e7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/projet/tasks/time.php
2019-06-17 18:16:32 +02:00
Laurent Destailleur
f6f8692711 Fix phpcs 2019-06-17 18:12:28 +02:00
Laurent Destailleur
f6f66f2a77 Fix syntax error 2019-06-17 18:11:38 +02:00
Laurent Destailleur
08d5ca4ddb Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
Laurent Destailleur
2fab35c287 Debug page to export file 2019-06-17 17:20:22 +02:00
Laurent Destailleur
4f2d6367b8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/projet/tasks/time.php
2019-06-17 16:02:59 +02:00
Laurent Destailleur
6966a854b0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/projet/tasks/time.php
2019-06-17 15:59:52 +02:00
Laurent Destailleur
dac99c878c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/projet/tasks/time.php
2019-06-17 15:57:06 +02:00
Laurent Destailleur
a74eaaff4d Fix sort of linked elements 2019-06-17 15:54:54 +02:00
Laurent Destailleur
cf82587504 Fix menu entry 2019-06-17 15:02:44 +02:00
Laurent Destailleur
8330078de1 Fix default value 2019-06-17 12:33:09 +02:00
Laurent Destailleur
157526205d Fix css 2019-06-16 23:00:40 +02:00
Laurent Destailleur
c0a30d1ff5 FIX #11325 FIX #5249
Conflicts:
	htdocs/projet/tasks/time.php
2019-06-16 22:21:38 +02:00