bf32e72414
Improve delivery form validation
2013-06-19 11:21:55 +02:00
c48ce138f3
cleanup of profile layout
2013-06-18 12:25:05 +02:00
04c9770e80
Complete I18n
2013-06-18 10:59:53 +02:00
cc1a839246
Allow to create stock_article as copy of article in delivery form
2013-06-18 10:48:19 +02:00
cc5574f8b5
Revert ac62dcce9d
2013-06-18 09:10:31 +02:00
1e984df3aa
more beautiful ordergroup edit form
2013-06-18 01:35:12 +02:00
6e6cce1cb7
Add Select2 jQuery plugin
2013-06-17 16:15:19 +02:00
9502ca28dd
Merge latest changes in master
2013-06-17 15:47:08 +02:00
a9938df443
Clean up sort functionality; Remove title attributes due to hard I18n
2013-06-17 15:43:42 +02:00
eee5d4a896
Fixed indentation bug in sync template.
2013-06-16 15:10:50 +02:00
8c4da55561
Merge branch 'show-percent-sign' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-show-percent-sign
2013-06-16 14:55:48 +02:00
713c030213
i18n and translate missing entry
2013-06-15 18:43:42 +02:00
6569579c02
styles the preferences in user profile
2013-06-14 22:38:07 +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
ac62dcce9d
make touch device events work on buttons ( closes foodcoop-rostock/foodsoft#34 , closes foodcoops/foodsoft#104 )
2013-06-14 01:42:47 +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
3a48d1576f
Remove broken sort-by-price; comment redundancy of stock_change template
2013-06-13 23:51:37 +02:00
65f61e09d5
Improve delivery workflow; introduce sortable tables; use js.erb for deliveries
2013-06-13 23:36:22 +02:00
3d1847fabb
small i18n and translation updates
2013-06-12 22:44:51 +02:00
4037ef12da
Users may delete all tasks of a group, i.e. delete the whole group.
2013-06-12 12:02:13 +02:00
f4a0e29297
Fixed bug in with new shared multiple suppliers feature.
2013-06-12 10:47:54 +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
49cfa9aded
Cleanup StockArticle creation during delivery
2013-06-11 15:05:19 +02:00
e28f3eda65
Fix StockArticle creation during delivery; small cleanups
2013-06-11 13:10:18 +02:00
b7f71f5859
fix reset password breakage by avoiding encoding ampersand in url ( closes #123 )
2013-06-11 00:01:57 +02:00
9753e6db00
Resolve merge conflicts with i18n
2013-06-10 20:05:47 +02:00
6bdb7b35f0
Showing/allowing multiple suppliers per shared supplier in shared-supplier-listing.
2013-06-10 11:37:59 +02:00
b7416b2210
Fixed percent sign in sync-view.
2013-06-10 11:01:31 +02:00
7a63394dac
Merge remote-tracking branch 'origin/rails3'
...
Conflicts:
Gemfile
Gemfile.lock
2013-06-10 01:53:31 +02:00
241c5666ec
Merge pull request #119 from balkansalat/rails3-improve-checkall-performance
...
Improve performance of *check-all* checkbox
2013-06-09 09:19:19 -07:00
fd091d9b89
Merge pull request #118 from balkansalat/rails3-order-delivery-articles
...
Order articles for delivery selection by name only
2013-06-09 09:15:20 -07: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
0ebe38b7a9
Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-improve-checkall-performance
2013-06-07 09:52:56 +02:00
966902ff55
Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-order-delivery-articles
2013-06-07 09:51:50 +02:00
ff343933dd
Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-show-percent-sign-in-views
2013-06-07 09:49:32 +02:00
0058e826b2
Reorder delivery articles
2013-06-07 09:35:22 +02:00
0f4614eb31
Add percent sign for tax in forms
2013-06-06 17:58:02 +02:00
b8a23a396c
Remove test variable
2013-06-06 17:09:22 +02:00
0d3c23f814
Improve performance of data-check-all
2013-06-06 17:06:05 +02: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
8929f69dc4
add missing i18n text
2013-06-06 02:42:38 +02:00
c38ce28347
fix i18n bug
2013-06-06 02:13:40 +02:00
82fb6d1dbe
Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112.
2013-06-06 00:37:50 +02:00
043fc6391c
show header on fax PDF (closes bennibu#109)
2013-06-04 13:08:50 +02:00
c194d2545f
Allowing SharedSuppliers to have multiple Suppliers. Should fix bennibu#107.
2013-06-04 11:28:25 +02:00
c2c1961bd0
adds i18n support to routes and application controller; default_locale is set to :en
2013-05-31 18:42:28 +02:00
2a1176c31a
Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112.
2013-05-30 10:54:22 +02:00
3b7cbf71e0
fix i18n typos
2013-05-16 00:05:47 +02:00
0c94ef5912
also translate mail subjects
2013-05-07 13:28:14 +02:00
8b559269c9
add deliveries, pages, tasks translation in English
2013-05-06 12:43:57 +02:00
53d5eabf79
fix login i18n
2013-04-26 21:35:23 +02:00
5e2a3fb3f0
fix articles controller i18n
...
Conflicts:
app/controllers/articles_controller.rb
2013-04-12 16:17:12 +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
70542c1ad7
update en translation
2013-04-12 01:30:02 +02:00
368d44e26b
fix tasks error reference
2013-04-12 01:08:35 +02:00
692c70d324
finish pages i18n
2013-04-12 00:59:45 +02:00
1a8c8537a4
finish tasks i18n
2013-04-12 00:00:02 +02:00
6c65799025
use more beautiful close mark
2013-04-10 17:34:24 +02:00
a501fac76f
helpers i18n
2013-04-10 17:29:06 +02:00
3f82138d84
finish deliveries i18n
2013-04-10 17:02:16 +02:00
ee5f7ff1b8
small i18n/translation fixes
2013-04-10 14:07:59 +02:00
3e9ca336a8
Fixed loosing assignments when updating a task.
2013-04-10 10:55:43 +02:00
93f4239db6
Fixed wrong articles total in group_order#show.
...
Conflicts:
app/views/group_orders/show.html.haml
2013-04-10 10:54:56 +02:00
d4b9370541
Fixed setting all user setting to false in user profile.
2013-04-10 10:52:41 +02:00
79d1c5a66d
Allow article price equal to zero. Closes #111
2013-04-10 10:51:36 +02:00
5b81c53a73
Fixed setting all user setting to false in user profile.
2013-04-08 15:08:57 +02:00
20e439c2a7
Allow article price equal to zero. Closes #111
2013-04-08 14:40:02 +02:00
4966aae0ad
Fixed modal forms. Submit form when hitting enter.
2013-04-08 14:27:23 +02:00
9c21a14c7e
Update group results when editing order article in balancing.
2013-04-08 14:26:40 +02:00
220343128c
Fixed wrong articles total in group_order#show.
2013-04-08 13:39: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
f1d6df9ecc
move commonly used verbs to common i18n identifier
2013-04-04 02:49:52 +02:00
4aa40b387a
finish article_categories controllers i18n + translation
2013-04-04 02:10:52 +02:00
8c8778459e
finish documents i18n
2013-04-04 02:04:31 +02:00
24d04b25db
fix some small i18n errors
2013-04-04 00:56:45 +02:00
ec1ef0289b
finish i18n of article_categories + translation
2013-04-04 00:44:07 +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
e1f5969719
use short form plus title for unit quantity
2013-04-04 00:24:14 +02:00
53518039f1
Fixed error message, when using GET for password reset actions.
2013-03-27 22:20:54 +01:00
915e1b9e79
Fixed bug in reset password error handling.
2013-03-27 22:12:46 +01:00
18f6cadca2
Ensure mail privacy in message reply and show view.
...
Thanks to @JuliusR for reporting.
2013-03-24 01:37:58 +01:00
da72d3a61c
Only show undeleted articles in delivery/stock_taking forms.
...
Fixed 100.
2013-03-23 18:25:54 +01:00
80b203a8da
Fixed missing templates in accept invitation action.
2013-03-23 17:51:33 +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
aabeb1a332
finish articles i18n
2013-03-22 00:20:37 +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
22550029b3
Added missing ajax support for messages index. Fixed #101
2013-03-20 23:31:13 +01:00
e275403cdd
Do not destroy articles in supplier sync. Mark them as deleted.
2013-03-18 19:05:11 +01:00
528295884e
Allow deleting of category, when there are only deleted articles left.
2013-03-17 20:13:11 +01:00
931bb1d7ca
Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3
2013-03-17 20:03:18 +01:00
6745b79bb9
Allow importing articles again, when article was deleted before.
2013-03-17 20:02:14 +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
033d3459a0
Merge pull request #98 from balkansalat/rails3-stock-taking-article-name
...
Prevent article name from being truncated in StockTaking form
2013-03-17 11:41:32 -07:00
bd0c251313
Merge pull request #97 from balkansalat/rails3-stockit-increase
...
Fix stockit increase formula in javascript
2013-03-17 11:34:16 -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
f7e885de7e
Fixed bug in fax template when there are missing supplier infos.
2013-03-17 18:10:48 +01:00
3a9ec5a3dd
Fixed wiki site-map, when there is no homepage.
2013-03-17 17:57:35 +01:00
707f989768
Fixed routes in redirect after direct_close of orders.
2013-03-17 17:50:50 +01:00
329c451774
Fixed articles sync view.
2013-03-17 17:47:37 +01:00
c05b3e0e19
Balancing: Do not update oder summary automaticly when changing group orders.
2013-03-17 15:47:50 +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
396e220369
Prevent article names from being truncated in StockTaking form
2013-03-14 22:30:22 +01:00
3208321319
Fix stockit increase formula for present behavior
2013-03-14 21:55:10 +01:00
8d0761a6c8
Merge branch 'rails3-fix-stock-ordering' into rails3-fix-stock-ordering-2
2013-03-14 21:14:42 +01:00
8bafb3f4b2
Show supplier name for articles in stockit order.
2013-03-12 19:08:18 +01:00
0d3564492b
Fixed bug in sorting articles in balancing view.
2013-03-12 18:54:51 +01:00
c4376f35bf
Removed article from includes in as it does not work with acts_as_paranoid.
...
See also https://github.com/goncalossilva/rails3_acts_as_paranoid/issues/62 .
Better we remove acts_as_paranoid and filter manually?
2013-03-12 12:50:56 +01:00
6196bdae41
Added some eager loading for balancing new.
2013-03-12 12:38:08 +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
762d529894
Added info link for apple restriction feature.
2013-03-09 18:14:53 +01:00
50873addf8
Fixed deleting of articles. Added missing id.
2013-03-09 16:46:33 +01:00
19527f8425
fix some link handling in i18n (using html_safe)
2013-03-09 00:48:52 +01:00
cb537bc11c
start articles i18n
2013-03-09 00:40:07 +01:00
b81f414ae5
finish finance/order_articles i18n + en translation
2013-03-08 23:35:50 +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
c9b2d01fa5
i18n last merge
2013-03-06 01:24:57 +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
2b03a15a9a
finish finance invoice i18n and en translation
2013-02-27 12:31:01 +01:00
d9949681a2
localize invite model
2013-02-27 11:59:03 +01:00
467b53c009
Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3-ajaxArticleDelete
2013-02-25 11:14:48 +01:00
0e1bd5c75e
Improve (AJAX) deletion of StockArticles
2013-02-25 11:12:28 +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
5dc3fc30ad
Revert 099e2b9b06
2013-02-25 10:29:47 +01:00
8f15cfb446
Revert 396a47b6af
2013-02-25 10:13:44 +01:00
ccf0d010b4
Apply AJAX for deleting a StockArticle
2013-02-25 10:02:21 +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
569cdce2db
finish finance controller i18n
2013-02-22 00:44:39 +01:00
8043fd2164
finish foodcoop i18n + controller + model
2013-02-22 00:19:22 +01:00
c693f697ff
workgroups i18n
2013-02-13 01:34:58 +01:00
02f04be6e8
finish stock_takings i18n + controller
2013-02-13 01:20:20 +01:00
734179a2bd
clarify group_orders i18n
2013-02-12 00:06:23 +01:00
cb2c724abd
fix typo
2013-02-11 23:37:52 +01:00
20533a5163
fix orders i18n
2013-02-11 15:34:31 +01:00
a0a974b9ce
finish stockit i18n + controllers + model
2013-02-11 11:19:26 +01:00
0065c44b74
i18n finance ordergroups
2013-02-11 10:21:39 +07:00
d2cd5b2b02
i18n group order articles
2013-02-11 10:21:39 +07:00
640e9799aa
i18n financial_transactions + controller
2013-02-11 10:21:39 +07:00
8be93c33f8
i18n finance + controller
2013-02-10 15:05:31 +07:00
2d58054d1c
added order for interpolation
2013-02-10 15:05:31 +07:00
22b3f3a491
fix bug in javascript i18n
2013-02-09 10:19:48 +01:00
36b18bcfbd
finish messages i18n + controller + model
2013-02-09 10:18:52 +01:00
5941bbbf4f
i18n feedback + controller
2013-02-09 13:01:44 +07:00
6a564f0a25
admin controllers
2013-02-09 12:47:21 +07:00
8d899581bd
finish group_orders i18n + controller
2013-02-09 02:01:31 +01:00
28c66642f5
finish shared i18n
2013-02-08 19:16:06 +01:00
e06524ca37
finish ordergroups and orders i18n + controller
2013-02-08 01:52:20 +01:00
d818ea5d53
finish suppliers controller I18n
2013-02-08 00:31:09 +01:00
eb1e02015e
finish suppliers i18n
2013-02-08 00:11:58 +01:00
de730808e7
finish mailer i18n
2013-02-06 00:50:59 +01:00
b12a906a74
finish login i18n + controller
2013-02-05 12:54:55 +01:00
c5de69bfc5
typo
2013-02-05 12:30:44 +01:00
39812bef99
finish layouts i18n, use help url from config, use html language from locale
2013-02-05 12:11:29 +01:00
5b53749fe6
fix small format bug in template
2013-02-04 13:13:04 +01:00
ecce8041a1
invites controller i18n
2013-02-04 13:01:06 +01:00
034f6a8f5c
finish invites i18n
2013-02-04 12:59:04 +01:00
9138f0da03
also internationalize home controller
2013-02-04 02:12:24 +01:00
1860e1c4cc
also internationalize sessions controller
2013-02-04 02:00:27 +01:00
0c09696b2c
finish sessions i18n
2013-02-04 01:46:07 +01:00
2b11549d33
finished home i18n
2013-02-04 00:46:22 +01:00
64b3d7e17d
finished admin/users i18n + dry the admin i18n
2013-02-04 01:38:18 +07:00
75c9338fd9
finished admin/workgroups i18n
2013-02-04 00:36:03 +07:00
e949257912
finished admin/ordergroups i18n
2013-02-04 00:10:11 +07:00
42c97520a1
started with admin views
2013-02-03 23:16:42 +07:00
e0b781fca6
split locales into directory, and load from there
2013-02-01 17:56:34 +01:00
a511da9ae3
Prevent stock_articles from appearing in supplier article index
2013-01-30 21:21:49 +01:00
2c9fdcd79e
Show customer number in fax pdf
2013-01-30 19:46:18 +01:00
8c7a4f0331
Fix empty dd in horizontal dl
2013-01-29 17:52:44 +01:00
396a47b6af
Improve stock_article_selections
2013-01-28 20:46:35 +01:00
524819b86f
Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3
...
Conflicts:
app/helpers/application_helper.rb
2013-01-27 22:01:53 +01:00
8b2b70f8bf
Fixed saving user for new orders.
2013-01-26 16:24:45 +01:00
04b611a080
Temporairly deactivated helper in new delivery form.
2013-01-26 15:57:29 +01:00
310a97912c
Fixed disabling submit_button in group order form.
2013-01-26 15:41:46 +01:00
3ab3ff2bc4
Minor speed improvements for group order load.
2013-01-26 15:18:35 +01:00
2a66d37c3a
Fixed wrong start balance in new group order.
2013-01-26 15:17:56 +01:00
ce0300df43
Fix order.created_by
2013-01-12 16:24:13 +01:00
099e2b9b06
Add stock_article_selection (deleting multiple stock articles at once)
2013-01-12 16:14:06 +01:00
0364562273
Fixed return_to when authorization gets lost.
2012-12-30 16:34:01 +01:00
f6ff422405
Fixed missing line breaks in haml email templates.
2012-12-30 16:24:36 +01:00
349cadd5e9
Renabled mail delivering in invites and login contrller.
2012-12-30 16:11:35 +01:00
28aec7e4d6
Replace ordergroup.account_updated with non database attr.
2012-12-30 15:31:37 +01:00
a489079334
Fixed wrong request method in deny_access.
2012-12-30 15:13:50 +01:00
ba75a6e328
Fixed accidently switching to english locale in production.
2012-12-29 17:48:14 +01:00
cd583cc9b2
Set host infos for urls in emails via app_config.
2012-12-28 13:55:18 +01:00
db07b28b1c
Fixed bug in accessing foodsoft config.
2012-12-28 13:28:03 +01:00
2c0fe08be6
Replaced delayed_job with resque. See README_DEVEL
2012-12-23 17:38:04 +01:00
b9138efa79
Fixed floating error in group_order new.
2012-12-22 14:42:19 +01:00
d954279d6a
Show accept/reject button in task show view.
2012-12-22 14:29:59 +01:00
807d476e44
Fixed missing scoping by ordergroup in financial index.
2012-12-22 14:23:58 +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
7c9d666909
Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3
...
Conflicts:
Gemfile
2012-11-24 15:27:48 +01:00
ecc31641aa
Changed header to copy old foodsoft style.
2012-11-24 15:23:12 +01:00
e1cb866935
Remove html5 support for IE Browsers.
2012-11-24 13:53:19 +01:00
1822b330d1
Merge remote-tracking branch 'upstream/rails3' into twitter-bootstrap
...
Conflicts:
Gemfile
2012-11-15 09:53:36 +01:00
2bd52b9270
Corrected config hash index to ':mailing_list_subscribe'
2012-11-13 10:18: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
95efe554fc
Add another option for mailing list subscription tip
2012-11-12 18:08:47 +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
dce79802e0
Fixed feedback.
2012-11-10 17:05:43 +01:00
181695d1bd
Small fixes for article_categories.
2012-11-10 16:51:30 +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
8f7e21b918
Fixed stockit.
2012-10-29 18:28:17 +01:00
27c719d8da
Fixed article categories.
2012-10-29 17:35:50 +01:00
fc1c173718
Fixed articles module.
2012-10-28 18:03:50 +01:00
ee3da51ad3
Fixed bug in new stockit article form.
2012-10-24 12:19:53 +02:00
f30e57dd49
Fixed articles views.
2012-10-19 01:12:47 +02:00
fd361090b4
Nice breadcrumb
2012-10-18 23:43:31 +02:00
9af26e1da6
Fixed deliveries.
2012-10-17 20:45:52 +02:00
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
f0bf196934
order group recepient list ascending
2012-10-15 17:33:33 +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
699fb9b233
Fixed wiki pages.
2012-10-09 02:31:10 +02:00
acdb331e36
Improved tasks.
2012-10-08 21:52:03 +02:00
52e62f8ddb
Fixed messages. New styling for token input plugin.
2012-10-08 18:19:15 +02:00
c0c41a7752
Fixed foodcoop/ordergroups and workgroups views.
2012-10-08 16:20:24 +02:00
ab81ef09d5
Replace will_paginate with kaminari. Fixed foodcoop/users page.
2012-10-08 15:24:32 +02:00
1708df3f6c
Fixed login, new_password and invitation views.
2012-10-08 11:51:56 +02:00
f20ae890dd
Added twitter bootstrap layout. Adapt home page.
2012-10-06 17:14:57 +02:00
31735f35ab
Reenabled sidebar..
2012-10-03 20:27:40 +02:00
92649d3053
Removed acts_as_ordered. Fixed bug in group_orders archive.
2012-10-03 20:08:54 +02:00
eb532babd6
Refactored pdf generation with newest prawn.
2012-10-02 02:50:48 +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
2860a3ca44
Fixed authentication when User is deleted during session.
2012-08-24 15:20:58 +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
6f7682d6a0
Fixed new user invite.
2012-08-06 12:00:40 +02:00
fc8418bc8e
Some fixes in group forms.
2012-07-31 18:48:41 +02:00
f759552022
Fixed user settings.
2012-07-31 18:21:42 +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
dc0d1b3e46
Fixed bug in apples stats.
2012-07-22 21:12:53 +02:00
cda3c37e20
Umlaute eingefügt
2012-07-19 15:37:17 +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
6bd4bbec86
Deactivated broken links in balancing.
2012-05-12 11:18:46 +02:00
c49edb79a2
Fixed edit_not in balancing.
2012-05-12 10:55:20 +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
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
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
45e0048490
Minor refactoring for ordering js data.
2011-06-13 16:45:37 +02:00
f3773314a7
Fixed ordering view.
2011-06-13 16:23:56 +02:00
adbe93f39e
Fixed open_orders partial.
2011-06-13 15:26:06 +02:00
5b2df07378
Fixed ordering before filter.
2011-06-10 13:58:50 +02:00
afb2c26ab3
Fixed orders form.
2011-06-10 13:53:51 +02:00
9ad93e9c06
Catch exceptions when deleting ordegroups.
2011-06-10 13:33:10 +02:00
a27c0c67fc
Fixed some typos.
2011-06-10 13:31:01 +02:00
172db1d37e
Admin namespace beendet.
2011-06-10 13:22:15 +02:00
6ddef7267a
Refactored items_per_page. Start on admin/workgroups.
2011-06-10 12:18:55 +02:00
689cfcfe01
Fixed items_per_page helper.
2011-06-10 12:03:32 +02:00
a47d4b1f0e
Unobtrusive pagination_links_remote
2011-06-10 11:43:56 +02:00
c173cf4a6a
my_profile and admin/ordergroups.
2011-06-10 01:36:04 +02:00
a787b3cf24
Admin/users refactored.
2011-06-09 22:03:27 +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
1e33411516
refactored some js stuff. Fixed forms in article modul.
2011-05-19 19:49:37 +02:00
9388e918a7
Implemented fancy box for ajax forms. Refactored articles modul.
2011-05-18 17:37:10 +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
772cf87c92
Fixed wiki module.
2011-05-18 15:29:38 +02:00
d5552059ce
Refactored messages modul, but refactoring is still neccessary.
2011-05-18 14:47:17 +02:00
6ac04d5e19
Fixed foodcoop/ordergroups view.
2011-05-18 11:47:00 +02:00
2ee30fee16
Refactored home/ordergroup.
2011-05-16 11:00:52 +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
79f8836da0
Fixed some html safe strings.
2011-05-15 21:17:01 +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
03d84aed1d
Added simple form for easier form building.
2011-05-14 17:06:32 +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
197516b7fc
Fixed language and flash divs.
2011-05-11 17:41:43 +02:00
2eb714b603
Fixed missing js for login layout.
2011-05-11 15:24:34 +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
4eba5fbc9c
First step for upgrading to rails 3.
...
Check rake rails:upgrade:check for next steps.
2011-05-11 01:32:21 +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
80691c441b
Fixed bug on new delivery page.
2010-09-17 18:45:07 +02:00
7742403bbe
Hide deleted stockarticles when creating new deliveries.
2010-07-24 20:28:37 +02:00
f640c673de
Fixed bad when selecting same page as parent.
2010-07-08 10:57:42 +02: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
db52c6e4ed
Fixed bug on wiki page.
2010-06-18 10:33:13 +02:00
833862df93
Fixed bug on wiki page when an author was deleted.
2010-06-14 23:00:09 +02:00
be321798a7
Fixed some links in tasks module.
2010-06-10 23:25:13 +02:00
0e4b6107ba
Fixed wrong path in task form.
2010-06-10 12:55:06 +02:00
74407a5912
Fixed paths in task-menu.
2010-06-01 16:18:20 +02:00
b71e809f34
Fixed ajax bug on categories page.
2010-05-28 12:01:19 +02:00
a8a243b5fa
Avoid exception on blank comments.
2010-05-28 11:55:12 +02:00
3a85d4f49f
Fixed bug on ordergroups account managment page.
2010-05-28 11:50:18 +02:00
7067294133
Fixed broken links/paths.
2010-05-25 23:36:05 +02:00
00d9f060cc
Merge branch 'routing-filter'
2010-05-25 23:16:49 +02:00
ca1c5d7db4
Start with I18n implementation.
2010-05-15 11:11:09 +02:00
fc823bb6d6
Fixed wrong my-tasks-path on home page.
2010-03-28 16:56:24 +02:00
d6ee00db17
Fixed hard coded links in wiki pages.
2010-03-22 03:11:32 +01:00
571548dfbc
Fixed routing bug on (ex) admin controller.
2010-03-22 01:58:37 +01:00
9a54d8504c
Secured users session, considering foodcoop token.
2010-03-22 01:38:23 +01:00
18e8a11b7d
Removed unnecessary config params. Improved error handling.
2010-03-22 01:25:24 +01: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
2c1952d625
Removed hardcoded links from main tabnav.
...
* Reorganized routes and foodsoft config
* Avoid saving of wrong foodcoop tokens when following hard coded link
2010-03-20 13:45:58 +01:00
9cb367463c
Merge branch 'master' into routing-filter
2010-03-20 13:45:27 +01:00
e7af7e82b5
Implemented routing filter for foodcoop select.
...
* Allows now a multi coop installation for one domain!
* SSL, we are coming...
* TODO: Remove all the hardcoded urls, check email-links etc.
2010-03-20 02:26:30 +01:00
662f8bf3d7
Round number of EUR per which you should to a job.
...
* Just polishing for better user experience :-)
2010-02-23 20:46:34 +01:00
b9576dd669
Updated user validation. Fixed duplicates on 'nick'.
2010-02-16 09:53:24 +01:00
1b9ae83496
Few design improvements for order pages.
2010-02-11 23:22:50 +01:00
b5df80b7dd
Fixed bug in wiki "all pages" view.
2010-02-10 00:13:51 +01:00
e93dd9e046
Zeige Wert der Äpfel.
2010-02-09 23:56:16 +01:00
94d1a897e7
Fixed bug in stock orders (orderfooter commit).
2010-02-09 22:34:04 +01:00
55d2976e98
Moved order stats and cleanup stuff into rake task.
...
Closes #14
2010-02-09 21:45:57 +01:00
a6646d06a6
Fixed bug during css caching.
2010-02-09 21:40:02 +01:00
48ee593d8d
Merge branch 'orderfooter'
2010-02-09 21:07:12 +01:00
7a77d1aa66
Caching of css and javascript for better speed results.
2010-02-09 21:06:24 +01:00
05d88d6178
Few css changes for performance improvement.
2010-02-09 20:38:48 +01:00
164653dbfc
Limited page versions number to 20.
2009-12-01 20:20:41 +01:00
45039bf60f
Replaced js article-info control with pure css.
2009-11-20 01:28:01 +01:00
d31b40bd66
Show also articles to get because of tolerance.
...
* Closes #54
2009-11-15 12:44:32 +01:00
74ed02e11e
Fixed broken link on start navigation menu.
...
Closes #53
2009-11-10 14:15:06 +01:00
5e9ffa7cb1
Orderfooter design improvements.
2009-11-08 19:26:28 +01:00
b8e336b9e8
Minor layout change of order footer.
2009-11-01 19:27:48 +01:00
e4ef6556b8
Do not display tolerance column in stock order.
2009-11-01 18:57:55 +01:00
fd1eb8a1d7
Refactor orderfooter and quantity display
...
* Unit, others_quantitiy and other_tolerance is now in orderfooter
* We display the missing units in the article row now.
2009-11-01 18:33:14 +01:00
2309fbe76b
Reduced max articles per page for article matrix.
...
Sometimes the last column wasn't displayed correctly.
2009-10-20 23:13:08 +02:00
646a6b11f5
Nice green +/- buttons for order page.
2009-10-20 23:05:41 +02:00
a4a48dc4fe
Css fixes.
2009-10-18 14:19:02 +02:00
65a0a30f5a
Introduced order footer.
...
An fixed element to present article meta data and other stuff.
2009-10-17 22:50:33 +02:00
036bc10282
Hide/show unavailable articles via js.
2009-10-17 20:33:36 +02:00
84610cc9a5
Fixed broken link. Closes #44
2009-10-17 18:53:01 +02:00
0b6b5eb0b5
Improved noscript warning on login page.
...
Also add 'foodsoft' to title. closes #48
2009-10-17 18:42:07 +02:00
1f218f77a0
Corrected message in order result. Closes #47
2009-10-17 18:25:33 +02:00
1f629ff861
Hide ignored articles in order result.
...
* also added js-link to show them if wanted
2009-10-17 12:22:13 +02:00
20c7c0ef02
Revert "Tasks should be default page in foodcoop module."
...
This reverts commit b5b27cee6e
2009-10-17 11:53:17 +02:00
b5b27cee6e
Tasks should be default page in foodcoop module.
2009-10-16 21:10:52 +02:00
cf9fa69ac2
Minor improvements to task show view.
2009-10-16 21:06:55 +02:00
d0e04a05ec
Removed unecessary weekly task templates.
2009-10-16 20:45:20 +02: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
305a4ac895
Don't show action "Create invoice" for stock order
2009-10-05 13:36:57 +02:00
c3ca3e23f9
Hide redirected pages in collection for parent ids.
2009-09-28 17:22:24 +02:00
65e41efc18
Fixed problems when deleting redirected pages.
2009-09-28 17:18:09 +02:00
6eba04d30d
Better messages and redirect when a page is deleted.
2009-09-28 16:26:53 +02:00
de86fcadd3
Made blank parent_id for wikipages possible.
2009-09-28 15:41:00 +02:00
7c192bbad3
Redirect /pages/id to /wiki/permalink
2009-09-28 15:31:20 +02:00
eca24d30f2
Show up tabnav link for wikipages.
2009-09-28 15:05:00 +02:00
529956ea5a
Merge branch 'wiki'
...
Conflicts:
app/helpers/pages_helper.rb
public/stylesheets/main.css
public/stylesheets/print.css
2009-09-28 15:04:07 +02:00
67661cb716
Added toc to wikipages. Patched wikicloth.
...
* patched wikicloth to serve anchor links for sections
* added table of contents
* subpages list doesn't show up per default
2009-09-28 14:57:11 +02:00
741815e24e
Fixed help for numbered lists in pages/_form
2009-09-28 13:53:56 +02:00
8bba70594d
Fixed bugs on my-ordergroup page and typos on invitation page.
2009-09-23 12:08:21 +02:00
aa341628a6
Fixed bug when ending the group membership on profile page.
2009-09-11 16:13:04 +02:00
8a37a0e746
Fixed bug in comments partial on missing users.
2009-09-11 16:10:18 +02:00
84a026a677
Fixed bug in new ordergroup stats feature.
2009-09-11 16:03:48 +02:00
21f128ef1d
Handle bad entries when creating new order articles in balancing
...
controller.
2009-09-07 13:31:03 +02:00
5a93ca1641
Added tax to stockit index view.
2009-09-07 11:29:56 +02:00
2cb0516e8c
Fixed some broken links on admin user page.
2009-09-07 11:21:12 +02:00
a1ca9f368d
Fixed bug when adding new article to a stock order (balancing
...
controller)
2009-09-07 10:57:49 +02:00
8276ff57f8
Fixed bug in messaging system.
2009-09-05 21:08:32 +02:00
8df679163e
Change line "edited by" in pages/show
...
* The line "Zuletzt bearbeitet" display now first the user and then the date.
* The user name is displayed in bold characters.
2009-08-25 23:30:49 +02:00
8927a80246
You can change the page parent now at pages/edit.
...
* Increased text area size for better layout with the new feature.
* Closes #39
2009-08-22 23:04:51 +02:00
7ec5381ca0
Improved wiki layout for sidebar and version sections
...
* Added new helper function format_datetime_timespec
2009-08-22 18:14:56 +02:00
f7e24d26b4
Better layout with equal distance from each sides.
...
* Added css class middle_column
2009-08-21 23:37:05 +02:00
004ce464c1
Fix problem in breadcrumps, when no "Home"-page exists.
2009-08-21 20:59:50 +02:00
47d3232e4e
Fix problem in breadcrumps, when no "Home"-page exists.
2009-08-19 22:59:53 +02:00
42b5e7a73f
Cherrypick of sandoz last commit
...
Conflicts:
app/views/pages/all.html.haml
public/stylesheets/main.css
public/stylesheets/print.css
2009-08-16 10:13:50 +02:00
6866c4eada
Merge branch 'wiki' of git@github.com:bennibu/foodsoft into wiki
2009-08-16 01:15:47 +02:00
57023cd018
Neues Breadcrump-Layout
...
* Die Breadcrump-Links sind jetzt überdem Seiten-Titel.
* Breadcrumps sind jetzt auf allen Wiki-Ansichten: edit, show, new, versions, all
* Bei edit und version ist der Breadcrump-Teil zur aktuellen Seite auch eine Link.
* Bei all wird nur der Foodcoop-Wiki-Teil angezeigt.
2009-08-16 01:09:11 +02:00
b46d7ca19c
Abbrechen-Link in wiki/edit etwas robuster gemacht.
...
* wiki/edit zeigt jetzt auf @page und nicht mehr auf :back.
* Man kann durchaus direkt zu einer Edit-Seite surfen, dann kann :back Beliebiges sein.
2009-08-16 01:07:12 +02:00
73c1137715
Removed another new wiki page link.
2009-08-15 17:39:14 +02:00
fd99125136
Temporarly removing of wiki tab.
2009-08-15 17:38:10 +02:00
e75a42d509
Merge branch 'wiki'
2009-08-15 17:24:08 +02:00
6fae1e8b64
Begin with h2 for the wiki content.
2009-08-15 17:14:07 +02:00
aa5166bb16
Hübschified "Schnelle Formatierungshilfe"
2009-08-15 15:08:02 +02:00
8d243c8e60
Show supplier email in suppliers/show.haml
...
* Closes : #38
2009-08-15 12:29:08 +02:00
27bec1f860
Remember per_page number when updating multiple articles. Closes #36
2009-08-13 17:23:14 +02:00
fd97c1fc60
Made multi coop installation available as an option in app_config.yml.
2009-08-13 16:36:01 +02:00
f4edfacd91
Fixed missing error message.
2009-08-13 16:09:06 +02:00
d470c660d8
Fixed broken link in ordergroups view.
2009-08-13 00:38:12 +02:00
d5342f5ff9
Added warn message, when deleting a page.
2009-08-12 19:06:15 +02:00
d7b65a304e
Removed new page link in wiki menu.
2009-08-12 19:02:03 +02:00
469c2473ca
Fixed some bugs on version page.
2009-08-12 19:00:45 +02:00
9516f349ce
Improved wikipage sidebar.
2009-08-12 18:55:36 +02:00
3b766af2a6
Fixed wikicloth bug "missing last row". (Better: implemented a workaround)
2009-08-12 18:47:33 +02:00
a8c93c08b7
Added parent-child relationship to pages to visualize a breadcrump and subpages.
2009-08-12 18:41:25 +02:00
83e741c1af
Improved delivery creating/updating prozess.
2009-08-12 13:38:03 +02:00
16346e3529
Added note to deliveries. Closes #34
2009-08-12 13:09:10 +02:00
5e1fc73c29
Avoid creating of duplicate articles. (Tests on article.name) Closes #10
2009-08-12 12:33:07 +02:00
aedfcae03b
Added stock_article number to stockit view. Closes #33
2009-08-12 11:46:27 +02:00
3656dac3cb
Fixed display bug with new ajax_box.
2009-08-11 19:49:31 +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
00619ccf55
Updated wiki format help.
2009-08-11 14:41:58 +02:00
5d9385cde4
Changed wiki parser to wikicloth.
...
* Temporarly removing of TOC.
2009-08-11 14:30:35 +02:00
7e2506baa2
Fixed haml bug.
2009-08-06 16:14:36 +02:00
f45509fc07
Merge branch 'tolerance_not_costly'
2009-08-05 17:02:12 +02:00
ad94006978
Hide ordergroup link for non ordergroup members.
2009-08-05 11:49:07 +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
b84ec884bd
Highlight javascript dependencies. Closes #19
2009-08-04 13:49:14 +02:00
4d57bd2e73
Show current stock value on stockit page.
2009-08-04 13:41:28 +02:00
6761a41048
Hide articles with a stock amount of zero. Closes #17
2009-08-04 13:35:52 +02:00
f72dccae18
Added edit invoice link to balancing sheet. Closes #8
2009-08-04 13:25:59 +02:00
f0caabfb53
Check account balance after creating a transaction.
2009-08-04 13:13:46 +02:00
116b1c4ed9
Fixed broken link on startpage for non ordergroup members.
2009-08-04 13:05:37 +02:00
ce375e1637
Fixed bad link in tasks/workgroups. Closes #23
2009-08-04 12:57:19 +02:00
68f8d00930
Fixed bug in stats on a fresh installation.
2009-08-04 12:32:25 +02:00
d9d800b41f
Fixed bug in stats modul. Consider missing ordergroup.
2009-08-02 20:04:54 +02:00
6659fe90f3
Merge branch 'stats'
2009-08-02 19:57:19 +02:00
4545a5f17c
Fixed wrong url during last commits.
2009-08-02 19:56:08 +02:00
178fba7b30
Create restful invites controller and ajaxified the workflow.
2009-08-02 19:41:09 +02:00
5cf75ee32a
Moved foodcoop/members into new foodcoop/users restful controller.
2009-08-02 19:01:45 +02:00
0d910dfbbd
Moved foodcoop/workgroups into new namespace foodcoop. Closes #20
2009-08-02 18:42:52 +02:00
1a8026c5a7
Move foodcoop/ordergroups into nwe namespace foodcoop. Made it more restful.
2009-08-02 18:12:13 +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
ecc1176020
Member search now includes the attribute 'nick'. Closes #18
2009-07-20 19:29:24 +02:00
d2efe64343
Fixed display bug in menu when using IE. Closes #15
2009-06-19 21:38:51 +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
2660d86b89
Added table of contents to wiki page.
2009-05-20 14:06:40 +02:00
d371839eba
Prefer textile over markup because markup doesn't support any tables. bähh.
2009-05-20 13:03:58 +02:00
7de45543c4
Added page-preview feature to wiki module.
2009-05-20 12:42:01 +02:00
0fb8ee214f
Added helpful links to submenu.
2009-05-20 11:54:18 +02:00
2af35e55bc
Improved stockit overiew. Fixed article ordering by suppliers.
2009-05-17 16:50:13 +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
e59ce8c313
Added deliveries counter to suppliers overview.
2009-05-17 16:18:14 +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
43fc7b06f8
Upgrade foodsoft to rails 2.3.2.
2009-05-17 15:01:36 +02:00
c03f3da21a
Added more info to delivery/show for easier comparision of invoice amount and sum of delivered items.
2009-05-15 17:58:02 +02:00
053c665270
Added version control for wiki pages.
2009-05-15 17:32:45 +02:00
7ba6bc3680
Added optimistic locking to wiki pages.
2009-05-15 13:54:42 +02:00
f83d2659de
Added better routing for wiki-root-path.
2009-05-15 13:53:45 +02:00
0d11e68bad
Added syntax help to wiki form.
2009-05-13 17:32:43 +02:00
8bfa83118c
Update ordergroup values after deleting an ordered article. Closes #11
...
* TODO: Implement callbacks to avoid such mistakes.
2009-05-13 13:04:39 +02:00
8b8a7c08cd
Fixed bug in ArticlePrice history. Closes #12
2009-05-13 12:52:35 +02:00
7e4409bc11
Few improvements to wiki module.
2009-05-07 18:15:14 +02:00
dafbb077b6
wiki-syntax: Use markup instead of textile.
2009-05-07 17:59:34 +02:00
4c57c57827
Changed default order of articles on balancing page.
2009-05-04 17:56:52 +02:00
e8fa912e8c
Removed contact data from ordergroups-page. Added names of users and date of last order.
2009-05-04 17:06:08 +02:00
ecc0340a70
Added message-link and notes to new foodcoop/ordergroups page.
2009-04-20 14:33:24 +02:00
a3fbc2d37b
Merge branch 'master' of git@github.com:bennibu/foodsoft
2009-04-20 14:13:47 +02:00
4db8184daa
Fixed some bugs in orders lists. Closes #3
2009-04-20 14:11:11 +02:00
e71cacfe50
Fixed typing error and changed default foodcoop tab to /tasks
2009-04-20 13:58:22 +02:00
fac0c05a46
Hide private messages on start page.
2009-04-20 13:54:39 +02:00
b1f16d5342
Calculate total prices correctly. ( Closes #6 )
2009-04-18 18:08:33 +02:00
e32e97d178
Added "ordergroups" view to list the ordergroups
...
* You can search in the name.
* You can show only active order groups (order in last 3 months)
* Future feature: generate text and pdf files for the box
labels
2009-04-18 15:39:07 +02:00
e95cdad5ec
Added ordergroups view to foodcoop namespace.
...
* For now just a searchable list. Nothing more.
2009-04-18 15:39:07 +02:00
c6187ebade
Fixed bug in password reset feature.
...
* Translated messages
* Cleaned up some code
2009-04-17 12:06:36 +02:00
00696c0e64
Replaced account balance by available funds on start page.
...
* Closes #206
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-07 18:08:35 +08:00
e3f9df0a0c
Replaced account_balance by available_funds in ordergroup view.
...
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-07 18:08:33 +08:00
1e011256e9
Remove all non-digits before sorting by order number in finance/balancing
...
* Since order_number is a string, there can be more than a-zA-Z + digits
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-07 18:08:30 +08:00
36f9bffdb8
Allow input of decimal numbers for GroupOrderArticle-result.
2009-04-05 15:23:21 +02:00
40886b71f9
Fixed Bug in balancing controller when adding an ordergroup-result.
2009-04-05 14:59:55 +02:00
d62d45e4a4
Hide zero results in matrix pdf.
2009-04-03 23:32:24 +02:00
de1aa2ac38
Headers and table improvements for matrix pdf. Fixed #204
2009-04-03 19:20:16 +02:00
578002501b
Hide ordergroups with result = 0.
2009-04-03 18:01:19 +02:00
30aa04b710
Made sort by order_number balancing view work.
2009-04-03 17:50:17 +02:00
596f5657bc
Fixed remote and non-remote link mixtures bug.
2009-04-03 17:35:00 +02:00
8fb4334610
Modified sort_link helper method to allo non ajax links.
2009-04-03 17:16:39 +02:00
45c7e29ebb
Added field description to tooltip
...
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-03 22:14:51 +08:00
8c1bf93809
Translated "Sort by this field" tooltip
...
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-03 22:14:50 +08:00
5a7fe17437
Make list of ordered articles sortable in _edit_results_by_articles
...
* For the moment you can sort by article name and order number
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-03 22:14:48 +08:00
2db8aec0e5
Improved warning message when finishing an order.
...
* Hope this makes unwanted ending of an order like last week less
possible.
* Finally Closes #159
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-03 22:14:46 +08: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
412d145c83
Removed ensureUTF8 filter. It's no longer required.
2009-03-24 17:32:56 +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
1c24127928
First part of multiple foodcoop installation.
2009-03-24 17:01:10 +01:00
3309248865
Removed restriction on create for invoices with the same delivery date.
2009-03-24 10:45:41 +01:00
37199bae1d
Implemented pagination for messages overview.
2009-03-23 11:31:36 +01:00
759217763e
Added pagination to task archiv.
2009-03-23 11:23:41 +01:00
f018db5b15
Translated tasks/workgroup page.
2009-03-23 11:08:56 +01:00
549c03f223
Updated workgroups page.
...
* Make use of render :collection helper.
* Translated some links.
2009-03-23 10:57:41 +01:00
1772e8840c
Translated pagination links.
2009-03-23 10:47:42 +01:00
48b6515c08
Genderchanged string 'Lieferant'
...
* Since s.b. started this already. I changed every string 'Lieferant' to
'Lieferantin' to give note on female existance in this world :-)
2009-03-22 15:04:29 +01:00
7c6a01b0fc
Genderneutralization in stockit/index.html.haml
...
* Genderneutralized string 'Lieferant'
2009-03-22 15:04:29 +01:00
1c62bf8786
Genderneutralized/Fixed strings in suppliers/index.haml
...
* Genderneutralized 'Lieferanten'
* Fixed string 'ArtikelDatenbank'
* Fixed string 'KundenNr'
2009-03-22 15:04:28 +01:00
a4900bf8e0
Translation/Genderneutralization in admin/index.html.haml
...
* Translated 'Nick' to 'Benutzername'
* Genderneutralized 'Neueste Benutzer'
* Genderneutralized '...Gruppen und Benutzer...'
* Changed 'Name' to 'Gruppenname' in section 'Neueste Gruppen'
2009-03-22 15:04:28 +01:00
8cdcb10c69
Translation in foodcoop/members.html.haml
...
* Renamed "Sort by Ordergroups :"
* Removed whitespace before ':'
* Improved German Grammar. Hope you agree :-)
2009-03-22 14:16:53 +01:00
8171d3d173
Translation in foodcoop/_users.html.haml
...
* Transalated 'Nick' to 'Benutzername'
2009-03-22 14:16:53 +01:00
fea8c0993b
Translation in profile.html.erb
...
* Translated "cancal membership" and warning.
2009-03-22 14:16:53 +01:00
8d4acac081
Removed string "Benutzername: in home/profile.html.erb
...
* I think it doubles it self to have the same string again on the next
line. Hope you find it more beautiful too :-)
2009-03-22 14:16:52 +01:00
584431d00a
Translations in shared/_user_form.rhtml
...
* Added German text in order not to user default text.
2009-03-22 14:16:52 +01:00
ceec784e62
Translation in profile.html.erb
...
* Renamed "Nickname" to "Benutzername"
* Removed also '#' in end of line.
2009-03-22 14:16:52 +01:00
92e2bdd187
Renamed 'Help' to 'Hilfe' in top loginInfo bar
2009-03-22 14:16:52 +01:00
54715e50fc
Changed caption of group orders sum price
...
* Changed caption of order_article.group_orders_sum[:price] to be "Summe
(FC-Preis)" in _group_order_articles.html
* Trying to improve clarification of diffrent prices.
2009-03-22 14:16:52 +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
2e490d1a52
Capitalized first letter of 'netto' and 'brutto' in Captions.
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
8fbce954e3
Correct 'brutto'-price to be price.gross not fc_price.
...
* We want to be more consistent in the use of diffrent price types:
* netto, brutto, fc_price
2009-03-20 20:28:44 +01:00
2c52944956
Fixed buggy link in finance/balancing/new.html.haml
...
* Link to "Rechnung anlegen" did not send supplier id.
2009-03-20 16:32:47 +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
e4c394d881
New foodcoop configuration option. Use own mailinglist instead of messaging system.
2009-03-17 18:13:00 +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
20d4177990
Added net|gross sum for deliveries-show-page. ( Fixed #193 )
2009-03-11 18:03:28 +01:00
35251576fa
Fixed failures in show-view of StockOrders. ( #195 )
2009-03-11 17:08:12 +01:00
714197eea1
Made order-finish-confirm-message consistently. Fixed #196
2009-03-11 17:00:51 +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
de4f1d573b
Fixed bug in order_result-message.
2009-03-09 00:10: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
857475af1b
Revert "First parts of new 'web-app-theme'." This is fun stuff and should be managed in another branch.
...
This reverts commit c04819e8c4
2009-02-18 12:01:51 +01:00
c04819e8c4
First parts of new 'web-app-theme'.
2009-02-18 11:41:03 +01:00
3ea8d5a2ef
Refactoring of message system.
2009-02-18 01:06:35 +01:00
a0e10141dc
Translations and other little improvements.
2009-02-12 21:38:41 +01:00
951d19db6a
Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views!
2009-02-12 18:32:20 +01:00
2bb4cdb9d6
Fixed bug in ordering page.
2009-02-12 14:35:29 +01:00
8cb8701c60
Fixed bug in commenting orders.
2009-02-12 14:30:25 +01:00
86b2b28dc9
Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices.
2009-02-11 18:09:04 +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
cd9636a650
Improved the creation/updating of deliveries.
2009-02-10 20:06:08 +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
24b66ee8d4
Small bugfix in shared view. Translations on start-page.
2009-02-06 21:18:20 +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
f7b9582261
Bugfixing in memberships-filter.
2009-02-02 17:28:59 +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
aa47a24fda
Refactoring of invitations.
2009-02-02 00:09:50 +01:00
d75c206db5
Fixed some wrong links in startpage. Added gettext-help for controllers.
2009-02-01 23:09:03 +01:00
7f09bb55e4
Fixed some wrong links in admin-startpage and bugs in ordergroup-model.
2009-02-01 21:53:08 +01:00
eedee9f070
Fixed gug in startpage.
2009-02-01 21:08:04 +01:00
80947b0059
Fixed bug from last commit. User.ordergroup ist now an 'Ordergroup'\!
2009-02-01 21:04:35 +01:00
e16bebd042
Removed acts-as-statemachine. Replaces User.find_ordergroup with ActiveRecord-Association 'has_one :ordergroup'.
2009-02-01 20:56:23 +01:00
ec402ffa7b
Fixed order.close workflow. (formerly known as order.balance)
2009-01-30 22:27:55 +01:00
288566f000
Moved 'shared' partial into shared-folder. Easer to maintain.
2009-01-30 19:02:35 +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
fc45345e0d
Introduced acts_as_paranoid. Avoid deleting of suppliers and articles. (for consistency of order-results)
2009-01-20 19:37:15 +01:00
2630ca2b14
Removed finance-controller for more clarity.
2009-01-19 16:40:06 +01:00
ff6b460cfc
Improved delivery-invoice-workflow.
2009-01-18 17:42:51 +01:00
936e6ef69a
Refactoring of articles and article_categories. articles are now a nested resource of supplier.
2009-01-16 16:19:26 +01:00
b38025869a
Introduced StockChange. Implemented first part of stockit-logic with updating article's quantity.
2009-01-16 02:17:49 +01:00
7ff0467b16
Some fixes of bugs during last commit.
2009-01-15 20:10:50 +01:00
e8d55e50c0
Complete refactoring of messaging module. From now messages are saved only once and send afterwards via a the 'send_emails'-rake-task.
2009-01-15 18:26:37 +01:00
6ce6c2c75a
Replaced IndexController by Home- and FoodcoopController. Some reorganizing in groups/memberships-logic (moved memberships out of admin-namespace).
2009-01-15 12:14:01 +01:00
fadc951208
Second part of admin-namespace-reorder. Also renamed OrderGroup into Ordergroup. More view-sharing between groups is neccessary.
2009-01-14 12:46:01 +01:00
2d5dc03b90
Groups are now workgroups. First part of moving groups-logic into admin-namespace.
2009-01-13 19:01:56 +01:00
461dfa8531
Moved users into new admin-namespace and made the controller restful. Also moved some logic from the controller into the user-model (dry it up..).
2009-01-12 18:26:09 +01:00
47398c6a70
Moved balancing logic into new namespace 'finance'.
2009-01-10 22:22:16 +01:00
c282cae79c
Moved financial_transaction into the new finance-namespace.
2009-01-10 21:28:22 +01:00
1d85b880f2
Created namespace 'finance' and moved invoices into it.
2009-01-10 19:36:58 +01:00
30f3d199d3
Introduced invoices and deliveries. Integration (especially of deliveries) isn't finished yet.
2009-01-08 16:33:27 +01:00
1894f27fe0
Fixed deprecation warning in will_paginate-helper.
2009-01-08 14:27:06 +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
da309f03b0
Add missing method for gettext-string-converter.
2009-01-06 15:55:29 +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
Julius
wvengen
Benjamin Meichsner
Manuel Wiedenmann
Robert Waltemath
davidrabel
yep
Benjamin Meichsner
sandoz
Benjamin Meichsner
root
sandoz