pull from master 23.5.2018

2018-05-23 09:36:49 +06:30
parent f1733d9f06
commit dbfc00435b
12 changed files with 89 additions and 62 deletions
--- a/app/views/settings/employees/_form.html.erb
+++ b/app/views/settings/employees/_form.html.erb
@@ -7,6 +7,7 @@

        <div class="form-inputs p-l-15">
          <%= f.input :name %>
+          <%= f.input :is_active,:input_html=>{:class=>"col-md-9"} %>
          <% if current_user.role == "administrator" %>
            <%= f.input :role, :collection => Lookup.collection_of("employee_roles"),:class=>'form-group' %>
          <% else %>