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

Minor bugfixes

Browse Source
This commit is contained in:
Nicolas Bally 2021-09-01 22:49:59 +02:00
parent 1dbe4a100c
commit 26755a6ab4
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/views/admin/price_documents/_price_document.html.haml
View File

@ -1,6 +1,8 @@
%tr#price_document_row{:id => price_document.id} %tr#price_document_row{:id => price_document.id}
- if price_document.doc_ref_id.present? - if price_document.doc_ref_id.present?
- parent_doc = PriceDocument.find(price_document.doc_ref_id) - parent_doc = PriceDocument.find(price_document.doc_ref_id)
-else
- parent_doc = nil
-tr = {} -tr = {}
@ -26,7 +28,7 @@
- else - else
=link_to ic('pencil') + " rapprocher le fournisseur", match_p_fournisseur_admin_price_document_path(price_document), remote: true =link_to ic('pencil') + " rapprocher le fournisseur", match_p_fournisseur_admin_price_document_path(price_document), remote: true
-else -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 -tr[:com_counter] = capture do
%td %td
@ -76,7 +78,12 @@
-tr[:end_date] = capture do -tr[:end_date] = capture do
%td %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 -tr[:dp_comment] = capture do
%td %td

4
app/views/admin/price_documents/analyse_reponses.html.haml
View File

@ -102,9 +102,9 @@
= price_line.p_product_ref.p_product_color.name = price_line.p_product_ref.p_product_color.name
%td %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 %td
= price_line.p_product_power.name = price_line.p_product_power.name if price_line.p_product_power
%td %td
/ Target hors Sorecop / Target hors Sorecop
%td %td

2
app/views/layouts/admin.html.haml
View File

@ -27,7 +27,7 @@
%body.admin{:id => "body_#{@qi_menu_active}"} %body.admin{:id => "body_#{@qi_menu_active}"}
#right_bar #right_bar
=link_to image_tag("/logo-presta.png"), "/", :id => "logo" =link_to image_tag("/logo-arcom.png"), "/", :id => "logo"
-if current_admin -if current_admin