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

2
resources/views/common/items/edit.blade.php
View File

@ -28,7 +28,7 @@
{{ Form::textGroup('purchase_price', trans('items.purchase_price'), 'money-bill-wave-alt') }}
{{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $item->category_id, ['path' => route('modals.categories.create') . '?type=item']) }}
{{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $item->category_id, ['path' => route('modals.categories.create') . '?type=item', 'remote_action' => route('categories.index'). '?type=item']) }}
{{ Form::fileGroup('picture', trans_choice('general.pictures', 1)) }}