Manuel Wiedenmann
2d58054d1c
added order for interpolation
2013-02-10 15:05:31 +07:00
wvengen
e06524ca37
finish ordergroups and orders i18n + controller
2013-02-08 01:52:20 +01:00
benni
0dff5ea784
Fixed some bugs in tasks, apple feature:
...
* Update ordergroup stats when task is destroyed.
* Removed assigned caching attribute in task object.
* A lot of eager loading for tasks controller.
2012-12-16 19:07:45 +01:00
benni
0edd29dfd4
Merge branch 'master' into master-to-rails3
...
Conflicts:
Gemfile
README_DEVEL
app/controllers/articles_controller.rb
app/controllers/orders_controller.rb
app/controllers/tasks_controller.rb
app/models/task.rb
app/views/articles/_import_search_results.haml
app/views/articles/index.haml
app/views/messages/new.haml
app/views/ordering/_order_head.haml
app/views/ordering/my_order_result.haml
app/views/orders/show.haml
app/views/stockit/new.html.haml
db/schema.rb
2012-12-14 18:10:46 +01:00
Julius
c17ff281c3
Save and display creator of Order
2012-11-12 14:24:49 +01:00
benni
f4f10b1e4c
Introduced actionbar. Some fixes for balancing page.
2012-11-12 13:13:01 +01:00
benni
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
benni
16de9124fe
Fixes orders.
2012-10-30 00:20:47 +01:00
benni
f30e57dd49
Fixed articles views.
2012-10-19 01:12:47 +02:00
benni
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
benni
92649d3053
Removed acts_as_ordered. Fixed bug in group_orders archive.
2012-10-03 20:08:54 +02:00
benni
eb532babd6
Refactored pdf generation with newest prawn.
2012-10-02 02:50:48 +02:00
benni
ec2e761e7f
Fixed multi coop routing and changed config accessors.
2012-08-24 19:52:38 +02:00
benni
4a8e286d98
Fixed encoding issues with ruby > 1.9.2..
2012-04-16 08:49:54 +02:00
benni
ad508b207b
Updated to rails 3.0.12. remove old gettext code.
2012-04-15 19:59:39 +02:00
benni
b3c64ecb85
Fixed order views.
2011-06-20 00:26:17 +02:00
benni
88b268cb0b
Refactoring of order comments.
2011-06-19 20:47:27 +02:00
benni
38b5dcba1f
Refactored ordering part two. Integrated stock order.
2011-06-19 19:56:04 +02:00
benni
afb2c26ab3
Fixed orders form.
2011-06-10 13:53:51 +02:00
Benjamin Meichsner
fbf6a283a0
Fixed bug in orders index if order.ends.nil?
2010-06-19 12:25:35 +02:00
Benjamin Meichsner
2309fbe76b
Reduced max articles per page for article matrix.
...
Sometimes the last column wasn't displayed correctly.
2009-10-20 23:13:08 +02:00
Benjamin Meichsner
d62d45e4a4
Hide zero results in matrix pdf.
2009-04-03 23:32:24 +02:00
Benjamin Meichsner
de1aa2ac38
Headers and table improvements for matrix pdf. Fixed #204
2009-04-03 19:20:16 +02:00
sandoz
2db8aec0e5
Improved warning message when finishing an order.
...
* Hope this makes unwanted ending of an order like last week less
possible.
* Finally Closes #159
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-03 22:14:46 +08:00
Benjamin Meichsner
ffc3adf907
Second (last) part of multiple foodcoop installation.
...
* When before_filter select_foodcoop is activated,
the database and configs will be loaded on each request.
* Replaced APP_CONFIG with new Foodsoft.config method.
2009-03-24 17:25:33 +01:00
sandoz
48b6515c08
Genderchanged string 'Lieferant'
...
* Since s.b. started this already. I changed every string 'Lieferant' to
'Lieferantin' to give note on female existance in this world :-)
2009-03-22 15:04:29 +01:00
Benjamin Meichsner
35251576fa
Fixed failures in show-view of StockOrders. ( #195 )
2009-03-11 17:08:12 +01:00
Benjamin Meichsner
714197eea1
Made order-finish-confirm-message consistently. Fixed #196
2009-03-11 17:00:51 +01:00
Benjamin Meichsner
a29053b4e9
Some language fixes. Finished migration path.
2009-03-01 18:45:34 +01: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
325d47b22f
Changed behaviour of acts_as_paraniod. Finder wrapper removed an replaced by simple named_scope 'without_deleted'.
2009-02-11 15:23:59 +01:00
Benjamin Meichsner
cd9636a650
Improved the creation/updating of deliveries.
2009-02-10 20:06:08 +01:00
Benjamin Meichsner
6202e05841
Last part of order refactoring. Now order_article create/update is possible.
2009-02-09 20:12:56 +01:00
Benjamin Meichsner
1912a3fd80
First part of stock-integratino. Orders with supplier_id == 0 become stockorders.
2009-02-05 16:40:02 +01:00
Benjamin Meichsner
251ced4fa1
Introduced group_order_article.result to save the result for each group/article.
2009-02-04 16:41:01 +01:00
Benjamin Meichsner
6fd5d825f9
Order-refactoring part II.
2009-02-03 21:14:48 +01:00
Benjamin Meichsner
288566f000
Moved 'shared' partial into shared-folder. Easer to maintain.
2009-01-30 19:02:35 +01:00
Benjamin Meichsner
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
Benjamin Meichsner
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
Benjamin Meichsner
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
Benjamin Meichsner
fb5884fbf6
Finished pdf-replacement. Improved Matrix.
2009-01-08 14:10:51 +01:00
Benjamin Meichsner
a6c7b04e33
Replaced rfpdf with prawn and prawnto. Start to convert pdf-views.
2009-01-07 15:29:23 +01:00
Benjamin Meichsner
9f8d0d28ac
Removed gettext and simplified_localization-plugin. L18n is now the appropriate module.
...
Upgraded to rails 2.2.2 and replaced complex foodsoft.rb-loader with simple
initializers/load_app_config.rb. Multiple foodcoops option is temporarly deactivated.
2009-01-06 15:45:19 +01:00
Benjamin Meichsner
5b9a7e05df
Initial commit of foodsoft 2
2009-01-06 11:49:19 +01:00
