diff --git a/app/views/finance/invoices/_form.html.haml b/app/views/finance/invoices/_form.html.haml index 0b0e30fd..4788c8b0 100644 --- a/app/views/finance/invoices/_form.html.haml +++ b/app/views/finance/invoices/_form.html.haml @@ -19,7 +19,7 @@ = Invoice.human_attribute_name(:created_by) .controls.control-text#article_fc_price = show_user @invoice.created_by - = f.association :supplier, hint: false + = f.association :supplier, collection: Supplier.order(:name), hint: false = f.input :number = f.input :date, as: :date_picker - if current_user.role_finance? diff --git a/app/views/tasks/_form.html.haml b/app/views/tasks/_form.html.haml index 56da25b7..2529a7b7 100644 --- a/app/views/tasks/_form.html.haml +++ b/app/views/tasks/_form.html.haml @@ -5,7 +5,7 @@ - unless local_assigns[:periodic] = form.input :user_list, :as => :string, :input_html => { 'data-pre' => form.object.users.map(&:token_attributes).to_json } = form.input :required_users -= form.association :workgroup += form.association :workgroup, collection: Workgroup.order(:name) = form.input :due_date, as: :date_picker - unless local_assigns[:periodic] = form.input :done