142de28ade
Split up messages for stock/ supplier orders.
2013-09-18 10:50:56 +02:00
e728e76729
Merge branch 'master' into warn-uncheck-ordered-article
2013-09-17 17:10:56 +02:00
6d4aa5ed40
Merge pull request #163 from foodcoop-rostock/order-tasks-alphabetically
...
Order tasks with same date by name.
2013-09-17 05:45:13 -07:00
b11706f30a
sort ordergroups in order screen and pdfs
2013-09-17 00:25:38 +02:00
8ca95f396f
make both ordered and received products visible in order screens and pdfs
2013-09-16 23:52:58 +02:00
7de57715f2
Merge branch 'master' into tests-rspec
...
Conflicts:
Gemfile
2013-09-07 01:11:24 +02:00
a0760ebfdb
Fixed delivering emails to users.
...
There was a bug in User#receive_email? Return values are now true or false, not '1' or '0'.
2013-09-06 11:40:40 +02:00
9f22615a25
Order tasks with same date by name.
2013-09-05 10:16:57 +02:00
805071f3fb
Added checkbox to ignore warnings. Added translations.
2013-09-04 10:52:14 +02:00
bb25bdc6eb
Improved error data passing.
2013-09-03 17:37:49 +02:00
1c9fad0a7b
Added validation for removed but ordered articles.
2013-09-03 12:09:33 +02:00
71e02ab569
Merge branch 'rails3' into rails3-to-master
...
Conflicts:
app/views/suppliers/shared_suppliers.haml
2013-09-02 13:31:40 +02:00
bb20e9abea
Merge branch 'master' into tests-rspec
...
Conflicts:
Gemfile
Gemfile.lock
2013-07-24 21:25:36 +02:00
74bfc85562
Merge remote-tracking branch 'fsmanuel/master' into master.
...
Updated migration date to today.
Conflicts:
db/schema.rb
2013-07-18 18:48:49 +02:00
c85a7fcc5c
fixes User#receive_email?
2013-07-18 16:58:04 +02:00
ebe93e292b
Merge pull request #141 from foodcoop-rostock/improve-delivery-workflow-further
...
Improve delivery workflow
2013-07-17 01:43:59 -07:00
db80fbd807
Merge branch 'master' into tests-rspec
2013-07-15 18:45:04 +02:00
5e9a49b2c7
make uniqueness_of_name validations work again ( closes foodcoops/foodsoft#157 )
2013-07-15 18:03:02 +02:00
3ed8e0bc84
allow longer supplier phone number
2013-07-15 17:57:00 +02:00
b303b48853
Merge branch 'master' into improve-delivery-workflow-further
2013-07-13 21:08:50 +02:00
126f7e7459
Merge pull request #150 from foodcoop-rostock/stock_article_quantity_history
...
Show StockChanges index
2013-07-13 03:16:31 -07:00
db8a929f0b
Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks
...
Great!
2013-07-11 12:48:41 -07:00
ef62a18ac9
Add StockChanges index
2013-07-09 21:46:04 +02:00
497c9e0cf1
fix closed group_order totals
2013-07-02 12:01:25 +02:00
d0ccf07bc5
Merge latest changes in master of http://github.com/foodcoops/foodsoft
2013-06-26 20:23:11 +02:00
a29d52dcae
Fix ordering of stock_changes in delivery (case-insensitive ordering did not work properly for all database flavors)
2013-06-26 20:14:33 +02:00
2ee7f716ae
Improve delivery validation: StockArticles must not be associated more than once
2013-06-26 17:58:55 +02:00
befe89d4ef
fix tolerance display in group_order form
2013-06-26 01:36:44 +02:00
c27127c745
Added i18n strings.
2013-06-24 11:53:52 +02:00
3d1faa9ed3
Skip save callback when migrating data.
2013-06-24 10:36:14 +02:00
d081a2c66b
Validate done/weekly combination only on creation of task.
2013-06-24 09:49:06 +02:00
577945e591
Add validation for task.done in combination with periodic task.
2013-06-22 18:56:17 +02:00
a7fd7a7936
Removed obsolete code of old workgroup-centric weekly task concept.
2013-06-22 18:14:11 +02:00
ef329b5647
Added up and down migration for weekly task data.
2013-06-22 17:35:45 +02:00
990397a7f0
Delete only the FOLLOWING tasks.
2013-06-21 22:04:36 +02:00
c52e482743
Exclude tasks from groups when changing attributes.
2013-06-21 20:54:24 +02:00
6b62fc90d8
Now creating periodic task via button
2013-06-21 13:48:48 +02:00
bf32e72414
Improve delivery form validation
2013-06-19 11:21:55 +02:00
9502ca28dd
Merge latest changes in master
2013-06-17 15:47:08 +02:00
713c030213
i18n and translate missing entry
2013-06-15 18:43:42 +02:00
b5acd9b116
Merge master branch of base
2013-06-14 18:59:17 +02:00
2c1d9aeb9c
finishes i18n set_locale with user settings
2013-06-14 02:39:25 +02:00
5b7ec86ed6
Merge branch master into i18n
2013-06-14 02:02:57 +02:00
8141ad0233
remove duplicate code
2013-06-14 01:39:30 +02:00
13f2c128c6
do not use string values for integers ( closes foodcoops/foodsoft#128 )
2013-06-14 01:36:41 +02:00
65f61e09d5
Improve delivery workflow; introduce sortable tables; use js.erb for deliveries
2013-06-13 23:36:22 +02:00
25fbb47320
Merge branch 'rails3-allow-multiple-suppliers' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-rails3-allow-multiple-suppliers
2013-06-12 10:40:20 +02:00
46b07a6136
Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks
...
Conflicts:
config/locales/de.yml
2013-06-12 10:00:11 +02:00
7a63394dac
Merge remote-tracking branch 'origin/rails3'
...
Conflicts:
Gemfile
Gemfile.lock
2013-06-10 01:53:31 +02:00
7c4ee01ff2
Define autofill attributes when creating new supplier from shared_supplier.
2013-06-09 18:02:47 +02:00
60afa85ece
Merge pull request #116 from balkansalat/rails3-balancing-delete-article
...
Update ordergroup prices in OrderArticles via Order.
2013-06-09 08:26:38 -07:00
0061e45198
removes routes locale constrain and fixes some bugs
2013-06-06 04:29:53 +02:00
60c4c5510a
adds a new user settings system + migration + rake task/worker updates
2013-06-06 03:40:15 +02:00
82fb6d1dbe
Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112.
2013-06-06 00:37:50 +02:00
c194d2545f
Allowing SharedSuppliers to have multiple Suppliers. Should fix bennibu#107.
2013-06-04 11:28:25 +02:00
2a1176c31a
Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112.
2013-05-30 10:54:22 +02:00
f6ba21832d
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/articles_controller.rb
app/views/articles/_form.html.haml
app/views/articles/sync.html.haml
app/views/finance/balancing/_edit_note.html.haml
app/views/finance/group_order_articles/_form.html.haml
app/views/finance/order_articles/_edit.html.haml
app/views/finance/order_articles/_new.html.haml
app/views/group_orders/show.html.haml
app/views/invites/_modal_form.html.haml
2013-04-12 15:45:24 +02:00
3e9ca336a8
Fixed loosing assignments when updating a task.
2013-04-10 10:55:43 +02:00
79d1c5a66d
Allow article price equal to zero. Closes #111
2013-04-10 10:51:36 +02:00
20e439c2a7
Allow article price equal to zero. Closes #111
2013-04-08 14:40:02 +02:00
03ea8e194e
Fixed loosing assignments when updating a task.
2013-04-08 01:31:21 +02:00
13e921a632
Fixed some errors in articles#sync. Show better error messages.
2013-04-08 01:00:49 +02:00
0bb080526a
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/login_controller.rb
app/models/message.rb
app/views/sessions/new.html.haml
2013-04-04 00:29:50 +02:00
18f6cadca2
Ensure mail privacy in message reply and show view.
...
Thanks to @JuliusR for reporting.
2013-03-24 01:37:58 +01:00
f81e315d6f
finish i18n of models without view
2013-03-22 01:21:44 +01:00
75a1051668
finish articles i18n, controller+model
2013-03-22 00:59:42 +01:00
7af796c09c
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
2013-03-21 22:08:09 +01:00
528295884e
Allow deleting of category, when there are only deleted articles left.
2013-03-17 20:13:11 +01:00
28343fc124
Merge pull request #99 from balkansalat/rails3-fix-stock-ordering-2
...
Prevent sold-out articles from being removed from stock order when editing
2013-03-17 11:50:56 -07:00
59de2e42a9
Fixed showing deleted articles when asking for available articles.
2013-03-17 18:36:34 +01:00
dd0bd0ad7e
Fixed updating order article in stockit balancing.
2013-03-17 18:33:04 +01:00
9cc98b4662
Added some more eager loading for balancing view.
2013-03-17 15:12:14 +01:00
07581b7ecf
Removed acts_as_paranoid. Implemented own version.
2013-03-16 17:57:38 +01:00
981944b869
Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks
...
Conflicts:
Gemfile
db/schema.rb
2013-03-15 17:59:19 +01:00
6aa0e0b736
Rename and comment new functions for fixing stock ordering
2013-03-15 08:50:55 +01:00
8d0761a6c8
Merge branch 'rails3-fix-stock-ordering' into rails3-fix-stock-ordering-2
2013-03-14 21:14:42 +01:00
0d3564492b
Fixed bug in sorting articles in balancing view.
2013-03-12 18:54:51 +01:00
40d9195eac
Fixed broken group_orders after editing order.
...
Caution, when using the model.association = models operator,
the after save callbacks are not triggerd! See Order#save_order_articles
2013-03-12 11:26:14 +01:00
c18fb20115
Ensure to get also deleted entries in belongs_to assoc.
2013-03-10 19:39:59 +01:00
b0e12d177e
Fixed editing an order and take care of group_orders.
2013-03-10 19:22:26 +01:00
63d8a3a1a6
Do not exclude ordered articles (with zero quantity) when editing orders.
2013-03-07 20:43:02 +01:00
93a99c45d8
Revert "Do not subtract articles in open orders when calculating quantity."
...
This reverts commit 6bf3b241e6
2013-03-07 20:39:35 +01:00
6bf3b241e6
Do not subtract articles in open orders when calculating quantity.
2013-03-06 14:19:06 +01:00
2d382df1f1
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/controllers/stockit_controller.rb
app/models/ordergroup.rb
app/models/workgroup.rb
app/views/stockit/index.html.haml
2013-03-06 01:01:12 +01:00
d9949681a2
localize invite model
2013-02-27 11:59:03 +01:00
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
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
6685012a3e
Fixed bad syntax (from already dropped meta_where gem).
...
Thanks to wvengen, closed #91
2013-02-24 23:56:56 +01:00
82178161fa
Show usefull error message for uniqueness_of_name with acts_as_paranoid.
...
Fixed #88
2013-02-24 23:26:16 +01:00
8043fd2164
finish foodcoop i18n + controller + model
2013-02-22 00:19:22 +01:00
cb2c724abd
fix typo
2013-02-11 23:37:52 +01:00
a0a974b9ce
finish stockit i18n + controllers + model
2013-02-11 11:19:26 +01:00
36b18bcfbd
finish messages i18n + controller + model
2013-02-09 10:18:52 +01: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
3ab3ff2bc4
Minor speed improvements for group order load.
2013-01-26 15:18:35 +01:00
28aec7e4d6
Replace ordergroup.account_updated with non database attr.
2012-12-30 15:31:37 +01:00
2c0fe08be6
Replaced delayed_job with resque. See README_DEVEL
2012-12-23 17:38:04 +01:00
1298af8377
Small improvement for update price. Removed delayed job.
...
Attention, every delayed job has to know its Foodcoop scope. Otherwise
every task will be executed in the default database. See email delivery.
2012-12-16 21:46:24 +01:00
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
9919183cb0
Fixed missing group_order_article in group_order show.
...
Also add eager loading for associated objects.
2012-12-16 16:50:09 +01:00
0fcd5abb3a
Fixed strange RecordReadOnly exception in task done.
2012-12-16 14:13:54 +01:00
cabcd201a6
Improvements for Ordergroup.avg_jobs_per_euro.
...
Tip #2 , Avoid initializing hole activerecord object whenever possible.
Use Class.pluck(:attribute) instead of Class.all.map(&:attribute)!
2012-12-16 13:56:47 +01:00
b86172bc62
Performance improvements for ordergroup.update_stats!
...
As I have learned today. Let mysql do the counting, calculation stuff.
In most of the cases, it will be much faster!
2012-12-16 13:48:15 +01:00
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
d9681eaf30
Added validation for article_price. Avoid unit_quantity of 0.
2012-12-11 10:59:50 +01:00
bae09624b7
Avoid deleting categories which still have articles.
2012-12-11 10:53:01 +01:00
620ec946f1
Merge branch 'master' into master-rails3-merging
...
Conflicts:
.gitignore
.rbenv-version
app/controllers/finance/balancing_controller.rb
app/views/finance/balancing/_order_article_form.html.haml
Fixed updating current price in finance balancing.
2012-12-11 10:32:59 +01:00
1cdb9e8501
Outlined new concept for multiple periodically recurring tasks ( #3 ).
2012-11-28 10:13:54 +01:00
ddcb4a9b2d
Moved acts_as_configurable to gemfile.
2012-11-24 16:49:19 +01:00
7e6ac8c924
Moved acts_as_tree to gemfile.
2012-11-24 16:41:34 +01:00
7fc0462fc4
Upgrade to rails 3.2.9. Moved acts_as_versioned to gem.
2012-11-24 16:36:40 +01:00
c032fdca6e
Merge remote-tracking branch 'upstream/master'
2012-11-13 08:55:50 +01:00
d086fe7cc7
Fix task validation again #16 ; mark assignment validation TODO
2012-11-12 21:31:04 +01:00
e561ddb064
Fix task validation #16
2012-11-12 20:14:06 +01:00
c17ff281c3
Save and display creator of Order
2012-11-12 14:24:49 +01:00
f4f10b1e4c
Introduced actionbar. Some fixes for balancing page.
2012-11-12 13:13:01 +01:00
1d9815731c
Removed fancybox. Fixed profile, my ordergroup and tasks.
2012-11-12 09:18:44 +01:00
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
16de9124fe
Fixes orders.
2012-10-30 00:20:47 +01:00
fc1c173718
Fixed articles module.
2012-10-28 18:03:50 +01:00
f30e57dd49
Fixed articles views.
2012-10-19 01:12:47 +02:00
9af26e1da6
Fixed deliveries.
2012-10-17 20:45:52 +02:00
e9383e0d17
Remove searching shared articles by list.
...
This is necessary to go with newest fixes in sharedlists app.
2012-10-13 22:19:01 +02:00
1708df3f6c
Fixed login, new_password and invitation views.
2012-10-08 11:51:56 +02:00
92649d3053
Removed acts_as_ordered. Fixed bug in group_orders archive.
2012-10-03 20:08:54 +02:00
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
cd91436f7f
Allow ignoring apple restriction for specific ordergroup.
2012-09-30 13:34:16 +02:00
ff4ab44bcc
Add option to restrict ordering when not enough apples.
2012-09-29 17:52:25 +02:00
971e80b505
Fixed foodsoft rake tasks.
2012-08-27 08:38:43 +02:00
ec2e761e7f
Fixed multi coop routing and changed config accessors.
2012-08-24 19:52:38 +02:00
8f8d866bb9
Moved notification about negative account balance to background.
2012-08-24 15:04:54 +02:00
edadb7d8d1
Moved message delivering into background process.
2012-08-24 14:33:45 +02:00
af3875d46b
Refactored order finishing. Delay user notifications.
2012-08-24 14:24:36 +02:00
5fb0bc2444
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
2012-08-24 11:11:40 +02:00
c936813967
Some fixes for mailer module.
2012-08-17 19:08:02 +02:00
ef2ce98e46
Performance improvement for stockit view.
2012-07-31 17:37:32 +02:00
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
af3c07f031
Simplifiying balancing view part 2. Lets call it finished.
2012-07-27 18:03:46 +02:00
2c1385c9ce
Preisänderungen beim Abrechnen können auch global angewandt werden.
2012-07-18 22:16:08 +02:00
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
f1b71a5588
Minor refactoring in stats partial.
2012-06-24 21:43:36 +02:00
7d54a416df
Allow changing number of automaticly created next weekly tasks.
2012-06-24 11:01:16 +02:00
467874a8a5
Simplify balancing view. Part 1 of ...
2012-06-21 17:19:00 +02:00
b295f62322
Updated finance/invoices
2012-04-20 18:33:47 +02:00
4a8e286d98
Fixed encoding issues with ruby > 1.9.2..
2012-04-16 08:49:54 +02:00
ad508b207b
Updated to rails 3.0.12. remove old gettext code.
2012-04-15 19:59:39 +02:00
88b268cb0b
Refactoring of order comments.
2011-06-19 20:47:27 +02:00
38b5dcba1f
Refactored ordering part two. Integrated stock order.
2011-06-19 19:56:04 +02:00
eb4705857b
Ordering refactored: Made everything RESTful.
2011-06-19 15:30:33 +02:00
adbe93f39e
Fixed open_orders partial.
2011-06-13 15:26:06 +02:00
afb2c26ab3
Fixed orders form.
2011-06-10 13:53:51 +02:00
172db1d37e
Admin namespace beendet.
2011-06-10 13:22:15 +02:00
c173cf4a6a
my_profile and admin/ordergroups.
2011-06-10 01:36:04 +02:00
ea6348bc5c
Refactored finance/ordergroups|transactions module.
2011-06-09 21:35:05 +02:00
fc1d130113
Refactored stockit, delivery an stock_takings.
2011-05-27 14:09:01 +02:00
5bf6503a8f
Included new localize_input gem.
2011-05-20 00:19:58 +02:00
3f133bb8c3
Added client side validations. Fixed shared sync.
2011-05-19 22:35:13 +02:00
013637a4fc
Refactored shared article import. Added meta search gem.
2011-05-19 22:22:05 +02:00
0decbb36e1
Refactored article_categories.
2011-05-18 16:10:30 +02:00
0b1682af7c
Fixed suppliers module.
2011-05-18 15:52:06 +02:00
d5552059ce
Refactored messages modul, but refactoring is still neccessary.
2011-05-18 14:47:17 +02:00
1cf63fc40b
Some fixes to home view.
2011-05-16 10:34:14 +02:00
06f2cc2007
Fixed and refactored foodcoop/workgroups.
2011-05-16 00:34:43 +02:00
c87ead8da9
Added meta where and jquery observe field. Fixed members view.
2011-05-15 23:43:23 +02:00
6c98c7c755
Some fixes for task module.
2011-05-15 22:06:54 +02:00
5d028ccf3a
Added new autocomplete for task assignments.
...
Introduced the cool jquery token plugin.
2011-05-14 19:41:46 +02:00
2e56bfe895
Some fixes for tasks.
2011-05-14 19:02:52 +02:00
185376d53d
Some improved validations for task.
2011-05-14 16:34:10 +02:00
8da229316c
Some improved validations for task.
2011-05-13 22:43:23 +02:00
2a72263bd3
Replaced protoype with jquery. Some fixes in mailer class.
2011-05-11 15:14:39 +02:00
e40f865c45
Refactored login module. Implemented standard sessions controller.
2011-05-11 13:38:46 +02:00
eab16e337e
Updated router. Temporarly replaced routing filter with rails internal.
2011-05-11 12:27:58 +02:00
8db221ca5f
New validate_on/before syntax.
2011-05-11 11:17:02 +02:00
2d7d0d3b94
Updated actionmailer classes and API.
2011-05-11 10:54:02 +02:00
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
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
dcd2a514a6
Added duration to tasks. Annotated all models.
2011-05-07 20:50:39 +02:00
383241621c
increased invite link lifetime from 2 days to 7 days.
2011-05-02 14:53:22 +02:00
6c82d0e06a
Avoid setting page as parent id, which has current page as parent.
2011-03-09 13:36:02 +01:00
5f51afb5ee
Fixed input control in balancing mode.
2010-07-01 16:12:02 +02:00
fbf6a283a0
Fixed bug in orders index if order.ends.nil?
2010-06-19 12:25:35 +02:00
f49c6493f4
Removed hard coded links from mailer and views.
...
* Not tested every mail template. Hopefully everything works ;-)
2010-03-20 14:49:46 +01:00
b9576dd669
Updated user validation. Fixed duplicates on 'nick'.
2010-02-16 09:53:24 +01:00
55d2976e98
Moved order stats and cleanup stuff into rake task.
...
Closes #14
2010-02-09 21:45:57 +01:00
164653dbfc
Limited page versions number to 20.
2009-12-01 20:20:41 +01:00
f34c307540
Merge branch 'master' of git@github.com:bennibu/foodsoft
2009-10-12 14:44:48 +02:00
42d85c63be
Allow to have equal article and stockarticle.
...
* Modified validation to allow the same name.
2009-10-12 14:42:31 +02:00
90f760858e
Added site map and titel list to pages/all
...
* pages/all now consists of three alternativ views: recent changes, site map and title list
2009-10-06 22:24:51 +02:00
c3ca3e23f9
Hide redirected pages in collection for parent ids.
2009-09-28 17:22:24 +02:00
84a026a677
Fixed bug in new ordergroup stats feature.
2009-09-11 16:03:48 +02:00
8276ff57f8
Fixed bug in messaging system.
2009-09-05 21:08:32 +02:00
e75a42d509
Merge branch 'wiki'
2009-08-15 17:24:08 +02:00
a8c93c08b7
Added parent-child relationship to pages to visualize a breadcrump and subpages.
2009-08-12 18:41:25 +02:00
5e1fc73c29
Avoid creating of duplicate articles. (Tests on article.name) Closes #10
2009-08-12 12:33:07 +02:00
49be55238b
Added rake task to notify workgroup members if not enough users assigned an upcoming task.
2009-08-11 18:10:14 +02:00
d8cdbe4abb
Added rake task for auto create of upcoming workgroup tasks (weekly tasks).
2009-08-11 17:22:08 +02:00
5d9385cde4
Changed wiki parser to wikicloth.
...
* Temporarly removing of TOC.
2009-08-11 14:30:35 +02:00
0adce9d54c
First try making tolerance not costly.
...
A new configuration setting was introduced: tolerance_is_costly
If set to false, article tolerance values do not count for total article price as long as the order is not finished.
This reduces the negative effect on using tolerance for the user.
2009-08-04 23:44:11 +02:00
c7e37fc7b2
Added possibility to give feedbacks via ajax form. Closes #2
...
* Feedback message will send to error_recipients, configured in app_config.yml
2009-08-04 15:22:11 +02:00
4d57bd2e73
Show current stock value on stockit page.
2009-08-04 13:41:28 +02:00
6659fe90f3
Merge branch 'stats'
2009-08-02 19:57:19 +02:00
178fba7b30
Create restful invites controller and ajaxified the workflow.
2009-08-02 19:41:09 +02:00
0d910dfbbd
Moved foodcoop/workgroups into new namespace foodcoop. Closes #20
2009-08-02 18:42:52 +02:00
d848831fea
Implemented stats for ordergroups on startpage. Annotated models.
2009-08-01 13:41:22 +02:00
709425855e
Added validation for unit_quantity and localization for article attributes.
2009-07-21 15:09:55 +02:00
55729e20f9
Create a redirect when editing the title of a page.
2009-06-11 23:51:26 +02:00
434fc4b2ff
Change wiki-parser again. Now wikitext is used.
2009-06-11 22:40:56 +02:00
eddf20b063
Added TOC (Table of contents) for wiki pages.
2009-06-11 17:59:21 +02:00
255a4cd6c7
Fixed problems in interacting of acts_as_versioned and optimistic locking.
2009-05-20 15:26:53 +02:00
0db7724f85
Hide StockArticles with negeative stock amount in new order. Closes #9
2009-05-17 16:43:48 +02:00
27ff4bbd9b
Removed price history for StockArticle.
2009-05-17 16:26:31 +02:00
a8e35bd421
Refactoring of delivery-workflow. Added ability to add stock_changes after creating a delivery.
2009-05-17 16:11:39 +02:00
053c665270
Added version control for wiki pages.
2009-05-15 17:32:45 +02:00
0d11e68bad
Added syntax help to wiki form.
2009-05-13 17:32:43 +02:00
8b8a7c08cd
Fixed bug in ArticlePrice history. Closes #12
2009-05-13 12:52:35 +02:00
b1f16d5342
Calculate total prices correctly. ( Closes #6 )
2009-04-18 18:08:33 +02:00
36f9bffdb8
Allow input of decimal numbers for GroupOrderArticle-result.
2009-04-05 15:23:21 +02:00
f450070dbf
First steps for an own wiki.
...
* Scaffold for Page Objekt
* Using textile for rendering html
* Easy wiki-links with [[wikipage]]
2009-03-25 19:54:04 +01: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
3309248865
Removed restriction on create for invoices with the same delivery date.
2009-03-24 10:45:41 +01:00
759217763e
Added pagination to task archiv.
2009-03-23 11:23:41 +01:00
cde1fb3525
Show total price of ordered units per article in finance/balancing
...
* Implement functions total_price and total_gross_price on model
order_article
* Show total_price and total_gross_price in view finance/balancing
_order_article (Closed #108 )
2009-03-22 14:16:52 +01:00
6da9190b03
Added buttons to in/decrease group order article results.
2009-03-20 20:37:13 +01:00
da08365816
Fixed bug order.profit calculation.
...
Order.profit will also be saved, when order is closed.
2009-03-17 19:43:41 +01:00
843e4a7233
Added ability to send private messages.
2009-03-17 18:28:09 +01:00
312e51e8dc
Fixed bug in group_order.price updates, when finishing an order.
2009-03-17 10:47:00 +01:00
1791243b25
Fixed bug when distuingish between finished and closed orders.
2009-03-13 00:06:20 +01:00
ce2156d75f
Send order-finish-notifications in background.
2009-03-11 16:58:31 +01:00
37c9e2aeaf
Fixed wrong price value of GroupOrder when finishing an order.
2009-03-11 16:34:36 +01:00
dd940fb414
Send messages directly instead of using controller filter. Litte improvements to the messages lists.
2009-03-09 13:02:43 +01:00
d680885660
Fixed bugs in message system.
2009-03-06 20:08:11 +01:00
a30444a602
Fixed bug in messaging system. Moved navigation 'messages' to 'foodcoop' tab.
2009-03-06 19:38:06 +01:00
a29053b4e9
Some language fixes. Finished migration path.
2009-03-01 18:45:34 +01:00
3ea8d5a2ef
Refactoring of message system.
2009-02-18 01:06:35 +01:00
951d19db6a
Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views!
2009-02-12 18:32:20 +01:00
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
67743cd014
Implement notification for upcoming tasks via a daily fired rake-task.
2009-02-10 15:07:47 +01:00
053593f718
Translations for articles-pages.
2009-02-10 13:26:10 +01:00
6202e05841
Last part of order refactoring. Now order_article create/update is possible.
2009-02-09 20:12:56 +01:00
4d796b8e73
Since there are StockArticles for each supplier, the StockArticles has
...
to be excluded in normal articles-view.
2009-02-07 15:19:07 +01:00
96442477d1
Fixed broken links in tasks-module. Translated some views into german.
2009-02-06 20:51:14 +01:00
0a87294ed4
Fixed bug in deliveries. Extended test fixtures.
2009-02-06 17:06:08 +01:00
c17b63b192
Second part of stock-integration.
...
Introduced StockArticle and a special page for ordering from stock. StockChanges will be created and the StockArticle.quantity
updated in 'order.close!'.
2009-02-06 16:26:35 +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
aec93d4b73
Fixed bugs from last commit and in ExceptionNotification-config.
2009-02-02 17:12:08 +01:00
0a2a79237a
Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing.
2009-02-02 16:35:43 +01:00
7f09bb55e4
Fixed some wrong links in admin-startpage and bugs in ordergroup-model.
2009-02-01 21:53:08 +01:00
Robert Waltemath
wvengen
wvengen
Benjamin Meichsner
Manuel Wiedenmann
Julius
davidrabel
yep
Benjamin Meichsner
Benjamin Meichsner
sandoz
sandoz