diff --git a/app/controllers/admin/p_articles_controller.rb b/app/controllers/admin/p_articles_controller.rb
index 24ba78d..ef8b79a 100644
--- a/app/controllers/admin/p_articles_controller.rb
+++ b/app/controllers/admin/p_articles_controller.rb
@@ -15,9 +15,9 @@ class Admin::PArticlesController < ApplicationController
 
     if params[:search][:p_product_color].to_s != ""
       if params[:search][:p_product_color].to_s == "null"
-        @p_articles = @p_articles.where(:p_product_color => nil)
+        @p_articles = @p_articles.joins(:p_product_ref).where("p_product_color_id = ?", nil)
       else
-        @p_articles = @p_articles.where(:p_product_color => params[:search][:p_product_color])
+        @p_articles = @p_articles.joins(:p_product_ref).where("p_product_color_id = ?", params[:search][:p_product_color])
       end
     end
 
@@ -25,6 +25,10 @@ class Admin::PArticlesController < ApplicationController
       @p_articles = @p_articles.joins(:p_product_ref).where("cc_name LIKE ?", "#{params[:search][:p_product_ref_cc_name]}%")
     end
 
+    if params[:search][:p_grade_id]
+      @p_articles = @p_articles.where("p_grade_id LIKE ?", "#{params[:search][:p_grade_id]}%")
+    end
+
     if params[:search][:p_product_ref_cc_code]
       @p_articles = @p_articles.joins(:p_product_ref).where("cc_code LIKE ?", "#{params[:search][:p_product_ref_cc_code]}%")
     end
diff --git a/app/views/admin/p_articles/index.html.haml b/app/views/admin/p_articles/index.html.haml
index 8bc5e78..2123172 100644
--- a/app/views/admin/p_articles/index.html.haml
+++ b/app/views/admin/p_articles/index.html.haml
@@ -18,9 +18,12 @@
 
         %td=text_field_tag "search[p_serial_num_value]", params[:search][:p_serial_num_value],:class => "form-control", :placeholder => "N° de serie"
 
+        %td.pl-2 Grade :
+        %td=select_tag "search[p_grade_id]", options_for_select([["",""],["Aucune","null"]]+PGrade.pluck(:grade, :id), params[:search][:p_grade_id]), class: "custom-select"
+
+        %td.pl-2 Couleur :
         %td
-          Couleur :
-          =select_tag "search[p_product_color]", options_for_select([["",""],["Aucune","null"]]+PProductColor.pluck(:color, :id), params[:search][:p_product_color])
+          =select_tag "search[p_product_color]", options_for_select([["",""],["Aucune","null"]]+PProductColor.pluck(:color, :id), params[:search][:p_product_color]),class: "custom-select"
 
 
     =render :partial => "qi/qi_ordered_table_search_footer", :locals => {:collection_object => @p_articles}