lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.6' into develop

Browse Source 
Conflicts:
	dev/codesniffer/ruleset.xml
This commit is contained in:
Laurent Destailleur 2014-07-20 16:09:42 +02:00
commit 5572364d2b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev/codesniffer/ruleset.xml
View File

@ -6,6 +6,8 @@
<exclude-pattern>*/conf.php</exclude-pattern> <exclude-pattern>*/conf.php</exclude-pattern>
<exclude-pattern>*/includes/*</exclude-pattern> <exclude-pattern>*/includes/*</exclude-pattern>
<exclude-pattern>*/documents/*</exclude-pattern> <exclude-pattern>*/documents/*</exclude-pattern>
<exclude-pattern>*/custom/*</exclude-pattern>
<exclude-pattern>*/nltechno*</exclude-pattern>
<!-- List of all tests --> <!-- List of all tests -->
@ -23,7 +25,11 @@
</rule> </rule>
<!-- The closing ?> tag MUST be omitted from files containing only PHP. --> <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
<<<<<<< HEAD
<rule ref="Zend.Files.ClosingTag"/> <rule ref="Zend.Files.ClosingTag"/>
=======
<!-- <rule ref="Zend.Files.ClosingTag"/> -->
>>>>>>> refs/remotes/origin/3.6
<!-- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" /> --> <!-- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" /> -->

1
htdocs/adherents/class/adherent.class.php
View File

@ -90,6 +90,7 @@ class Adherent extends CommonObject
var $user_login; var $user_login;
var $fk_soc; var $fk_soc;
var $thirdparty; // Loaded by ->fetch_thirdparty()
// Fields loaded by fetch_subscriptions() // Fields loaded by fetch_subscriptions()
var $first_subscription_date; var $first_subscription_date;