Minor bugfixes
This commit is contained in:
parent
1dbe4a100c
commit
26755a6ab4
@ -1,6 +1,8 @@
|
||||
%tr#price_document_row{:id => price_document.id}
|
||||
- if price_document.doc_ref_id.present?
|
||||
- parent_doc = PriceDocument.find(price_document.doc_ref_id)
|
||||
-else
|
||||
- parent_doc = nil
|
||||
|
||||
-tr = {}
|
||||
|
||||
@ -26,7 +28,7 @@
|
||||
- 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
|
||||
= price_document.p_fournisseur.name if price_document.p_fournisseur
|
||||
|
||||
-tr[:com_counter] = capture do
|
||||
%td
|
||||
@ -76,7 +78,12 @@
|
||||
|
||||
-tr[:end_date] = capture do
|
||||
%td
|
||||
= price_document.end_date || parent_doc.end_date
|
||||
-if price_document.end_date
|
||||
=price_document.end_date
|
||||
|
||||
-elsif parent_doc and parent_doc.end_date
|
||||
=parent_doc.end_date
|
||||
|
||||
|
||||
-tr[:dp_comment] = capture do
|
||||
%td
|
||||
|
@ -102,9 +102,9 @@
|
||||
= price_line.p_product_ref.p_product_color.name
|
||||
|
||||
%td
|
||||
= price_line.p_product_ref.p_product_color.color
|
||||
= price_line.p_product_ref.p_product_color.color if price_line.p_product_ref and price_line.p_product_ref.p_product_color
|
||||
%td
|
||||
= price_line.p_product_power.name
|
||||
= price_line.p_product_power.name if price_line.p_product_power
|
||||
%td
|
||||
/ Target hors Sorecop
|
||||
%td
|
||||
|
@ -27,7 +27,7 @@
|
||||
|
||||
%body.admin{:id => "body_#{@qi_menu_active}"}
|
||||
#right_bar
|
||||
=link_to image_tag("/logo-presta.png"), "/", :id => "logo"
|
||||
=link_to image_tag("/logo-arcom.png"), "/", :id => "logo"
|
||||
|
||||
|
||||
-if current_admin
|
||||
|
Reference in New Issue
Block a user