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

Conflicts:
	htdocs/societe/class/societe.class.php
This commit is contained in:
Laurent Destailleur 2020-04-10 02:04:26 +02:00
commit 92cd0372db

View File

@ -3524,6 +3524,7 @@ class Societe extends CommonObject
$this->phone = $member->phone; // Prof phone
$this->email = $member->email;
$this->socialnetworks = $member->socialnetworks;
$this->entity=$member->entity;
$this->client = 1; // A member is a customer by default
$this->code_client = ($customercode ? $customercode : -1);