has_accounts 0.8.3 → 0.9.0

data/app/models/booking.rb

@@ -33,7 +33,13 @@ class Booking < ActiveRecord::Base
   default_scope order('value_date, id')
 
   scope :by_value_date, lambda {|value_date| where("date(value_date) = ?", value_date) }
-  scope :by_value_period, lambda {|from, to| where("date(value_date) BETWEEN :from AND :to", :from => from, :to => to) }
+  scope :by_value_period, lambda {|from, to|
+    if from.present?
+      where("date(value_date) BETWEEN :from AND :to", :from => from, :to => to)
+    else
+      where("date(value_date) <= :to", :to => to)
+    end
+  }
   
   scope :by_account, lambda {|account_id|
     { :conditions => ["debit_account_id = :account_id OR credit_account_id = :account_id", {:account_id => account_id}] }

data/lib/has_accounts/version.rb

@@ -0,0 +1,3 @@
+module HasAccounts
+  VERSION = "0.9.0"
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_accounts
 version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: 
+  hash: 59
+  prerelease: false
   segments: 
   - 0
-  - 8
-  - 3
-  version: 0.8.3
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 +02:00
+date: 2011-07-27 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -26,31 +26,26 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.md
 files: 
+- app/models/account.rb
 - app/models/account_scope_extension.rb
-- app/models/booking.rb~
+- app/models/account_type.rb
 - app/models/bank.rb
-- app/models/account.rb
 - app/models/bank_account.rb
-- app/models/account_type.rb
 - app/models/booking.rb
-- app/models/account.rb~
-- lib/has_accounts/railtie.rb
+- lib/generators/has_accounts/migration_generator.rb
+- lib/generators/has_accounts/templates/migration.rb
+- lib/has_accounts.rb
 - lib/has_accounts/class_methods.rb
 - lib/has_accounts/core_ext/rounding.rb
 - lib/has_accounts/model.rb
-- lib/has_accounts.rb
-- lib/generators/has_accounts/migration_generator.rb
-- lib/generators/has_accounts/templates/migration.rb~
-- lib/generators/has_accounts/templates/migration.rb
-- lib/generators/migration_generator.rb~
-- MIT-LICENSE
-- Rakefile
+- lib/has_accounts/railtie.rb
+- lib/has_accounts/version.rb
 - README.md
 has_rdoc: true
-homepage: 
+homepage: https://github.com/huerlisi/has_accounts
 licenses: []
 
 post_install_message: 
@@ -79,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: HasAccounts provides models for financial accounting.

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2008 [name of plugin creator]
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,26 +0,0 @@
-# encoding: UTF-8
-require 'rubygems'
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rake'
-require 'rdoc/task'
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
-
-desc 'Generate documentation for the has_accounts plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Accounting'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/app/models/account.rb~

@@ -1,107 +0,0 @@
-class Account < ActiveRecord::Base
-  # Scopes
-  default_scope :order => 'code'
-  
-  # Dummy scope to make scoped_by happy
-  scope :by_value_period, scoped
-  
-  # Validation
-  validates_presence_of :code, :title
-  
-  # String
-  def to_s(format = :default)
-    "%s (%s)" % [title, code]
-  end
-
-  # Account Type
-  # ============
-  belongs_to :account_type
-  validates_presence_of :account_type
-
-  def is_asset_account?
-    Account.by_type(['current_assets', 'capital_assets', 'costs']).exists?(self)
-  end
-  
-  def is_liability_account?
-    !is_asset_account?
-  end
-
-  scope :by_type, lambda {|value| includes(:account_type).where('account_types.name' => value)} do
-    include AccountScopeExtension
-  end
-
-  # Holder
-  # ======
-  belongs_to :holder, :polymorphic => true
-  
-  # Bookings
-  # ========
-  has_many :credit_bookings, :class_name => "Booking", :foreign_key => "credit_account_id"
-  has_many :debit_bookings, :class_name => "Booking", :foreign_key => "debit_account_id"
-  
-  def bookings
-    Booking.by_account(id)
-  end
-  
-  # Helpers
-  # =======
-  def self.overview(value_range = Date.today, format = :default)
-    Account.all.map{|a| a.to_s(value_range, format)}
-  end
-  
-  # Calculations
-  def turnover(selector = Date.today, inclusive = true)
-    if selector.is_a? Range or selector.is_a? Array
-      if selector.first.is_a? Booking
-        equality = "=" if inclusive
-        if selector.first.value_date == selector.last.value_date
-          condition = ["date(value_date) = :value_date AND id >#{equality} :first_id AND id <#{equality} :last_id", {
-            :value_date => selector.first.value_date,
-            :first_id => selector.first.id,
-            :last_id => selector.last.id
-          }]
-        else
-          condition = ["(value_date > :first_value_date AND value_date < :latest_value_date) OR (date(value_date) = :first_value_date AND id >#{equality} :first_id) OR (date(value_date) = :latest_value_date AND id <#{equality} :last_id)", {
-            :first_value_date => selector.first.value_date,
-            :latest_value_date => selector.last.value_date,
-            :first_id => selector.first.id,
-            :last_id => selector.last.id
-          }]
-        end
-      elsif
-        if selector.first == selector.last
-          condition = ["date(value_date) = :value_date", {
-            :value_date => selector.first
-          }]
-        else
-          condition = ["date(value_date) BETWEEN :first_value_date AND :latest_value_date", {
-            :first_value_date => selector.first,
-            :latest_value_date => selector.last
-          }]
-        end
-      end
-    else
-      if selector.is_a? Booking
-        equality = "=" if inclusive
-        # date(value_date) is needed on sqlite!
-        condition = ["(value_date < :value_date) OR (date(value_date) = :value_date AND id <#{equality} :id)", {:value_date => selector.value_date, :id => selector.id}]
-      else
-        equality = "=" if inclusive
-        condition = ["date(value_date) <#{equality} ?", selector]
-      end
-    end
-
-    credit_amount = credit_bookings.where(condition).sum(:amount)
-    debit_amount = debit_bookings.where(condition).sum(:amount)
-    
-    [credit_amount || 0.0, debit_amount || 0.0]
-  end
-  
-  def saldo(selector = Date.today, inclusive = true)
-    credit_amount, debit_amount = turnover(selector, inclusive)
-
-    amount = credit_amount - debit_amount
-    
-    return is_asset_account? ? amount : -amount
-  end
-end

data/app/models/booking.rb~

@@ -1,186 +0,0 @@
-class Booking < ActiveRecord::Base
-  # Validation
-  validates_presence_of :debit_account, :credit_account, :title, :amount, :value_date
-  validates_time :value_date
-
-  # Account
-  belongs_to :debit_account, :foreign_key => 'debit_account_id', :class_name => "Account"
-  belongs_to :credit_account, :foreign_key => 'credit_account_id', :class_name => "Account"
-
-  def direct_account
-    return nil unless reference
-    
-    return reference.direct_account if reference.respond_to? :direct_account
-  end
-  
-  def contra_account(account = nil)
-    # Derive from direct_account if available
-    account ||= direct_account
-
-    return unless account
-
-    if debit_account == account
-      return credit_account
-    elsif credit_account == account
-      return debit_account
-    else
-      return nil
-    end
-  end
-  
-  # Scoping
-  default_scope order('value_date, id')
-
-  scope :by_value_date, lambda {|value_date| where("date(value_date) = ?", value_date) }
-  scope :by_value_period, lambda {|from, to| where("date(value_date) BETWEEN :from AND :to", :from => from, :to => to) }
-  
-  scope :by_account, lambda {|account_id|
-    { :conditions => ["debit_account_id = :account_id OR credit_account_id = :account_id", {:account_id => account_id}] }
-  } do
-    # Returns array of all booking titles.
-    def titles
-      find(:all, :group => :title).map{|booking| booking.title}
-    end
-    
-    # Statistics per booking title.
-    #
-    # The statistics are an array of hashes with keys title, count, sum, average.
-    def statistics
-      find(:all, :select => "title, count(*) AS count, sum(amount) AS sum, avg(amount) AS avg", :group => :title).map{|stat| stat.attributes}
-    end
-  end
-
-  scope :by_text, lambda {|value|
-    text   = '%' + value + '%'
-    
-    amount = value.delete("'").to_f
-    if amount == 0.0
-      amount = nil unless value.match(/^[0.]*$/)
-    end
-    
-    date   = nil
-    begin
-      date = Date.parse(value)
-    rescue ArgumentError
-    end
-    
-    where("title LIKE :text OR comments LIKE :text OR amount = :amount OR value_date = :value_date", :text => text, :amount => amount, :value_date => date)
-  }
-  
-  # Returns array of all years we have bookings for
-  def self.fiscal_years
-    with_exclusive_scope do
-      select("DISTINCT year(value_date) AS year").all.map{|booking| booking.year}
-    end
-  end
-
-  # Standard methods
-  def to_s(format = :default)
-    case format
-    when :short
-      "%s: %s / %s CHF %s" % [
-        value_date ? value_date : '?',
-        credit_account ? credit_account.code : '?',
-        debit_account ? debit_account.code : '?',
-        amount ? "%0.2f" % amount : '?',
-      ]
-    else
-      "%s: %s an %s CHF %s, %s (%s)" % [
-        value_date ? value_date : '?',
-        credit_account ? "#{credit_account.title} (#{credit_account.code})" : '?',
-        debit_account ? "#{debit_account.title} (#{debit_account.code})" : '?',
-        amount ? "%0.2f" % amount : '?',
-        title.present? ? title : '?',
-        comments.present? ? comments : '?'
-      ]
-    end
-  end
-
-  # Helpers
-  def accounted_amount(account)
-    if credit_account == account
-      balance = -(amount)
-    elsif debit_account == account
-      balance = amount
-    else
-      return BigDecimal.new('0')
-    end
-
-    if account.is_asset_account?
-      return -(balance)
-    else
-      return balance
-    end
-  end
-
-  def amount_as_string
-    '%0.2f' % amount
-  end
-  
-  def amount_as_string=(value)
-    self.amount = value
-  end
-  
-  def rounded_amount
-    if amount.nil?
-    	return 0
-    else
-    	return (amount * 20).round / 20.0
-    end
-  end
-
-  # Templates
-  def booking_template_id
-    nil
-  end
-  
-  def booking_template_id=(value)
-  end
-  
-  # Helpers
-  def split(amount, params = {})
-    # Clone
-    new_booking = self.clone
-
-    # Set amount
-    new_booking[:amount] = amount
-    self.amount -= amount
-    
-    # Update attributes
-    params.each{|key, value|
-      new_booking[key] = value
-    }
-    
-    [self, new_booking]
-  end
-  
-  # Reference
-  belongs_to :reference, :polymorphic => true
-  after_save :notify_references
-
-  # Safety net for form assignments
-  def reference_type=(value)
-    write_attribute(:reference_type, value) unless value.blank?
-  end
-
-  scope :by_reference, lambda {|value|
-    where(:reference_id => value.id, :reference_type => value.class.base_class)
-  } do
-    # TODO duplicated in Invoice
-    def direct_balance(direct_account)
-      balance = 0.0
-
-      for booking in all
-        balance += booking.accounted_amount(direct_account)
-      end
-
-      balance
-    end
-  end
-  
-  private
-  def notify_references
-    return unless reference and reference.respond_to?(:booking_saved)
-    reference.booking_saved(self)
-  end
-end

data/lib/generators/has_accounts/templates/migration.rb~

@@ -1,59 +0,0 @@
-class SetupHasAccountsEngine < ActiveRecord::Migration
-  def self.up
-    create_table "account_types", :force => true do |t|
-      t.string   "name",       :limit => 100
-      t.string   "title",      :limit => 100
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
-
-    create_table "accounts", :force => true do |t|
-      t.string   "title",           :limit => 100
-      t.integer  "parent_id"
-      t.integer  "account_type_id"
-      t.integer  "number"
-      t.string   "code"
-      t.integer  "type"
-      t.integer  "holder_id"
-      t.string   "holder_type"
-      t.integer  "bank_id"
-      t.integer  "esr_id"
-      t.integer  "pc_id"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
-
-    add_index "accounts", ["bank_id"], :name => "index_accounts_on_bank_id"
-    add_index "accounts", ["code"], :name => "index_accounts_on_code"
-    add_index "accounts", ["holder_id", "holder_type"], :name => "index_accounts_on_holder_id_and_holder_type"
-    add_index "accounts", ["type"], :name => "index_accounts_on_type"
-
-    create_table "banks", :force => true do |t|
-      t.integer  "vcard_id"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
-
-    create_table "bookings", :force => true do |t|
-      t.string   "title",             :limit => 100
-      t.decimal  "amount"
-      t.integer  "credit_account_id"
-      t.integer  "debit_account_id"
-      t.date     "value_date"
-      t.text     "comments",          :limit => 1000, :default => ""
-      t.string   "scan"
-      t.string   "debit_currency",                    :default => "CHF"
-      t.string   "credit_currency",                   :default => "CHF"
-      t.float    "exchange_rate",                     :default => 1.0
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.integer  "reference_id"
-      t.string   "reference_type"
-    end
-  end
-
-  def self.down
-    drop_table :account_types, :accounts, :banks, :bookings
-  end
-end
-

data/lib/generators/migration_generator.rb~

@@ -1,27 +0,0 @@
-require 'rails/generators/base'
-require 'rails/generators/migration'
-  
-module HasVcards
-  class MigrationGenerator < Rails::Generators::Base
-    include Rails::Generators::Migration
-
-    def self.source_root
-      @source_root ||= File.join(File.dirname(__FILE__), 'templates')
-    end
-
-    # Implement the required interface for Rails::Generators::Migration.
-    # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
-    def self.next_migration_number(dirname)
-      if ActiveRecord::Base.timestamped_migrations
-        Time.now.utc.strftime("%Y%m%d%H%M%S")
-      else
-        "%.3d" % (current_migration_number(dirname) + 1)
-      end
-    end
-
-    def create_migration_file
-      migration_template 'migration.rb', 'db/migrate/create_has_vcards.rb'
-    end
-
-  end
-end