Merge branch 'master' into tests-rspec

app/controllers/stockit_controller.rb

@@ -55,4 +55,9 @@ 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

app/helpers/stockit_helper.rb

@@ -4,4 +4,14 @@ module StockitHelper
     class_names << "unavailable" if article.quantity_available <= 0
     class_names.join(" ")
   end
+
+  def link_to_stock_change_reason(stock_change)
+    if stock_change.delivery_id
+      link_to t('.delivery'), supplier_delivery_path(stock_change.delivery.supplier, stock_change.delivery)
+    elsif stock_change.order_id
+      link_to t('.order'), order_path(stock_change.order)
+    elsif stock_change.stock_taking_id
+      link_to t('.stock_taking'), stock_taking_path(stock_change.stock_taking)
+    end
+  end
 end

app/models/ordergroup.rb

@@ -108,13 +108,13 @@ class Ordergroup < Group
 
   # Make sure, the name is uniq, add usefull message if uniq group is already deleted
   def uniqueness_of_name
-    id = new_record? ? nil : self.id
-    group = Ordergroup.where('groups.id != ? AND groups.name = ?', id, name).first
-    if group.present?
-      message = group.deleted? ? :taken_with_deleted : :taken
+    group = Ordergroup.where('groups.name = ?', name)
+    group = group.where('groups.id != ?', self.id) unless new_record?
+    if group.exists?
+      message = group.first.deleted? ? :taken_with_deleted : :taken
       errors.add :name, message
     end
   end
-  
+ 
 end
 

app/models/stock_article.rb

@@ -17,6 +17,10 @@ class StockArticle < Article
     quantity - OrderArticle.where(article_id: id).
         joins(:order).where("orders.state = 'open' OR orders.state = 'finished'").sum(:units_to_order)
   end
+  
+  def quantity_history
+    stock_changes.reorder('stock_changes.created_at ASC').map{|s| s.quantity}.cumulative_sum
+  end
 
   def self.stock_value
     available.collect { |a| a.quantity * a.gross_price }.sum

app/models/stock_change.rb

@@ -1,6 +1,7 @@
 class StockChange < ActiveRecord::Base
   belongs_to :delivery
   belongs_to :order
+  belongs_to :stock_taking
   belongs_to :stock_article
 
   validates_presence_of :stock_article_id, :quantity

app/models/supplier.rb

@@ -80,10 +80,10 @@ class Supplier < ActiveRecord::Base
 
   # Make sure, the name is uniq, add usefull message if uniq group is already deleted
   def uniqueness_of_name
-    id = new_record? ? nil : self.id
-    supplier = Supplier.where('suppliers.id != ? AND suppliers.name = ?', id, name).first
-    if supplier.present?
-      message = supplier.deleted? ? :taken_with_deleted : :taken
+    supplier = Supplier.where('suppliers.name = ?', name)
+    supplier = supplier.where('suppliers.id != ?', self.id) unless new_record?
+    if supplier.exists?
+      message = supplier.first.deleted? ? :taken_with_deleted : :taken
       errors.add :name, message
     end
   end

app/views/stockit/history.haml

@@ -0,0 +1,17 @@
+- 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]

app/views/stockit/index.html.haml

@@ -56,6 +56,7 @@
         %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