diff --git a/.sass-cache/f6b9a0b1905a68d5dbb2139e95d49cba92f6fa93/(__TEMPLATE__)c b/.sass-cache/f6b9a0b1905a68d5dbb2139e95d49cba92f6fa93/(__TEMPLATE__)c index f14f694..e1c3ae1 100644 Binary files a/.sass-cache/f6b9a0b1905a68d5dbb2139e95d49cba92f6fa93/(__TEMPLATE__)c and b/.sass-cache/f6b9a0b1905a68d5dbb2139e95d49cba92f6fa93/(__TEMPLATE__)c differ diff --git a/app/models/price_document.rb b/app/models/price_document.rb index d81a403..0f019c2 100644 --- a/app/models/price_document.rb +++ b/app/models/price_document.rb @@ -266,7 +266,8 @@ class PriceDocument < ApplicationRecord def self.qi_table_order { - :id => {:name => "ID", :reorder => false}, + :id => {:name => "ID", :reorder => false}, + :actions => {:name => "Actions", :reorder => false}, :p_customer_code => {:name => "Code client", :reorder => false}, #:avancement => {:name => "Avancement (%)", :reorder => true}, #:list_designaton => {:name => "Designation liste", :reorder => true}, @@ -297,9 +298,8 @@ class PriceDocument < ApplicationRecord :cc_to_paid_ttc => {:name => "Restant dû", :reorder => true, :as => :currency}, :cc_cost_ht => {:name => "Coût HT", :reorder => true, :as => :currency}, :cc_marge_ht => {:name => "Marge HT", :reorder => true, :as => :currency}, - :cost_ok => {:name => "Marge calculée", :reorder => true, :as => :boolean}, + :cost_ok => {:name => "Marge calculée", :reorder => true, :as => :boolean} #:f_token => {:name => "Liens consultation"}, - :actions => {:name => "Actions", :reorder => false} } #, :sort_name => "code" end diff --git a/app/views/admin/price_line_blocks/_form_facture_achat.html.haml b/app/views/admin/price_line_blocks/_form_facture_achat.html.haml index 88536e2..5113806 100644 --- a/app/views/admin/price_line_blocks/_form_facture_achat.html.haml +++ b/app/views/admin/price_line_blocks/_form_facture_achat.html.haml @@ -15,26 +15,26 @@ PRICE LINE BLOCKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK -if f.object.p_customer and f.object.p_customer.particular =render :partial => "admin/p_customers/apercu", :locals => {:particular => f.object.p_customer.particular} - .addresses.row - .columns.span_6 - %h3 Adresse de facturation + -# .addresses.row + -# .columns.span_6 + -# %h3 Adresse de facturation - -if f.object.p_customer - =f.inputs do - = f.input :particular_bill_id, :collection => f.object.p_customer.particulars.all, :as => :select, :member_label => :address_line, :include_blank => false, :label => "Adresse de facturation" - -else - =f.inputs do - = f.input :particular_bill_id, :collection => [], :as => :select, :include_blank => false, :label => "Adresse de facturation" + -# -if f.object.p_customer + -# =f.inputs do + -# = f.input :particular_bill_id, :collection => f.object.p_customer.particulars.all, :as => :select, :member_label => :address_line, :include_blank => false, :label => "Adresse de facturation" + -# -else + -# =f.inputs do + -# = f.input :particular_bill_id, :collection => [], :as => :select, :include_blank => false, :label => "Adresse de facturation" - .columns.span_6 - %h3 Adresse de livraison + -# .columns.span_6 + -# %h3 Adresse de livraison - -if f.object.p_customer - =f.inputs do - = f.input :particular_send_id, :collection => f.object.p_customer.particulars.all, :as => :select, :member_label => :address_line, :include_blank => false, :label => "Adresse de livraison" - -else - =f.inputs do - = f.input :particular_send_id, :collection => [], :as => :select, :include_blank => false, :label => "Adresse de livraison" + -# -if f.object.p_customer + -# =f.inputs do + -# = f.input :particular_send_id, :collection => f.object.p_customer.particulars.all, :as => :select, :member_label => :address_line, :include_blank => false, :label => "Adresse de livraison" + -# -else + -# =f.inputs do + -# = f.input :particular_send_id, :collection => [], :as => :select, :include_blank => false, :label => "Adresse de livraison" .clear @@ -45,6 +45,10 @@ PRICE LINE BLOCKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK =# f.input :wish_date, :label => "Date de livraison souhaitée :", :as => :date %td =# f.input :ct_creation_date, :label => "Date de commande (si différente de la date de création) :", :as => :date + .row + .col-6 + = f.input :validation_date, :label => "Date d'entrée en stock :", :as => :date + .row .col-6 = f.input :customer_ref, :label => "Référence commande fournisseur :"