shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'akaunting:master' into master

Browse Source
This commit is contained in:
Burak Civan 2022-04-28 09:27:53 +03:00 committed by GitHub
commit 91bc935e02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/Banking/Transaction.php
View File

@ -387,18 +387,18 @@ class Transaction extends Model
} }
if ($this->isIncome()) { if ($this->isIncome()) {
if ($this->document->type != 'invoice') { if (! empty($this->document) && $this->document->type != 'invoice') {
return $this->getRouteFromConfig(); return $this->getRouteFromConfig();
} else { } else {
return !empty($this->document_id) ? 'invoices.show' : 'revenues.show'; return ! empty($this->document_id) ? 'invoices.show' : 'revenues.show';
} }
} }
if ($this->isExpense()) { if ($this->isExpense()) {
if ($this->document->type != 'bill') { if (! empty($this->document) && $this->document->type != 'bill') {
return $this->getRouteFromConfig(); return $this->getRouteFromConfig();
} else { } else {
return !empty($this->document_id) ? 'bills.show' : 'payments.show'; return ! empty($this->document_id) ? 'bills.show' : 'payments.show';
} }
} }

6
config/version.php
View File

@ -10,15 +10,15 @@ return [
'minor' => '1', 'minor' => '1',
'patch' => '34', 'patch' => '35',
'build' => '', 'build' => '',
'status' => 'Stable', 'status' => 'Stable',
'date' => '26-April-2021', 'date' => '27-April-2021',
'time' => '12:00', 'time' => '14:00',
'zone' => 'GMT +3', 'zone' => 'GMT +3',

2
resources/lang/bs-BA/maintenance.php
View File

@ -6,4 +6,6 @@ return [
'message' => 'Žao nam je, trenutno smo na održavanju. Molimo pokušajte ponovo kasnije!', 'message' => 'Žao nam je, trenutno smo na održavanju. Molimo pokušajte ponovo kasnije!',
'read_only' => 'Omogućen je samo režim za čitanje. Dozvoljen vam je pregled, ali ništa ne možete mijenjati!',
]; ];

2
resources/lang/en-AU/maintenance.php
View File

@ -6,4 +6,6 @@ return [
'message' => 'Sorry, we\'re down for maintenance. Please, try again later!', 'message' => 'Sorry, we\'re down for maintenance. Please, try again later!',
'read_only' => 'Read-only mode is enabled. You are allowed to view but not change anything!',
]; ];

2
resources/lang/es-ES/maintenance.php
View File

@ -6,4 +6,6 @@ return [
'message' => 'Lo sentimos, estamos en mantenimiento. Por favor, inténtalo de nuevo más tarde!', 'message' => 'Lo sentimos, estamos en mantenimiento. Por favor, inténtalo de nuevo más tarde!',
'read_only' => 'El modo de solo lectura está activo. Puede ver pero no hacer cambios.',
]; ];

2
resources/lang/pt-BR/maintenance.php
View File

@ -6,6 +6,6 @@ return [
'message' => 'Desculpe, estamos em manutenção. Por favor, tente novamente mais tarde!', 'message' => 'Desculpe, estamos em manutenção. Por favor, tente novamente mais tarde!',
'read_only' => 'Modo somente leitura está ativado. Você poderá visualizar, mas não pode alterar nada!', 'read_only' => 'O modo somente leitura está ativado. É permitido visualizar, mas não altera nada!',
]; ];