Fixed bug order.profit calculation.
Order.profit will also be saved, when order is closed.
This commit is contained in:
parent
843e4a7233
commit
da08365816
32 changed files with 408 additions and 34 deletions
2
test/fixtures/articles.yml
vendored
2
test/fixtures/articles.yml
vendored
|
|
@ -1,5 +1,5 @@
|
|||
# == Schema Information
|
||||
# Schema version: 20090120184410
|
||||
# Schema version: 20090317175355
|
||||
#
|
||||
# Table name: articles
|
||||
#
|
||||
|
|
|
|||
3
test/fixtures/orders.yml
vendored
3
test/fixtures/orders.yml
vendored
|
|
@ -1,5 +1,5 @@
|
|||
# == Schema Information
|
||||
# Schema version: 20090119155930
|
||||
# Schema version: 20090317175355
|
||||
#
|
||||
# Table name: orders
|
||||
#
|
||||
|
|
@ -11,6 +11,7 @@
|
|||
# state :string(255) default("open")
|
||||
# lock_version :integer default(0), not null
|
||||
# updated_by_user_id :integer
|
||||
# foodcoop_result :decimal(8, 2)
|
||||
#
|
||||
|
||||
# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
|
||||
|
|
|
|||
3
test/fixtures/stock_changes.yml
vendored
3
test/fixtures/stock_changes.yml
vendored
|
|
@ -1,5 +1,5 @@
|
|||
# == Schema Information
|
||||
# Schema version: 20090120184410
|
||||
# Schema version: 20090317175355
|
||||
#
|
||||
# Table name: stock_changes
|
||||
#
|
||||
|
|
@ -9,6 +9,7 @@
|
|||
# stock_article_id :integer
|
||||
# quantity :integer default(0)
|
||||
# created_at :datetime
|
||||
# stock_taking_id :integer
|
||||
#
|
||||
|
||||
# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
|
||||
|
|
|
|||
11
test/fixtures/stock_takings.yml
vendored
11
test/fixtures/stock_takings.yml
vendored
|
|
@ -1,3 +1,14 @@
|
|||
# == Schema Information
|
||||
# Schema version: 20090317175355
|
||||
#
|
||||
# Table name: stock_takings
|
||||
#
|
||||
# id :integer not null, primary key
|
||||
# date :date
|
||||
# note :text
|
||||
# created_at :datetime
|
||||
#
|
||||
|
||||
# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
|
||||
|
||||
one:
|
||||
|
|
|
|||
31
test/fixtures/suppliers.yml
vendored
31
test/fixtures/suppliers.yml
vendored
|
|
@ -1,24 +1,21 @@
|
|||
# == Schema Information
|
||||
# Schema version: 20090120184410
|
||||
# Schema version: 20090317175355
|
||||
#
|
||||
# Table name: suppliers
|
||||
#
|
||||
# id :integer not null, primary key
|
||||
# name :string(255) default(""), not null
|
||||
# address :string(255) default(""), not null
|
||||
# phone :string(255) default(""), not null
|
||||
# phone2 :string(255)
|
||||
# fax :string(255)
|
||||
# email :string(255)
|
||||
# url :string(255)
|
||||
# contact_person :string(255)
|
||||
# customer_number :string(255)
|
||||
# delivery_days :string(255)
|
||||
# order_howto :string(255)
|
||||
# note :string(255)
|
||||
# shared_supplier_id :integer
|
||||
# min_order_quantity :string(255)
|
||||
# deleted_at :datetime
|
||||
# id :integer(4) not null, primary key
|
||||
# name :string(255) not null
|
||||
# address :string(255) not null
|
||||
# phone :string(255) not null
|
||||
# phone2 :string(255)
|
||||
# fax :string(255)
|
||||
# email :string(255)
|
||||
# url :string(255)
|
||||
# delivery_days :string(255)
|
||||
# note :string(255)
|
||||
# created_on :datetime
|
||||
# updated_on :datetime
|
||||
# lists :string(255)
|
||||
#
|
||||
|
||||
# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue