Commit f201d4ee by Yvon Kerdoncuff

Merge branch 'fix-admin-export-reconversions' into 'ssa-gironde'

fix admin reconversions export

See merge request cooperatic/kohinos-tav!108
parents 4916c79d 829290c2
...@@ -91,7 +91,6 @@ class ReconversionAdmin extends FluxAdmin ...@@ -91,7 +91,6 @@ class ReconversionAdmin extends FluxAdmin
'tauxreconversionpercent' => 'tauxreconversionpercent', 'tauxreconversionpercent' => 'tauxreconversionpercent',
'montantareconvertir' => 'montantareconvertir', 'montantareconvertir' => 'montantareconvertir',
'montantcommission' => 'montantcommission', 'montantcommission' => 'montantcommission',
'montantcommission' => 'montantcommission',
'Reference' => 'reference', 'Reference' => 'reference',
'Reconverti ?' => 'reconverti', 'Reconverti ?' => 'reconverti',
]; ];
......
...@@ -641,7 +641,7 @@ abstract class Flux implements FluxInterface ...@@ -641,7 +641,7 @@ abstract class Flux implements FluxInterface
public function getOperateurAndRole(): string public function getOperateurAndRole(): string
{ {
return $this->getOperateur() ? ($this->getOperateur()->__toString() . ' (' . $this->getRole() . ')') : $this->getRole(); return $this->getOperateur() ? ($this->getOperateur()->__toString() . ' (' . $this->getRole() . ')') : '';
} }
public function __toString(): string public function __toString(): string
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment