vesr 0.11.6 → 0.11.7

data/app/models/esr_record.rb

@@ -93,27 +93,29 @@ class EsrRecord < ActiveRecord::Base
   end
 
   def update_remarks
-    if invoice.nil?
+    # Invoice not found
+    if self.state == 'missing'
       self.remarks += ", Rechnung ##{invoice_id} nicht gefunden"
-    elsif invoice.state == 'paid'
-      # already paid
-      if invoice.amount == self.amount
-        # paid twice
-        self.remarks += ", doppelt bezahlt"
-      else
-        self.remarks += ", bereits bezahlt"
-      end
-    elsif !(invoice.active)
-      # canceled invoice
+      return
+    end
+
+    # Remark if invoice should not get payment according to state
+    if !(invoice.active)
       self.remarks += ", wurde bereits #{invoice.state_adverb}"
-    elsif invoice.amount == self.amount
-      # TODO much too open condition (issue #804)
-      # reminder fee not paid
-      self.remarks += ", Mahnspesen nicht bezahlt"
-    else
-      # bad amount
-      self.remarks += ", falscher Betrag"
+      return
+    end
+
+    # Perfect payment
+    return if invoice.balance == 0
+
+    # Paid more than once
+    if (self.state == 'overpaid') and (invoice.amount == self.amount)
+      self.remarks += ", mehrfach bezahlt"
+      return
     end
+
+    # Simply mark bad amount otherwise
+    self.remarks += ", falscher Betrag"
   end
 
   def update_state
@@ -140,7 +142,7 @@ class EsrRecord < ActiveRecord::Base
   end
 
   # Invoices
-  before_create :assign_invoice, :create_esr_booking, :update_remarks, :update_state
+  before_create :assign_invoice, :create_esr_booking, :update_state, :update_remarks, :update_invoice_state
   
   private
   def assign_invoice
@@ -185,6 +187,12 @@ class EsrRecord < ActiveRecord::Base
     return esr_booking
   end
 
+  def update_invoice_state
+    if invoice
+      invoice.calculate_state
+    end
+  end
+
 public
   def create_extra_earning_booking(comments = nil)
     Booking.create(:title => "Ausserordentlicher Ertrag",

data/lib/vesr/version.rb

@@ -1,3 +1,3 @@
 module Vesr
-  VERSION = "0.11.6"
+  VERSION = "0.11.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vesr
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 11
-  - 6
-  version: 0.11.6
+  - 7
+  version: 0.11.7
 platform: ruby
 authors: 
 - Roman Simecek
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-20 00:00:00 Z
+date: 2012-03-23 00:00:00 Z
 dependencies: []
 
 description: VESR provides support for ESR number calculations and gives ready to use Rails components.
@@ -95,9 +95,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: VESR invoice support library.
 test_files: []
 
+has_rdoc: