bookkeeper 0.0.5 → 0.0.6

data/app/assets/javascripts/bookkeeper.js

@@ -3,7 +3,7 @@
 $(document).ready(function(){
   $('a[data-toggle=tooltip]').tooltip();
 
-  $('input.datepicker').datepicker({ yearRange: "1920:2020", changeMonth: true, changeYear: true });
+  $('input.datepicker').datepicker({ weekStart: 1 });
 
   $('form .add-on.calendar').click(function(){
     var el = this.parentNode;

data/app/controllers/bookkeeper/balance_controller.rb

@@ -3,12 +3,8 @@ require_dependency "bookkeeper/application_controller"
 module Bookkeeper
   class BalanceController < ApplicationController
     def index
-      @movements = Movement.all
-
-      respond_to do |format|
-        format.html
-        format.json { render json: @movements }
-      end
+      @account = Account.first
+      @movements = @account.movements
     end
   end
 end

data/app/controllers/bookkeeper/incomings_controller.rb

@@ -0,0 +1,41 @@
+require_dependency "bookkeeper/application_controller"
+
+module Bookkeeper
+  class IncomingsController < ApplicationController
+    def new
+      @incoming = Incoming.new
+    end
+
+    def edit
+      @incoming = Incoming.find(params[:id])
+    end
+
+    def create
+      @incoming = Incoming.new(params[:incoming])
+
+      if @incoming.save
+        redirect_to balance_index_path, notice: I18n.t('.bookkeeper.controllers.incomings.created')
+      else
+        render action: "new"
+      end
+    end
+
+    def update
+      @incoming = Incoming.find(params[:id])
+
+      if @incoming.update_attributes(params[:incoming])
+        redirect_to balance_index_path, notice: I18n.t('.bookkeeper.controllers.incomings.updated')
+      else
+        render action: "edit"
+      end
+    end
+
+    def destroy
+      @incoming = Incoming.find(params[:id])
+      @incoming.destroy
+      flash[:notice] = I18n.t('.bookkeeper.controllers.incomings.destroyed')
+
+      redirect_to balance_index_path
+    end
+  end
+end

data/app/controllers/bookkeeper/outgoings_controller.rb

@@ -0,0 +1,41 @@
+require_dependency "bookkeeper/application_controller"
+
+module Bookkeeper
+  class OutgoingsController < ApplicationController
+    def new
+      @outgoing = Outgoing.new
+    end
+
+    def edit
+      @outgoing = Outgoing.find(params[:id])
+    end
+
+    def create
+      @outgoing = Outgoing.new(params[:outgoing])
+
+      if @outgoing.save
+        redirect_to balance_index_path, notice: I18n.t('.bookkeeper.controllers.outgoings.created')
+      else
+        render action: "new"
+      end
+    end
+
+    def update
+      @outgoing = Outgoing.find(params[:id])
+
+      if @outgoing.update_attributes(params[:outgoing])
+        redirect_to balance_index_path, notice: I18n.t('.bookkeeper.controllers.outgoings.updated')
+      else
+        render action: "edit"
+      end
+    end
+
+    def destroy
+      @outgoing = Outgoing.find(params[:id])
+      @outgoing.destroy
+      flash[:notice] = I18n.t('.bookkeeper.controllers.outgoings.destroyed')
+
+      redirect_to balance_index_path
+    end
+  end
+end

data/app/models/bookkeeper/account.rb

@@ -1,24 +1,48 @@
 module Bookkeeper
   class Account < ActiveRecord::Base
-    attr_accessible :start_date, :initial_balance
+    attr_accessible :title, :start_date, :initial_balance, :default
 
     has_many :movements, class_name: "Bookkeeper::Movement"
+    has_many :incomings, class_name: "Bookkeeper::Incoming"
+    has_many :outgoings, class_name: "Bookkeeper::Outgoing"
 
     validates :balance, numericality: { allow_nil: true }
     validates :title, presence: true, uniqueness: true
+    validate :default_must_be_uniq
 
     before_save do
       self.update_start_date if self.start_date.blank? and !self.movements.empty?
       self.rebuild_balance
     end
 
+    def update_balance
+      self.rebuild_balance
+      self.save
+    end
+
     def rebuild_balance
-      self.balance = self.initial_balance + Movement.where('bookkeeper_movements.account_id = ?', self.id).sum(:amount)
+      self.balance = self.initial_balance + self.incomings.sum(:amount) - self.outgoings.sum(:amount)
     end
 
     def update_start_date
       self.update_attribute(:start_date, self.movements.first.created_at)
     end
+
+    def self.default
+      if account = Account.find_by_default(true)
+        account
+      else
+        Account.create(title: "Default", start_date: Time.now, initial_balance: 0.0, default: true)
+      end
+    end
+
+    protected
+
+    def default_must_be_uniq
+      if !self.persisted? && Account.where(default: true).first != self
+        errors.add(:base, I18n.t(".default_must_be_uniq"))
+      end
+    end
   end
 end
 

data/app/models/bookkeeper/incoming.rb

@@ -0,0 +1,5 @@
+module Bookkeeper
+  class Incoming < Movement
+  end
+end
+

data/app/models/bookkeeper/movement.rb

@@ -1,6 +1,6 @@
 module Bookkeeper
   class Movement < ActiveRecord::Base
-    attr_accessible :amount, :description
+    attr_accessible :amount, :description, :date
 
     belongs_to :account, class_name: "Bookkeeper::Account"
     has_many :categories, as: :categorizable
@@ -9,14 +9,29 @@ module Bookkeeper
     validates :description, presence: true
     validate :amount_cannot_be_zero
     validates :account, presence: true
+    validates :date, presence: true
 
-    default_scope order('created_at DESC')
+    scope :ordered, order('date ASC, created_at ASC')
+    scope :reverse_ordered, order('date DESC, created_at DESC')
 
+    before_validation do
+      self.account = Account.default unless self.account
+    end
 
     after_save do
-      self.account.rebuild_balance
+      self.account.update_balance
+    end
+
+    after_destroy do
+      self.account.update_balance
     end
 
+    def incoming?
+      self.class == Bookkeeper::Incoming
+    end
+
+    protected
+
     def amount_cannot_be_zero
       if !amount.blank? && amount == 0
         errors.add(:amount, I18n.t(".cannot_be_zero"))

data/app/models/bookkeeper/outgoing.rb

@@ -0,0 +1,6 @@
+module Bookkeeper
+  class Outgoing < Movement
+  end
+end
+
+

data/app/views/bookkeeper/balance/_balance_chart.html.erb

@@ -0,0 +1,26 @@
+<% content_for :javascripts do %>
+  <script type="text/javascript">
+    google.setOnLoadCallback(drawBalanceChart);
+    function drawBalanceChart() {
+        var data = google.visualization.arrayToDataTable([
+          ['<%=t ".date" %>', null],
+          <% balance = @account.initial_balance %>
+          ['<%= @account.start_date.strftime("%d/%m/%Y") %>', <%= balance %> ],
+          <% @movements.ordered.each do |movement| %>
+            <% movement.incoming? ? (balance += movement.amount) : (balance -= movement.amount) %>
+            ['<%= movement.date.strftime("%d/%m/%Y") %>', <%= balance %> ],
+          <% end %>
+        ]);
+
+        var options = {
+          title: '<%=t ".title" %>',
+          colors: ['#F89406']
+        };
+
+        var chart = new google.visualization.LineChart(document.getElementById('balance_chart'));
+        chart.draw(data, options);
+      }
+
+  </script>
+<% end %>
+

data/app/views/bookkeeper/balance/_movements_chart.html.erb

@@ -0,0 +1,46 @@
+<% content_for :javascripts do %>
+  <script type="text/javascript">
+    google.load("visualization", "1", {packages:["corechart"]});
+    google.setOnLoadCallback(drawMovementsChart);
+    function drawMovementsChart() {
+      var data = new google.visualization.DataTable();
+      data.addColumn('string', '<%= t ".date" %>');
+      data.addColumn('number', '<%= t ".movement" %>');
+      data.addRows([
+        <% @movements.ordered.each do |movement| %>
+          <% if movement.incoming? %>
+            ['<%= movement.date.strftime("%d/%m/%Y") %>', <%= movement.amount %> ],
+          <% else %>
+            ['<%= movement.date.strftime("%d/%m/%Y") %>', <%= -movement.amount %> ],
+          <% end %>
+        <% end %>
+      ]);
+
+      var options = {
+        isStacked: true,
+        title: '<%=t ".title" %>',
+        colors: ['#468847', '#F89406'],
+        chartArea: { top: 30 },
+        hAxis: { format:'#.##€' },
+      };
+
+      var view = new google.visualization.DataView(data);
+      view.setColumns([0, {
+          type: 'number',
+          label: null,
+          calc: function (dt, row) {
+              return (dt.getValue(row, 1) > 0) ? dt.getValue(row, 1) : null;
+          }
+        }, {
+          type: 'number',
+          label: null,
+          calc: function (dt, row) {
+              return (dt.getValue(row, 1) <  0) ? dt.getValue(row, 1) : null;
+          }
+      }]);
+      var chart = new google.visualization.BarChart(document.getElementById('movements_chart'));
+      chart.draw(view, options);
+    }
+  </script>
+<% end %>
+

data/app/views/bookkeeper/balance/index.html.erb

@@ -1,31 +1,56 @@
 <h1><%= t '.title' %></h1>
 
-<table class='table table-striped table-condensed table-bordered'>
-  <thead>
-    <tr>
-      <th><%=t 'bookkeeper.models.movement.attributes.amount' %></th>
-      <th><%=t 'bookkeeper.models.movement.attributes.description' %></th>
-      <th><%=t 'bookkeeper.models.movement.attributes.created_at' %></th>
-      <th><%=t 'bookkeeper.models.movement.attributes.updated_at' %></th>
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @movements.each do |movement| %>
-      <tr>
-        <td><%= number_to_currency movement.amount %></td>
-        <td><%= movement.description %></td>
-        <td><%=l movement.created_at, format: :short rescue '' %></td>
-        <td><%=l movement.updated_at, format: :short rescue '' %></td>
-        <td>
-          <%= link_to ('<i class="icon-pencil"></i> ' + t('bookkeeper.actions.edit')).html_safe, edit_movement_path(movement), class: 'btn btn-mini' %>
-          <%= link_to ('<i class="icon-remove"></i> ' + t('bookkeeper.actions.destroy')).html_safe, movement, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-mini btn-danger' %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<div class="row">
+  <div class="span3">
+    <h3><%=t '.account_balance' %></h3>
+    <p><%= number_to_currency @account.balance %></p>
+  </div>
+  <div id="balance_chart" class="span9" style="height: 300px;"></div>
+</div>
 
-<br />
+<div class="row">
+  <div class="span6">
+    <table class='table table-striped table-condensed table-bordered'>
+      <thead>
+        <tr>
+          <th><%=t 'bookkeeper.models.movement.attributes.amount' %></th>
+          <th><%=t 'bookkeeper.models.movement.attributes.description' %></th>
+          <th><%=t 'bookkeeper.models.movement.attributes.date' %></th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @movements.reverse_ordered.each do |movement| %>
+          <tr>
+            <td>
+              <span class="label label-<%= movement.incoming? ? "success" : "warning" %>"><%= (movement.incoming? ? '<i class="icon-circle-arrow-down"></i>' : '<i class="icon-circle-arrow-up"></i>').html_safe %></span>
+              <%= number_to_currency movement.amount %></td>
+            <td><%= movement.description %></td>
+            <td><%=l movement.date, format: :short rescue '' %></td>
+            <td>
+              <% if movement.incoming? %>
+                <%= link_to ('<i class="icon-pencil"></i> ' + t('bookkeeper.actions.edit')).html_safe, edit_incoming_path(movement), class: 'btn btn-mini' %>
+              <% else %>
+                <%= link_to ('<i class="icon-pencil"></i> ' + t('bookkeeper.actions.edit')).html_safe, edit_outgoing_path(movement), class: 'btn btn-mini' %>
+              <% end %>
+              <%= link_to ('<i class="icon-remove"></i> ' + t('bookkeeper.actions.destroy')).html_safe, movement, method: :delete, data: { confirm: t('bookkeeper.actions.destroy_confirm', default: 'Are you sure?') }, class: 'btn btn-mini btn-danger' %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
 
-<%= link_to ('<i class="icon-plus"></i> ' + t('.new')).html_safe, new_movement_path, class: 'btn' %>
+    <br />
+
+    <%= link_to ('<i class="icon-circle-arrow-down"></i> ' + t('.new_incoming')).html_safe, new_incoming_path, class: 'btn btn-success' %>
+    <%= link_to ('<i class="icon-circle-arrow-up"></i> ' + t('.new_outgoing')).html_safe, new_outgoing_path, class: 'btn btn-warning' %>
+  </div>
+  <div id="movements_chart" class="span6" style="height: 500px;"></div>
+</div>
+
+
+<% content_for :javascripts do %>
+  <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+<% end %>
+<%= render partial: "movements_chart" %>
+<%= render partial: "balance_chart" %>

data/app/views/bookkeeper/incomings/_form.html.erb

@@ -0,0 +1,3 @@
+<%= simple_form_for @incoming, html: { class: 'form-horizontal' } do |f| %>
+  <%= render partial: 'bookkeeper/shared/movement_form', locals: { f: f } %>
+<% end %>

data/app/views/bookkeeper/outgoings/_form.html.erb

@@ -0,0 +1,3 @@
+<%= simple_form_for @outgoing,  html: { class: 'form-horizontal' } do |f| %>
+  <%= render partial: 'bookkeeper/shared/movement_form', locals: { f: f } %>
+<% end %>

data/app/views/bookkeeper/outgoings/edit.html.erb

@@ -0,0 +1,5 @@
+<h1><%= t '.title' %></h1>
+
+<%= render 'form' %>
+
+<%= link_to ('<i class="icon-arrow-left"></i> ' + t('bookkeeper.actions.back')).html_safe, balance_index_path, class: 'btn' %>

data/app/views/bookkeeper/outgoings/new.html.erb

@@ -0,0 +1,5 @@
+<h1><%= t '.title' %></h1>
+
+<%= render 'form' %>
+
+<%= link_to ('<i class="icon-arrow-left"></i> ' + t('bookkeeper.actions.back')).html_safe, balance_index_path, class: 'btn' %>

data/app/views/bookkeeper/purchases/_form.html.erb

@@ -14,7 +14,7 @@
       <%= content_tag :span, '<i class="icon-money"></i>'.html_safe, class: "add-on calendar" %>
       <%= f.input_field :amount, class: "input-mini" %>
     <% end %>
-    <%= f.input :warranty_duration, collection: [["6 months", 6], ["1 year", 12], ["2 years", 24], ["3 years", 36]], input_html: { class: 'input-small' } %>
+    <%= f.input :warranty_duration, collection: [["6 #{t('simple_form.labels.purchase.months')}", 6], ["1 #{t('simple_form.labels.purchase.year')}", 12], ["2 #{t('simple_form.labels.purchase.years')}", 24], ["3 #{t('simple_form.labels.purchase.years')}", 36]], input_html: { class: 'input-small' } %>
     <%= f.input :receipt %>
   </div>
   <div class="form-actions">

data/app/views/bookkeeper/purchases/index.html.erb

@@ -24,7 +24,7 @@
         <td><%=l purchase.updated_at, format: :short rescue '' %></td>
         <td>
           <%= link_to ('<i class="icon-pencil"></i> ' + t('bookkeeper.actions.edit')).html_safe, edit_purchase_path(purchase), class: 'btn btn-mini' %>
-          <%= link_to ('<i class="icon-remove"></i> ' + t('bookkeeper.actions.destroy')).html_safe, purchase, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-mini btn-danger' %>
+          <%= link_to ('<i class="icon-remove"></i> ' + t('bookkeeper.actions.destroy')).html_safe, purchase, method: :delete, data: { confirm: t('bookkeeper.actions.destroy_confirm', default: 'Are you sure?') }, class: 'btn btn-mini btn-danger' %>
         </td>
       </tr>
     <% end %>

data/app/views/bookkeeper/shared/_movement_form.html.erb

@@ -0,0 +1,16 @@
+<%= f.error_notification %>
+
+<div class="form-inputs">
+  <%= f.input :amount, :wrapper => :append do %>
+    <%= f.input_field :amount, class: "input-mini" %>
+    <%= content_tag :span, '&euro;'.html_safe, class: "add-on" %>
+  <% end %>
+  <%= f.input :description, input_html: { class: 'input-xxlarge' } %>
+  <%= f.input :date, :wrapper => :prepend do %>
+    <%= content_tag :span, '<i class="icon-calendar"></i>'.html_safe, class: "add-on calendar" %>
+    <%= f.input_field :date, as: :datepicker, data: { 'date-format' => 'dd/mm/yyyy' } %>
+  <% end %>
+</div>
+<div class="form-actions">
+  <%= button_tag ('<i class="icon-ok"></i> ' + t('bookkeeper.actions.save')).html_safe, class: 'btn' %>
+</div>

data/config/locales/en.yml

@@ -27,13 +27,17 @@ en:
     # controllers
     controllers:
       purchases:
-        created: 'Purchase was successfully created.'
-        updated: 'Purchase was successfully updated.'
-        destroyed: 'Purchase was successfully deleted.'
-      movementss:
-        created: 'Movement was successfully created.'
-        updated: 'Movement was successfully updated.'
-        destroyed: 'Movement was successfully deleted.'
+        created: 'The purchase was successfully created.'
+        updated: 'The purchase was successfully updated.'
+        destroyed: 'The purchase was successfully deleted.'
+      incomings:
+        created: 'The movement was successfully created.'
+        updated: 'The movement was successfully updated.'
+        destroyed: 'The movement was successfully deleted.'
+      outgoings:
+        created: 'The movement was successfully created.'
+        updated: 'The movement was successfully updated.'
+        destroyed: 'The movement was successfully deleted.'
     # views
     search:
       create:
@@ -51,7 +55,15 @@ en:
     balance:
       index:
         title: 'Last movements'
-        new: 'Insert new movement'
+        new_incoming: 'New incoming'
+        new_outgoing: 'New outgoing'
+        date: "Date"
+      balance_chart:
+        title: "Balance"
+      movements_chart:
+        title: "Movements"
+        incomings: "Incomings"
+        outgoings: "Outgoings"
     movements:
       index:
         title: 'Listing movements'

data/config/locales/it.yml

@@ -0,0 +1,84 @@
+#encoding: utf-8
+it:
+  bookkeeper:
+    # actions
+    actions:
+      save: 'Salva'
+      back: 'Indietro'
+      new: 'Nuovo'
+      edit: 'Modifica'
+      destroy: 'Elimina'
+      destroy_confirm: 'Sei sicuro?'
+    # models
+    models:
+      purchase:
+        attributes:
+          title: 'Titolo'
+          description: 'Descrizione'
+          purchase_date: 'Data di acquisto'
+          warranty_duration: 'Durata della garanzia'
+          receipt: 'Ricevuta'
+          updated_at: 'Ultimo aggiornamento'
+      movement:
+        attributes:
+          amount: 'Importo'
+          description: 'Descrizione'
+          created_at: 'Data di creazione'
+          updated_at: 'Ultimo aggiornamento'
+          date: "Data"
+    # controllers
+    controllers:
+      purchases:
+        creato: "L'acquisto è stato correttamente creato."
+        modificato: "L'acquisto è stato correttamente modificato."
+        destroyed: "L'acquisto è stato correttamente eliminato."
+      incomings:
+        creato: 'Il movimento è stato correttamente creato.'
+        modificato: 'Il movimento è stato correttamente modificato.'
+        destroyed: 'Il movimento è stato correttamente eliminato.'
+      outgoings:
+        creato: 'Il movimento è stato correttamente creato.'
+        modificato: 'Il movimento è stato correttamente modificato.'
+        destroyed: 'Il movimento è stato correttamente eliminato.'
+    # views
+    search:
+      create:
+        title: 'Risultati della ricerca di "%{q}"'
+    purchases:
+      index:
+        title: 'Acquisti'
+        months: 'mesi'
+      new:
+        title: 'Nuovo acquisto'
+      edit:
+        title: "Modifica l'acquisto"
+      search:
+        search: 'Cerca'
+    balance:
+      index:
+        title: 'Ultimi movimenti'
+        new_incoming: 'Nuova entrata'
+        new_outgoing: 'Nuova uscita'
+        date: "Data"
+        account_balance: "Bilancio"
+      balance_chart:
+        title: "Bilancio"
+      movements_chart:
+        title: "Movimento"
+        incomings: "Entrate"
+        outgoings: "Uscite"
+    movements:
+      index:
+        title: 'Ultimi movimenti'
+      new:
+        title: 'Nuovo movimento'
+      edit:
+        title: 'Modifica il movimento'
+      search:
+        search: 'Cerca'
+    incomings:
+      new:
+        title: 'Inserisci una nuova entrata'
+    outgoings:
+      new:
+        title: 'Inserisci una nuova uscita'

data/config/locales/simple_form.it.yml

@@ -0,0 +1,28 @@
+it:
+  simple_form:
+    "yes": 'Si'
+    "no": 'No'
+    required:
+      html: '<a href="#" data-toggle="tooltip" title="Obbligatorio"><i class="icon-exclamation-sign"></i></a>'
+    error_notification:
+      default_message: "I seguenti problemi hanno impedito il salvataggio"
+    labels:
+      purchase:
+        title: 'Titolo'
+        description: 'Descrizione'
+        purchase_date: 'Data di acquisto'
+        warranty_duration: 'Durata della garanzia'
+        receipt: 'Ricevuta'
+        invoice: 'Fattura'
+        amount: 'Importo'
+        months: 'mesi'
+        year: 'anno'
+        years: 'anni'
+      incoming:
+        amount: 'Importo'
+        description: 'Descrizione'
+        date: 'Data'
+      outgoing:
+        amount: 'Importo'
+        description: 'Descrizione'
+        date: 'Data'

data/config/routes.rb

@@ -2,5 +2,6 @@ Bookkeeper::Engine.routes.draw do
   resources :purchases
   resources :search, only: [:create]
   resources :balance, only: [:index]
-  resources :movements
+  resources :incomings, except: [:index, :show]
+  resources :outgoings, except: [:index, :show]
 end

data/db/migrate/20130317163103_add_sti_to_movements.rb

@@ -0,0 +1,6 @@
+class AddStiToMovements < ActiveRecord::Migration
+  def change
+    add_column :bookkeeper_movements, :type, :string
+    add_index :bookkeeper_movements, :type
+  end
+end

data/db/migrate/20130317165439_add_default_to_accounts.rb

@@ -0,0 +1,6 @@
+class AddDefaultToAccounts < ActiveRecord::Migration
+  def change
+    add_column :bookkeeper_accounts, :default, :boolean, default: false
+    add_index :bookkeeper_accounts, :default
+  end
+end

data/db/migrate/20130317181020_add_date_to_movements.rb

@@ -0,0 +1,5 @@
+class AddDateToMovements < ActiveRecord::Migration
+  def change
+    add_column :bookkeeper_movements, :date, :date, nil: false
+  end
+end

data/lib/bookkeeper/version.rb

@@ -1,3 +1,3 @@
 module Bookkeeper
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookkeeper
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,37 +234,48 @@ files:
 - app/assets/stylesheets/bookkeeper.css
 - app/controllers/bookkeeper/application_controller.rb
 - app/controllers/bookkeeper/balance_controller.rb
-- app/controllers/bookkeeper/movements_controller.rb
+- app/controllers/bookkeeper/incomings_controller.rb
+- app/controllers/bookkeeper/outgoings_controller.rb
 - app/controllers/bookkeeper/purchases_controller.rb
 - app/controllers/bookkeeper/search_controller.rb
 - app/helpers/bookkeeper/application_helper.rb
 - app/inputs/datepicker_input.rb
 - app/models/bookkeeper/account.rb
 - app/models/bookkeeper/categories.rb
+- app/models/bookkeeper/incoming.rb
 - app/models/bookkeeper/movement.rb
+- app/models/bookkeeper/outgoing.rb
 - app/models/bookkeeper/purchase.rb
 - app/uploaders/receipt_uploader.rb
+- app/views/bookkeeper/balance/_balance_chart.html.erb
+- app/views/bookkeeper/balance/_movements_chart.html.erb
 - app/views/bookkeeper/balance/index.html.erb
-- app/views/bookkeeper/movements/_form.html.erb
+- app/views/bookkeeper/incomings/_form.html.erb
+- app/views/bookkeeper/incomings/edit.html.erb
+- app/views/bookkeeper/incomings/new.html.erb
 - app/views/bookkeeper/movements/_search.html.erb
-- app/views/bookkeeper/movements/edit.html.erb
 - app/views/bookkeeper/movements/index.html.erb
-- app/views/bookkeeper/movements/new.html.erb
+- app/views/bookkeeper/outgoings/_form.html.erb
+- app/views/bookkeeper/outgoings/edit.html.erb
+- app/views/bookkeeper/outgoings/new.html.erb
 - app/views/bookkeeper/purchases/_form.html.erb
 - app/views/bookkeeper/purchases/_search.html.erb
 - app/views/bookkeeper/purchases/edit.html.erb
 - app/views/bookkeeper/purchases/index.html.erb
 - app/views/bookkeeper/purchases/new.html.erb
 - app/views/bookkeeper/search/create.html.erb
+- app/views/bookkeeper/shared/_movement_form.html.erb
 - app/views/layouts/bookkeeper/application.html.erb
 - config/initializers/carrierwave.rb
 - config/initializers/simple_form.rb
 - config/initializers/simple_form_bootstrap.rb
 - config/initializers/validates_timeliness.rb
 - config/locales/en.yml
+- config/locales/it.yml
 - config/locales/rails-i18n.en.yml
 - config/locales/rails-i18n.it.yml
 - config/locales/simple_form.en.yml
+- config/locales/simple_form.it.yml
 - config/locales/validates_timeliness.en.yml
 - config/routes.rb
 - db/migrate/20130215165240_create_bookkeeper_purchases.rb
@@ -272,6 +283,9 @@ files:
 - db/migrate/20130228234703_create_bookkeeper_movements.rb
 - db/migrate/20130308231159_add_details_to_purchases.rb
 - db/migrate/20130308231918_create_bookkeeper_categories.rb
+- db/migrate/20130317163103_add_sti_to_movements.rb
+- db/migrate/20130317165439_add_default_to_accounts.rb
+- db/migrate/20130317181020_add_date_to_movements.rb
 - lib/bookkeeper/engine.rb
 - lib/bookkeeper/version.rb
 - lib/bookkeeper.rb

data/app/controllers/bookkeeper/movements_controller.rb

@@ -1,67 +0,0 @@
-require_dependency "bookkeeper/application_controller"
-
-module Bookkeeper
-  class MovementsController < ApplicationController
-    def index
-      @movements = Movement.all
-
-      respond_to do |format|
-        format.html
-        format.json { render json: @movements }
-      end
-    end
-
-    def new
-      @movement = Movement.new
-
-      respond_to do |format|
-        format.html
-        format.json { render json: @movement }
-      end
-    end
-
-    def edit
-      @movement = Movement.find(params[:id])
-    end
-
-    def create
-      @movement = Movement.new(params[:movement])
-
-      respond_to do |format|
-        if @movement.save
-          format.html { redirect_to balance_index_path, notice: I18n.t('.bookkeeper.controllers.movements.created') }
-          format.json { render json: @movement, status: :created, location: @movement }
-        else
-          format.html { render action: "new" }
-          format.json { render json: @movement.errors, status: :unprocessable_entity }
-        end
-      end
-    end
-
-    def update
-      @movement = Movement.find(params[:id])
-
-      respond_to do |format|
-        if @movement.update_attributes(params[:movement])
-          format.html { redirect_to balance_index_path, notice: I18n.t('.bookkeeper.controllers.movements.updated') }
-          format.json { head :no_content }
-        else
-          format.html { render action: "edit" }
-          format.json { render json: @movement.errors, status: :unprocessable_entity }
-        end
-      end
-    end
-
-    def destroy
-      @movement = Movement.find(params[:id])
-      @movement.destroy
-      flash[:notice] = I18n.t('.bookkeeper.controllers.movements.destroyed')
-
-      respond_to do |format|
-        format.html { redirect_to balance_index_path }
-        format.json { head :no_content }
-      end
-    end
-  end
-end
-

data/app/views/bookkeeper/movements/_form.html.erb

@@ -1,15 +0,0 @@
-<%= simple_form_for @movement, html: { class: 'form-horizontal' } do |f| %>
-
-  <%= f.error_notification %>
-
-  <div class="form-inputs">
-    <%= f.input :amount, :wrapper => :append do %>
-      <%= f.input_field :amount, class: "input-mini" %>
-      <%= content_tag :span, '&euro;'.html_safe, class: "add-on" %>
-    <% end %>
-    <%= f.input :description, input_html: { class: 'input-xxlarge' } %>
-  </div>
-  <div class="form-actions">
-    <%= button_tag ('<i class="icon-ok"></i> ' + t('bookkeeper.actions.save')).html_safe, class: 'btn' %>
-  </div>
-<% end %>