plutus 0.10.1 → 0.15

data/app/models/plutus/equity.rb

@@ -7,24 +7,29 @@ module Plutus
   # @see http://en.wikipedia.org/wiki/Equity_(finance) Equity
   #
   # @author Michael Bulat
-  class Equity < Account
+  class Equity < Plutus::Account
+
+    self.normal_credit_balance = true
 
     # The balance of the account.
     #
     # Equity accounts have normal credit balances, so the debits are subtracted from the credits
     # unless this is a contra account, in which credits are subtracted from debits
     #
+    # Takes an optional hash specifying :from_date and :to_date for calculating balances during periods.
+    # :from_date and :to_date may be strings of the form "yyyy-mm-dd" or Ruby Date objects
+    #
+    # @example
+    #   >> equity.balance({:from_date => "2000-01-01", :to_date => Date.today})
+    #   => #<BigDecimal:103259bb8,'0.1E4',4(12)>
+    #
     # @example
-    #   >> asset.balance
+    #   >> equity.balance
     #   => #<BigDecimal:103259bb8,'0.2E4',4(12)>
     #
     # @return [BigDecimal] The decimal value balance
-    def balance
-      unless contra
-        credits_balance - debits_balance
-      else
-        debits_balance - credits_balance
-      end
+    def balance(options={})
+      super
     end
 
     # This class method is used to return
@@ -32,22 +37,20 @@ module Plutus
     #
     # Contra accounts are automatically subtracted from the balance.
     #
+    # Takes an optional hash specifying :from_date and :to_date for calculating balances during periods.
+    # :from_date and :to_date may be strings of the form "yyyy-mm-dd" or Ruby Date objects
+    #
+    # @example
+    #   >> Plutus::Equity.balance({:from_date => "2000-01-01", :to_date => Date.today})
+    #   => #<BigDecimal:103259bb8,'0.1E4',4(12)>
+    #
     # @example
     #   >> Plutus::Equity.balance
     #   => #<BigDecimal:1030fcc98,'0.82875E5',8(20)>
     #
     # @return [BigDecimal] The decimal value balance
-    def self.balance
-      accounts_balance = BigDecimal.new('0')
-      accounts = self.all
-      accounts.each do |equity|
-        unless equity.contra
-          accounts_balance += equity.balance
-        else
-          accounts_balance -= equity.balance
-        end
-      end
-      accounts_balance
+    def self.balance(options={})
+      super
     end
   end
 end

data/app/models/plutus/expense.rb

@@ -7,24 +7,29 @@ module Plutus
   # @see http://en.wikipedia.org/wiki/Expense Expenses
   #
   # @author Michael Bulat
-  class Expense < Account
+  class Expense < Plutus::Account
+
+    self.normal_credit_balance = false
 
     # The balance of the account.
     #
     # Expenses have normal debit balances, so the credits are subtracted from the debits
     # unless this is a contra account, in which debits are subtracted from credits
     #
+    # Takes an optional hash specifying :from_date and :to_date for calculating balances during periods.
+    # :from_date and :to_date may be strings of the form "yyyy-mm-dd" or Ruby Date objects
+    #
+    # @example
+    #   >> expense.balance({:from_date => "2000-01-01", :to_date => Date.today})
+    #   => #<BigDecimal:103259bb8,'0.1E4',4(12)>
+    #
     # @example
     #   >> expense.balance
     #   => #<BigDecimal:103259bb8,'0.2E4',4(12)>
     #
     # @return [BigDecimal] The decimal value balance
-    def balance
-      unless contra
-        debits_balance - credits_balance
-      else
-        credits_balance - debits_balance
-      end
+    def balance(options={})
+      super
     end
 
     # This class method is used to return
@@ -32,22 +37,20 @@ module Plutus
     #
     # Contra accounts are automatically subtracted from the balance.
     #
