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

suite

Browse Source
This commit is contained in:
Nicolas Bally 2020-05-12 23:11:24 +02:00
parent 4eb5271e39
commit c0c6c94896
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/price_line.rb
View File

@ -53,9 +53,10 @@ class PriceLine < ApplicationRecord
def ca_ship_price_ht def ca_ship_price_ht
if self.ct_ship_price_ht if self.ct_ship_price_ht
self.ct_ship_price_ht self.ct_ship_price_ht.to_f
elsif self.p_product_ref and self.p_product_ref.p_product elsif self.p_product_ref and self.p_product_ref.p_product
#self.p_product.caution #self.p_product.caution
0.0
end end

6
app/views/admin/price_documents/print.html.haml
View File

@ -74,9 +74,10 @@
-if particular_doc.organisation? -if particular_doc.organisation?
%strong=particular_doc.organisation %strong=particular_doc.organisation
-if particular_doc.organisation?
%br %br
-if particular_doc.com_name?
=particular_doc.com_name =particular_doc.com_name
%br
-if particular_doc.firstname? or particular_doc.name? -if particular_doc.firstname? or particular_doc.name?
@ -109,9 +110,10 @@
-if particular_doc.organisation? -if particular_doc.organisation?
%strong=particular_doc.organisation %strong=particular_doc.organisation
-if particular_doc.organisation?
%br %br
-if particular_doc.com_name?
=particular_doc.com_name =particular_doc.com_name
%br
-if particular_doc.firstname? or particular_doc.name? -if particular_doc.firstname? or particular_doc.name?