has_accounts 0.19.1 → 0.20.0

data/app/controllers/bank_accounts_controller.rb

@@ -1,2 +1,3 @@
 class BankAccountsController < AccountsController
+  defaults :resource_class => BankAccount
 end

data/app/controllers/banks_controller.rb

@@ -0,0 +1,3 @@
+class BanksController < PeopleController
+  defaults :resource_class => Bank
+end

data/app/models/account.rb

@@ -1,16 +1,16 @@
 class Account < ActiveRecord::Base
   # Access restrictions
-  attr_accessible :title, :code, :account_type_id
+  attr_accessible :title, :code
 
   # 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]
@@ -19,12 +19,13 @@ class Account < ActiveRecord::Base
   # Account Type
   # ============
   belongs_to :account_type
+  attr_accessible :title, :code, :account_type_id, :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
@@ -44,12 +45,12 @@ class Account < ActiveRecord::Base
   # 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
@@ -64,7 +65,7 @@ class Account < ActiveRecord::Base
   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)
     equality = "=" if inclusive
@@ -108,15 +109,15 @@ class Account < ActiveRecord::Base
 
     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/bank.rb

@@ -1,11 +1,12 @@
 class Bank < Person
-  has_many :bank_accounts
+  # Access restrictions
+  attr_accessible :swift, :clearing
 
-  has_vcards
+  has_many :bank_accounts
 
   def to_s
     return "" unless vcard
 
-    [vcard.full_name, vcard.locality].compact.join(', ')      
+    [vcard.full_name, vcard.locality].compact.join(', ')
   end
 end

data/app/views/banks/_bank.html.haml

@@ -0,0 +1,3 @@
+%tr[bank]
+  %td= link_to bank.vcard.try(:full_name), bank, {'data-href-container' => 'tr'}
+  %td= [ bank.vcard.address_lines.join(", "), bank.vcard.contacts.map{|contact| contact.to_s(': ', :label)}.join(', ') ].compact.join("<br/>").html_safe

data/app/views/banks/_form.html.haml

@@ -0,0 +1,12 @@
+= simple_form_for resource do |f|
+  = render 'address_form', :f => f
+
+  %h3= t('form.bank.money_transfer')
+  .row-fluid
+    .span6
+      = f.input :swift
+    .span6
+      = f.input :clearing
+
+  .form-actions
+    = f.button :submit

data/config/locales/de.yml

@@ -44,10 +44,23 @@ de:
         valuta:         Valuta
         value:          Betrag
 
+  form:
+    bank:
+      money_transfer: Bankverbindung
+
   # Title customizations
   accounts:
     index:
       title:            Kontenplan
+    edit_bookings:
+      title: Buchungen
+    info:
+      title: Kontodaten
+    journal:
+      title: Auszug
+  attachments:
+    list:
+      title: Dokumente
   bank_accounts:
     index:
       title:            Bankkonti
@@ -66,3 +79,5 @@ de:
   crud:
     action:
       copy:             Kopieren
+      only_credit_bookings: "Nur Soll"
+      only_debit_bookings: "Nur Haben"

data/config/routes.rb

@@ -24,7 +24,16 @@ Rails.application.routes.draw do
     resources :attachments
   end
 
-  resources :banks
+  resources :banks do
+    resources :phone_numbers
+    member do
+      get :new_phone_number
+    end
+    collection do
+      get :new_phone_number
+    end
+  end
+
   resources :bank_accounts do
     member do
       get :csv_bookings

data/lib/has_accounts/version.rb

@@ -1,3 +1,3 @@
 module HasAccounts
-  VERSION = "0.19.1"
+  VERSION = "0.20.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_accounts
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,6 +87,7 @@ extra_rdoc_files:
 files:
 - app/controllers/accounts_controller.rb
 - app/controllers/bank_accounts_controller.rb
+- app/controllers/banks_controller.rb
 - app/controllers/bookings_controller.rb
 - app/helpers/account_helper.rb
 - app/models/account.rb
@@ -116,6 +117,8 @@ files:
 - app/views/accounts/show.html.haml
 - app/views/bank_accounts/_bank_account.html.haml
 - app/views/bank_accounts/_form.html.haml
+- app/views/banks/_bank.html.haml
+- app/views/banks/_form.html.haml
 - app/views/bookings/_booking.html.haml
 - app/views/bookings/_form.html.haml
 - app/views/bookings/_list.html.haml