Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev
# 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:
		@@ -4,10 +4,10 @@
 | 
			
		||||
 | 
			
		||||
@section('new_button')
 | 
			
		||||
    @can('create-sales-revenues')
 | 
			
		||||
        <a href="{{ route('revenues.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
 | 
			
		||||
        <a href="{{ route('import.create', ['group' => 'sales', 'type' => 'revenues']) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
 | 
			
		||||
        <span><a href="{{ route('revenues.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span>  {{ trans('general.add_new') }}</a></span>
 | 
			
		||||
        <span><a href="{{ route('import.create', ['group' => 'sales', 'type' => 'revenues']) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span>  {{ trans('import.import') }}</a></span>
 | 
			
		||||
    @endcan
 | 
			
		||||
    <a href="{{ route('revenues.export', request()->input()) }}" class="btn btn-white btn-sm">{{ trans('general.export') }}</a>
 | 
			
		||||
    <span><a href="{{ route('revenues.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span>  {{ trans('general.export') }}</a></span>
 | 
			
		||||
@endsection
 | 
			
		||||
 | 
			
		||||
@section('content')
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user