erp_invoicing 3.0.3 → 3.0.4

data/app/models/payment_application.rb

@@ -1,6 +1,6 @@
 class PaymentApplication < ActiveRecord::Base
 
-  belongs_to :financial_txn, :dependent => :destroy
+  belongs_to :financial_txn
   belongs_to :payment_applied_to, :polymorphic => true
   belongs_to :money, :foreign_key => 'applied_money_amount_id', :dependent => :destroy
 
@@ -25,12 +25,14 @@ class PaymentApplication < ActiveRecord::Base
   def unapply_payment
     #check the calculate balance strategy, if it includes payments then do nothing
     #if it doesn't include payments then update the balance on the model
-    unless self.payment_applied_to.calculate_balance_strategy_type.nil?
-      unless self.payment_applied_to.calculate_balance_strategy_type.iid =~ /payment/
+    if self.payment_applied_to.respond_to? :calculate_balance_strategy_type
+      if !self.payment_applied_to.calculate_balance_strategy_type.nil?
+        if self.payment_applied_to.calculate_balance_strategy_type.iid !=~ /payment/ and !self.is_pending?
+          update_applied_to_balance(:credit)
+        end
+      elsif !self.is_pending?
         update_applied_to_balance(:credit)
       end
-    else
-      update_applied_to_balance(:credit)
     end
   end
 

data/lib/erp_invoicing/version.rb

@@ -2,7 +2,7 @@ module ErpInvoicing
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_invoicing
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_inventory
-  requirement: &2152724880 !ruby/object:Gem::Requirement
+  requirement: &70249999417200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152724880
+  version_requirements: *70249999417200
 - !ruby/object:Gem::Dependency
   name: erp_work_effort
-  requirement: &2152723880 !ruby/object:Gem::Requirement
+  requirement: &70249999412520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152723880
+  version_requirements: *70249999412520
 - !ruby/object:Gem::Dependency
   name: erp_commerce
-  requirement: &2152722720 !ruby/object:Gem::Requirement
+  requirement: &70249999424560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152722720
+  version_requirements: *70249999424560
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
-  requirement: &2152721260 !ruby/object:Gem::Requirement
+  requirement: &70249999420280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *2152721260
+  version_requirements: *70249999420280
 description: ErpInvoicing adds models and services to the CompassAE core to handle
   invoicing and billing functions. It includes extensions to the core ERP classes
   for accounts and things that are 'billable' (products, work efforts), and additional
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: ErpInvoicing adds models and services to the CompassAE core to handle invoicing