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

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

Browse Source 
# Conflicts:
#	composer.lock
#	resources/views/banking/accounts/index.blade.php
#	resources/views/banking/reconciliations/index.blade.php
#	resources/views/banking/transactions/index.blade.php
#	resources/views/banking/transfers/index.blade.php
#	resources/views/common/items/index.blade.php
#	resources/views/common/reports/index.blade.php
#	resources/views/purchases/bills/index.blade.php
#	resources/views/purchases/payments/index.blade.php
#	resources/views/purchases/vendors/index.blade.php
#	resources/views/sales/customers/index.blade.php
#	resources/views/sales/invoices/index.blade.php
#	resources/views/sales/revenues/index.blade.php
This commit is contained in:
Cüneyt Şentürk
2020-10-22 18:03:20 +03:00
parent 77e4109b03 bf66a5988b
commit 642243790e
114 changed files with 2409 additions and 1587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/settings/invoice/edit.blade.php
View File

@@ -45,7 +45,7 @@
<div class="input-group">
<a href="#" class="btn btn-block btn-outline-primary" @click="onTemplate">
{{ trans('settings.invoice.choose_template') }}
<i class="fas fa-palette"></i>&nbsp; {{ trans('settings.invoice.choose_template') }}
</a>
</div>
</div>