Merge branch 'master' into i18n

Conflicts:
	app/assets/javascripts/application.js

app/views/deliveries/_form.html.haml

@@ -61,8 +61,6 @@
           return true;
         }
       });
-      
-      enablePriceTooltips();
     });
     
     function mark_article_for_delivery(stock_article_id) {
@@ -80,14 +78,6 @@
       return ( 0 == $('#stock_change_stock_article_' + stock_article_id).length );
     }
 
-    function enablePriceTooltips(context) {
-      $('[data-toggle~="tooltip"]', context).tooltip({
-        animation: false,
-        html: true,
-        placement: 'left'
-      });
-    }
-
 = simple_form_for [@supplier, @delivery], validate: true do |f|
   = f.error_notification
   = base_errors f.object

app/views/deliveries/add_stock_change.js.erb

@@ -13,7 +13,6 @@
   var stock_change = $(
     '<%= j(render(:partial => 'stock_change', :locals => {:stock_change => @stock_change})) %>'
   ).addClass('success');
-  enablePriceTooltips(stock_change);
   $('input.stock-change-quantity', stock_change).val(quantity);
   
   $('#stock_changes').append(stock_change);

app/views/deliveries/create_stock_article.js.erb

@@ -8,7 +8,6 @@ $('div.container-fluid').prepend(
   var stock_article_for_adding = $(
     '<%= j(render(:partial => 'stock_article_for_adding', :locals => {:article => @stock_article})) %>'
   ).addClass('success');
-  enablePriceTooltips(stock_article_for_adding);
   
   $('#stock_articles_for_adding tbody').append(stock_article_for_adding);
   updateSort('#stock_articles_for_adding');

app/views/deliveries/update_stock_article.js.erb

@@ -10,7 +10,6 @@ $('div.container-fluid').prepend(
   var stock_article_for_adding = $(
     '<%= j(render(:partial => 'stock_article_for_adding', :locals => {:article => @stock_article, :delivery => @delivery})) %>'
   ).addClass('success');
-  enablePriceTooltips(stock_article_for_adding);
   
   $('#stock_article_<%= @stock_article.id %>').replaceWith(stock_article_for_adding);
   updateSort('#stock_articles_for_adding');