erp_base_erp_svcs 3.0.4 → 3.0.5

data/app/models/contact.rb

@@ -1,10 +1,10 @@
 class Contact < ActiveRecord::Base
     has_and_belongs_to_many :contact_purposes
     belongs_to :party
-    belongs_to :contact_mechanism, :polymorphic => true
+    belongs_to :contact_mechanism, :polymorphic => true, :dependent => :destroy
   
     #rather than carry our own description for the abstract -contact-, we'll
-    #delegate that call to the implementor of the -contact_mechanism- interface
+    #delegate that call to the implementer of the -contact_mechanism- interface
 
     def description
         @description = contact_mechanism.description
@@ -14,7 +14,7 @@ class Contact < ActiveRecord::Base
         @description=d
     end
 
-    #delegate our need to provide a label to scaffolds to the implementor of
+    #delegate our need to provide a label to scaffolds to the implementer of
     #the -contact_mechanism- interface.
 
     def to_label

data/app/models/party.rb

@@ -6,14 +6,23 @@ class Party < ActiveRecord::Base
   belongs_to :business_party, :polymorphic => true
   has_many   :party_roles, :dependent => :destroy
 	has_many   :role_types, :through => :party_roles
-	
+
+  after_destroy :destroy_business_party
+
 	attr_reader :relationships
   attr_writer :create_relationship
 
   # Gathers all party relationships that contain this particular party id
   # in either the from or to side of the relationship.
   def relationships
-    @relationships ||= PartyRelationship.where('party_id_from = ? OR party_id_to = ?', id, id)
+    @relationships ||= PartyRelationship.where('party_id_from = ? or party_id_to = ?', id, id)
+  end
+
+  def find_relationships_by_type(relationship_type_iid)
+    PartyRelationship.includes(:relationship_type)
+                     .where('party_id_from = ? or party_id_to = ?', id, id)
+                     .where('relationship_types.internal_identifier' => relationship_type_iid.to_s)
+
   end
 
   # Creates a new PartyRelationship for this particular
@@ -23,7 +32,7 @@ class Party < ActiveRecord::Base
   end
 
   # Callback
-	def after_destroy
+	def destroy_business_party
     if self.business_party
       self.business_party.destroy
     end

data/db/migrate/20080805000020_base_erp_services.rb

@@ -282,7 +282,7 @@ class BaseErpServices < ActiveRecord::Migration
     unless table_exists?(:money)
       create_table :money do |t|
         t.string      :description
-        t.float       :amount
+        t.decimal     :amount, :precision => 8, :scale => 2
         t.references  :currency 
         t.timestamps
       end

data/db/migrate/20110913145329_create_compass_ae_instance.rb

@@ -2,7 +2,7 @@ class CreateCompassAeInstance < ActiveRecord::Migration
   def self.up
     unless table_exists?(:compass_ae_instances)
       create_table :compass_ae_instances do |t|
-        t.decimal :version
+        t.decimal :version, :scale => 8, :precision => 3
         
         t.timestamps
       end

data/lib/erp_base_erp_svcs/extensions/active_record/acts_as_category.rb

@@ -37,7 +37,7 @@ module ErpBaseErpSvcs
 				  end
 
 				  def initialize_category
-            if (self.category.nil?)
+            if self.new_record? and self.category.nil?
               category = Category.new
               self.category = category
               category.category_record = self

data/lib/erp_base_erp_svcs/extensions/active_record/acts_as_note_type.rb

@@ -33,7 +33,7 @@ module ErpBaseErpSvcs
 				  end
 
 				  def initialize_note_type
-					  if (self.note_type_record.nil?)
+					  if self.new_record? and self.note_type_record.nil?
 					    note_type_record = NoteType.new
 					    self.note_type_record = note_type_record
 					    self.note_type_record.note_type_record = self

data/lib/erp_base_erp_svcs/extensions/active_record/has_contact.rb

@@ -39,7 +39,7 @@ module ErpBaseErpSvcs
 				  end
 
 				  def destroy_contact
-					  self.contact.destroy
+					  self.contact.destroy unless self.contact.nil?
 				  end
 
 				  def initialize_contact

