suite

app/views/admin/m_odr_files/_form.html.haml

@@ -9,15 +9,11 @@
 
         = 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;"}
         
 
 
@@ -32,6 +28,7 @@
 
 
         -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}
@@ -39,6 +36,10 @@
             %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

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
     
 
       

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}"