Patrick Gansterer
ea2862fdef
Run rubocop --fix-layout and remove encoding comments
2021-03-02 09:12:19 +01:00
wvengen
ed9192c47f
API v1 order_articles endpoints
2021-02-17 17:07:39 +01:00
lentschi
085562dbf4
#779 Received state for orders (PR #789 , #779 )
2021-02-03 20:57:53 +01:00
wvengen
be287cf67e
Fix new stock article failing
2016-05-20 21:30:56 +02:00
wvengen
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
wvengen
a475a27f79
i18n cleanup (affects foodcoops#137)
2013-12-06 22:43:36 +01:00
Julius
ef62a18ac9
Add StockChanges index
2013-07-09 21:46:04 +02:00
wvengen
7af796c09c
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
2013-03-21 22:08:09 +01:00
Benjamin Meichsner
07581b7ecf
Removed acts_as_paranoid. Implemented own version.
2013-03-16 17:57:38 +01:00
wvengen
cb2c724abd
fix typo
2013-02-11 23:37:52 +01:00
wvengen
a0a974b9ce
finish stockit i18n + controllers + model
2013-02-11 11:19:26 +01:00
benni
ef2ce98e46
Performance improvement for stockit view.
2012-07-31 17:37:32 +02:00
benni
8a74e7d77f
Removed annoate and hirb Gemfiles.
...
Annotate: Better look in schema.rb, this reference should be always up
to date.
Hirb: To reactivate hirb, look in railscasts:
http://railscasts.com/episodes/48-console-tricks-revised
2012-07-27 18:07:42 +02:00
benni
4a8e286d98
Fixed encoding issues with ruby > 1.9.2..
2012-04-16 08:49:54 +02:00
benni
fc1d130113
Refactored stockit, delivery an stock_takings.
2011-05-27 14:09:01 +02:00
benni
eab16e337e
Updated router. Temporarly replaced routing filter with rails internal.
2011-05-11 12:27:58 +02:00
benni
46450cebef
New annotation, because of db switch to mysql.
...
Background: sqlite has some problems with decimal option.
2011-05-07 21:55:24 +02:00
benni
dcd2a514a6
Added duration to tasks. Annotated all models.
2011-05-07 20:50:39 +02:00
Benjamin Meichsner
e75a42d509
Merge branch 'wiki'
2009-08-15 17:24:08 +02:00
Benjamin Meichsner
4d57bd2e73
Show current stock value on stockit page.
2009-08-04 13:41:28 +02:00
Benjamin Meichsner
d848831fea
Implemented stats for ordergroups on startpage. Annotated models.
2009-08-01 13:41:22 +02:00
Benjamin Meichsner
27ff4bbd9b
Removed price history for StockArticle.
2009-05-17 16:26:31 +02:00
Benjamin Meichsner
951d19db6a
Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views!
2009-02-12 18:32:20 +01:00
Benjamin Meichsner
0a87294ed4
Fixed bug in deliveries. Extended test fixtures.
2009-02-06 17:06:08 +01:00
Benjamin Meichsner
c17b63b192
Second part of stock-integration.
...
Introduced StockArticle and a special page for ordering from stock. StockChanges will be created and the StockArticle.quantity
updated in 'order.close!'.
2009-02-06 16:26:35 +01:00