+    # Takes an optional hash specifying :from_date and :to_date for calculating balances during periods.
+    # :from_date and :to_date may be strings of the form "yyyy-mm-dd" or Ruby Date objects
+    #
+    # @example
+    #   >> Plutus::Expense.balance({:from_date => "2000-01-01", :to_date => Date.today})
+    #   => #<BigDecimal:103259bb8,'0.1E4',4(12)>
+    #
     # @example
     #   >> Plutus::Expense.balance
     #   => #<BigDecimal:1030fcc98,'0.82875E5',8(20)>
     #
     # @return [BigDecimal] The decimal value balance
-    def self.balance
-      accounts_balance = BigDecimal.new('0')
-      accounts = self.all
-      accounts.each do |expense|
-        unless expense.contra
-          accounts_balance += expense.balance
-        else
-          accounts_balance -= expense.balance
-        end
-      end
-      accounts_balance
+    def self.balance(options={})
+      super
     end
   end
 end

data/app/models/plutus/liability.rb

@@ -7,42 +7,50 @@ module Plutus
   # @see http://en.wikipedia.org/wiki/Liability_(financial_accounting) Liability
   #
   # @author Michael Bulat
-  class Liability < Account
+  class Liability < Plutus::Account
+
+    self.normal_credit_balance = true
 
     # The balance of the account.
     #
     # Liability accounts have normal credit balances, so the debits are subtracted from the credits
     # unless this is a contra account, in which credits are subtracted from debits
     #
+    # Takes an optional hash specifying :from_date and :to_date for calculating balances during periods.
+    # :from_date and :to_date may be strings of the form "yyyy-mm-dd" or Ruby Date objects
+    #
+    # @example
+    #   >> liability.balance({:from_date => "2000-01-01", :to_date => Date.today})
+    #   => #<BigDecimal:103259bb8,'0.1E4',4(12)>
+    #
     # @example
     #   >> liability.balance
     #   => #<BigDecimal:103259bb8,'0.2E4',4(12)>
     #
     # @return [BigDecimal] The decimal value balance
-    def balance
-      unless contra
-        credits_balance - debits_balance
-      else
-        debits_balance - credits_balance
-      end
+    def balance(options={})
+      super
     end
 
-    # Balance of all Liability accounts
+    # This class method is used to return
+    # the balance of all Liability accounts.
+    #
+    # Contra accounts are automatically subtracted from the balance.
+    #
+    # Takes an optional hash specifying :from_date and :to_date for calculating balances during periods.
+    # :from_date and :to_date may be strings of the form "yyyy-mm-dd" or Ruby Date objects
+    #
+    # @example
+    #   >> Plutus::Liability.balance({:from_date => "2000-01-01", :to_date => Date.today})
+    #   => #<BigDecimal:103259bb8,'0.1E4',4(12)>
     #
     # @example
     #   >> Plutus::Liability.balance
     #   => #<BigDecimal:1030fcc98,'0.82875E5',8(20)>
-    def self.balance
-      accounts_balance = BigDecimal.new('0')
-      accounts = self.all
-      accounts.each do |liability|
-        unless liability.contra
-          accounts_balance += liability.balance
-        else
-          accounts_balance -= liability.balance
-        end
-      end
-      accounts_balance
+    #
+    # @return [BigDecimal] The decimal value balance
+    def self.balance(options={})
+      super
     end
   end
 end

data/app/models/plutus/revenue.rb

@@ -7,24 +7,29 @@ module Plutus
   # @see http://en.wikipedia.org/wiki/Revenue Revenue
   #
   # @author Michael Bulat
-  class Revenue < Account
+  class Revenue < Plutus::Account
+
+    self.normal_credit_balance = true
 
     # The balance of the account.
     #
     # Revenue accounts have normal credit balances, so the debits are subtracted from the credits
     # unless this is a contra account, in which credits are subtracted from debits
     #
+    # Takes an optional hash specifying :from_date and :to_date for calculating balances during periods.
+    # :from_date and :to_date may be strings of the form "yyyy-mm-dd" or Ruby Date objects
+    #
+    # @example
+    #   >> revenue.balance({:from_date => "2000-01-01", :to_date => Date.today})
+    #   => #<BigDecimal:103259bb8,'0.1E4',4(12)>
+    #
     # @example
-    #   >> asset.balance
+    #   >> revenue.balance
     #   => #<BigDecimal:103259bb8,'0.2E4',4(12)>
     #
     # @return [BigDecimal] The decimal value balance
-    def balance
-      unless contra
-        credits_balance - debits_balance
-      else
-        debits_balance - credits_balance
-      end
+    def balance(options={})
+      super
     end
 
     # This class method is used to return
@@ -32,22 +37,20 @@ module Plutus
     #
     # Contra accounts are automatically subtracted from the balance.
     #
+    # Takes an optional hash specifying :from_date and :to_date for calculating balances during periods.
+    # :from_date and :to_date may be strings of the form "yyyy-mm-dd" or Ruby Date objects
+    #
+    # @example
+    #   >> Plutus::Revenue.balance({:from_date => "2000-01-01", :to_date => Date.today})
+    #   => #<BigDecimal:103259bb8,'0.1E4',4(12)>
+    #
     # @example
     #   >> Plutus::Revenue.balance
     #   => #<BigDecimal:1030fcc98,'0.82875E5',8(20)>
     #
     # @return [BigDecimal] The decimal value balance
-    def self.balance
-      accounts_balance = BigDecimal.new('0')
-      accounts = self.all
-      accounts.each do |revenue|
-        unless revenue.contra
-          accounts_balance += revenue.balance
-        else
-          accounts_balance -= revenue.balance
-        end
-      end
-      accounts_balance
+    def self.balance(options={})
+      super
     end
   end
 end

data/app/models/plutus/tenancy.rb

@@ -5,7 +5,11 @@ module Plutus
     included do
       validates :name, presence: true, uniqueness: { scope: :tenant_id }
 
-      belongs_to :tenant, class_name: Plutus.tenant_class
+      if ActiveRecord::VERSION::MAJOR > 4
+        belongs_to :tenant, class_name: Plutus.tenant_class, optional: true
+      else
+        belongs_to :tenant, class_name: Plutus.tenant_class
+      end
     end
   end
 end

data/app/views/layouts/plutus/_messages.html.erb

@@ -0,0 +1,9 @@
+<%# Rails flash messages styled for Bootstrap 3.0 %>
+<% flash.each do |name, msg| %>
+  <% if msg.is_a?(String) %>
+    <div class="alert alert-<%= name.to_s == 'notice' ? 'success' : 'danger' %>">
+      <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+      <%= content_tag :div, msg, :id => "flash_#{name}" %>
+    </div>
+  <% end %>
+<% end %>

data/app/views/layouts/plutus/_navigation.html.erb

@@ -0,0 +1,19 @@
+<%# navigation styled for Bootstrap 3.0 %>
+<nav class="navbar navbar-default navbar-fixed-top">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/">&nbsp;Plutus</a>
+    </div>
+    <div class="collapse navbar-collapse">
+      <ul class="nav navbar-nav">
+        <%= render 'layouts/plutus/navigation_links' %>
+      </ul>
+    </div>
+  </div>
+</nav>

data/app/views/layouts/plutus/_navigation_links.html.erb

@@ -0,0 +1,5 @@
+<%# add navigation links to this file %>
+<li><%= link_to "Balance Sheet", reports_balance_sheet_path%></li>
+<li><%= link_to "Income Statement", reports_income_statement_path%></li>
+<li><%= link_to "General Ledger", accounts_path%></li>
+<li><%= link_to "Journal", entries_path%></li>

data/app/views/layouts/plutus/application.html.erb

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Plutus</title>
+  <%= stylesheet_link_tag    "plutus/application", media: "all" %>
+  <%= javascript_include_tag "plutus/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+    <header>
+      <%= render 'layouts/plutus/navigation' %>
+    </header>
+    <main role="main">
+       <%= render 'layouts/plutus/messages' %>
+       <%= yield %>
+    </main>
+</body>
+</html>

