tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/develop' into develop

Browse source
This commit is contained in:
David Bomba 2016-10-28 20:07:46 +11:00
commit 0dc1a5f73f
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Console/Commands/CheckData.php
View file

@ -92,7 +92,7 @@ class CheckData extends Command {
$count = DB::table('activities')
->where('activity_type_id', '=', 5)
->where('json_backup', '=', '')
->whereNotIn('id', [634386, 756352, 756353, 756356])
->whereNotIn('id', [634386, 756352, 756353, 756356, 820872])
->count();
if ($count > 0) {

2
app/Http/Controllers/ExpenseCategoryApiController.php
View file

@ -18,6 +18,8 @@ class ExpenseCategoryApiController extends BaseAPIController
public function __construct(ExpenseCategoryRepository $categoryRepo, ExpenseCategoryService $categoryService)
{
parent::__construct();
$this->categoryRepo = $categoryRepo;
$this->categoryService = $categoryService;
}