Merge branch 'master' of github.com:24eme/giilda

24eme · Apr 24, 2024 · 62eae35 · 62eae35
2 parents c5d76f1 + cbff7bc
commit 62eae35
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/project/plugins/acVinSocietePlugin/lib/model/Societe/Societe.class.php b/project/plugins/acVinSocietePlugin/lib/model/Societe/Societe.class.php
@@ -191,7 +191,7 @@ public function getEtablissementPrincipal() {
  foreach ($etablissements as $id => $etbObj) {
  $etablissement = $etbObj->etablissement;
  $compte = $this->getCompte($etablissement->compte);
- if ($compte->compte_type == CompteClient::TYPE_COMPTE_SOCIETE) {
+ if ($compte && $compte->compte_type == CompteClient::TYPE_COMPTE_SOCIETE) {
  return $etablissement;
  }
  }
@@ -218,6 +218,9 @@ public function getContactsObj($withSocietesLiees = false) {
  public function getAllCompteObj() {
  if (!$this->comptes || !count($this->comptes)) {
  foreach ($this->contacts as $id => $obj) {
+ if (!$id) {
+ continue;
+ }
  $compteToAdd = CompteClient::getInstance()->find($id);
  if($compteToAdd){
  $this->addToComptes($compteToAdd);