diff --git a/app/models/price_document.rb b/app/models/price_document.rb index 6328710..07c348c 100644 --- a/app/models/price_document.rb +++ b/app/models/price_document.rb @@ -271,7 +271,8 @@ class PriceDocument < ApplicationRecord :end_date => {:name => "Fin de consultation", :reorder => true}, :dp_comment => {:name => "Commentaire", :reorder => true}, :acheteur_text => {:name => "Envoyé à", :reorder => true}, - + :customer_ref => {:name => "Ref cotation", :reorder => false}, + :p_commercial => {:name => "Commercial", :reorder => false}, :p_customer => {:name => "Client", :reorder => false}, diff --git a/app/views/admin/price_documents/_price_document.html.haml b/app/views/admin/price_documents/_price_document.html.haml index 923ddb6..f8e14de 100644 --- a/app/views/admin/price_documents/_price_document.html.haml +++ b/app/views/admin/price_documents/_price_document.html.haml @@ -1,4 +1,7 @@ %tr#price_document_row{:id => price_document.id} + - if price_document.doc_ref_id.present? + - parent_doc = PriceDocument.find(price_document.doc_ref_id) + -tr = {} -tr[:p_payment_type] = capture do @@ -17,7 +20,13 @@ -tr[:p_fournisseur] = capture do %td - = price_document.p_fournisseur.name if price_document.p_fournisseur + - if price_document.price_document_type_id == 2 + -if price_document.p_fournisseur.present? + = price_document.p_fournisseur.name + - else + =link_to ic('pencil') + " rapprocher le fournisseur", match_p_fournisseur_admin_price_document_path(price_document), remote: true + -else + = price_document.p_fournisseur.name if price_document.p_fournisseur -tr[:com_counter] = capture do %td @@ -58,8 +67,30 @@ %td - if price_document.avancement = price_document.avancement.to_s + " %" + - elsif parent_doc.avancement + = parent_doc.avancement.to_s + " %" + + -tr[:list_designaton] = capture do + %td + = price_document.list_designaton || parent_doc.list_designaton + + -tr[:end_date] = capture do + %td + = price_document.end_date || parent_doc.end_date + + -tr[:dp_comment] = capture do + %td + = price_document.dp_comment || parent_doc.dp_comment + + -tr[:acheteur_text] = capture do + %td + = price_document.acheteur_text || parent_doc.acheteur_text + + -tr[:customer_ref] = capture do + %td + -if price_document.price_line_block.present? + = price_document.price_line_block.customer_ref - -tr[:stock_ok] = capture do %td -if !price_document.imported