Commit Graph

491 Commits

Author SHA1 Message Date
Benjamin Meichsner 37c9e2aeaf Fixed wrong price value of GroupOrder when finishing an order. 2009-03-11 16:34:36 +01:00
Benjamin Meichsner dd940fb414 Send messages directly instead of using controller filter. Litte improvements to the messages lists. 2009-03-09 13:02:43 +01:00
Benjamin Meichsner d680885660 Fixed bugs in message system. 2009-03-06 20:08:11 +01:00
Benjamin Meichsner a30444a602 Fixed bug in messaging system. Moved navigation 'messages' to 'foodcoop' tab. 2009-03-06 19:38:06 +01:00
Benjamin Meichsner a29053b4e9 Some language fixes. Finished migration path. 2009-03-01 18:45:34 +01:00
Benjamin Meichsner 3ea8d5a2ef Refactoring of message system. 2009-02-18 01:06:35 +01:00
Benjamin Meichsner 951d19db6a Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views! 2009-02-12 18:32:20 +01:00
Benjamin Meichsner 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
Benjamin Meichsner 67743cd014 Implement notification for upcoming tasks via a daily fired rake-task. 2009-02-10 15:07:47 +01:00
Benjamin Meichsner 053593f718 Translations for articles-pages. 2009-02-10 13:26:10 +01:00
Benjamin Meichsner 6202e05841 Last part of order refactoring. Now order_article create/update is possible. 2009-02-09 20:12:56 +01:00
Benjamin Meichsner 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
Benjamin Meichsner 96442477d1 Fixed broken links in tasks-module. Translated some views into german. 2009-02-06 20:51:14 +01:00
Benjamin Meichsner 0a87294ed4 Fixed bug in deliveries. Extended test fixtures. 2009-02-06 17:06:08 +01:00
Benjamin Meichsner 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
Benjamin Meichsner 1912a3fd80 First part of stock-integratino. Orders with supplier_id == 0 become stockorders. 2009-02-05 16:40:02 +01:00
Benjamin Meichsner 251ced4fa1 Introduced group_order_article.result to save the result for each group/article. 2009-02-04 16:41:01 +01:00
Benjamin Meichsner 6fd5d825f9 Order-refactoring part II. 2009-02-03 21:14:48 +01:00
Benjamin Meichsner aec93d4b73 Fixed bugs from last commit and in ExceptionNotification-config. 2009-02-02 17:12:08 +01:00
Benjamin Meichsner 0a2a79237a Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing. 2009-02-02 16:35:43 +01:00
Benjamin Meichsner 7f09bb55e4 Fixed some wrong links in admin-startpage and bugs in ordergroup-model. 2009-02-01 21:53:08 +01:00
Benjamin Meichsner 80947b0059 Fixed bug from last commit. User.ordergroup ist now an 'Ordergroup'\! 2009-02-01 21:04:35 +01:00
Benjamin Meichsner e16bebd042 Removed acts-as-statemachine. Replaces User.find_ordergroup with ActiveRecord-Association 'has_one :ordergroup'. 2009-02-01 20:56:23 +01:00
Benjamin Meichsner ec402ffa7b Fixed order.close workflow. (formerly known as order.balance) 2009-01-30 22:27:55 +01:00
Benjamin Meichsner 190a777278 Order refactoring part two: Balancing workflow was adapted to the new order schema. Article modification is still missing. 2009-01-29 21:28:22 +01:00
Benjamin Meichsner 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
Benjamin Meichsner fc45345e0d Introduced acts_as_paranoid. Avoid deleting of suppliers and articles. (for consistency of order-results) 2009-01-20 19:37:15 +01:00
Benjamin Meichsner ff6b460cfc Improved delivery-invoice-workflow. 2009-01-18 17:42:51 +01:00
Benjamin Meichsner b38025869a Introduced StockChange. Implemented first part of stockit-logic with updating article's quantity. 2009-01-16 02:17:49 +01:00
Benjamin Meichsner 7ff0467b16 Some fixes of bugs during last commit. 2009-01-15 20:10:50 +01:00
Benjamin Meichsner 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
Benjamin Meichsner 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
Benjamin Meichsner 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
Benjamin Meichsner 2d5dc03b90 Groups are now workgroups. First part of moving groups-logic into admin-namespace. 2009-01-13 19:01:56 +01:00
Benjamin Meichsner 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
Benjamin Meichsner 47398c6a70 Moved balancing logic into new namespace 'finance'. 2009-01-10 22:22:16 +01:00
Benjamin Meichsner c282cae79c Moved financial_transaction into the new finance-namespace. 2009-01-10 21:28:22 +01:00
Benjamin Meichsner 1d85b880f2 Created namespace 'finance' and moved invoices into it. 2009-01-10 19:36:58 +01:00
Benjamin Meichsner 30f3d199d3 Introduced invoices and deliveries. Integration (especially of deliveries) isn't finished yet. 2009-01-08 16:33:27 +01:00
Benjamin Meichsner 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
Benjamin Meichsner 5b9a7e05df Initial commit of foodsoft 2 2009-01-06 11:49:19 +01:00