suite
This commit is contained in:
parent
f521e0abf8
commit
2dba5e96b5
@ -26,7 +26,7 @@ class Admin::PDocumentsController < ApplicationController
|
|||||||
params[:inline] = true
|
params[:inline] = true
|
||||||
|
|
||||||
|
|
||||||
if !params[:html]
|
if !params[:html] and !Rails.env.development?
|
||||||
|
|
||||||
@temp_file = "#{Rails.root}/pdf/p_documents/#{@p_document.d_number}_temp.pdf"
|
@temp_file = "#{Rails.root}/pdf/p_documents/#{@p_document.d_number}_temp.pdf"
|
||||||
@final_file = "#{Rails.root}/pdf/p_documents/#{@p_document.d_number}.pdf"
|
@final_file = "#{Rails.root}/pdf/p_documents/#{@p_document.d_number}.pdf"
|
||||||
|
@ -299,11 +299,21 @@ class PDocument < ActiveRecord::Base
|
|||||||
if self.comptant
|
if self.comptant
|
||||||
d
|
d
|
||||||
else
|
else
|
||||||
d + self.payment_delais.to_i.day
|
|
||||||
|
puts self.payment_delais.to_i
|
||||||
|
d = d + self.payment_delais.to_i.days
|
||||||
|
|
||||||
|
puts d
|
||||||
end
|
end
|
||||||
if self.payment_fin_de_mois
|
if self.payment_fin_de_mois
|
||||||
d = d.end_of_month
|
d = d.end_of_month
|
||||||
|
puts d
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
puts d
|
||||||
|
|
||||||
|
#fsdsdf = sfsfd
|
||||||
return d
|
return d
|
||||||
|
|
||||||
end
|
end
|
||||||
|
@ -130,7 +130,7 @@
|
|||||||
-else
|
-else
|
||||||
=@p_document.payment_delais.to_i
|
=@p_document.payment_delais.to_i
|
||||||
-if @p_document.payment_fin_de_mois
|
-if @p_document.payment_fin_de_mois
|
||||||
jours fin de moi
|
jours fin de mois
|
||||||
-else
|
-else
|
||||||
jours nets
|
jours nets
|
||||||
|
|
||||||
@ -138,6 +138,7 @@
|
|||||||
=l @p_document.echeance, :format => :date
|
=l @p_document.echeance, :format => :date
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-if @element.p_customer.p_contacts.count > 0
|
-if @element.p_customer.p_contacts.count > 0
|
||||||
%p{:style => "margin-bottom:0;"} Contacts généraux du compte client :
|
%p{:style => "margin-bottom:0;"} Contacts généraux du compte client :
|
||||||
.p_contacts
|
.p_contacts
|
||||||
|
Loading…
x
Reference in New Issue
Block a user