Commit Graph

5501 Commits

Author SHA1 Message Date
Frédéric FRANCE
b2e2b2e186 Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-31 18:27:27 +01:00
Philippe GRAND
0cc8053708 update with html5 compliant code 2019-01-31 12:42:38 +01:00
Philippe GRAND
1cda3106b2 update with html5 compliant code 2019-01-31 12:40:50 +01:00
Philippe GRAND
2a9c378c1f update with html5 compliant code 2019-01-31 12:35:49 +01:00
Philippe GRAND
ff46a0ee30 update with html5 compliant code 2019-01-31 12:33:01 +01:00
Laurent Destailleur
4c31749f4b Add tooltip on setup 2019-01-31 11:11:56 +01:00
Laurent Destailleur
e18bd6f986 Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
e72d6c50e6 Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70 Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Laurent Destailleur
3198f9fbbe Merge pull request #10441 from aspangaro/10.0_email
Move my email to the new one
2019-01-30 14:59:58 +01:00
Laurent Destailleur
6d3529b606 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-30 14:47:28 +01:00
Laurent Destailleur
340412ed00 FIX generation of document for supplie rinvoice 2019-01-30 14:07:50 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
ff39491f15 wip 2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
ecc30b8ffe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2019-01-27 18:27:58 +01:00
Laurent Destailleur
f30a3d59ba Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Laurent Destailleur
3c88816bf8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-27 17:44:13 +01:00
Laurent Destailleur
d59097f65c Fix upload of module file 2019-01-27 17:40:56 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
f96d730943 Merge pull request #10391 from grandoc/new_branch_22_01_2019
update with html5 compliant code
2019-01-26 14:09:15 +01:00
Laurent Destailleur
e42fe4022a Uniformize lenght of small list 2019-01-25 15:22:36 +01:00
Philippe GRAND
0a45d87f4a update with html5 compliant code 2019-01-22 11:56:09 +01:00
Philippe GRAND
a75ecc0832 update with html5 compliant code 2019-01-22 11:51:03 +01:00
Philippe GRAND
a609c11383 update with html5 compliant code 2019-01-22 11:48:15 +01:00
Philippe GRAND
05b33c149c update with html5 compliant code 2019-01-22 11:46:12 +01:00
Philippe GRAND
7a7a7e7aa9 update with html5 compliant code 2019-01-22 11:40:53 +01:00
Philippe GRAND
8d877fd289 update with html5 compliant code 2019-01-22 11:37:23 +01:00
Philippe GRAND
e671c6705c update with html5 compliant code 2019-01-21 22:37:42 +01:00
Philippe GRAND
218636271a update with html5 compliant code 2019-01-21 22:36:14 +01:00
Laurent Destailleur
fbf5a1c056 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-21 20:48:19 +01:00
Laurent Destailleur
3cf81d14e3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-21 20:47:44 +01:00
Laurent Destailleur
6f553db93d Remove bad text 2019-01-21 20:47:07 +01:00
Philippe GRAND
37c7837bd3 update with html5 compliant code 2019-01-21 09:52:49 +01:00
Laurent Destailleur
c26f264cac Merge pull request #10369 from mwelters/mwelters/addays
Add configurable days to SEPA Withdrawal  Execution Date
2019-01-20 19:47:57 +01:00
markus
a45ea9239d Rename consts and cleanup 2019-01-19 14:24:20 +01:00
ptibogxiv
b3cbbc1b11 FIX lang for dolistore in module.php 2019-01-19 11:41:47 +01:00
ptibogxiv
ff99927f65 FIX lang for dolistore in module.php 2019-01-19 11:18:07 +01:00
markus
de9b8f427d Add configurable days to SEPA Withdrawal Execution Date 2019-01-18 16:16:55 +01:00
Laurent Destailleur
3187636c1c Merge pull request #10352 from hregis/develop_mc
FIX DAV compatibility with mutlicompany
2019-01-17 18:58:32 +01:00
Philippe GRAND
98e5397e38 update with html5 compliant code 2019-01-17 14:19:15 +01:00
Regis Houssin
528f1d6f5c FIX DAV add url public 2019-01-17 08:28:51 +01:00
Laurent Destailleur
e7943ae844 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 16:48:52 +01:00
Laurent Destailleur
d3828130ab Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/adherents/class/adherent.class.php
2019-01-16 16:48:21 +01:00
Laurent Destailleur
21741b6409 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 13:57:42 +01:00
Laurent Destailleur
a72d92006b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 13:57:33 +01:00