Commit graph

373 commits

Author SHA1 Message Date
Patrick Gansterer
9ae7c05a89 Create next tasks directly after creating a periodic task 2016-03-04 17:13:16 +01:00
Patrick Gansterer
36dd19f324 Require due_date for periodic tasks 2016-03-04 17:11:47 +01:00
Patrick Gansterer
8b8693df5a Show last activity of ordergroups 2016-03-04 16:16:09 +01:00
Patrick Gansterer
1315103a7d Add role_invoices
This new role allows users to create invoices without role_finance. Users
can then only modify their own created invoices until somebody with the
role_finance sets the paid_on value.
2016-03-04 16:06:02 +01:00
Patrick Gansterer
460cf1e82c Change relationship of invoices #390
This change will allow us to have invoices for more than one order/delivery
in the future. There are no UI changes for now.
2016-03-04 15:55:39 +01:00
Patrick Gansterer
53b51f0f5c Remove useless upper bound of 99 items #388 2016-02-24 00:39:57 +01:00
Patrick Gansterer
3d6f908102 Add created_by to invoice and show it 2016-02-24 00:39:07 +01:00
wvengen
90b21ecc3a Allow increasing just tolerance in the boxfill phase 2015-11-13 18:10:46 +01:00
wvengen
a03789e048 Add optional boxfill phase to orders 2015-11-13 18:10:46 +01:00
wvengen
ec03d579d0 Merge branch 'feature/edit-recurring-task'
Conflicts:
	config/locales/en.yml
2015-05-08 20:10:23 +02:00
Robert
a8a434ef7b Move due date according to delta 2015-05-01 21:31:06 +02:00
Robert
fd51b07e21 Allow editing recurring task groups, basic functionality for #152 2015-05-01 21:14:16 +02:00
wvengen
aa7a2a31ae Bundle update & restructure tests (RSpec 3) 2015-04-25 17:14:37 +02:00
wvengen
17cbc57850 Don't error when deleting supplier/group with already existing deleted name (closes foodcoops/foodsoft#197) 2015-04-17 20:09:40 +02:00
wvengen
c30ec67548 Allow synchronising units when uploading 2015-04-11 02:52:57 +02:00
wvengen
4d1e102f47 Checkbox to remove articles not in upload 2015-04-11 02:52:57 +02:00
wvengen
d5a7f6a074 Move file import logic to model 2015-04-11 02:52:57 +02:00
wvengen
07ba6f0535 Import multiple spreadsheet formats. Make upload work like sync. 2015-04-11 02:52:57 +02:00
wvengen
4239843b3e Merge foodcoop1040:order_message into master
Conflicts:
	plugins/messages/app/models/message.rb
2015-04-10 18:30:54 +02:00
wvengen
497488ef0e Improve associations 2015-04-10 18:30:12 +02:00
wvengen
1b48882c0e Refactor orders index 2015-02-18 23:46:50 +01:00
wvengen
118886344a Use boolean comparators where it makes sense 2015-01-14 21:17:00 +01:00
wvengen
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
wvengen
f340b127dc Fix fast test failing 2015-01-02 18:08:38 +01:00
wvengen
cee2ac8f9f Merge pull request #331 from foodcoops/feature/configure-upfront-tasks
Configure upfront tasks
2014-12-06 14:35:22 +01:00
wvengen
f6c008c79c Allow configuration of task periods 2014-11-23 01:34:51 +01:00
wvengen
219eb71bc9 Allow to specify an order schedule for new orders. 2014-11-23 00:38:13 +01:00
wvengen
6e990fed4c Upgrade to rails 4.1 2014-11-21 14:37:56 +01:00
wvengen
0e1cde9e2b more extensive database seeds (in two languages) (closes foodcoops#277) 2014-09-29 17:26:27 +02:00
Benjamin Meichsner
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
Benjamin Meichsner
0231df9d5b Delete memberships when deleting associated groups. 2014-09-21 12:47:58 +02:00
wvengen
cf360335ee fix articles with zero quantity showing
complements 8913ad615c
2014-09-11 13:47:03 +02:00
wvengen
8473f16091 query performance improvements 2014-09-02 12:58:32 +02:00
wvengen
647b7f0430 allow to synchronize all articles of a shared supplier 2014-09-02 12:58:31 +02:00
wvengen
3918e22214 synchronize price on two decimal places only 2014-09-02 12:58:31 +02:00
wvengen
d9c61b2db3 allow to match category names on import/sync 2014-09-02 12:58:31 +02:00
wvengen
ecf5601023 make missing_units get correct details for closed orders 2014-09-01 12:25:42 +02:00
wvengen
8913ad615c show articles ordered by members but not by foodcoop dimmed in receive 2014-08-29 12:23:23 +02:00
wvengen
a43020463d normalize article and category attributes (closes foodcoops#294) 2014-06-23 17:51:19 +02:00
wvengen
7c2ecd8658 add some model api docs 2014-06-23 17:51:19 +02:00
wvengen
2bf13dbefa give partially unused order articles a distinct colour 2014-06-23 17:51:19 +02:00
wvengen
c64a7ba3cd validate date and time inputs 2014-06-23 17:51:18 +02:00
wvengen
8c0df3b4e8 edit order user-interface update
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
wvengen
3a41e9530f fix order bug 2014-05-13 17:01:27 +02:00
wvengen
852f3484ad make settle directly less dangerous
(closes foodcoops#275)
2014-05-13 17:01:26 +02:00
wvengen
25854f2de7 do not store GroupOrderArticles with zero quantity and tolerance 2014-05-13 17:01:26 +02:00
Robert Waltemath
7556c753d0 Extract message system to plugin. 2014-05-13 17:01:25 +02:00
wvengen
c25d4d3f4f use ruby-units for unit parsing (closes foodcoops/foodsoft#200)
Conflicts:
	Gemfile
	Gemfile.lock
2014-05-13 17:01:25 +02:00
wvengen
3f032e5dd9 make apple points optional
a next step would be to move this to a plugin
2014-05-13 17:01:25 +02:00
wvengen
0fa9bebac9 show supplier user-interface update 2014-05-13 17:01:24 +02:00