diff --git a/app/controllers/stockit_controller.rb b/app/controllers/stockit_controller.rb
index 3e3b43b2..475ac3a3 100644
--- a/app/controllers/stockit_controller.rb
+++ b/app/controllers/stockit_controller.rb
@@ -31,6 +31,11 @@ class StockitController < ApplicationController
end
end
+ def show
+ @stock_article = StockArticle.find(params[:id])
+ @stock_changes = @stock_article.stock_changes.order('stock_changes.created_at DESC')
+ end
+
def destroy
@article = StockArticle.find(params[:id])
@article.mark_as_deleted
@@ -55,9 +60,4 @@ class StockitController < ApplicationController
render :partial => 'form', :locals => {:stock_article => stock_article}
end
-
- def history
- @stock_article = StockArticle.undeleted.find(params[:stock_article_id])
- @stock_changes = @stock_article.stock_changes.order('stock_changes.created_at DESC').each {|s| s.readonly!}
- end
end
diff --git a/app/views/stock_takings/_stock_change.html.haml b/app/views/stock_takings/_stock_change.html.haml
index 616be369..3d27c1fa 100644
--- a/app/views/stock_takings/_stock_change.html.haml
+++ b/app/views/stock_takings/_stock_change.html.haml
@@ -3,5 +3,6 @@
= form.hidden_field :stock_article_id
= "Menge (#{stock_change.stock_article.quantity_available})"
= form.text_field :quantity, :size => 5, :autocomplete => 'off'
- %b= stock_change.stock_article.name
- = "(#{number_to_currency(stock_change.stock_article.price)} / #{stock_change.stock_article.unit})"
+ %span{:data => {:toggle => :tooltip, :title => render(:partial => 'shared/article_price_info', :locals => {:article => stock_change.stock_article})}}
+ %b= stock_change.stock_article.name
+ = "(#{number_to_currency(stock_change.stock_article.price)} / #{stock_change.stock_article.unit})"
diff --git a/app/views/stock_takings/new.html.haml b/app/views/stock_takings/new.html.haml
index 51239ba4..6e4526f9 100644
--- a/app/views/stock_takings/new.html.haml
+++ b/app/views/stock_takings/new.html.haml
@@ -1,5 +1,20 @@
- title t('.title')
+- content_for :javascript do
+ :javascript
+ $(function() {
+ enablePriceTooltips();
+ });
+
+ function enablePriceTooltips(context) {
+ $('[data-toggle~="tooltip"]', context).tooltip({
+ animation: false,
+ html: true,
+ placement: 'left',
+ container: 'body'
+ });
+ }
+
- content_for :sidebar do
%p
%i= t('.text_deviations', inv_link: link_to(t('.temp_inventory'), stock_articles_path)).html_safe
diff --git a/app/views/stockit/history.haml b/app/views/stockit/history.haml
deleted file mode 100644
index f4fe2b07..00000000
--- a/app/views/stockit/history.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-- title t('.stock_changes', :article_name => @stock_article.name)
-
-%table.table.table-hover#stock_changes
- %thead
- %tr
- %th= t '.datetime'
- %th= t '.reason'
- %th= t '.change_quantity'
- %th= t '.new_quantity'
- %tbody
- - reversed_history = @stock_article.quantity_history.reverse
- - @stock_changes.each_with_index do |stock_change, index|
- %tr
- %td= l stock_change.created_at
- %td= link_to_stock_change_reason(stock_change)
- %td= stock_change.quantity
- %td= reversed_history[index]
diff --git a/app/views/stockit/index.html.haml b/app/views/stockit/index.html.haml
index 477e5816..c2899d9e 100644
--- a/app/views/stockit/index.html.haml
+++ b/app/views/stockit/index.html.haml
@@ -45,7 +45,7 @@
%tbody
- for article in @stock_articles
%tr{:class => stock_article_classes(article), :id => "stockArticle-#{article.id}"}
- %td=h article.name
+ %td= link_to article.name, article
%td= article.quantity
%td= article.quantity - article.quantity_available
%th= article.quantity_available
@@ -56,7 +56,6 @@
%td= article.article_category.name
%td
= link_to t('ui.edit'), edit_stock_article_path(article), class: 'btn btn-mini'
- = link_to t('ui.history'), stock_article_history_path(article), class: 'btn btn-mini'
= link_to t('ui.delete'), article, :method => :delete, :confirm => t('.confirm_delete'),
class: 'btn btn-mini btn-danger', :remote => true
%p
diff --git a/app/views/stockit/show.html.haml b/app/views/stockit/show.html.haml
new file mode 100644
index 00000000..5f416bf9
--- /dev/null
+++ b/app/views/stockit/show.html.haml
@@ -0,0 +1,47 @@
+- title @stock_article.name
+
+.row-fluid
+ .span6
+ %dl.dl-horizontal
+ %dt= StockArticle.human_attribute_name 'supplier'
+ %dd= link_to @stock_article.supplier.name, @stock_article.supplier
+ %dt= StockArticle.human_attribute_name 'name'
+ %dd= @stock_article.name
+ %dt= StockArticle.human_attribute_name 'unit'
+ %dd= @stock_article.unit
+ %dt= StockArticle.human_attribute_name 'price'
+ %dd= number_to_currency @stock_article.price
+ %dt= StockArticle.human_attribute_name 'tax'
+ %dd= number_to_percentage @stock_article.tax
+ %dt= StockArticle.human_attribute_name 'deposit'
+ %dd= number_to_currency @stock_article.deposit
+ %dt= StockArticle.human_attribute_name 'fc_price'
+ %dd= number_to_currency @stock_article.fc_price
+ %dt= StockArticle.human_attribute_name 'article_category'
+ %dd= @stock_article.article_category.name
+ %dt= StockArticle.human_attribute_name 'note'
+ %dd= @stock_article.note
+ %dt= StockArticle.human_attribute_name 'quantity'
+ %dd= @stock_article.quantity
+ %dt= StockArticle.human_attribute_name 'quantity_available'
+ %dd= @stock_article.quantity_available
+ .form-actions
+ = link_to t('ui.edit'), edit_stock_article_path(@stock_article), class: 'btn'
+
+ .span6
+ %h2= t('.stock_changes')
+ %table.table.table-hover#stock_changes
+ %thead
+ %tr
+ %th= t '.datetime'
+ %th= t '.reason'
+ %th= t '.change_quantity'
+ %th= t '.new_quantity'
+ %tbody
+ - reversed_history = @stock_article.quantity_history.reverse
+ - @stock_changes.each_with_index do |stock_change, index|
+ %tr
+ %td= l stock_change.created_at
+ %td= link_to_stock_change_reason(stock_change)
+ %td= stock_change.quantity
+ %td= reversed_history[index]
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 893739d6..ea3d9bf8 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -42,7 +42,10 @@ de:
fc_price: Endpreis
fc_share: FC-Aufschlag
gross_price: Bruttopreis
+ name: Name
+ note: Notiz
price: Nettopreis
+ supplier: Lieferantin
tax: MwSt
unit: Einheit
unit_quantity: Gebindegröße
@@ -51,6 +54,8 @@ de:
note: Notiz
stock_article:
price: Nettopreis
+ quantity: Lagerbestand
+ quantity_available: Verfügbarer Bestand
user:
first_name: Vorname
password: Passwort
@@ -1733,15 +1738,6 @@ de:
title: Lagerartikel bearbeiten
form:
price_hint: Um Chaos zu vermeiden können bis auf weiteres die Preise von angelegten Lagerartikeln nicht mehr verändert werden.
- history:
- change_quantity: Veränderung
- datetime: Zeitpunkt
- delivery: Lieferung
- new_quantity: Neuer Bestand
- order: Bestellung
- reason: Ereignis
- stock_changes: Verlauf anzeigen für »%{article_name}«
- stock_taking: Inventur
index:
article:
article: Artikel
@@ -1767,6 +1763,15 @@ de:
new:
search_text: ! 'Suche nache Artikeln aus allen Katalogen:'
title: Neuen Lagerartikel anlegen
+ show:
+ change_quantity: Veränderung
+ datetime: Zeitpunkt
+ delivery: Lieferung
+ new_quantity: Neuer Bestand
+ order: Bestellung
+ reason: Ereignis
+ stock_changes: Verlauf des Lagerbestands
+ stock_taking: Inventur
stock_create:
notice: Lagerartikel wurde gespeichert.
stock_update:
@@ -1891,7 +1896,6 @@ de:
close: Schließen
delete: Löschen
edit: Bearbeiten
- history: Verlauf anzeigen
marks:
close: ! '×'
success:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 915f4341..d54afc8a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -42,7 +42,10 @@ en:
fc_price: FC price
fc_share: FC share
gross_price: gross price
+ name: name
+ note: note
price: price
+ supplier: supplier
tax: VAT
unit: unit
unit_quantity: unit quantity
@@ -50,7 +53,9 @@ en:
amount: amount
note: note
stock_article:
- price: Price
+ price: price
+ quantity: quantity
+ quantity_available: available quantity
user:
first_name: First name
password: Password
@@ -1737,15 +1742,6 @@ en:
title: Edit stock articles
form:
price_hint: To avoid choas, it is not possible to edit the prices of already added stock articles until further notice.
- history:
- change_quantity: Change
- datetime: Time
- delivery: Delivery
- new_quantity: New quantity
- order: Order
- reason: Reason
- stock_changes: Stock quantity changes of ‘%{article_name}’
- stock_taking: Inventory
index:
article:
article: Article
@@ -1771,6 +1767,15 @@ en:
new:
search_text: ! 'Search for articles in all catalogues:'
title: Add new stock article
+ show:
+ change_quantity: Change
+ datetime: Time
+ delivery: Delivery
+ new_quantity: New quantity
+ order: Order
+ reason: Reason
+ stock_changes: Stock quantity changes
+ stock_taking: Inventory
stock_create:
notice: Stock article was created.
stock_update:
@@ -1895,7 +1900,6 @@ en:
close: Close
delete: Delete
edit: Edit
- history: Show history
marks:
close: ! '×'
success:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 2c176d31..835bbdfe 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1739,15 +1739,6 @@ fr:
title: Modifier l'article
form:
price_hint: Pour éviter que ça soit le bazar, les prix des articles en stock ne peuvent plus être modifiés.
- history:
- change_quantity: Modification
- datetime: Temps
- delivery: Réapprovisionnement
- new_quantity: Nouveau stock
- order: Commande
- reason: Raison
- stock_changes: Afficher l'historique pour "%{article_name}"
- stock_taking: Inventaire
index:
article:
article: Article
@@ -1773,6 +1764,15 @@ fr:
new:
search_text: ! 'Rechercher des articles dans tous les catalogues:'
title: Ajouter un article au stock
+ show:
+ change_quantity: Modification
+ datetime: Temps
+ delivery: Réapprovisionnement
+ new_quantity: Nouveau stock
+ order: Commande
+ reason: Raison
+ stock_changes: Afficher l'historique
+ stock_taking: Inventaire
stock_create:
notice: L'article a été sauvegardé.
stock_update:
@@ -1905,7 +1905,6 @@ fr:
close: Fermer
delete: Supprimer
edit: Modifier
- history: Afficher l'historique
marks:
close: ! '×'
success:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 05b3ea5e..5a3d4f99 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1665,15 +1665,6 @@ nl:
title:
form:
price_hint:
- history:
- change_quantity:
- datetime:
- delivery:
- new_quantity:
- order:
- reason:
- stock_changes:
- stock_taking:
index:
article:
article:
@@ -1699,6 +1690,15 @@ nl:
new:
search_text:
title:
+ show:
+ change_quantity:
+ datetime:
+ delivery:
+ new_quantity:
+ order:
+ reason:
+ stock_changes:
+ stock_taking:
stock_create:
notice: Voorraadsartikel is opgeslagen.
stock_update:
@@ -1823,7 +1823,6 @@ nl:
close: Sluiten
delete: Verwijder
edit: Bewerk
- history:
marks:
close: ! '×'
success:
diff --git a/config/routes.rb b/config/routes.rb
index 0f96d7fa..533d2d97 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -97,8 +97,6 @@ Foodsoft::Application.routes.draw do
get :articles_search
get :fill_new_stock_article_form
end
-
- get :history
end
resources :suppliers do