Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0

Conflicts: htdocs/societe/class/societe.class.php
altzone · Apr 10, 2020 · a1e714f · a1e714f
2 parents f52f59e + c4d898e
commit a1e714f
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
@@ -3402,6 +3402,7 @@ public function create_from_member(Adherent $member, $socname = '', $socalias =
 		$this->twitter=$member->twitter;
 		$this->facebook=$member->facebook;
 		$this->linkedin=$member->linkedin;
+		$this->entity=$member->entity;
 
 		$this->client = 1;				// A member is a customer by default
 		$this->code_client = ($customercode?$customercode:-1);