diff --git a/app/views/admin/m_odr_files/_form.html.haml b/app/views/admin/m_odr_files/_form.html.haml index 4726db9..3f13cd8 100644 --- a/app/views/admin/m_odr_files/_form.html.haml +++ b/app/views/admin/m_odr_files/_form.html.haml @@ -9,16 +9,12 @@ = f.input :file, :label => "Fichier :" - = f.input :buy_at, :label => "Date de la facture :", :as => :date + = f.hidden_field :m_odr_file_type_id =# f.input :m_odr_file_type_id, :label => "Décision :", :collection => MOdrFileType.all, :as => :select, :include_blank => false - = f.input :admin_ok, :label => "Décision :", :collection => [["Validé",true], ["Refusé", false]], :as => :select - = f.input :reject_reason, :label => "Motif du rejet :", :collection => ["Mauvais document","Mauvaise qualité rendant le fichier illisible"] - = f.input :reject_reason_description, :label => "Précisions sur le rejet", :input_html => {:style => "height:100px;"} - -if f.object.m_odr_file_type_id == 2 @@ -32,13 +28,18 @@ -else + = f.input :buy_at, :label => "Date de la facture :", :as => :date %table.m_odr_file_roulages_form.form-table =f.semantic_fields_for :m_odr_file_roulages do |form| =render :partial => "admin/m_odr_file_roulages/form", :locals => {:form => form} %p= link_to_add_fields ic(:plus)+" Ajouter un roulage", f, :m_odr_file_roulages - + + = f.input :admin_ok, :label => "Décision :", :collection => [["Validé",true], ["Refusé", false]], :as => :select + + = f.input :reject_reason_description, :label => "Commentaire interne", :input_html => {:style => "height:100px;"} + .large_actions diff --git a/app/views/admin/m_odr_primes/index.html.haml b/app/views/admin/m_odr_primes/index.html.haml index 09d17a6..003f5d2 100644 --- a/app/views/admin/m_odr_primes/index.html.haml +++ b/app/views/admin/m_odr_primes/index.html.haml @@ -1,6 +1,9 @@ .qi_header .right= link_to ic(:plus)+' Ajouter', new_admin_m_odr_prime_path(), :class => "btn btn-primary btn-ap-add", :remote => true %h1 + Primes + %span + Primes diff --git a/app/views/admin/m_odr_primes/show.html.haml b/app/views/admin/m_odr_primes/show.html.haml index 0dabad3..e42891d 100644 --- a/app/views/admin/m_odr_primes/show.html.haml +++ b/app/views/admin/m_odr_primes/show.html.haml @@ -2,7 +2,7 @@ .right #state=render :partial => "admin/m_odr_primes/state" %h1 - Prime + Primes %span Détail de la prime ="##{@m_odr_prime.id}"