Commit Graph

1649 Commits

Author SHA1 Message Date
Laurent Destailleur
e64b8eaf40 Fix debug credit transfer module 2020-08-03 11:21:13 +02:00
Laurent Destailleur
2687666579 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-29 13:54:12 +02:00
Laurent Destailleur
8045cff888 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/expedition/class/expedition.class.php
2020-07-29 13:53:09 +02:00
Laurent Destailleur
6bd450dcd0 Doc 2020-07-29 13:10:31 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
8c06e3577d Fix several trouble with diret debit module and credit transfer module 2020-07-27 19:33:24 +02:00
Laurent Destailleur
988e9e5817 Update to jquery 3.5.1 2020-07-27 13:52:19 +02:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Laurent Destailleur
6c6a64db66 Fix phpcs 2020-06-26 19:55:35 +02:00
Laurent Destailleur
9bbe004e96 Add test tool 2020-06-26 01:14:39 +02:00
Laurent Destailleur
fd6af312e9 Fix tool 2020-06-18 03:49:35 +02:00
Laurent Destailleur
b763b40d8c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-12 19:37:27 +02:00
Laurent Destailleur
2c327aae66 Prepare v12 2020-06-12 19:30:23 +02:00
Laurent Destailleur
8492272a08 Fix initdemo 2020-06-12 19:11:00 +02:00
Laurent Destailleur
a995bf97eb Fix tools 2020-06-06 15:35:50 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
2b963479a8 Sync transifex 2020-05-23 23:50:00 +02:00
Laurent Destailleur
02d5359749 Fix transifex sync 2020-05-23 23:30:52 +02:00
Laurent Destailleur
3dca55661c Fix Add unit test to avoid the big % instead of comon % char. 2020-05-23 22:01:17 +02:00
Frédéric FRANCE
674b0e38c8
add new rule 2020-05-21 15:13:31 +02:00
Frédéric FRANCE
d9f42f85d1
add new rule 2020-05-21 15:08:14 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ba8cf2b398
add new rule 2020-05-21 09:21:30 +02:00
Frédéric FRANCE
def53338de
add new rule 2020-05-21 09:07:10 +02:00
Frédéric FRANCE
a636f81eac
add new rule 2020-05-21 02:17:21 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Frédéric FRANCE
43dcd9beb5
add new rule 2020-05-21 00:02:33 +02:00
Laurent Destailleur
22301d63d8 Replace a ZEND phpcs rule with a PSR2 rule 2020-05-13 00:35:10 +02:00
Laurent Destailleur
b5f3be4599 Clean phpcs rule file 2020-05-13 00:29:46 +02:00
Alexandre SPANGARO
640158ea4c NEW Accountancy - Add Fiducial Winfic eWinfic WinSis Compta 2020-05-08 13:50:26 +02:00
Laurent Destailleur
4d6a45d491 Major doxygen fix 2020-05-03 22:48:35 +02:00
Laurent Destailleur
a88ab40384 Clean phpcs 2020-05-02 15:18:59 +02:00
Laurent Destailleur
6bc7085297 Check more phpcs rules 2020-05-02 13:02:58 +02:00
Laurent Destailleur
b20d85b198 Fix phpcs 2020-04-26 23:06:52 +02:00
Laurent Destailleur
6caa872280 Enable more PHPCS rules 2020-04-25 19:27:42 +02:00
Laurent Destailleur
068a890c36 Enable more PHPCS rules 2020-04-25 19:13:20 +02:00
Laurent Destailleur
5c18404083 Move to jquery 4.0.13 with fix in reponsive
Restore some files modified by error.
2020-04-18 15:15:35 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
2020-04-16 15:58:59 +02:00
Laurent Destailleur
b540bb29e0
Merge pull request #13617 from atm-quentin/11.0_viewstatut_to_search_status
FIX viewstatut to search status
2020-04-16 00:48:12 +02:00
Laurent Destailleur
86eaa78f1e FIX Use of image into free text for PDF if DOL_DATA_DIR is outside of
DOL_DOCUMENT_DIR.
2020-04-15 20:00:27 +02:00
atm-quentin
5b96066bf4 FIX keep viewstatut for doli 3.5 2020-04-15 15:07:11 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
Laurent Destailleur
f7726cd366 Try to disable a not expected rule 2020-04-10 13:04:30 +02:00
Frédéric FRANCE
fc34b5a4cb
compress png with zopflipng 2020-04-06 19:03:48 +02:00
Laurent Destailleur
e0d713bbef Update demo 2020-03-31 12:56:21 +02:00
Laurent Destailleur
2b725ad5d5 Update year in demo data 2020-03-30 14:57:56 +02:00
Laurent Destailleur
ead99c5976 Enhance updatedemo 2020-03-30 12:12:23 +02:00
Laurent Destailleur
6d732c9ea4 Update demo 2020-03-30 11:39:02 +02:00
Laurent Destailleur
8bab245c7e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
Laurent Destailleur
56e4fa1bb3 Trans 2020-03-18 14:01:11 +01:00
Laurent Destailleur
5ac038419d
Merge pull request #13217 from dolibit-ut/patch-14
http -> https:
2020-02-26 16:20:24 +01:00
Laurent Destailleur
f28278d3d4
Merge pull request #13216 from dolibit-ut/patch-13
licence -> license
2020-02-26 16:20:05 +01:00
Laurent Destailleur
7d242b6a40
Merge pull request #13215 from dolibit-ut/patch-12
http to https
2020-02-26 16:19:46 +01:00
Laurent Destailleur
3164857223
Merge pull request #13213 from dolibit-ut/patch-11
Update
2020-02-26 16:19:15 +01:00
UT from dolibit
4c4050c06e
http -> https:
add: for Linux OS
2020-02-26 12:35:17 +01:00
UT from dolibit
ec3c3f0165
licence -> license 2020-02-26 12:25:25 +01:00
UT from dolibit
5e51369e64
http to https 2020-02-26 12:22:12 +01:00
UT from dolibit
9be050765d
Update
changed Mon organisation to my organisation
2020-02-26 11:42:59 +01:00
UT from dolibit
21f1de2dea
update
changed mon organsiation to my organsiation
2020-02-26 11:39:49 +01:00
UT from dolibit
028287d8fa
Update erp_comparison_translation.txt 2020-02-25 14:41:18 +01:00
Laurent Destailleur
b995dc87fa NEW Add profile for PSR12 for Eclipse 2020-02-25 12:57:26 +01:00
Laurent Destailleur
55bef402c4 Fix remove a lot of warnings on Eclipse 2020-02-21 17:47:36 +01:00
Laurent Destailleur
ec09e7222d Fix remove a lot of warnings on Eclipse 2020-02-21 17:31:37 +01:00
Laurent Destailleur
1dd5ba093d Prepare PHP v8 - mktime() and gmmktime() are no more allowed 2020-02-19 12:11:16 +01:00
Laurent Destailleur
4b5cda5cd2 Code comment on OAUth ahtent 2020-02-16 21:16:00 +01:00
Laurent Destailleur
878026ebc5 Fix phpcs 2020-02-11 14:44:53 +01:00
Laurent Destailleur
5533526331 Fix phpcs 2020-02-11 11:48:10 +01:00
Laurent Destailleur
2756dc156d Add tool to convert pgdump into mysql dump 2020-02-10 20:35:18 +01:00
Alexandre SPANGARO
d6d3fff9dc Merge branch 'develop' into 10.0_intracommreport 2020-02-03 21:15:07 +01:00
Laurent Destailleur
87f84e5b17 FIX #12973 2020-02-03 06:29:40 +01:00
Laurent Destailleur
8957a29990 FIX #12973 2020-02-03 06:28:04 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
a02a2a6def Sync transifex 2020-01-27 16:07:53 +01:00
Laurent Destailleur
a9790f355d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 11:32:40 +01:00
Laurent Destailleur
faf289cd13 Update demo 2020-01-21 11:32:17 +01:00
Laurent Destailleur
62b84810bd Exclude includes in dev 2020-01-15 14:25:16 +01:00
Laurent Destailleur
d771efe37c Fix phpcs 2020-01-15 13:08:29 +01:00
Laurent Destailleur
82757e6d03 Move files 2020-01-15 12:23:14 +01:00
stickler-ci
ece3face5e Fixing style errors. 2020-01-14 14:34:36 +00:00
Norbert Penel
43aa5ec658
Dbf -> Db & import from table
1 Import a BIG DBF (aka excel openoffice) into a new table
    then you can see and search content easily

