suite

app/controllers/admin/m_odr_reps_controller.rb

@@ -20,7 +20,9 @@ class Admin::MOdrRepsController < ApplicationController
       
     end
     
-    
+    if params[:name].to_s != ""
+      @m_odr_reps = @m_odr_reps.where("cc_particular_name LIKE ? or cc_particular_firstname LIKE ?","%#{params[:name]}%", "%#{params[:name]}%")
+    end
     
     if params[:search][:state].to_s != ""
       @m_odr_reps = @m_odr_reps.where(:state => params[:search][:state])

app/views/admin/m_odr_reps/_left_column.html.haml

@@ -122,7 +122,7 @@ RIB :
   
         
     
-
+%br
 -if @m_odr_rep.state == "Refusée"
   .red Demande refusée
   Envoyer un mail de notification :

app/views/admin/m_odr_reps/show.html.haml

@@ -10,12 +10,33 @@
       
 -@m_odr_rep.save
 
+-@can_update = current_admin.has_permission?("odr_rep.update")
+
+
+-params[:search][:per_page] = params[:search][:per_page] || 50
+-per_page = params[:search][:per_page]
+-page = (params[:page] and params[:page] != "") ? params[:page] : 1 
+-m_odr_reps = MOdrRep.where(:m_odr_id => @m_odr_rep.m_odr_id).where("cc_particular_name LIKE ? or cc_particular_firstname LIKE ? or cc_particular_name LIKE ? or cc_particular_firstname LIKE ? or cc_particular_email LIKE ? or cc_particular_address_2 LIKE ?","%#{@m_odr_rep.cc_particular_firstname}%", "%#{@m_odr_rep.cc_particular_firstname}%", "%#{@m_odr_rep.cc_particular_name}%", "%#{@m_odr_rep.cc_particular_name}%", "%#{@m_odr_rep.cc_particular_email}%", "%#{@m_odr_rep.cc_particular_address_2}%").where("id != ?",@m_odr_rep.id)
+-m_odr_reps = sort_by_sorting(m_odr_reps, "created_at DESC")
+-m_odr_reps = m_odr_reps.page(page).per(per_page)
+
+-if m_odr_reps.count > 0
+
+  %hr
+          Doublons potentiels :
+
+  =render :partial => "qi/qi_ordered_table", :locals => {:qi_ordered_table_collection => m_odr_reps}
+
+
 .qi_row
   .qi_pannel.qi_plain.padding
 
       
     #head=render :partial => "admin/m_odr_reps/head"
     
+    
+    
+    
     %hr
     Achat
     .row