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/purchases/bills/index.blade.php
View File

@@ -64,7 +64,7 @@
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
<a class="dropdown-item" href="{{ route('bills.show', $item->id) }}">{{ trans('general.show') }}</a>
@if (!$item->reconciled)
@if (!$item->reconciled)""
<a class="dropdown-item" href="{{ route('bills.edit', $item->id) }}">{{ trans('general.edit') }}</a>
@endif
<div class="dropdown-divider"></div>