Merge branch 'front-update' into pre-prod

app/controllers/admin/buy_lists_controller.rb

@@ -8,7 +8,7 @@ class Admin::BuyListsController < ApplicationController
     
     @p_customer_sheets = PCustomerSheet.all
     
-    @p_customer_sheets = @p_customer_sheets.where(:state => ["AV BPA", "PAS BPA", "BPA"])
+    @p_customer_sheets = @p_customer_sheets.where(:state => ["brouillon", "offre", "commande"])
     
     @price_line_blocks = PriceLineBlock.where(:price_lineable_type => "PCustomerSheet", :price_lineable_id => @p_customer_sheets.ids)
     

app/models/p_customer_sheet.rb

@@ -256,7 +256,7 @@ class PCustomerSheet < ApplicationRecord
 
 
   after_create do
-    #self.state = "brouillon" if self.state != "Panier web"
+    self.state = "brouillon" if self.state != "Panier web"
     self.save
   end
 

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

@@ -1,14 +1,7 @@
 =semantic_form_for [:admin, @p_customer_sheet], :html => {:class => "qi_price_form"}, :remote => false do |form|
   
   .content
-    .qi_row
-      .qi_pannel.qi_plain.padding
-        -if @p_customer_sheet and @p_customer_sheet.state != "commande"
-          =#form.input :demande_type, :collection => ["Brouillon", "Demande de bon de commande","Demande de devis"], :as => :select, :include_blank => false, :label => "Type de demande :"
 
-        =form.input :state, :collection => ["AV BPA", "PAS BPA","BPA", "Traitée"], :as => :select, :include_blank => false, :label => "Statut :"
-        
-        =form.input :past_id, :label => "N° système actuel"
   
     .price_line_block_form
       =form.semantic_fields_for :price_line_block do |f|