Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
74,307 Commits 36 Branches 189 Tags
4495f0a755c52c76456b51a3347ea42f4fc101a1
Commit Graph

334 Commits

Author SHA1 Message Date
Frédéric FRANCE
13042ade53 replace html by html5 in expedition 2019-03-10 09:13:13 +01:00
Frédéric FRANCE
43aacbd55a replace html by html5 in donation 2019-03-10 09:00:59 +01:00
Frédéric FRANCE
f283782445 change visibility 2019-03-04 19:57:46 +01:00
Laurent Destailleur
06a40726bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-04 16:29:23 +01:00
Laurent Destailleur
27402f432a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/class/don.class.php
	htdocs/product/stock/card.php
	htdocs/theme/eldy/style.css.php
 2019-03-04 16:29:16 +01:00
ptibogxiv
d18b1dd9dc Update don.class.php 2019-03-03 22:36:34 +01:00
ptibogxiv
c05552e1cc Fixe date on fetch don.class.php 
v 10
 2019-03-03 21:42:28 +01:00
ptibogxiv
ad18077567 Fixe date on fetch don.class.php 2019-03-03 21:38:06 +01:00
Frédéric FRANCE
5a4ac82880 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 08:23:29 +01:00
Laurent Destailleur
0522f6649c Merge pull request #10696 from ptibogxiv/patch-132 
FIX; donation api checkressource
 2019-02-27 01:14:54 +01:00
Laurent Destailleur
60d01771b3 Merge pull request #10697 from ptibogxiv/patch-133 
FIX dolibarize  don.class.php
 2019-02-27 01:09:00 +01:00
Laurent Destailleur
53a4a57e91 Merge pull request #10699 from ptibogxiv/patch-134 
FIX dolibarize fk_soc socid
 2019-02-27 01:06:24 +01:00
ptibogxiv
70fc33e8bb Update don.class.php 2019-02-27 00:14:11 +01:00
Frédéric FRANCE
81f2f99db5 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-26 21:16:01 +01:00
Laurent Destailleur
3ec2338c2d Look and feel v10 2019-02-26 19:37:32 +01:00
ptibogxiv
aa6e18f66f FIX dolibarize fk_soc socid 2019-02-26 18:45:02 +01:00
ptibogxiv
70e451a886 Update don.class.php 2019-02-26 18:44:07 +01:00
ptibogxiv
085aa8a247 FIX dolibarize fk_soc / socid 2019-02-26 18:31:00 +01:00
ptibogxiv
a013b2a814 FIX; donation api checkressource 2019-02-26 18:19:44 +01:00
Frédéric FRANCE
1c07006015 wip 2019-02-25 21:36:27 +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
041310c4ee wip 2019-02-24 23:47:00 +01:00
Laurent Destailleur
14b9a06e57 Merge pull request #10680 from ptibogxiv/patch-130 
FIX donations API
 2019-02-24 20:50:32 +01:00
ptibogxiv
c2d05141bf FIX donations API 2019-02-24 16:36:06 +01:00
Frédéric FRANCE
167a857f4c replace html code by html5 in contact 2019-02-24 14:47:47 +01:00
Laurent Destailleur
42bb96dc27 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-12 19:44:30 +01:00
Laurent Destailleur
6a8504e1f8 Fix missing constant 2019-02-12 19:44:12 +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
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +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
c33860cfab Merge pull request #10368 from ptibogxiv/patch-91 
NEW thirdparty in donation if option ON
 2019-01-27 18:07:46 +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
ptibogxiv
e5d1466ec5 Update card.php 2019-01-22 18:44:28 +01:00
ptibogxiv
4d2231a6a2 Fix double < 2019-01-21 23:53:17 +01:00
Laurent Destailleur
844643c37d Merge pull request #10375 from grandoc/new_branch_19_01_2019 
update with html5 compliant code
 2019-01-20 19:48:32 +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
Philippe GRAND
29fdad144d update with html5 compliant code 2019-01-19 12:40:17 +01:00
ptibogxiv
a3153889b8 fix 2019-01-19 11:31:40 +01:00
Laurent Destailleur
302a838673 Merge pull request #10365 from ptibogxiv/patch-89 
NEW Add option DONATION_USE_THIRDPARTIES in admin of membership module
 2019-01-19 11:25:25 +01:00
ptibogxiv
d6cfd15102 NEW add API REST for donations 2019-01-18 17:56:56 +01:00
ptibogxiv
e74bccca21 Update don.class.php 2019-01-18 17:51:42 +01:00
ptibogxiv
c2c238ec24 Update don.class.php 2019-01-18 16:32:13 +01:00