2 Create thirdparties or products from a table
2020-01-14 15:31:41 +01:00
Laurent Destailleur
a7496c16cb Doc 2020-01-12 22:00:23 +01:00
Laurent Destailleur
a6bae97826 Sync from transifex 2020-01-12 21:28:09 +01:00
Laurent Destailleur
6508ee03bf Fix for en_US 2020-01-12 21:27:43 +01:00
Laurent Destailleur
e52ca6f1b5 Fix script 2020-01-08 13:35:38 +01:00
Laurent Destailleur
027d88d3ce Fix purge script 2020-01-08 13:35:17 +01:00
Alexandre SPANGARO
c664a1e42d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-12-31 08:34:37 +01:00
Laurent Destailleur
c6d50ff786 Update demo sql file 2019-12-21 17:48:29 +01:00
Laurent Destailleur
2e2c9562e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-05 18:30:37 +01:00
Laurent Destailleur
4ae26be878 Work whatever is running dir 2019-12-05 18:30:26 +01:00
Laurent Destailleur
599ca6cae2 Demo 2019-12-05 13:01:02 +01:00
Laurent Destailleur
25546f64b8 Update demo 2019-12-05 12:09:52 +01:00
Laurent Destailleur
590d2cda17 Complete #12556 2019-12-01 18:56:34 +01:00
Laurent Destailleur
fc2fc81bb0 Fix image 2019-12-01 18:22:08 +01:00
Laurent Destailleur
958ffa6ec8 FIX Images in TCPDF are removed by TCPDF when it should not 2019-11-30 17:19:25 +01:00
Laurent Destailleur
cb2bf00ef8 Add sql 2019-11-30 11:50:49 +01:00
Laurent Destailleur
268535a320 Update demo 2019-11-29 10:05:46 +01:00
Laurent Destailleur
3148f6a9fa Add file for demo v11 2019-11-28 16:44:05 +01:00
Laurent Destailleur
1636d341c7 Debug module BOM
Enhance demo data for TakePOS
2019-11-28 15:18:14 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
Frédéric FRANCE
5006001753
clean indent 2019-10-27 08:50:32 +01:00
Frédéric FRANCE
7f3f48be0f
clean indent in theme directory 2019-10-26 21:11:36 +02:00
Frédéric FRANCE
a7797ba1da
clean indent in variants directory 2019-10-26 20:53:39 +02:00
Frédéric FRANCE
635306c084
restore original rules to be mergeable without errors 2019-10-26 18:23:51 +02:00
Frédéric FRANCE
a1f0245c79
clean indent in compta, contact directory 2019-10-26 18:13:20 +02:00
Frédéric FRANCE
79825e2193
start clean indent in compta directory 2019-10-26 14:42:25 +02:00
Frédéric FRANCE
1a10b30a76
clean indent in comm directory 2019-10-26 14:28:40 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Frédéric FRANCE
0ede817588
do not ignore lines with mix od tabs and spaces 2019-10-20 16:56:47 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Frédéric FRANCE
9f59656589
fix typo inspired by grandoc 2019-10-11 23:08:33 +02:00
Laurent Destailleur
5d64cec354 Exclude medias from fixdosfiles 2019-10-10 10:52:06 +02:00
Laurent Destailleur
aebae5ff83 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/margins.lang
	htdocs/user/class/user.class.php
