update balancing screen

This commit is contained in:
wvengen 2013-12-18 22:08:02 +01:00
parent 873a1ff108
commit 84fe791078
7 changed files with 18 additions and 10 deletions

View file

@ -1,8 +1,9 @@
%td.closed
= link_to order_article.article.name, '#', 'data-toggle-this' => "#group_order_articles_#{order_article.id}"
%td= order_article.article.order_number
%td
= order_article.units_to_order
%td{title: units_history_line(order_article)}
= order_article.units
%i.package pkg
- unless order_article.ordered_quantities_equal_to_group_orders?
%span{:style => "color:red;font-weight: bold"} !
%td #{order_article.price.unit_quantity} × #{order_article.article.unit}

View file

@ -19,7 +19,7 @@
%td= show_user(order.updated_by)
%td
- unless order.closed?
= link_to t('.receive'), edit_finance_receive_path(order), class: 'btn btn-mini'
= link_to t('orders.index.action_receive'), receive_order_path(order), class: 'btn btn-mini'
= link_to t('.clear'), new_finance_order_path(order_id: order.id), class: 'btn btn-mini btn-primary'
= link_to t('.close'), close_direct_finance_order_path(order),
:confirm => t('.confirm'), :method => :put, class: 'btn btn-mini'