diff --git a/library/Scores/IdentiteEntreprise.php b/library/Scores/IdentiteEntreprise.php index a358ebbc6..8fb3880c9 100644 --- a/library/Scores/IdentiteEntreprise.php +++ b/library/Scores/IdentiteEntreprise.php @@ -956,24 +956,13 @@ class IdentiteEntreprise } public function getChiffreAffaireTexte() { - if ($this->identite->TrancheCAType=='E' && !empty($this->identite->Bilan->CA)){ - - $data = $this->moneyKM($this->identite->Bilan->CA).$this->deviseText($this->identite->Bilan->Devise).' au '. - WDate::dateT('Ymd', 'd/m/Y',$this->identite->Bilan->Cloture); - - } elseif (!empty($this->identite->TrancheCALib) && $this->identite->TrancheCALib!='N/C') { - + if (!empty($this->identite->TrancheCALib) && $this->identite->TrancheCALib!='N/C') + { $data = $this->identite->TrancheCALib; $data.= empty($this->identite->AnneeTCA) || $this->identite->AnneeTCA=='0000' ? '' : ' en '.$this->identite->AnneeTCA; - - } elseif (!empty($this->identite->Bilan->CA)) { - - $data = $this->moneyKM($this->identite->Bilan->CA).$this->deviseText($this->identite->Bilan->Devise).' au '. - WDate::dateT('Ymd', 'd/m/Y',$this->identite->Bilan->Cloture); - $data.= empty($this->identite->AnneeTCA) || $this->identite->AnneeTCA=='0000' ? '' : ' en '.$this->identite->AnneeTCA; - - } else { - + } + else + { $data = 'N/C'; } return $data;