2019-10-10 10:37:17 +02:00
Laurent Destailleur
1c105718b9 Update demo 2019-10-08 21:06:09 +02:00
Laurent Destailleur
0cf014b01f Update Restler to 3.0RC6 (last bug fixes of branch v3) 2019-10-08 11:14:53 +02:00
Laurent Destailleur
44025ce4c2 Update TCPDF to 6.3.2 2019-10-08 09:59:17 +02:00
Laurent Destailleur
539f4355c3 Try to fix stickler 2019-10-07 20:48:44 +02:00
Laurent Destailleur
8904ce5732 Removed warning we don't want 2019-10-03 16:57:12 +02:00
stickler-ci
3cad71f2c1 Fixing style errors. 2019-10-03 08:00:38 +00:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
258424416e
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
2019-09-27 14:11:14 +02:00
Laurent Destailleur
33754f1951 Update demo 2019-09-26 14:36:23 +02:00
Laurent Destailleur
24e5b6ab79 Fix default filename of dump 2019-09-26 14:35:50 +02:00
Laurent Destailleur
0e5d0a7784 Add data for tickets 2019-09-26 14:14:01 +02:00
Laurent Destailleur
b0615d477e Update demo 2019-09-26 13:58:43 +02:00
Laurent Destailleur
280219843e Update demo 2019-09-26 13:58:30 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
9e18f5243a
jshint 2019-09-11 18:21:59 +02:00
Frédéric FRANCE
638362f373
jshint 2019-09-11 18:17:12 +02:00
Frédéric FRANCE
d37dd4ed3c
jshint 2019-09-11 18:07:21 +02:00
Frédéric FRANCE
c6a02312a9
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-07 14:19:07 +02:00
Laurent Destailleur
8891fd4981 Exclude namespacemig 2019-08-21 14:59:48 +02:00
Laurent Destailleur
d82e60adb7 Work on namespaces test 2019-08-20 20:31:46 +02:00
Jean Traullé
c739b95666
Fix codestyle
lessc.class.php should be excluded from ruleset as it is an external lib
2019-08-14 23:33:06 +02:00
Laurent Destailleur
6df36866e1 Remove mentions to register_globals 2019-08-14 15:30:03 +02:00
Alexandre SPANGARO
8b8aaafc05 Merge branch 'develop' into 10.0_intracommreport 2019-07-20 05:47:31 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/opensurvey/index.php
2019-07-18 18:23:24 +02:00
Laurent Destailleur
ea349de081 FIX #11498 2019-07-15 23:25:42 +02:00
Alexandre SPANGARO
9da91c06ed Merge branch 'develop' into 10.0_intracommreport 2019-06-26 15:11:43 +02:00
Philippe GRAND
9e905901d1 all http addresses should be https now 2019-06-23 15:35:12 +02:00
Philippe GRAND
eef9b2867b all http addresses should be https now 2019-06-23 15:33:04 +02:00
Philippe GRAND
8dd7e15193 all http addresses should be https now 2019-06-23 15:32:29 +02:00
Philippe GRAND
2348d499a2 all http addresses should be https now 2019-06-23 15:30:35 +02:00
Alexandre SPANGARO
abfb708044 Merge branch 'develop' into 10.0_intracommreport 2019-06-19 21:43:40 +02:00
Laurent Destailleur
1189abdef8 Clean demo file 2019-06-05 11:59:01 +02:00
Laurent Destailleur
8ef7a3abf2 Clean demofile for v10 2019-06-05 11:56:57 +02:00
Laurent Destailleur
ba7b601387 Fix phpcs 2019-05-23 14:29:37 +02:00
Laurent Destailleur
e8ba312d2a Fix phpcs 2019-05-23 14:25:16 +02:00
Laurent Destailleur
5f639f611a Try to introduce rules on tab 2019-05-23 13:12:04 +02:00
Frédéric FRANCE
08b1f123b0
zapier for dolibarr 2019-05-19 21:49:34 +02:00
Frédéric FRANCE
aef850f6d3
zapier for dolibarr 2019-05-19 21:12:22 +02:00
Alexandre SPANGARO
f9e3a958c4 NEW Module Intracomm report 2019-05-19 10:44:09 +02:00
Laurent Destailleur
384c2d8358 Exclude files 2019-04-03 18:10:10 +02:00
Laurent Destailleur
c959c8b645 Fix api with prestashop 2019-03-31 18:21:00 +02:00
Philippe GRAND
9af5aa8eaa update with html5 compliant code 2019-03-19 13:41:55 +01:00
Laurent Destailleur
23252ed646 Add a test to avoid SQL non compatible with postgresql 2019-03-18 11:10:37 +01:00
Laurent Destailleur
39e6e71b0d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
2019-03-14 14:20:34 +01:00
Laurent Destailleur
3073567763 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-14 14:17:52 +01:00
Laurent Destailleur
bd0dcf3fb6 NEW Add a script to purge data older than a defined creation date 2019-03-11 14:24:20 +01:00
Laurent Destailleur
a47cc4ef57 Fix script to delete data 2019-03-08 19:26:16 +01:00
Laurent Destailleur
6b8c2a1d3b Enhance script to purge data 2019-03-08 14:09:22 +01:00
Laurent Destailleur
f6c52578cc Add README file 2019-03-08 13:34:03 +01:00
Alexandre SPANGARO
d926657534 FIX: Accountancy - Format EBP import
Add doc
2019-03-08 10:57:14 +01:00
Frédéric FRANCE
2745f98644
PSR2.Classes.PropertyDeclaration.VarUsed 2019-03-05 22:10:46 +01:00
Laurent Destailleur
a5711a51ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/json.lib.php
	test/phpunit/JsonLibTest.php
