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
843e4a7233
Added ability to send private messages.
2009-03-17 18:28:09 +01:00
Benjamin Meichsner
e4c394d881
New foodcoop configuration option. Use own mailinglist instead of messaging system.
2009-03-17 18:13:00 +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
20d4177990
Added net|gross sum for deliveries-show-page. ( Fixed #193 )
2009-03-11 18:03:28 +01:00
Benjamin Meichsner
35251576fa
Fixed failures in show-view of StockOrders. ( #195 )
2009-03-11 17:08:12 +01:00
Benjamin Meichsner
714197eea1
Made order-finish-confirm-message consistently. Fixed #196
2009-03-11 17:00:51 +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
de4f1d573b
Fixed bug in order_result-message.
2009-03-09 00:10: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
857475af1b
Revert "First parts of new 'web-app-theme'." This is fun stuff and should be managed in another branch.
...
This reverts commit c04819e8c4
2009-02-18 12:01:51 +01:00
Benjamin Meichsner
c04819e8c4
First parts of new 'web-app-theme'.
2009-02-18 11:41:03 +01:00
Benjamin Meichsner
3ea8d5a2ef
Refactoring of message system.
2009-02-18 01:06:35 +01:00
Benjamin Meichsner
a0e10141dc
Translations and other little improvements.
2009-02-12 21:38: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
2bb4cdb9d6
Fixed bug in ordering page.
2009-02-12 14:35:29 +01:00
Benjamin Meichsner
8cb8701c60
Fixed bug in commenting orders.
2009-02-12 14:30:25 +01:00
Benjamin Meichsner
86b2b28dc9
Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices.
2009-02-11 18:09:04 +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
cd9636a650
Improved the creation/updating of deliveries.
2009-02-10 20:06:08 +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
24b66ee8d4
Small bugfix in shared view. Translations on start-page.
2009-02-06 21:18:20 +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
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
46d0a9c485
Updated database-schema.
2009-02-06 16:40:05 +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
f7b9582261
Bugfixing in memberships-filter.
2009-02-02 17:28:59 +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
aa47a24fda
Refactoring of invitations.
2009-02-02 00:09:50 +01:00
Benjamin Meichsner
d75c206db5
Fixed some wrong links in startpage. Added gettext-help for controllers.
2009-02-01 23:09:03 +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
eedee9f070
Fixed gug in startpage.
2009-02-01 21:08:04 +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
288566f000
Moved 'shared' partial into shared-folder. Easer to maintain.
2009-01-30 19:02:35 +01:00
