Merge branch 'wiki'

Conflicts: app/helpers/pages_helper.rb public/stylesheets/main.css public/stylesheets/print.css
2009-09-28 15:04:07 +02:00 · 2009-09-28 15:04:07 +02:00 · 529956ea5a
commit 529956ea5a
parent 8bba70594d 67661cb716
15 changed files with 381 additions and 180 deletions
--- a/app/views/finance/balancing/new.html.haml
+++ b/app/views/finance/balancing/new.html.haml
@ -10,7 +10,7 @@
    = render :partial => "summary", :locals => {:order => @order}

 - unless @order.stockit?
-  .left_column{:style => 'width: 24em'}
+  .middle_column{:style => 'width: 24em'}
    .box_title
      %h2 Rechnung
    .column_content#invoice