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
Benjamin Meichsner
root
sandoz