From c0c6c9489602bf2caa2253d1a681d208350a15d8 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <nico@Heribook.local>
Date: Tue, 12 May 2020 23:11:24 +0200
Subject: [PATCH] suite

---
 app/models/price_line.rb                        | 3 ++-
 app/views/admin/price_documents/print.html.haml | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/models/price_line.rb b/app/models/price_line.rb
index 82cdc24..e5709eb 100644
--- a/app/models/price_line.rb
+++ b/app/models/price_line.rb
@@ -53,9 +53,10 @@ class PriceLine < ApplicationRecord
   
   def ca_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
       #self.p_product.caution
+      0.0
       
     end
       
diff --git a/app/views/admin/price_documents/print.html.haml b/app/views/admin/price_documents/print.html.haml
index 2ad03e7..e8c6b76 100644
--- a/app/views/admin/price_documents/print.html.haml
+++ b/app/views/admin/price_documents/print.html.haml
@@ -74,9 +74,10 @@
     
           -if particular_doc.organisation?
             %strong=particular_doc.organisation
-          -if particular_doc.organisation?
             %br
+          -if particular_doc.com_name?
             =particular_doc.com_name
+            %br
       
     
           -if particular_doc.firstname? or particular_doc.name?
@@ -109,9 +110,10 @@
     
           -if particular_doc.organisation?
             %strong=particular_doc.organisation
-          -if particular_doc.organisation?
             %br
+          -if particular_doc.com_name?
             =particular_doc.com_name
+            %br
       
     
           -if particular_doc.firstname? or particular_doc.name?