98f59a3de3
Readonly receive input if GroupOrderArticle result has manually been changed
...
Conflicts:
app/helpers/orders_helper.rb
app/views/orders/_edit_amount.html.haml
2014-01-03 10:33:09 +01:00
033aa90698
Use OrderArticle#create in receive form instead of Order#add_article
2014-01-02 19:16:09 +01:00
cf1e68f11d
Allow to edit OrderArticle in Order#receive form
2014-01-02 19:14:33 +01:00
a28c6031a4
fix receive exception when input is set to nil
2013-12-21 17:39:20 +01:00
d299fa4870
move receive screen to orders
2013-12-18 21:08:58 +01:00
94b4454a1b
add receive to order screen, and distinguish between finished and closed orders to put it in nicely
2013-12-18 19:21:39 +01:00
de948d7692
fix and cleanup routing (closes foodcoops#190)
2013-10-30 02:27:04 +01:00
98e7189d31
Merge branch 'master' into i18n
...
Conflicts:
app/assets/javascripts/application.js
2013-10-18 12:30:34 +02:00
762292ef8e
small i18n move
2013-10-09 22:29:19 +02:00
28644dc334
Force update in Order#finish; rescue if error raised
2013-10-08 19:58:11 +02:00
70542c1ad7
update en translation
2013-04-12 01:30:02 +02:00
24d04b25db
fix some small i18n errors
2013-04-04 00:56:45 +02:00
e06524ca37
finish ordergroups and orders i18n + controller
2013-02-08 01:52:20 +01:00
8b2b70f8bf
Fixed saving user for new orders.
2013-01-26 16:24:45 +01:00
16de9124fe
Fixes orders.
2012-10-30 00:20:47 +01:00
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
eb532babd6
Refactored pdf generation with newest prawn.
2012-10-02 02:50:48 +02:00
ec2e761e7f
Fixed multi coop routing and changed config accessors.
2012-08-24 19:52:38 +02:00
af3875d46b
Refactored order finishing. Delay user notifications.
2012-08-24 14:24:36 +02:00
4a8e286d98
Fixed encoding issues with ruby > 1.9.2..
2012-04-16 08:49:54 +02:00
b3c64ecb85
Fixed order views.
2011-06-20 00:26:17 +02:00
88b268cb0b
Refactoring of order comments.
2011-06-19 20:47:27 +02:00
55d2976e98
Moved order stats and cleanup stuff into rake task.
...
Closes #14
2010-02-09 21:45:57 +01:00
4db8184daa
Fixed some bugs in orders lists. Closes #3
2009-04-20 14:11:11 +02:00
d62d45e4a4
Hide zero results in matrix pdf.
2009-04-03 23:32:24 +02:00
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
ce2156d75f
Send order-finish-notifications in background.
2009-03-11 16:58:31 +01:00
1912a3fd80
First part of stock-integratino. Orders with supplier_id == 0 become stockorders.
2009-02-05 16:40:02 +01:00
251ced4fa1
Introduced group_order_article.result to save the result for each group/article.
2009-02-04 16:41:01 +01:00
6fd5d825f9
Order-refactoring part II.
2009-02-03 21:14:48 +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
fb5884fbf6
Finished pdf-replacement. Improved Matrix.
2009-01-08 14:10:51 +01:00
a6c7b04e33
Replaced rfpdf with prawn and prawnto. Start to convert pdf-views.
2009-01-07 15:29:23 +01:00
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
5b9a7e05df
Initial commit of foodsoft 2
2009-01-06 11:49:19 +01:00
wvengen
Julius
Benjamin Meichsner
Benjamin Meichsner
Benjamin Meichsner