Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 19:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
125,218 Commits 36 Branches 190 Tags
c263fccb5f8bedd828ef2fd34b64b51fb8812c06
Commit Graph

607 Commits

Author SHA1 Message Date
Frédéric FRANCE
62501b11e8 add visibility 2019-03-02 00:14:22 +01:00
Laurent Destailleur
e054b080a5 Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
Frédéric FRANCE
1e43f8e54a PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Alexandre SPANGARO
2ba8ae00e4 Merge remote-tracking branch 'upstream/develop' into develop 2019-02-06 21:56:01 +01:00
Alexandre SPANGARO
13cf3b1d7f Add subledger in various payment 2019-02-01 15:50:12 +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
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Laurent Destailleur
eb66d45947 Merge branch 'develop' into 10.0_accoutancy_stats 2018-12-15 15:17:15 +01:00
Laurent Destailleur
21b3bbc2e6 Merge 2018-12-08 11:55:27 +01:00
Laurent Destailleur
a915d82883 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-08 11:42:30 +01:00
Laurent Destailleur
5ce26bae1b Fix form of bank info for CH 2018-12-04 22:01:35 +01:00
Alexandre SPANGARO
088c002ed1 NEW: Add stats on entries & movements by fiscal year 2018-12-02 11:01:11 +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
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
 2018-10-24 03:35:44 +02:00
Laurent Destailleur
f8316abfc0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/theme/md/style.css.php
 2018-10-24 02:58:29 +02:00
Laurent Destailleur
919c4fc5bc Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/theme/md/style.css.php
 2018-10-24 02:40:57 +02:00
Laurent Destailleur
99fde00902 Merge pull request #9719 from frederic34/patch-11 
do not trim int
 2018-10-12 17:35:04 +02:00
Laurent Destailleur
cb29209457 NEW Enhancement in process to make manual bank conciliation 2018-10-10 12:47:18 +02:00
Frédéric FRANCE
03fcc2f088 Update paymentvarious.class.php 2018-10-09 20:31:14 +02:00
Frédéric FRANCE
b917fd0cf2 do not trim int 2018-10-09 19:41:53 +02:00
Philippe GRAND
e9bd1be41b Standardize and update code 2018-10-09 15:38:42 +02:00
Laurent Destailleur
5034264d60 Debug / Standardize code 2018-10-04 18:27:49 +02:00
Philippe GRAND
15ff9f8917 Standardize and update code 2018-09-28 14:44:47 +02:00
Philippe GRAND
803505b6b7 Standardize and update code 2018-09-20 12:27:06 +02:00
Frédéric FRANCE
ce76a2e714 Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 20:21:35 +02:00
Frédéric FRANCE
cdc5a174aa Update account.class.php 2018-09-11 00:29:01 +02:00
Frédéric FRANCE
7e0b1055db Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-09 13:36:53 +02:00
Laurent Destailleur
84bbe8684b Fix scrutinizer 2018-09-08 18:38:24 +02:00
Frédéric FRANCE
2b62c4ca8f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Philippe GRAND
38ca6096b2 Standardize and update code 2018-09-05 10:31:12 +02:00
Frédéric FRANCE
7799774ca1 move phpcs:ignore 2018-09-04 22:52:55 +02:00
Frédéric FRANCE
65b74ad30f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Frédéric FRANCE
04c1a7d4af move phpcs:ignore 2018-09-02 13:38:11 +02:00
Philippe GRAND
c4f05aff28 Standardize and update code 2018-09-02 10:42:31 +02:00
Philippe GRAND
ae2df6be11 Standardize and Update code 2018-09-01 23:04:46 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Philippe GRAND
7354e485b0 precise label comment 2018-09-01 13:22:08 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Laurent Destailleur
b863b5176d Merge pull request #9322 from grandoc/new_branch_29_08_2018 
New branch 29 08 2018
 2018-09-01 12:11:01 +02:00
Philippe GRAND
edaa575435 Standardize and update code 2018-08-31 18:36:15 +02:00
Frédéric FRANCE
6aee680a4f PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00