data/lib/erp_base_erp_svcs/extensions/core/hash.rb

@@ -15,5 +15,14 @@ Hash.class_eval do
     item
   end
 
+  #merge hash and overwrite key only if it is nil
+  def apply_if(hash)
+    self.merge(hash){|key, v1, v2| v1.nil? ? v2 : v1}
+  end
+
+  def apply_if!(hash)
+    self.merge!(hash){|key, v1, v2| v1.nil? ? v2 : v1}
+  end
+
 end
 

data/lib/erp_base_erp_svcs/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_base_erp_svcs
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70165485088400 !ruby/object:Gem::Requirement
+  requirement: &70130672354840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165485088400
+  version_requirements: *70130672354840
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70165485087900 !ruby/object:Gem::Requirement
+  requirement: &70130672353840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165485087900
+  version_requirements: *70130672353840
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70165485087420 !ruby/object:Gem::Requirement
+  requirement: &70130672352580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165485087420
+  version_requirements: *70130672352580
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70165485086840 !ruby/object:Gem::Requirement
+  requirement: &70130672351280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165485086840
+  version_requirements: *70130672351280
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70165485086240 !ruby/object:Gem::Requirement
+  requirement: &70130672343880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165485086240
+  version_requirements: *70130672343880
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70165485085240 !ruby/object:Gem::Requirement
+  requirement: &70130672343080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165485085240
+  version_requirements: *70130672343080
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70165485084740 !ruby/object:Gem::Requirement
+  requirement: &70130672342160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165485084740
+  version_requirements: *70130672342160
 - !ruby/object:Gem::Dependency
   name: attr_encrypted
-  requirement: &70165485084280 !ruby/object:Gem::Requirement
+  requirement: &70130672341260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165485084280
+  version_requirements: *70130672341260
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70165485083640 !ruby/object:Gem::Requirement
+  requirement: &70130672340560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70165485083640
+  version_requirements: *70130672340560
 - !ruby/object:Gem::Dependency
   name: data_migrator
-  requirement: &70165485082960 !ruby/object:Gem::Requirement
+  requirement: &70130672339700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70165485082960
+  version_requirements: *70130672339700
 - !ruby/object:Gem::Dependency
   name: has_many_polymorphic
-  requirement: &70165485075800 !ruby/object:Gem::Requirement
+  requirement: &70130672338760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70165485075800
+  version_requirements: *70130672338760
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &70165485074940 !ruby/object:Gem::Requirement
+  requirement: &70130672337600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -142,10 +142,10 @@ dependencies:
         version: 2.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70165485074940
+  version_requirements: *70130672337600
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70165485073940 !ruby/object:Gem::Requirement
+  requirement: &70130672336980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165485073940
+  version_requirements: *70130672336980
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70165485073200 !ruby/object:Gem::Requirement
+  requirement: &70130672336220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -164,10 +164,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70165485073200
+  version_requirements: *70130672336220
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70165485072700 !ruby/object:Gem::Requirement
+  requirement: &70130672329240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -175,10 +175,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70165485072700
+  version_requirements: *70130672329240
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70165485072080 !ruby/object:Gem::Requirement
+  requirement: &70130672328660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -186,10 +186,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70165485072080
+  version_requirements: *70130672328660
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70165485071360 !ruby/object:Gem::Requirement
+  requirement: &70130672328020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -197,10 +197,10 @@ dependencies:
         version: 0.9.0.rc
   type: :development
   prerelease: false
-  version_requirements: *70165485071360
+  version_requirements: *70130672328020
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70165485070660 !ruby/object:Gem::Requirement
+  requirement: &70130672327260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -208,10 +208,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70165485070660
+  version_requirements: *70130672327260
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70165485070220 !ruby/object:Gem::Requirement
+  requirement: &70130672326640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,7 +219,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165485070220
+  version_requirements: *70130672326640
 description: contains an implementation of the ubiquitous 'party model' for managing
   people, organizations, roles, relationships and contact information. The models
   in this library are designed to be useful in a variety of circumstances, including