2019-03-02 18:30:17 +01:00
Frédéric FRANCE
40d34940f1
fix exclude from phpcs 2019-03-02 10:00:51 +01:00
Frédéric FRANCE
c5c27fdb77
add visibility 2019-03-01 19:24:06 +01:00
Frédéric FRANCE
bd2e541fd6
add visibility 2019-03-01 18:28:51 +01:00
Frédéric FRANCE
796ea6f4ea
add visibility 2019-02-28 23:19:58 +01:00
Frédéric FRANCE
304dafe9f5
check without new rule 2019-02-28 22:48:24 +01:00
Frédéric FRANCE
c89e4d79b8
wip 2019-02-25 22:27:04 +01:00
Frédéric FRANCE
6ee186096c
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-24 23:48:51 +01:00
Frédéric FRANCE
27218b7087
wip 2019-02-24 23:32:09 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
Laurent Destailleur
09fa5b0456 Add more github stats 2019-02-15 23:17:46 +01:00
Laurent Destailleur
e6e18ff616 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/product/stock/card.php
	htdocs/product/stock/info.php
	htdocs/product/stock/movement_list.php
2019-02-14 15:33:17 +01:00
Laurent Destailleur
f0846a9e30 Update date of demo 2019-02-13 15:48:55 +01:00
Laurent Destailleur
6a4d8c68e8 Missing dir in summary 2019-02-13 15:35:30 +01:00
Laurent Destailleur
ec9e70a79a Enhance script to load demo 2019-02-13 15:19:12 +01:00
Laurent Destailleur
a1803f35e4 Avoid warnings 2019-02-13 15:14:12 +01:00
Laurent Destailleur
19d68e7085 Removed non required files 2019-02-13 15:11:31 +01:00
Laurent Destailleur
fb5466fca0 Fix remove bad rule 2019-02-12 17:02:27 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
Laurent Destailleur
031999047b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-12 13:18:05 +01:00
Laurent Destailleur
65f5cb4302 Doc 2019-02-12 13:17:40 +01:00
Laurent Destailleur
9070e5fe01
Merge pull request #10543 from ka7/spelling_1
spelling fixes
2019-02-12 13:10:18 +01:00
Laurent Destailleur
4476a1038b Update lib 2019-02-12 04:04:57 +01:00
Laurent Destailleur
5450a09b7c Add link to resource 2019-02-12 01:33:03 +01:00
klemens
beb2791dde spelling fixes 2019-02-10 12:59:09 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing 2019-02-09 12:00:49 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921
Merge pull request #10481 from frederic34/psr2forloop
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
2019-02-03 19:11:07 +01:00
Frédéric FRANCE
273d68381c
psr2 end file new line none found 2019-02-03 15:21:21 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091
psr2 2019-02-02 18:25:01 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +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
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
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
3ddfcbe3bb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	dev/setup/codesniffer/ruleset.xml
2019-01-20 20:36:45 +01:00
Laurent Destailleur
abd9686d65 Enable accounting module 2019-01-20 14:25:26 +01:00
Laurent Destailleur
168ff1a806 Fix phpcs 2019-01-20 13:22:56 +01:00
Laurent Destailleur
43277cb630 Removed some warning 2019-01-20 13:22:04 +01:00
Laurent Destailleur
3ba4c4dde0 Remove annoying warnings 2019-01-12 19:08:19 +01:00
Laurent Destailleur
6e078105ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
2019-01-06 01:22:10 +01:00
Laurent Destailleur
cbf1c30647 Fix better test tool 2019-01-05 15:19:07 +01:00
Laurent Destailleur
b5ad35f886 Fix better test tool 2019-01-05 15:18:37 +01:00
Laurent Destailleur
5c516fdae2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2018-12-26 19:43:01 +01:00
Laurent Destailleur
def732246d Clean dump 2018-12-26 19:16:05 +01:00
Laurent Destailleur
e7b3c91645 Fix dump file 2018-12-26 19:10:22 +01:00
Laurent Destailleur
394a19e93b
Merge pull request #10148 from atm-ph/new_bash_snake_case_to_camel_case
New bash snake case to camel case
2018-12-15 15:15:03 +01:00
Laurent Destailleur
f48cc46763 Update doc schema 2018-12-12 21:18:55 +01:00
Laurent Destailleur
a81d7e5338 Removed deprecated files 2018-12-12 13:02:29 +01:00
Laurent Destailleur
446dbb49f6 Update Dolibarr schema 2018-12-12 13:02:23 +01:00
atm-ph
edb2283e3a Fix missing return 2018-12-01 20:41:19 +01:00
atm-ph
658e295a94 New bash to convert snake case function into camel case 2018-12-01 20:26:17 +01:00
Laurent Destailleur
5bd9c14929 Update demo data for 8.0 and 9.0 2018-11-23 14:05:45 +01:00
Laurent Destailleur
9bced281db Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-09 01:28:47 +01:00
Laurent Destailleur
d827601857 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-09 01:25:35 +01:00
Laurent Destailleur
aad0b700d4 Fix travis 2018-11-09 01:22:56 +01:00
Laurent Destailleur
0d6709c9f7 Update phpcs config 2018-11-09 01:20:57 +01: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
Laurent Destailleur
a3d6146bed Code comment 2018-10-24 02:32:01 +02:00
Philippe GRAND
56f5aaf1ad html5 2018-10-13 13:56:23 +02:00
Philippe GRAND
a48554e875 fix typo 2018-10-13 11:19:41 +02:00
Alexey Pyltsyn
49de7a5881 Replace multiple load calls with loadLangs method 2018-10-01 09:22:23 +03:00
Laurent Destailleur
bd523973d8 Add missing translation key 2018-09-25 00:55:03 +02:00
Frédéric FRANCE
03a5aba8a2
move phpcs:ignore 2018-09-02 18:49:23 +02:00
Frédéric FRANCE
e13a8ec572
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-02 18:19:45 +02:00
Frédéric FRANCE
e98b8e5e25
move phpcs:ignore 2018-09-02 09:27:59 +02:00
Frédéric FRANCE
83a647ce0d
comment missing and not camecaps are incompatible 2018-09-01 15:56:14 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing
function Comment Missing
2018-09-01 12:59:32 +02:00
Frédéric FRANCE
ebcf43ec73
function Comment Missing 2018-08-31 21:39:23 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 14:03:02 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing 2018-08-21 13:40:04 +02:00