Merge branch 'master' of github.com:akaunting/akaunting

This commit is contained in:
Cüneyt Şentürk 2019-12-27 15:42:34 +03:00
commit d9b96a4920
3 changed files with 4 additions and 4 deletions

View File

@ -21,7 +21,7 @@ return [
'reports' => [
'income' => 'Monthly income summary by category.',
'expense' => 'Monthly expense summary by category.',
'income_expense' => 'Monthly income vs expense summary by category.',
'income_expense' => 'Monthly income vs expense by category.',
'tax' => 'Quarterly tax summary by category.',
'pl' => 'Quarterly profit & loss by category.',
],

View File

@ -12,8 +12,8 @@ return [
'net_profit' => 'Net Profit',
'total_expenses' => 'Total Expenses',
'net' => 'NET',
'income-expense' => 'Income & Expense',
'income_expense' => 'Income & Expense',
'summary' => [
'income' => 'Income Summary',
'expense' => 'Expense Summary',

View File

@ -14,7 +14,7 @@
<div class="row mb-4">
<div class="col-md-12">
<h3 id="stats">{{ trans('reports.income-expense') }}</h3>
<h3 id="stats">{{ trans('reports.income_expense') }}</h3>
</div>
@foreach($reports['income-expense'] as $report)