diff --git a/app/views/inventories/show.html.haml b/app/views/inventories/show.html.haml
@@ -5,7 +5,17 @@
 - heading @inventory.item || "???"
 %p
   %b Descrição
-  = @inventory.description || "vazia"
+%p= @inventory.description || "vazia"
+%p
+  %b Quantidade
+%p= @inventory.total || "vazia"
+%p
+  %b Total
+%p= @inventory.balance || "vazia"
+%p
+  %b Média Ponderada Móvel
+%p= @inventory.mpms.last || "vazia"
+
 %hr
   %h4 Entradas
   %hr

diff --git a/app/views/shared/_links.html.haml b/app/views/shared/_links.html.haml
@@ -6,7 +6,7 @@
           %i.fa.fa-leaf
             %span.fa-title Fazenda
         %ul.nav.nav-second-level
-          = fa_menu_item(farm_path(current_farm), "Status", "bar-chart-o")
+          = fa_menu_item(farm_path(current_user.farm), "Status", "bar-chart-o")
           = fa_menu_item(livrodiario_path, "Livro Diário", "book")
           = fa_menu_item(accounts_path, "Livro Razão", "calculator")
       %li

diff --git a/db/migrate/20161015004950_create_inventories.rb b/db/migrate/20161015004950_create_inventories.rb
@@ -2,11 +2,11 @@ class CreateInventories < ActiveRecord::Migration
   def change
     create_table :inventories do |t|
       t.string :item
-      t.references :first_entry
       t.text :description
-      t.decimal :start_amount, default: 0
-      t.date :start_date
-      t.decimal :start_value, default: 0
+
+      t.decimal :initial_amount, default: 0
+      t.datetime :date, default: Time.now
+      t.decimal :initial_balance, default: 0
 
       t.timestamps null: false
     end

diff --git a/db/migrate/20161015005219_create_entries.rb b/db/migrate/20161015005219_create_entries.rb
@@ -1,7 +1,6 @@
 class CreateEntries < ActiveRecord::Migration
   def change
     create_table :entries do |t|
-      t.date :date
       t.references :inventory, index: true, foreign_key: true
       t.references :move, index: true, foreign_key: true
       t.decimal :amount

diff --git a/db/schema.rb b/db/schema.rb
@@ -18,6 +18,7 @@
 
   create_table "accounts", force: :cascade do |t|
     t.integer  "farm_id"
+    t.integer  "parent_id"
     t.decimal  "start",      default: 0.0
     t.string   "type"
     t.string   "name"
@@ -35,7 +36,6 @@
   end
 
   create_table "entries", force: :cascade do |t|
-    t.date     "date"
     t.integer  "inventory_id"
     t.integer  "move_id"
     t.decimal  "amount"
@@ -62,21 +62,19 @@
 
   create_table "inventories", force: :cascade do |t|
     t.string   "item"
-    t.integer  "first_entry_id"
     t.text     "description"
-    t.decimal  "start_amount"
-    t.date     "start_date"
-    t.decimal  "start_value"
-    t.datetime "created_at",     null: false
-    t.datetime "updated_at",     null: false
+    t.decimal  "initial_amount",  default: 0.0
+    t.datetime "date",            default: '2016-10-20 22:08:51'
+    t.decimal  "initial_balance", default: 0.0
+    t.datetime "created_at",                                      null: false
+    t.datetime "updated_at",                                      null: false
   end
 
   create_table "moves", force: :cascade do |t|
     t.integer  "debit_id"
     t.integer  "credit_id"
     t.integer  "fact_id"
     t.integer  "partner_id"
-    t.string   "type"
     t.decimal  "amount"
     t.text     "evidence"
     t.datetime "created_at", null: false

diff --git a/db/seeds.rb b/db/seeds.rb
@@ -14,16 +14,21 @@
 admin.confirm
 
 # Accounts
-Creditor.create!({  name: "Capital"     })
-Debtor.create!({    name: "Despesas"    })
-Creditor.create!({  name: "Receitas"    })
-Debtor.create!({    name: "Mercadorias" })
-Debtor.create!({    name: "Custos"      })
-Debtor.create!({    name: "Depreciação"      })
+Creditor.create!({ name: "Capital" })
+Debitor.create!({ name: "Despesas" })
+Debitor.create!({ name: "Despesas Financeiras" })
+Creditor.create!({ name: "Imposto de Renda" })
+Creditor.create!({ name: "Receitas" })
+Debtor.create!({ name: "Mercadorias" })
+Debtor.create!({ name: "Custos de Mercadorias Vendidas" })
+Creditor.create!({ name: "Depreciação" })
+Debtor.create!({ name: "Devoluções" })
+Debtor.create!({ name: "Descontos" })
+Debitor.create!({ name: "Impostos" })
 
 # Inventories
-Inventory.create!({ item: "Machos" })
-Inventory.create!({ item: "Fêmeas" })
+Inventory.create!({ item: "Machos", description: "Machos disponíveis para compra e venda."  })
+Inventory.create!({ item: "Fêmeas", description: "Fêmeas disponíveis para compra e venda."  })
 
 # Partners
 

diff --git a/test/controllers/farms_controller_test.rb b/test/controllers/farms_controller_test.rb
@@ -1,7 +1,49 @@
 require 'test_helper'
 
 class FarmsControllerTest < ActionController::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+  setup do
+    @farm = farms(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:farms)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create farm" do
+    assert_difference('Farm.count') do
+      post :create, farm: { show: @farm.show }
+    end
+
+    assert_redirected_to farm_path(assigns(:farm))
+  end
+
+  test "should show farm" do
+    get :show, id: @farm
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @farm
+    assert_response :success
+  end
+
+  test "should update farm" do
+    patch :update, id: @farm, farm: { show: @farm.show }
+    assert_redirected_to farm_path(assigns(:farm))
+  end
+
+  test "should destroy farm" do
+    assert_difference('Farm.count', -1) do
+      delete :destroy, id: @farm
+    end
+
+    assert_redirected_to farms_path
+  end
 end