nicolas/phone_app
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding stock entrace date to price_line_block form

Browse Source
This commit is contained in:
Philippe 2021-10-28 12:45:37 +02:00
parent 118116ab70
commit 05007c569b
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.sass-cache/f6b9a0b1905a68d5dbb2139e95d49cba92f6fa93/(__TEMPLATE__)c
View File

Binary file not shown.

6
app/models/price_document.rb
View File

@ -266,7 +266,8 @@ class PriceDocument < ApplicationRecord
def self.qi_table_order 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}, :p_customer_code => {:name => "Code client", :reorder => false},
#:avancement => {:name => "Avancement (%)", :reorder => true}, #:avancement => {:name => "Avancement (%)", :reorder => true},
#:list_designaton => {:name => "Designation liste", :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_to_paid_ttc => {:name => "Restant dû", :reorder => true, :as => :currency},
:cc_cost_ht => {:name => "Coût HT", :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}, :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"}, #:f_token => {:name => "Liens consultation"},
:actions => {:name => "Actions", :reorder => false}
} }
#, :sort_name => "code" #, :sort_name => "code"
end end

38
app/views/admin/price_line_blocks/_form_facture_achat.html.haml
View File

@ -15,26 +15,26 @@ PRICE LINE BLOCKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
-if f.object.p_customer and f.object.p_customer.particular -if f.object.p_customer and f.object.p_customer.particular
=render :partial => "admin/p_customers/apercu", :locals => {:particular => f.object.p_customer.particular} =render :partial => "admin/p_customers/apercu", :locals => {:particular => f.object.p_customer.particular}
.addresses.row -# .addresses.row
.columns.span_6 -# .columns.span_6
%h3 Adresse de facturation -# %h3 Adresse de facturation
-if f.object.p_customer -# -if f.object.p_customer
=f.inputs do -# =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" -# = 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 -# -else
=f.inputs do -# =f.inputs do
= f.input :particular_bill_id, :collection => [], :as => :select, :include_blank => false, :label => "Adresse de facturation" -# = f.input :particular_bill_id, :collection => [], :as => :select, :include_blank => false, :label => "Adresse de facturation"
.columns.span_6 -# .columns.span_6
%h3 Adresse de livraison -# %h3 Adresse de livraison
-if f.object.p_customer -# -if f.object.p_customer
=f.inputs do -# =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" -# = 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 -# -else
=f.inputs do -# =f.inputs do
= f.input :particular_send_id, :collection => [], :as => :select, :include_blank => false, :label => "Adresse de livraison" -# = f.input :particular_send_id, :collection => [], :as => :select, :include_blank => false, :label => "Adresse de livraison"
.clear .clear
@ -45,6 +45,10 @@ PRICE LINE BLOCKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
=# f.input :wish_date, :label => "Date de livraison souhaitée :", :as => :date =# f.input :wish_date, :label => "Date de livraison souhaitée :", :as => :date
%td %td
=# f.input :ct_creation_date, :label => "Date de commande (si différente de la date de création) :", :as => :date =# 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 .row
.col-6 .col-6
= f.input :customer_ref, :label => "Référence commande fournisseur :" = f.input :customer_ref, :label => "Référence commande fournisseur :"