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
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
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
ff6b460cfc
Improved delivery-invoice-workflow.
2009-01-18 17:42:51 +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
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
Benjamin Meichsner
sandoz
sandoz