Merge branch 'hotfix/v0.10.1'

app/models/plutus/account.rb

@@ -38,9 +38,9 @@ class Account < ActiveRecord::Base
     validates_presence_of :type
 
     if Plutus.enable_tenancy
-      include Tenancy
+      include Plutus::Tenancy
     else
-      include NoTenancy
+      include Plutus::NoTenancy
     end
 
     # The credit balance for the account.
@@ -74,10 +74,10 @@ def debits_balance
     #
     # @return [BigDecimal] The decimal value balance of all accounts
     def self.trial_balance
-      unless self.new.class == Account
+      unless self.new.class == Plutus::Account
         raise(NoMethodError, "undefined method 'trial_balance'")
       else
-        Asset.balance - (Liability.balance + Equity.balance + Revenue.balance - Expense.balance)
+        Plutus::Asset.balance - (Plutus::Liability.balance + Plutus::Equity.balance + Plutus::Revenue.balance - Plutus::Expense.balance)
       end
     end
 

app/models/plutus/entry.rb

@@ -40,21 +40,21 @@ class Entry < ActiveRecord::Base
     #   entry = Plutus::Entry.build(
     #     description: "Sold some widgets",
     #     debits: [
-    #       {account: "Accounts Receivable", amount: 50}], 
+    #       {account: "Accounts Receivable", amount: 50}],
     #     credits: [
     #       {account: "Sales Revenue", amount: 45},
     #       {account: "Sales Tax Payable", amount: 5}])
     #
     # @return [Plutus::Entry] A Entry with built credit and debit objects ready for saving
     def self.build(hash)
-      entry = Entry.new(:description => hash[:description], :commercial_document => hash[:commercial_document])
+      entry = Plutus::Entry.new(:description => hash[:description], :commercial_document => hash[:commercial_document])
       hash[:debits].each do |debit|
-        a = Account.find_by_name(debit[:account])
-        entry.debit_amounts << DebitAmount.new(:account => a, :amount => debit[:amount], :entry => entry)
+        a = Plutus::Account.find_by_name(debit[:account])
+        entry.debit_amounts << Plutus::DebitAmount.new(:account => a, :amount => debit[:amount], :entry => entry)
       end
       hash[:credits].each do |credit|
-        a = Account.find_by_name(credit[:account])
-        entry.credit_amounts << CreditAmount.new(:account => a, :amount => credit[:amount], :entry => entry)
+        a = Plutus::Account.find_by_name(credit[:account])
+        entry.credit_amounts << Plutus::CreditAmount.new(:account => a, :amount => credit[:amount], :entry => entry)
       end
       entry
     end

lib/plutus/version.rb

@@ -1,3 +1,3 @@
 module Plutus
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end