diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php index 4bce82feb9..0209c132e3 100644 --- a/resources/views/accessories/edit.blade.php +++ b/resources/views/accessories/edit.blade.php @@ -32,14 +32,12 @@ @@ -49,7 +47,6 @@ @@ -83,7 +78,6 @@ + @include ('partials.forms.edit.image-upload', ['image_path' => app('accessories_upload_path')]) - - @stop diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php index fd9efcc49f..bfcabbc4b1 100755 --- a/resources/views/categories/edit.blade.php +++ b/resources/views/categories/edit.blade.php @@ -9,7 +9,12 @@ @section('inputFields') -@include ('partials.forms.edit.name', ['translated_name' => trans('admin/categories/general.name')]) + +
diff --git a/resources/views/companies/edit.blade.php b/resources/views/companies/edit.blade.php index 1c68fbe0f7..5cc35cb76b 100644 --- a/resources/views/companies/edit.blade.php +++ b/resources/views/companies/edit.blade.php @@ -12,7 +12,6 @@ @@ -20,7 +19,6 @@ @@ -29,7 +27,6 @@ @@ -38,7 +35,6 @@ @@ -50,7 +46,6 @@ @@ -29,7 +28,6 @@ @@ -65,7 +61,6 @@ @@ -78,7 +73,6 @@ @@ -87,7 +81,6 @@ + @include ('partials.forms.edit.image-upload', ['image_path' => app('components_upload_path')]) diff --git a/resources/views/consumables/edit.blade.php b/resources/views/consumables/edit.blade.php index b7e4cc69cd..96a0d48499 100644 --- a/resources/views/consumables/edit.blade.php +++ b/resources/views/consumables/edit.blade.php @@ -20,7 +20,6 @@ @@ -33,7 +32,6 @@ @@ -42,7 +40,6 @@ @@ -51,7 +48,6 @@ @@ -60,7 +56,6 @@ @@ -96,7 +89,6 @@ - -
- -
- - {!! $errors->first('name', '') !!} -
-
+ +
diff --git a/resources/views/custom_fields/fieldsets/edit.blade.php b/resources/views/custom_fields/fieldsets/edit.blade.php index 7a35ca146f..23007fb697 100644 --- a/resources/views/custom_fields/fieldsets/edit.blade.php +++ b/resources/views/custom_fields/fieldsets/edit.blade.php @@ -11,7 +11,12 @@ @stop @section('inputFields') -@include ('partials.forms.edit.name', ['translated_name' => trans('general.name')]) + + @stop diff --git a/resources/views/departments/edit.blade.php b/resources/views/departments/edit.blade.php index 05d9b49e4c..4f1f1f50ae 100644 --- a/resources/views/departments/edit.blade.php +++ b/resources/views/departments/edit.blade.php @@ -7,7 +7,12 @@ {{-- Page content --}} @section('inputFields') - @include ('partials.forms.edit.name', ['translated_name' => trans('admin/departments/table.name')]) + + @if (\App\Models\Company::canManageUsersCompanies()) @@ -16,8 +21,21 @@ @endif - @include ('partials.forms.edit.phone') - @include ('partials.forms.edit.fax') + + + + + @include ('partials.forms.edit.user-select', ['translated_name' => trans('admin/users/table.manager'), 'fieldname' => 'manager_id']) @@ -26,20 +44,15 @@ @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id']) @include ('partials.forms.edit.image-upload', ['image_path' => app('departments_upload_path')]) -
- -
- - {!! $errors->first('notes', '') !!} -
-
+ + @stop diff --git a/resources/views/depreciations/edit.blade.php b/resources/views/depreciations/edit.blade.php index a89750ab2f..cff35d8930 100755 --- a/resources/views/depreciations/edit.blade.php +++ b/resources/views/depreciations/edit.blade.php @@ -9,17 +9,23 @@ {{-- Page content --}} @section('inputFields') -@include ('partials.forms.edit.name', ['translated_name' => trans('admin/depreciations/general.depreciation_name')]) - -
- -
- - {!! $errors->first('months', '') !!} -
-
+ + + + + +
diff --git a/resources/views/kits/create.blade.php b/resources/views/kits/create.blade.php index c33fb35292..0c7f483fa5 100644 --- a/resources/views/kits/create.blade.php +++ b/resources/views/kits/create.blade.php @@ -6,5 +6,10 @@ {{-- Page content --}} @section('inputFields') -@include ('partials.forms.edit.name', ['translated_name' => trans('general.name')]) + + @stop diff --git a/resources/views/kits/edit.blade.php b/resources/views/kits/edit.blade.php index eb53365786..57ca8e3c61 100644 --- a/resources/views/kits/edit.blade.php +++ b/resources/views/kits/edit.blade.php @@ -25,12 +25,7 @@ @@ -30,7 +29,6 @@ @@ -79,7 +74,6 @@ @@ -88,7 +82,6 @@ @@ -109,7 +101,6 @@ @@ -118,7 +109,6 @@ @@ -31,7 +30,6 @@ @@ -40,7 +38,6 @@ @@ -49,7 +46,6 @@ - @include ('partials.forms.edit.name', ['translated_name' => trans('general.name'), 'required' => 'true']) + + @if (!$item->id) diff --git a/resources/views/manufacturers/edit.blade.php b/resources/views/manufacturers/edit.blade.php index a778048a66..1de00c8a91 100755 --- a/resources/views/manufacturers/edit.blade.php +++ b/resources/views/manufacturers/edit.blade.php @@ -14,7 +14,6 @@ @@ -22,7 +21,6 @@ @@ -31,7 +29,6 @@ @@ -40,7 +37,6 @@ @@ -59,7 +54,6 @@ @@ -25,7 +24,6 @@ @@ -35,7 +33,6 @@ @@ -61,7 +60,6 @@ @@ -24,7 +23,6 @@ @@ -33,7 +31,6 @@ @@ -42,7 +39,6 @@ @@ -51,7 +47,6 @@ @@ -60,7 +55,6 @@ @@ -71,7 +65,6 @@