07ba6f0535
Import multiple spreadsheet formats. Make upload work like sync.
2015-04-11 02:52:57 +02:00
4239843b3e
Merge foodcoop1040:order_message into master
...
Conflicts:
plugins/messages/app/models/message.rb
2015-04-10 18:30:54 +02:00
497488ef0e
Improve associations
2015-04-10 18:30:12 +02:00
1b48882c0e
Refactor orders index
2015-02-18 23:46:50 +01:00
118886344a
Use boolean comparators where it makes sense
2015-01-14 21:17:00 +01:00
1b9b81fa75
Make sync work when unit has no name
...
(closes foodcoops#337)
Conflicts:
app/models/article.rb
2015-01-02 23:20:36 +01:00
f340b127dc
Fix fast test failing
2015-01-02 18:08:38 +01:00
cee2ac8f9f
Merge pull request #331 from foodcoops/feature/configure-upfront-tasks
...
Configure upfront tasks
2014-12-06 14:35:22 +01:00
f6c008c79c
Allow configuration of task periods
2014-11-23 01:34:51 +01:00
219eb71bc9
Allow to specify an order schedule for new orders.
2014-11-23 00:38:13 +01:00
6e990fed4c
Upgrade to rails 4.1
2014-11-21 14:37:56 +01:00
0e1cde9e2b
more extensive database seeds (in two languages) (closes foodcoops#277)
2014-09-29 17:26:27 +02:00
91bcf0c580
Avoid out of range error when using big numbers in financial transactions.
...
The database schema allows numbers up (+/-) 999_999.99. But as we are also adding the amount to the Ordergroup#account_balance, we use lower barriers to avoid running in errors when updating the account balance.
So, technically the user has to make 10 times the maximum input to raise an account balance error. This should be sufficient, I hope.
2014-09-22 11:36:10 +02:00
0231df9d5b
Delete memberships when deleting associated groups.
2014-09-21 12:47:58 +02:00
cf360335ee
fix articles with zero quantity showing
...
complements 8913ad615c
2014-09-11 13:47:03 +02:00
8473f16091
query performance improvements
2014-09-02 12:58:32 +02:00
647b7f0430
allow to synchronize all articles of a shared supplier
2014-09-02 12:58:31 +02:00
3918e22214
synchronize price on two decimal places only
2014-09-02 12:58:31 +02:00
d9c61b2db3
allow to match category names on import/sync
2014-09-02 12:58:31 +02:00
ecf5601023
make missing_units get correct details for closed orders
2014-09-01 12:25:42 +02:00
8913ad615c
show articles ordered by members but not by foodcoop dimmed in receive
2014-08-29 12:23:23 +02:00
a43020463d
normalize article and category attributes (closes foodcoops#294)
2014-06-23 17:51:19 +02:00
7c2ecd8658
add some model api docs
2014-06-23 17:51:19 +02:00
2bf13dbefa
give partially unused order articles a distinct colour
2014-06-23 17:51:19 +02:00
c64a7ba3cd
validate date and time inputs
2014-06-23 17:51:18 +02:00
8c0df3b4e8
edit order user-interface update
...
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
3a41e9530f
fix order bug
2014-05-13 17:01:27 +02:00
852f3484ad
make settle directly less dangerous
...
(closes foodcoops#275)
2014-05-13 17:01:26 +02:00
25854f2de7
do not store GroupOrderArticles with zero quantity and tolerance
2014-05-13 17:01:26 +02:00
7556c753d0
Extract message system to plugin.
2014-05-13 17:01:25 +02:00
c25d4d3f4f
use ruby-units for unit parsing ( closes foodcoops/foodsoft#200 )
...
Conflicts:
Gemfile
Gemfile.lock
2014-05-13 17:01:25 +02:00
3f032e5dd9
make apple points optional
...
a next step would be to move this to a plugin
2014-05-13 17:01:25 +02:00
0fa9bebac9
show supplier user-interface update
2014-05-13 17:01:24 +02:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
f8fca4d630
fix order article add + test
2014-02-24 11:37:06 +01:00
2c85618284
fix balancing and matrix since receive
2014-02-13 16:06:45 +01:00
2de4a2a3a0
Merge pull request #256 from wvengen/feature-partial_shared_sync
...
Small change to allow non-shared articles with shared suppliers
2014-02-07 11:24:33 +01:00
4bfd7fa6f8
fix database sync when value is nil
2014-02-03 15:32:53 +01:00
49e563af89
allow non-shared articles to be part of a shared supplier using a blank order number
2014-01-24 22:10:00 +01:00
6c0de3dc74
Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'
...
Conflicts:
config/locales/de.yml
config/locales/en.yml
2014-01-20 12:12:00 +01:00
dc92de771e
Comment on ArticlePrices without Article association
2014-01-04 21:39:11 +01:00
f83f6971e8
Rename update_current_price to update_global_price to avoid confusion
2014-01-04 21:35:19 +01:00
3c88f572a4
When updating OrderArticle: save ArticlePrice association
2014-01-04 21:22:57 +01:00
1a5dc3ebe4
consider group_order_article without result not manually changed
2014-01-03 13:03:28 +01:00
0af8a065a1
Fix calculation of OrderArticle.total_price and .total_gross_price
2014-01-03 10:33:31 +01:00
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
8e52fca304
Do not set quantity of newly created OrderArticles to 1
2014-01-02 19:17:46 +01:00
01264bc0ac
Clean up OrderArticle#new form and related stuff
2014-01-02 19:14:46 +01:00
27a73be68f
Merge remote-tracking branch 'foodcoops/master' into feature-receive
2014-01-02 18:57:59 +01:00
03bb83ecc0
show different warning signs for mismatch with ordered and received
2013-12-23 12:35:09 +01:00
wvengen
wvengen
Benjamin Meichsner
Robert Waltemath
Julius