7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
59c118a171
Apply publish/subscribe for OrderArticle#create
2014-01-02 19:16:03 +01:00
81dfe8110c
Apply publish/subscribe for OrderArticle#update
2014-01-02 19:14:07 +01:00
6cfaa4979a
show lines with zero units but with member orders in balancing screen ( closes foodcoops/foodsoft#179 )
2013-10-02 16:32:29 +02:00
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
707f989768
Fixed routes in redirect after direct_close of orders.
2013-03-17 17:50:50 +01:00
c05b3e0e19
Balancing: Do not update oder summary automaticly when changing group orders.
2013-03-17 15:47:50 +01:00
9cc98b4662
Added some more eager loading for balancing view.
2013-03-17 15:12:14 +01:00
0d3564492b
Fixed bug in sorting articles in balancing view.
2013-03-12 18:54:51 +01:00
c4376f35bf
Removed article from includes in as it does not work with acts_as_paranoid.
...
See also https://github.com/goncalossilva/rails3_acts_as_paranoid/issues/62 .
Better we remove acts_as_paranoid and filter manually?
2013-03-12 12:50:56 +01:00
6196bdae41
Added some eager loading for balancing new.
2013-03-12 12:38:08 +01:00
8be93c33f8
i18n finance + controller
2013-02-10 15:05:31 +07:00
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
af3c07f031
Simplifiying balancing view part 2. Lets call it finished.
2012-07-27 18:03:46 +02:00
467874a8a5
Simplify balancing view. Part 1 of ...
2012-06-21 17:19:00 +02:00
6bd4bbec86
Deactivated broken links in balancing.
2012-05-12 11:18:46 +02:00
c49edb79a2
Fixed edit_not in balancing.
2012-05-12 10:55:20 +02:00
4a8e286d98
Fixed encoding issues with ruby > 1.9.2..
2012-04-16 08:49:54 +02:00
21f128ef1d
Handle bad entries when creating new order articles in balancing
...
controller.
2009-09-07 13:31:03 +02:00
a1ca9f368d
Fixed bug when adding new article to a stock order (balancing
...
controller)
2009-09-07 10:57:49 +02:00
8bfa83118c
Update ordergroup values after deleting an ordered article. Closes #11
...
* TODO: Implement callbacks to avoid such mistakes.
2009-05-13 13:04:39 +02:00
4c57c57827
Changed default order of articles on balancing page.
2009-05-04 17:56:52 +02:00
1e011256e9
Remove all non-digits before sorting by order number in finance/balancing
...
* Since order_number is a string, there can be more than a-zA-Z + digits
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-07 18:08:30 +08:00
40886b71f9
Fixed Bug in balancing controller when adding an ordergroup-result.
2009-04-05 14:59:55 +02:00
30aa04b710
Made sort by order_number balancing view work.
2009-04-03 17:50:17 +02:00
596f5657bc
Fixed remote and non-remote link mixtures bug.
2009-04-03 17:35:00 +02:00
5a7fe17437
Make list of ordered articles sortable in _edit_results_by_articles
...
* For the moment you can sort by article name and order number
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-03 22:14:48 +08:00
3654ba7cf1
Added buttons to in/decrease group order article results.
...
Signed-off-by: bennibu <benni@dresdener27.de>
2009-03-21 05:39:02 +08:00
6202e05841
Last part of order refactoring. Now order_article create/update is possible.
2009-02-09 20:12:56 +01:00
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
251ced4fa1
Introduced group_order_article.result to save the result for each group/article.
2009-02-04 16:41:01 +01:00
ec402ffa7b
Fixed order.close workflow. (formerly known as order.balance)
2009-01-30 22:27:55 +01:00
190a777278
Order refactoring part two: Balancing workflow was adapted to the new order schema. Article modification is still missing.
2009-01-29 21:28:22 +01:00
9eb2125f15
Complete refactoring of orders-workflow.
...
OrderResult tables are removed. Data consistency is now possible through new article.price-history (ArticlePrice).
Balancing-workflow needs to be updated.
2009-01-29 01:57:51 +01:00
2630ca2b14
Removed finance-controller for more clarity.
2009-01-19 16:40:06 +01:00
fadc951208
Second part of admin-namespace-reorder. Also renamed OrderGroup into Ordergroup. More view-sharing between groups is neccessary.
2009-01-14 12:46:01 +01:00
47398c6a70
Moved balancing logic into new namespace 'finance'.
2009-01-10 22:22:16 +01:00
wvengen
Julius
Benjamin Meichsner
Manuel Wiedenmann
Benjamin Meichsner
sandoz
sandoz