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');

app/views/finance/financial_transactions/new_collection.html.haml

@@ -5,12 +5,12 @@
     var ordergroup = "#{escape_javascript(render('ordergroup'))}"
 
     $(function() {
-      $('a[data-remove-transaction]').live('click', function() {
+      $(document).on('click', 'a[data-remove-transaction]', function() {
         $(this).parents('tr').remove();
         return false;
       });
 
-      $('a[data-add-transaction]').click(function() {
+      $(document).on('click', 'a[data-add-transaction]', function() {
         $('#ordergroups').append(ordergroup);
         return false;
       });

app/views/shared/_open_orders.html.haml

@@ -2,7 +2,7 @@
   %h2= t '.title'
   - if ordergroup.not_enough_apples?
     .alert
-    = t '.not_enough_apples'
+      = t '.not_enough_apples'
   - unless Order.open.empty?
     %table.table.table-striped
       %thead

app/views/stock_takings/new.html.haml

@@ -1,20 +1,5 @@
 - 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

app/views/suppliers/_form.haml

@@ -1,7 +1,7 @@
 = simple_form_for @supplier do |f|
   - if @supplier.shared_supplier
-    .alert.alert-success
-    = t 'suppliers.shared_supplier_note'
+    .alert.alert-info
+      = t 'suppliers.shared_supplier_note'
   = f.hidden_field :shared_supplier_id
   = f.input :name
   = f.input :address

app/views/suppliers/show.haml

@@ -4,7 +4,7 @@
   .span6
     - if shared_supplier = @supplier.shared_supplier
       .alert.alert-info
-      = t 'suppliers.shared_supplier_note'
+        = t 'suppliers.shared_supplier_note'
 
     %dl.dl-horizontal
       %dt= heading_helper(Supplier, :address) + ':'