Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
179 commits 22 branches 1 tag 31 MiB
Commit graph

67 commits

Author SHA1 Message Date
Benjamin Meichsner
49be55238b Added rake task to notify workgroup members if not enough users assigned an upcoming task. 2009-08-11 18:10:14 +02:00
Benjamin Meichsner
d8cdbe4abb Added rake task for auto create of upcoming workgroup tasks (weekly tasks). 2009-08-11 17:22:08 +02:00
sandoz
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
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
4d57bd2e73 Show current stock value on stockit page. 2009-08-04 13:41:28 +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
0d910dfbbd Moved foodcoop/workgroups into new namespace foodcoop. Closes #20 2009-08-02 18:42:52 +02:00
Benjamin Meichsner
d848831fea Implemented stats for ordergroups on startpage. Annotated models. 2009-08-01 13:41:22 +02:00
Benjamin Meichsner
709425855e Added validation for unit_quantity and localization for article attributes. 2009-07-21 15:09:55 +02:00
Benjamin Meichsner
0db7724f85 Hide StockArticles with negeative stock amount in new order. Closes #9 2009-05-17 16:43:48 +02:00
Benjamin Meichsner
27ff4bbd9b Removed price history for StockArticle. 2009-05-17 16:26:31 +02:00
Benjamin Meichsner
a8e35bd421 Refactoring of delivery-workflow. Added ability to add stock_changes after creating a delivery. 2009-05-17 16:11:39 +02:00
Benjamin Meichsner
8b8a7c08cd Fixed bug in ArticlePrice history. Closes #12 2009-05-13 12:52:35 +02:00
sandoz
b1f16d5342 Calculate total prices correctly. (Closes #6) 2009-04-18 18:08:33 +02:00
Benjamin Meichsner
36f9bffdb8 Allow input of decimal numbers for GroupOrderArticle-result. 2009-04-05 15:23:21 +02:00
Benjamin Meichsner
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
Benjamin Meichsner
3309248865 Removed restriction on create for invoices with the same delivery date. 2009-03-24 10:45:41 +01:00
Benjamin Meichsner
759217763e Added pagination to task archiv. 2009-03-23 11:23:41 +01:00
sandoz
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
sandoz
6da9190b03 Added buttons to in/decrease group order article results. 2009-03-20 20:37:13 +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
843e4a7233 Added ability to send private messages. 2009-03-17 18:28:09 +01:00
Benjamin Meichsner
312e51e8dc Fixed bug in group_order.price updates, when finishing an order. 2009-03-17 10:47:00 +01:00
Benjamin Meichsner
1791243b25 Fixed bug when distuingish between finished and closed orders. 2009-03-13 00:06:20 +01:00
Benjamin Meichsner
ce2156d75f Send order-finish-notifications in background. 2009-03-11 16:58:31 +01:00
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