data/app/views/plutus/accounts/index.html.erb

@@ -1,9 +1,11 @@
-<div class="plutus_container">
-<h1>Listing Accounts</h1>
+<div class="container">
+  <center>
+    <h1>General Ledger</h1>
+    <br>
+  </center>
 
-<table>
+<table class="table table-striped table-hover">
   <tr>
-    <th class="nobg">ID</th>
     <th>Name</th>
     <th>Type</th>
     <th>Credit Balance</th>
@@ -13,17 +15,12 @@
 
 <% @accounts.each do |account| %>
   <tr class="<%= cycle("even", "odd") -%>">
-    <td><%=link_to(account.id, account_path(account.id)) %></td>
     <td><%=h account.name %></td>
     <td><%=h account.type.sub('Plutus::','') %></td>
-    <td><%=h account.credits_balance %></td>
-    <td><%=h account.debits_balance %></td>
-    <td><%=h account.balance %></td>
+    <td><%=h account.credits_balance.round(2) %></td>
+    <td><%=h account.debits_balance.round(2) %></td>
+    <td><%=h account.balance.round(2) %></td>
   </tr>
 <% end %>
 </table>
-
-<br />
-
-<h3>Go to <%= link_to 'Entries', entries_path %></h3>
 </div>

data/app/views/plutus/entries/index.html.erb

@@ -1,10 +1,19 @@
-<div class="plutus_container">
-<h1>Entries</h1>
+<div class="container">
+  <center>
+    <h1>Journal</h1>
+    <br>
+    <%= form_tag({:action => 'index'}, {:method => :get, :class => 'form-inline'}) do%>
+      <div class="form-group">
+      Per page: <%= select_tag :limit, options_for_select([25, 100, 200, 300], selected: params[:limit]), class: 'form-control' %>
+      Order: <%= select_tag :order, options_for_select(['descending', 'ascending'], selected: params[:order]), class: 'form-control' %>
+      </div>
+      <button type="submit" class="btn btn-default">Refresh</button>
+    <% end %>
+  </center>
 
-<table cellspacing="0">
+<table class="table table-striped table-hover">
   <thead>
     <tr>
-      <th class="nobg">ID</th>
       <th>Description</th>
       <th>Debits</th>
       <th>Credits</th>
@@ -14,7 +23,6 @@
   <tbody>
   <% @entries.each do |entry| %>
     <tr class="<%= cycle("even", "odd") -%>">
-      <td><%=link_to(entry.id, entry_path(entry)) %></td>
       <td><%=h entry.description %></td>
       <td></td>
       <td></td>
@@ -22,27 +30,30 @@
     </tr>
     <% entry.debit_amounts.each do |debit_amount| %>
       <tr class="<%= cycle("odd", "odd") -%>">
-        <td></td>
         <td>&nbsp;&nbsp;&nbsp;&nbsp;<%=h "#{debit_amount.account.name}" %></td>
-        <td><%=h debit_amount.amount %></td>
+        <td><%=h debit_amount.amount.round(2) %></td>
         <td></td>
         <td></td>
       </tr>
     <% end %>
     <% entry.credit_amounts.each do |credit_amount| %>
       <tr class="<%= cycle("odd", "odd") -%>">
-        <td></td>
         <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<%=h "#{credit_amount.account.name}" %></td>
         <td></td>
-        <td><%=h credit_amount.amount %></td>
+        <td><%=h credit_amount.amount.round(2) %></td>
         <td></td>
       </tr>
     <% end %>
+    <tr class="<%= cycle("odd", "odd") -%>">
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+    </tr>
   <% end %>
   </tbody>
 </table>
 
-<br />
+<%= paginate @entries %>
 
-<h3>Go to <%= link_to 'Accounts', accounts_path %></h3>
 </div>