Commit graph

26 commits

Author SHA1 Message Date
Patrick Gansterer
75deec9f06 Add custom fields to invoice, odergroup, supplier and user 2017-10-28 20:16:47 +02:00
wvengen
3a41e9530f fix order bug 2014-05-13 17:01:27 +02:00
wvengen
7841245795 migrate to Rails 4.0 (closes foodcoops#214)
Conflicts:
	Gemfile.lock
2014-02-24 12:46:28 +01:00
Robert Waltemath
9f22615a25 Order tasks with same date by name. 2013-09-05 10:16:57 +02:00
Robert Waltemath
a7fd7a7936 Removed obsolete code of old workgroup-centric weekly task concept. 2013-06-22 18:14:11 +02:00
Benjamin Meichsner
2d1ae0ad97 Fixed bad syntax (from already dropped meta_where gem).
Thanks to wvengen, closed #91

Conflicts:

	app/models/workgroup.rb
2013-02-25 10:51:01 +01:00
Benjamin Meichsner
3fb5c313ee Show usefull error message for uniqueness_of_name with acts_as_paranoid.
Fixed #88

Conflicts:

	app/models/ordergroup.rb
2013-02-25 10:49:55 +01:00
wvengen
8043fd2164 finish foodcoop i18n + controller + model 2013-02-22 00:19:22 +01:00
benni
5fb0bc2444 Big feactoring and bug fixing, Mailer, Tasks, GroupOrders 2012-08-24 11:11:40 +02:00
benni
8a74e7d77f Removed annoate and hirb Gemfiles.
Annotate: Better look in schema.rb, this reference should be always up
to date.

Hirb: To reactivate hirb, look in railscasts:
http://railscasts.com/episodes/48-console-tricks-revised
2012-07-27 18:07:42 +02:00
benni
182742fbec Merge branch 'master' into rails3
Conflicts:
	.gitignore
	app/models/task.rb
	app/models/workgroup.rb
	app/views/shared/_group_form.html.haml
	config/locales/de.yml
	db/schema.rb
2012-06-26 11:51:56 +02:00
benni
7d54a416df Allow changing number of automaticly created next weekly tasks. 2012-06-24 11:01:16 +02:00
benni
ad508b207b Updated to rails 3.0.12. remove old gettext code. 2012-04-15 19:59:39 +02:00
benni
172db1d37e Admin namespace beendet. 2011-06-10 13:22:15 +02:00
benni
46450cebef New annotation, because of db switch to mysql.
Background: sqlite has some problems with decimal option.
2011-05-07 21:55:24 +02:00
benni
c2496aa4fd Consider task duration in ordergroup stats.
* Also added duration to task template in workgroup task_duration.
2011-05-07 21:54:00 +02:00
benni
dcd2a514a6 Added duration to tasks. Annotated all models. 2011-05-07 20:50:39 +02:00
Benjamin Meichsner
e75a42d509 Merge branch 'wiki' 2009-08-15 17:24:08 +02:00
Benjamin Meichsner
49be55238b Added rake task to notify workgroup members if not enough users assigned an upcoming task. 2009-08-11 18:10:14 +02:00
Benjamin Meichsner
d8cdbe4abb Added rake task for auto create of upcoming workgroup tasks (weekly tasks). 2009-08-11 17:22:08 +02:00
Benjamin Meichsner
6659fe90f3 Merge branch 'stats' 2009-08-02 19:57:19 +02:00
Benjamin Meichsner
0d910dfbbd Moved foodcoop/workgroups into new namespace foodcoop. Closes #20 2009-08-02 18:42:52 +02:00
Benjamin Meichsner
d848831fea Implemented stats for ordergroups on startpage. Annotated models. 2009-08-01 13:41:22 +02:00
Benjamin Meichsner
0a2a79237a Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing. 2009-02-02 16:35:43 +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
2d5dc03b90 Groups are now workgroups. First part of moving groups-logic into admin-namespace. 2009-01-13 19:01:56 +01:00