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

removed chart field from pl and tax reports

Browse Source
This commit is contained in:
denisdulici 2020-01-23 15:03:25 +03:00
parent 6c72fc39ce
commit f3e79c4885
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Listeners/Update/V20/Version200.php
View File

@ -283,14 +283,14 @@ class Version200 extends Listener
'class' => 'App\Reports\ProfitLoss', 'class' => 'App\Reports\ProfitLoss',
'name' => trans('reports.profit_loss'), 'name' => trans('reports.profit_loss'),
'description' => trans('demo.reports.profit_loss'), 'description' => trans('demo.reports.profit_loss'),
'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual', 'chart' => '0'], 'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual'],
], ],
[ [
'company_id' => $company->id, 'company_id' => $company->id,
'class' => 'App\Reports\TaxSummary', 'class' => 'App\Reports\TaxSummary',
'name' => trans('reports.summary.tax'), 'name' => trans('reports.summary.tax'),
'description' => trans('demo.reports.tax'), 'description' => trans('demo.reports.tax'),
'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual', 'chart' => '0'], 'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual'],
], ],
]; ];

9
app/Reports/ProfitLoss.php
View File

@ -109,4 +109,13 @@ class ProfitLoss extends Report
} }
} }
} }
public function getFields()
{
return [
$this->getGroupField(),
$this->getPeriodField(),
$this->getBasisField(),
];
}
} }

9
app/Reports/TaxSummary.php
View File

@ -124,4 +124,13 @@ class TaxSummary extends Report
} }
} }
} }
public function getFields()
{
return [
$this->getGroupField(),
$this->getPeriodField(),
$this->getBasisField(),
];
}
} }

4
database/seeds/Reports.php
View File

@ -53,14 +53,14 @@ class Reports extends Seeder
'class' => 'App\Reports\ProfitLoss', 'class' => 'App\Reports\ProfitLoss',
'name' => trans('reports.profit_loss'), 'name' => trans('reports.profit_loss'),
'description' => trans('demo.reports.profit_loss'), 'description' => trans('demo.reports.profit_loss'),
'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual', 'chart' => '0'], 'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual'],
], ],
[ [
'company_id' => $company_id, 'company_id' => $company_id,
'class' => 'App\Reports\TaxSummary', 'class' => 'App\Reports\TaxSummary',
'name' => trans('reports.summary.tax'), 'name' => trans('reports.summary.tax'),
'description' => trans('demo.reports.tax'), 'description' => trans('demo.reports.tax'),
'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual', 'chart' => '0'], 'settings' => ['group' => 'category', 'period' => 'quarterly', 'basis' => 'accrual'],
], ],
]; ];