diff --git a/app/models/goods/additional/value.rb b/app/models/goods/additional/value.rb index bb7f178..19b3331 100644 --- a/app/models/goods/additional/value.rb +++ b/app/models/goods/additional/value.rb @@ -1,7 +1,7 @@ class Goods::Additional::Value < ActiveRecord::Base belongs_to :goods_additional_type, :class_name => "Goods::Additional::Type",:foreign_key => "goods_additional_type_id" - has_one :transaction_goods_additional, :class_name => "Transaction::Goods::Additional",:foreign_key => "goods_additional_value_id" - has_one :transaction_tot, :class_name => "Transaction::Tot", :foreign_key => "goods_additional_value_id" + has_one :transaction_goods_additional, :class_name => "Transaction::Goods::Additional",:foreign_key => "goods_additional_value_id", :dependent => :destroy + has_one :transaction_tot, :class_name => "Transaction::Tot", :foreign_key => "goods_additional_value_id", :dependent => :destroy validates_presence_of :goods_additional_type_id validates_associated :goods_additional_type, :class_name => "Goods::Additional::Type",:foreign_key => "goods_additional_type_id" end diff --git a/app/models/participant/type.rb b/app/models/participant/type.rb index 1870a08..1ca6e99 100644 --- a/app/models/participant/type.rb +++ b/app/models/participant/type.rb @@ -1,7 +1,7 @@ class Participant::Type < ActiveRecord::Base has_many :transaction_participant, :class_name => "Transaction::Participant", :foreign_key => "participant_type_id", :dependent => :destroy - belongs_to :participantPerson, :class_name => "Participant::Person", :foreign_key => "participant_person_id" - validates_associated :participantPerson, :class_name => "Participant::Person", :foreign_key => "participant_person_id" + belongs_to :participant_person, :class_name => "Participant::Person", :foreign_key => "participant_person_id" + validates_associated :participant_person, :class_name => "Participant::Person", :foreign_key => "participant_person_id" validates_presence_of :participant_person_id validates_uniqueness_of :participant_person_id, :scope => :type end diff --git a/app/models/transaction/taxe.rb b/app/models/transaction/taxe.rb index 2edb841..e92a69a 100644 --- a/app/models/transaction/taxe.rb +++ b/app/models/transaction/taxe.rb @@ -3,7 +3,7 @@ class Transaction::Taxe < ActiveRecord::Base belongs_to :taxe_value, :class_name => "Taxe::Value", :dependent => :destroy , :foreign_key => "taxe_value_id" validates_presence_of :transaction_record_id validates_presence_of :taxe_value_id - validates_associated :taxe_value, :class_name => "Taxe::Value", :dependent => :destroy , :foreign_key => "taxe_value_id" + validates_associated :taxe_value, :class_name => "Taxe::Value", :foreign_key => "taxe_value_id" validates_associated :transaction_record, :class_name => "Transaction::Record", :foreign_key => "transaction_record_id" validates_uniqueness_of :taxe_value_id end diff --git a/app/models/transaction/tot.rb b/app/models/transaction/tot.rb index 42f845d..30c1034 100644 --- a/app/models/transaction/tot.rb +++ b/app/models/transaction/tot.rb @@ -3,7 +3,7 @@ class Transaction::Tot < ActiveRecord::Base belongs_to :goods_additional_value, :class_name => "Goods::Additional::Value", :foreign_key => "goods_additional_value_id", :dependent => :destroy validates_presence_of :transaction_record_id, :goods_additional_value_id validates_associated :transaction_record, :class_name => "Transaction::Record", :foreign_key => "transaction_record_id" - validates_associated :goods_additional_value, :class_name => "Goods::Additional::Value", :foreign_key => "goods_additional_value_id", :dependent => :destroy + validates_associated :goods_additional_value, :class_name => "Goods::Additional::Value", :foreign_key => "goods_additional_value_id" validates_uniqueness_of :goods_additional_value_id end diff --git a/app/models/transaction/xml.rb b/app/models/transaction/xml.rb index b2242a3..745b856 100644 --- a/app/models/transaction/xml.rb +++ b/app/models/transaction/xml.rb @@ -22,7 +22,7 @@ class Transaction::Xml < ActiveRecord::Base belongs_to :transaction_record, :class_name => 'Transaction::Record', :dependent => :destroy , :foreign_key => "transaction_record_id" validates_uniqueness_of :transaction_record_id, :name - validates_associated :transaction_record, :class_name => 'Transaction::Record', :dependent => :destroy , :foreign_key => "transaction_record_id" + validates_associated :transaction_record, :class_name => 'Transaction::Record', :foreign_key => "transaction_record_id" #validates_presence_of :content, :message => 'Deve Informar Um arquivo Xml' #has_attached_file :xml