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

Conflicts:
	dev/codesniffer/ruleset.xml

dev/codesniffer/ruleset.xml

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

htdocs/adherents/class/adherent.class.php

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