Second part of stock-integration.
Introduced StockArticle and a special page for ordering from stock. StockChanges will be created and the StockArticle.quantity updated in 'order.close!'.
This commit is contained in:
parent
1912a3fd80
commit
c17b63b192
37 changed files with 616 additions and 340 deletions
|
|
@ -17,7 +17,7 @@
|
|||
%td{:id => "group_order_article_#{group_order_article.id}_quantity"}
|
||||
= group_order_article.result
|
||||
%td.currency
|
||||
= number_to_currency(group_order_article.order_article.price.fc_price * group_order_article.quantity, :unit => "")
|
||||
= number_to_currency(group_order_article.order_article.price.fc_price * group_order_article.result, :unit => "")
|
||||
%td.actions{:style=>"width:1em"}
|
||||
= remote_link_to icon(:edit), :update => 'edit_box', |
|
||||
:url => {:action => 'edit_group_order_article', :id => group_order_article}, |
|
||||
|
|
|
|||
|
|
@ -8,11 +8,13 @@
|
|||
%h2 Zusammenfassung
|
||||
.column_content#summary
|
||||
= render :partial => "summary", :locals => {:order => @order}
|
||||
.left_column{:style => 'width: 24em'}
|
||||
.box_title
|
||||
%h2 Rechnung
|
||||
.column_content#invoice
|
||||
= render :partial => "invoice", :locals => {:invoice => @order.invoice}
|
||||
|
||||
- unless @order.stockit?
|
||||
.left_column{:style => 'width: 24em'}
|
||||
.box_title
|
||||
%h2 Rechnung
|
||||
.column_content#invoice
|
||||
= render :partial => "invoice", :locals => {:invoice => @order.invoice}
|
||||
|
||||
.right_column{:style => 'width: 20em'}
|
||||
.box_title
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue