Merge branch 'chemi_branch' of SML/pos-boutique into master

app/datatables/stocks_datatable.rb

@@ -49,9 +49,9 @@ class StocksDatatable
   def fetch_stock
     stock =
       if @current_user.usertype == 'S'
-        WarehouseStock.activos.includes(:product, :category).where(warehouse_id: @current_user.warehouse_id).order('products.name')
+        WarehouseStock.activos.includes(:product, :categories).where(warehouse_id: @current_user.warehouse_id).order('products.name')
       else
-        AvailableProduct.activos.includes(:product, :category).where(pointsale_id: @current_user.pointsale_id.present? ? @current_user.pointsale_id : params[:pointsale]).order('products.name')
+        AvailableProduct.activos.includes(:product, :categories).where(pointsale_id: @current_user.pointsale_id.present? ? @current_user.pointsale_id : params[:pointsale]).order('products.name')
       end
     stock = stock.page(page).per_page(per_page)
     stock = stock.where("products.sku ilike :search or products.name ilike :search", search: "%#{params[:busqueda]}%").order('products.name') unless params[:busqueda].blank?