Commit Graph

121 Commits

Author SHA1 Message Date
Frédéric FRANCE
b69f63e7d7 replace html by html5 2019-03-10 09:32:19 +01:00
Frédéric FRANCE
014f69850e add visibility 2019-03-01 23:08:57 +01:00
Frédéric FRANCE
796ea6f4ea add visibility 2019-02-28 23:19:58 +01:00
Frédéric FRANCE
0022c4fe72 add visibility 2019-02-28 22:44:12 +01:00
Frédéric FRANCE
4f9e35f350 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-28 20:48:23 +01:00
Frédéric FRANCE
8ea475df64 Update establishment.class.php 2019-02-27 16:11:19 +01:00
Frédéric FRANCE
49cbaed569 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 14:21:15 +01:00
Laurent Destailleur
24a8bd12fe Update admin_establishment.php 2019-02-27 13:33:34 +01:00
wdammak
b1782f0fc8 rename function select_establishments to selectEstablishments 2019-02-27 04:05:02 +01:00
wdammak
0a28d06213 Add parent company 2019-02-26 22:36:53 +01:00
wdammak
672c7f8b19 Fix phpcs 2019-02-26 22:31:07 +01:00
wdammak
a706710f44 Add parent company 2019-02-26 18:46:30 +01:00
wdammak
0e7ed6d169 Add parent company 2019-02-26 18:45:53 +01:00
wdammak
b79bcb25ea Add parent company 2019-02-26 18:45:07 +01:00
Frédéric FRANCE
1c07006015 wip 2019-02-25 21:36:27 +01:00
Frédéric FRANCE
1e43f8e54a PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Laurent Destailleur
a6dde3d6bd Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Frédéric FRANCE
03701fa091 psr2 2019-02-02 18:25:01 +01:00
Laurent Destailleur
648eea3a70 Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +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
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +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
e42fe4022a Uniformize lenght of small list 2019-01-25 15:22:36 +01:00
Philippe GRAND
e6d5925b7a update with html5 compliant code 2019-01-19 12:52:34 +01:00
Frédéric FRANCE
12dcda7e02 Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-15 22:01:36 +01:00
Frédéric FRANCE
42a9abad56 remove fieldlabel and add fieldeditkey 2018-10-27 17:45:29 +02:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Philippe GRAND
596dba9ce1 Standardize code 2018-10-06 12:14:47 +02:00
Philippe GRAND
b3925dd2bd Standardize code 2018-10-05 16:04:10 +02:00
Philippe GRAND
073ec85208 Standardize code 2018-10-05 15:51:08 +02:00
Frédéric FRANCE
ad2d15bef1 reduce complexity of establishment class 2018-09-16 19:11:56 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Frédéric FRANCE
4e619dd0ed Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 18:51:21 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
2018-09-04 21:35:43 +02:00
Frédéric FRANCE
65b74ad30f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Laurent Destailleur
cdc1e1fc76 Fix responsive 2018-09-04 09:37:51 +02:00
Frédéric FRANCE
2a5c994009 move phpcs:ignore 2018-09-02 14:01:37 +02:00
Philippe GRAND
3de16a145e Standardize and update code 2018-09-02 11:08:41 +02:00
Philippe GRAND
7b0d3c32ab Standardize and Update code 2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Philippe GRAND
45cbc36a15 Standardize and update code 2018-09-01 15:27:55 +02:00
Philippe GRAND
bb05e80a87 Standardize and update code 2018-08-31 18:47:25 +02:00
Philippe GRAND
70ae8c6081 Standardize and update code 2018-08-31 18:27:16 +02:00
Frédéric FRANCE
fe4260a014 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
7219bac0b2 Merge pull request #9168 from frederic34/trimtrailing
Trimtrailing
2018-08-28 02:30:02 +02:00
Philippe GRAND
87067b2bc9 Standardize and update code 2018-08-23 18:35:45 +02:00