Merge branch '2.1-dev' of github.com:akaunting/akaunting into 2.1-dev
This commit is contained in:
		@@ -19,7 +19,7 @@
 | 
			
		||||
                <div class="row">
 | 
			
		||||
                    {{ Form::textGroup('name', trans('general.name'), 'tag') }}
 | 
			
		||||
 | 
			
		||||
                    {{ Form::selectAddNewGroup('tax_id', trans_choice('general.taxes', 1), 'percentage', $taxes, setting('default.tax'), ['path' => route('modals.taxes.create'), 'field' => ['key' => 'id', 'value' => 'title']]) }}
 | 
			
		||||
                    {{ Form::multiSelectAddNewGroup('tax_ids', trans_choice('general.taxes', 1), 'percentage', $taxes, [setting('default.tax')], ['path' => route('modals.taxes.create'), 'field' => ['key' => 'id', 'value' => 'title']]) }}
 | 
			
		||||
 | 
			
		||||
                    {{ Form::textareaGroup('description', trans('general.description')) }}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -20,7 +20,7 @@
 | 
			
		||||
                <div class="row">
 | 
			
		||||
                    {{ Form::textGroup('name', trans('general.name'), 'tag') }}
 | 
			
		||||
 | 
			
		||||
                    {{ Form::selectAddNewGroup('tax_id', trans_choice('general.taxes', 1), 'percentage', $taxes, $item->tax_id, ['path' => route('modals.taxes.create'), 'field' => ['key' => 'id', 'value' => 'title']]) }}
 | 
			
		||||
                    {{ Form::multiSelectAddNewGroup('tax_ids', trans_choice('general.taxes', 1), 'percentage', $taxes, $item->tax_ids, ['path' => route('modals.taxes.create'), 'field' => ['key' => 'id', 'value' => 'title']]) }}
 | 
			
		||||
 | 
			
		||||
                    {{ Form::textareaGroup('description', trans('general.description')) }}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user