has_accounts 2.0.0 → 2.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 28cbabaea7786eb02bdcae1f7f043c148f10be49
+  data.tar.gz: 222d2bf0e7d2d1a754ecda00e135e3393479c5f2
+SHA512:
+  metadata.gz: b28f0cf26147ace9c7e5dd584ccd825159f08659aa1a90bdbe31cd3a1496debdd9afc6ebd732299a5f349968e37f145fba98478720a441e1eb9471ecfd0f1b96
+  data.tar.gz: 580e84f7697c19d549c863c4996428dcd7e9274de51815bc8015c9cbb8a0c1c8a67bd391dcc9cc4fe414684226ee1e5b70e2b615e130318538c6f4681b83e506

data/MIT-LICENSE

@@ -1,4 +1,7 @@
-Copyright (c) 2008 [name of plugin creator]
+Copyright (c) 2008 Agrabah <http://www.agrabah.ch>
+Copyright (c) 2008-2014 Simon Hürlimann <simon.huerlimann@cyt.ch>
+Copyright (c) 2010-2014 CyT <http://www.cyt.ch>
+Copyright (c) 2008-2010 ZytoLabor <http://www.zyto-labor.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -9,7 +9,7 @@ Rails plugin providing financal accounting models and helpers.
 Install
 =======
 
-In Rails 3 simply add
+In Rails simply add
 
     gem 'has_accounts'
 
@@ -38,7 +38,7 @@ Add specific seed depending on the needs of your project, e.g.:
     capital_assets = AccountType.find_by_name('capital_assets')
     earnings = AccountType.find_by_name('earnings')
     costs = AccountType.find_by_name('costs')
-    
+
     Account.create!([
       {:code => "1000", :title => "Kasse", :account_type => current_assets},
       {:code => "1100", :title => "Debitoren", :account_type => current_assets},
@@ -68,9 +68,4 @@ To use it, simply add the following to your Model:
 License
 =======
 
-* Copyright (c) 2008 Agrabah <http://www.agrabah.ch>
-* Copyright (c) 2008-2011 Simon Hürlimann <simon.huerlimann@cyt.ch>
-* Copyright (c) 2010-2011 CyT <http://www.cyt.ch>
-* Copyright (c) 2008-2010 ZytoLabor <http://www.zyto-labor.com>
-
 Released under the MIT license.

data/app/models/account.rb

@@ -1,3 +1,4 @@
+# Account model
 class Account < ActiveRecord::Base
   # Access restrictions
   attr_accessible :title, :code
@@ -30,26 +31,18 @@ class Account < ActiveRecord::Base
   def asset_account?
     Account.by_type(['current_assets', 'capital_assets', 'costs']).exists?(self)
   end
-  # Deprecated
-  alias_method :is_asset_account?, :asset_account?
 
   def liability_account?
     !asset_account?
   end
-  # Deprecated
-  alias_method :is_liability_account?, :liability_account?
 
   def balance_account?
     Account.by_type(['current_assets', 'capital_assets', 'outside_capital', 'equity_capital']).exists?(self)
   end
-  # Deprecated
-  alias_method :is_balance_account?, :balance_account?
 
   def profit_account?
     !balance_account?
   end
-  # Deprecated
-  alias_method :is_profit_account?, :profit_account?
 
   scope :by_type, lambda {|value| includes(:account_type).where('account_types.name' => value)} do
     include AccountScopeExtension
@@ -146,6 +139,6 @@ class Account < ActiveRecord::Base
 
     amount = debit_amount - credit_amount
 
-    return is_asset_account? ? amount : -amount
+    return asset_account? ? amount : -amount
   end
 end

data/app/models/booking.rb

@@ -52,13 +52,13 @@ class Booking < ActiveRecord::Base
   end
 
   def balance_account
-    return credit_account if credit_account.is_balance_account?
-    return debit_account if debit_account.is_balance_account?
+    return credit_account if credit_account.balance_account?
+    return debit_account if debit_account.balance_account?
   end
 
   def profit_account
-    return credit_account if credit_account.is_profit_account?
-    return debit_account if debit_account.is_profit_account?
+    return credit_account if credit_account.profit_account?
+    return debit_account if debit_account.profit_account?
   end
 
   # Scoping
@@ -147,7 +147,8 @@ class Booking < ActiveRecord::Base
   # @param account_or_id Account id or object
   def self.unbalanced_by_grouped_reference(account_or_id)
     # Do a manual sum using select() to be able to give it an alias we can use in having()
-    summs = group(:reference_type, :reference_id).having("balance != 0.0").select("sum(#{SELECT_ACCOUNTED_AMOUNT % {:account_id => get_account_id(account_or_id)}}) AS balance, reference_type, reference_id")
+    balance_select = "sum(#{SELECT_ACCOUNTED_AMOUNT % {:account_id => get_account_id(account_or_id)}})"
+    summs = group(:reference_type, :reference_id).having("#{balance_select} != 0.0").select("reference_type, reference_id, #{balance_select} AS balance").reorder(nil)
 
     # Simulate Rails grouped summing result format
     grouped = Hash[summs.map{ |group| [[group[:reference_type], group[:reference_id]], group[:balance]] }]
@@ -222,7 +223,7 @@ class Booking < ActiveRecord::Base
       return BigDecimal.new('0')
     end
 
-    if account.is_asset_account?
+    if account.asset_account?
       return balance
     else
       return -(balance)

data/app/models/booking_template.rb

@@ -1,6 +1,6 @@
 class BookingTemplate < ActiveRecord::Base
   # Access restrictions
-  attr_accessible :title, :code, :amount, :amount_relates_to, :comments
+  attr_accessible :title, :code, :amount, :amount_relates_to, :comments, :charge_rate_code
 
   # Associations
   belongs_to :debit_account, :foreign_key => 'debit_account_id', :class_name => "Account"

data/db/migrate/20111108000000_create_has_accounts_tables.rb

@@ -48,7 +48,7 @@ class CreateHasAccountsTables < ActiveRecord::Migration
       t.integer  "credit_account_id"
       t.integer  "debit_account_id"
       t.date     "value_date"
-      t.text     "comments",          :limit => 1000, :default => ""
+      t.text     "comments",          :limit => 1000
       t.string   "scan"
       t.string   "debit_currency",                    :default => "CHF"
       t.string   "credit_currency",                   :default => "CHF"

data/lib/has_accounts/version.rb

@@ -1,3 +1,3 @@
 module HasAccounts
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: has_accounts
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.0.1
 platform: ruby
 authors:
 - Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: validates_timeliness
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: HasAccounts is a full featured Rails 3 gem providing models for financial
@@ -53,6 +48,8 @@ extra_rdoc_files:
 - MIT-LICENSE
 - README.md
 files:
+- MIT-LICENSE
+- README.md
 - app/models/account.rb
 - app/models/account_scope_extension.rb
 - app/models/account_type.rb
@@ -72,32 +69,28 @@ files:
 - lib/has_accounts/model.rb
 - lib/has_accounts/railtie.rb
 - lib/has_accounts/version.rb
-- MIT-LICENSE
-- README.md
 homepage: https://github.com/huerlisi/has_accounts
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HasAccounts provides models for financial accounting.
 test_files: []
-has_rdoc: