diff --git a/app/Mail/Admin/EntityCreatedObject.php b/app/Mail/Admin/EntityCreatedObject.php index 9dbd4a54a473..f8b426a798fc 100644 --- a/app/Mail/Admin/EntityCreatedObject.php +++ b/app/Mail/Admin/EntityCreatedObject.php @@ -45,9 +45,9 @@ class EntityCreatedObject /* Init a new copy of the translator*/ $t = app('translator'); /* Set the locale*/ - App::setLocale($this->company->getLocale()); + App::setLocale($this->entity->company->getLocale()); /* Set customized translations _NOW_ */ - $t->replace(Ninja::transformTranslations($this->company->settings)); + $t->replace(Ninja::transformTranslations($this->entity->company->settings)); $this->contact = $this->entity->invitations()->first()->contact; $this->company = $this->entity->company; diff --git a/tests/Integration/CompanyLedgerTest.php b/tests/Integration/CompanyLedgerTest.php index b097e594111d..1a228ab74d5b 100644 --- a/tests/Integration/CompanyLedgerTest.php +++ b/tests/Integration/CompanyLedgerTest.php @@ -97,6 +97,7 @@ class CompanyLedgerTest extends TestCase $settings->vat_number = 'vat number'; $settings->id_number = 'id number'; $settings->timezone_id = '1'; + $settings->language_id = '1'; $this->company->settings = $settings; $this->company->save();