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

Conflicts:
	htdocs/societe/class/societe.class.php
This commit is contained in:
Laurent Destailleur 2020-04-10 02:03:12 +02:00
commit a1e714f123

View File

@ -3402,6 +3402,7 @@ class Societe extends CommonObject
$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);