Commit Graph

39 Commits

Author SHA1 Message Date
benni 88b268cb0b Refactoring of order comments. 2011-06-19 20:47:27 +02:00
benni ea6348bc5c Refactored finance/ordergroups|transactions module. 2011-06-09 21:35:05 +02:00
benni 5d028ccf3a Added new autocomplete for task assignments.
Introduced the cool jquery token plugin.
2011-05-14 19:41:46 +02:00
benni e40f865c45 Refactored login module. Implemented standard sessions controller. 2011-05-11 13:38:46 +02:00
benni 4eba5fbc9c First step for upgrading to rails 3.
Check rake rails:upgrade:check for next steps.
2011-05-11 01:32:21 +02:00
benni 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
benni 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
benni dcd2a514a6 Added duration to tasks. Annotated all models. 2011-05-07 20:50:39 +02:00
Benjamin Meichsner e75a42d509 Merge branch 'wiki' 2009-08-15 17:24:08 +02:00
Benjamin Meichsner 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
Benjamin Meichsner 6659fe90f3 Merge branch 'stats' 2009-08-02 19:57:19 +02:00
Benjamin Meichsner 178fba7b30 Create restful invites controller and ajaxified the workflow. 2009-08-02 19:41:09 +02:00
Benjamin Meichsner d848831fea Implemented stats for ordergroups on startpage. Annotated models. 2009-08-01 13:41:22 +02:00
Benjamin Meichsner eddf20b063 Added TOC (Table of contents) for wiki pages. 2009-06-11 17:59:21 +02:00
Benjamin Meichsner 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
sandoz f655272448 Removed auto-created fixtures in stock_takings.yml
Signed-off-by: bennibu <benni@dresdener27.de>
2009-03-21 05:38:55 +08:00
sandoz 192fbd4662 Removed auto-created fixtures in stock_takings.yml 2009-03-20 16:00:42 +01:00
Benjamin Meichsner da08365816 Fixed bug order.profit calculation.
Order.profit will also be saved, when order is closed.
2009-03-17 19:43:41 +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 85eb27079f Fixed wrong datetime-settings in fixtures. 2009-02-06 19:30:35 +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 6fd5d825f9 Order-refactoring part II. 2009-02-03 21:14:48 +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 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 936e6ef69a Refactoring of articles and article_categories. articles are now a nested resource of supplier. 2009-01-16 16:19:26 +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 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 30f3d199d3 Introduced invoices and deliveries. Integration (especially of deliveries) isn't finished yet. 2009-01-08 16:33:27 +01:00
Benjamin Meichsner 5b9a7e05df Initial commit of foodsoft 2 2009-01-06 11:49:19 +01:00