Merge remote-tracking branch 'bennibu/rails3' into rails3

Conflicts:
	app/controllers/articles_controller.rb
	app/views/articles/_form.html.haml
	app/views/articles/sync.html.haml
	app/views/finance/balancing/_edit_note.html.haml
	app/views/finance/group_order_articles/_form.html.haml
	app/views/finance/order_articles/_edit.html.haml
	app/views/finance/order_articles/_new.html.haml
	app/views/group_orders/show.html.haml
	app/views/invites/_modal_form.html.haml

app/views/articles/_form.html.haml

@@ -2,7 +2,7 @@
   = f.hidden_field :shared_updated_on
   = f.hidden_field :supplier_id
   .modal-header
-    = button_tag t('ui.marks.close').html_safe, class: 'close', data: {dismiss: 'modal'}
+    = link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
     %h3= t '.title'
   .modal-body
     = f.input :availability
@@ -19,6 +19,6 @@
     = f.input :tax
     = f.input :deposit
   .modal-footer
-    = button_tag t('ui.close'), class: 'btn', data: {dismiss: 'modal'}
+    = link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
     = f.submit class: 'btn btn-primary'
 

app/views/articles/sync.html.haml

@@ -1,6 +1,6 @@
 - title 'Artikel mit externer Datenbank synchronisieren'
 
-= form_tag update_all_supplier_articles_path(@supplier, :sync => "1") do
+= form_tag update_synchronized_supplier_articles_path(@supplier) do
   %h2= t '.outlist.title'
   %p
   - unless @outlisted_articles.empty?
@@ -10,6 +10,9 @@
         %li
           = hidden_field_tag "outlisted_articles[#{article.id}]", '1'
           = article.name
+          - if article.in_open_order
+            .alert
+              Achtung, #{article.name} wird gerade in einer laufenden Bestellung verwendet. Bitte erst Bestellung anpassen.
   - else
     %i= t '.outlist.body_skip'
   %hr/

app/views/finance/balancing/_edit_note.html.haml

@@ -1,9 +1,10 @@
 = simple_form_for @order, url: update_note_finance_order_path(@order), remote: true, method: :put do |f|
   .modal-header
-    = button_tag t('ui.marks.close').html_safe, class: 'close', data: {dismiss: 'modal'}
+    = link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
     %h3 Notiz bearbeiten
   .modal-body
     = f.input :note, input_html: {class: 'input-xlarge'}
   .modal-footer
-    = button_tag t('ui.close'), class: 'btn', data: {dismiss: 'modal'}
-    = f.submit , class: 'btn btn-primary'
+    = link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
+    = f.submit t('ui.save'), class: 'btn btn-primary'
+

app/views/finance/group_order_articles/_form.html.haml

@@ -1,11 +1,11 @@
 = simple_form_for [:finance, @group_order_article], remote: true do |form|
   = form.hidden_field :order_article_id
   .modal-header
-    = button_tag "x", class: 'close', data: {dismiss: 'modal'}
+    = link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
     %h3= t('.amount_change_for', article: @order_article.article.name)
   .modal-body
     = form.input :ordergroup_id, as: :select, collection: Ordergroup.all.map { |g| [g.name, g.id] }
     = form.input :result, hint: "Einheit: #{@order_article.article.unit}"
   .modal-footer
-    = button_tag t('ui.close'), class: 'btn', data: {dismiss: 'modal'}
+    = link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
     = form.submit t('ui.save'), class: 'btn btn-primary'

app/views/finance/order_articles/_edit.html.haml

@@ -1,6 +1,6 @@
 = simple_form_for [:finance, @order, @order_article], remote: true do |form|
   .modal-header
-    = button_tag t('ui.marks.close').html_safe, class: 'close', data: {dismiss: 'modal'}
+    = link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
     %h3= t '.title'
   .modal-body
     = form.input :units_to_order
@@ -20,5 +20,5 @@
         = f.input :deposit
       = form.input :update_current_price, as: :boolean
   .modal-footer
-    = button_tag t('ui.close'), class: 'btn', data: {dismiss: 'modal'}
+    = link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
     = form.submit class: 'btn btn-primary'

app/views/finance/order_articles/_new.html.haml

@@ -1,9 +1,9 @@
 = simple_form_for [:finance, @order, @order_article], remote: true do |form|
   .modal-header
-    = button_tag t('ui.marks.close').html_safe, class: 'close', data: {dismiss: 'modal'}
+    = link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
     %h3= t '.title'
   .modal-body
     = form.input :article_id, as: :select, collection: new_order_articles_collection
   .modal-footer
-    = button_tag t('ui.close'), class: 'btn', data: {dismiss: 'modal'}
+    = link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
     = form.submit class: 'btn btn-primary'

app/views/finance/order_articles/create.js.haml

@@ -1,2 +1,3 @@
 $('#modalContainer').modal('hide');
 $('#result_table').prepend('#{j(render('finance/balancing/order_article_result', order_article: @order_article))}');
+$('#summaryChangedWarning').show();

app/views/finance/order_articles/update.js.haml

@@ -1,2 +1,4 @@
 $('#modalContainer').modal('hide');
 $('#order_article_#{@order_article.id}').html('#{j(render('finance/balancing/order_article', order_article: @order_article))}');
+$('#group_order_articles_#{@order_article.id}').html('#{j(render('finance/balancing/group_order_articles', order_article: @order_article))}');
+$('#summaryChangedWarning').show();

app/views/invites/_modal_form.html.haml

@@ -1,6 +1,6 @@
 = simple_form_for @invite, remote: true do |form|
   .modal-header
-    = button_tag t('ui.marks.close').html_safe, class: 'close', data: {dismiss: 'modal'}
+    = link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
     %h3= t '.title'
   .modal-body
     = t('.body', group: @invite.group.name).html_safe
@@ -8,5 +8,5 @@
     = form.hidden_field :group_id
     = form.input :email
   .modal-footer
-    = button_tag t('ui.close'), class: 'btn', data: {dismiss: 'modal'}
+    = link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
     = form.submit class: 'btn btn-primary'