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

Merge branch '2.1-dev' of github.com:akaunting/akaunting into search-filter

Browse Source 
# Conflicts:
#	resources/assets/js/components/AkauntingSearch.vue
This commit is contained in:
Cüneyt Şentürk
2020-11-10 22:25:03 +03:00
parent 93a62fed4a 374fa6b570
commit d4a3f9c1a3
35 changed files with 764 additions and 1526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Common/Items.php
View File

@@ -50,9 +50,9 @@ class Items extends Controller
*/
public function create()
{
$categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::item()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->take(setting('default.select_limit'))->pluck('title', 'id');
return view('common.items.create', compact('categories', 'taxes'));
}