Commit Graph

76509 Commits

Author SHA1 Message Date
Regis Houssin
fd263cb316 FIX add v10 in virtualmin script 2019-06-18 07:15:59 +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
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
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
Laurent Destailleur
dd5e42e325 FIX #11325 FIX #5249 2019-06-16 22:17:04 +02:00
Laurent Destailleur
f833dc1176
Merge pull request #11341 from frederic34/patch-5
missing translation in agenda.lang
2019-06-16 17:27:26 +02:00
Laurent Destailleur
a6c5dc9a46
Merge pull request #11346 from ptibogxiv/patch-189
Fix add / delete contact access in order API
2019-06-16 17:26:50 +02:00
Laurent Destailleur
4f03d4f642
Merge branch '10.0' into patch-189 2019-06-16 17:26:41 +02:00
Laurent Destailleur
badfd47ee7 Fix migration 2019-06-16 17:25:42 +02:00
Laurent Destailleur
5a4f2fa0b3
Merge pull request #11342 from simnandez/9.0
FIX: #11335
2019-06-16 17:25:02 +02:00
Laurent Destailleur
efb9a30ec1 Fix compatibility with payment modes 2019-06-16 17:17:07 +02:00
Laurent Destailleur
48b2cb83af Close #11152 by a manual merge to keep only required things 2019-06-16 17:08:23 +02:00
ptibogxiv
651f4158ac
Fix add / delete contact access 2019-06-16 14:18:26 +02:00
Laurent Destailleur
6760368b64
Merge pull request #11343 from ptibogxiv/patch-188
Fix bom sql
2019-06-14 18:59:32 +02:00
Juanjo Menent
a73ae49c4d FIX: #11296 2019-06-14 18:56:30 +02:00
ptibogxiv
d838ced12e
Update 9.0.0-10.0.0.sql 2019-06-14 18:41:38 +02:00
ptibogxiv
cd5c2c3249
Update llx_bom_bom.sql 2019-06-14 18:39:05 +02:00
Juanjo Menent
8afffc8762 FIX: #11335 2019-06-14 18:28:01 +02:00
Frédéric FRANCE
baf95c3c86
Update agenda.lang 2019-06-14 16:47:53 +02:00
Laurent Destailleur
bc8c7e0d4f Code comment 2019-06-14 15:03:37 +02:00
Laurent Destailleur
3585a5161c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-14 13:58:28 +02:00
Laurent Destailleur
a7ca177100 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-14 13:58:19 +02:00
Laurent Destailleur
239e41f6c4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-14 13:57:49 +02:00
Laurent Destailleur
1d2c9c9df4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-14 13:57:23 +02:00
Laurent Destailleur
a163623dc6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-14 13:57:17 +02:00
Laurent Destailleur
122c4eb8bd
Merge pull request #11337 from atm-john/10.0_fix_dolGetButtonAction
FIX empty test
2019-06-14 13:51:34 +02:00
Laurent Destailleur
5cada6ee0b
Merge pull request #11336 from ptibogxiv/patch-186
Fix measuring_units_string display function
2019-06-14 13:48:31 +02:00
Laurent Destailleur
1fa1b91916
Update product.lib.php 2019-06-14 13:46:59 +02:00
Laurent Destailleur
e6c28188db
Update product.lib.php 2019-06-14 13:38:52 +02:00
Laurent Destailleur
e6b6246fea
Merge pull request #11334 from atm-florianm/8.0_FIX-print-dictionaries-escape
FIX: in edit mode, dictionary inputs do not escape the string inside …
2019-06-14 13:36:06 +02:00
Laurent Destailleur
5bac3d4d2b
Merge pull request #11332 from atm-gauthier/7.0_fix_syntax_error
FIX : syntax error
2019-06-14 13:35:40 +02:00
Laurent Destailleur
e8b139d1c6 Fix repeated logs and fetch 2019-06-13 22:48:31 +02:00
ATM john
e7d81a68f0 Fix Override Attribute 2019-06-13 22:11:47 +02:00
Laurent Destailleur
ff1adb3934 Fix dead code 2019-06-13 22:11:25 +02:00
ATM john
0ef9a8843a Fix empty test 2019-06-13 21:57:30 +02:00
ptibogxiv
a30f029bbf
Update product.lib.php 2019-06-13 20:53:24 +02:00
ptibogxiv
b13b089c58
Fix measuring_units_string display function 2019-06-13 20:52:52 +02:00
atm-florian.m
787e1319b9 FIX: in edit mode, dictionary inputs do not escape the string inside the 'value' attribute, causing errors if there are any double quotes 2019-06-13 16:21:07 +02:00