From c03f3da21a3f20076497cf3acbe40fdb8d087c7f Mon Sep 17 00:00:00 2001
From: Benjamin Meichsner <benni@dresdener27.de>
Date: Fri, 15 May 2009 17:58:02 +0200
Subject: [PATCH] Added more info to delivery/show for easier comparision of
 invoice amount and sum of delivered items.

---
 app/controllers/deliveries_controller.rb | 2 +-
 app/views/deliveries/show.html.haml      | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/controllers/deliveries_controller.rb b/app/controllers/deliveries_controller.rb
index 170cb4c8..fc19672c 100644
--- a/app/controllers/deliveries_controller.rb
+++ b/app/controllers/deliveries_controller.rb
@@ -3,7 +3,7 @@ class DeliveriesController < ApplicationController
   before_filter :find_supplier, :exclude => :fill_new_stock_article_form
   
   def index
-    @deliveries = @supplier.deliveries.find(:all)
+    @deliveries = @supplier.deliveries.all :order => 'delivered_on DESC'
 
     respond_to do |format|
       format.html # index.html.erb
diff --git a/app/views/deliveries/show.html.haml b/app/views/deliveries/show.html.haml
index 1de0015f..f8da7d5c 100644
--- a/app/views/deliveries/show.html.haml
+++ b/app/views/deliveries/show.html.haml
@@ -9,6 +9,10 @@
 %p
   %b Rechnungsbetrag:
   = link_to_invoice(@delivery)
+- if @delivery.invoice
+  %p
+    %b bereinigter Rechnungsbetrag:
+    = number_to_currency @delivery.invoice.net_amount
 
 %h2 Artikel
 %table.list{:style => "width:30em"}
@@ -37,6 +41,11 @@
   Bruttosumme:
   = number_to_currency total_gross
 
+- if @delivery.invoice
+  %p
+    %b Brutto - bereinigter Rechnungsbetrag:
+    = number_to_currency total_gross - @delivery.invoice.net_amount
+
 %br/
 = link_to 'Bearbeiten', edit_supplier_delivery_path(@supplier,@delivery)
 |