Commit Graph

89109 Commits

Author SHA1 Message Date
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
Eric Seigne
0b3bc5a172 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into allowZeroAsAccountNumber 2019-06-17 18:30:11 +02:00
Eric Seigne
80d4d8754d allow zero as accountancy code nomber (replace all empty tests by != '') 2019-06-17 18:28:11 +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
Ferran Marcet
c62f370959 FIX: Wrong stock movement on supplier credit notes 2019-06-17 16:30:56 +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
Frédéric FRANCE
aa92bfd1e0
Update bom_card.php 2019-06-17 15:31:48 +02:00
Laurent Destailleur
cf82587504 Fix menu entry 2019-06-17 15:02:44 +02:00
Nicolas ZABOURI
8e9596bdd2 Merge remote-tracking branch 'Dolibarr/10.0' into 10.0 2019-06-17 14:58:43 +02:00
Eric Seigne
71d984483d Update print VAT document: remove form part and add right title 2019-06-17 14:45:49 +02:00
Frédéric FRANCE
1a1f3493c9
NEW can specify hour start end for selectDate and step for minutes 2019-06-17 14:03:57 +02:00
Frédéric FRANCE
a399e3f63d
Update companies.lang 2019-06-17 13:33:44 +02:00
Laurent Destailleur
8330078de1 Fix default value 2019-06-17 12:33:09 +02:00
Nicolas ZABOURI
d0456d2ee6 Merge remote-tracking branch 'Dolibarr/10.0' into 10.0 2019-06-17 10:55:39 +02:00
Nicolas ZABOURI
e600563dce Merge remote-tracking branch 'Dolibarr/develop' into develop 2019-06-17 10:02:43 +02:00
Christophe Battarel
dfe63f3b9b Merge https://github.com/Dolibarr/dolibarr into develop 2019-06-17 09:58:25 +02:00
Regis Houssin
3afd4e15ad FIX try to remove ob_* functions 2019-06-17 07:09:19 +02:00
Regis Houssin
908b5fff00 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_pdf 2019-06-17 07:08:35 +02:00
Regis Houssin
6597c9f60d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-06-17 06:45:08 +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