foodsoft

Foodsoft/foodsoft

Fork 0

Commit graph

412d145c83 Removed ensureUTF8 filter. It's no longer required. Benjamin Meichsner 2009-03-24 17:32:56 +01:00
ffc3adf907 Second (last) part of multiple foodcoop installation. Benjamin Meichsner 2009-03-24 17:25:33 +01:00
1c24127928 First part of multiple foodcoop installation. Benjamin Meichsner 2009-03-24 17:01:10 +01:00
3309248865 Removed restriction on create for invoices with the same delivery date. Benjamin Meichsner 2009-03-24 10:45:41 +01:00
3a8de36ca6 Merge branch 'master' of git://github.com/bennibu/foodsoft sandoz 2009-03-23 23:58:10 +01:00
37199bae1d Implemented pagination for messages overview. Benjamin Meichsner 2009-03-23 11:31:36 +01:00
759217763e Added pagination to task archiv. Benjamin Meichsner 2009-03-23 11:23:41 +01:00
f018db5b15 Translated tasks/workgroup page. Benjamin Meichsner 2009-03-23 11:08:56 +01:00
549c03f223 Updated workgroups page. Benjamin Meichsner 2009-03-23 10:57:41 +01:00
1772e8840c Translated pagination links. Benjamin Meichsner 2009-03-23 10:47:42 +01:00
51f9826ea6 Merge branch 'master' of git://github.com/sandoz/foodsoft Benjamin Meichsner 2009-03-23 10:40:03 +01:00
48b6515c08 Genderchanged string 'Lieferant' sandoz 2009-03-22 13:56:54 +01:00
7c6a01b0fc Genderneutralization in stockit/index.html.haml sandoz 2009-03-22 13:49:16 +01:00
1c62bf8786 Genderneutralized/Fixed strings in suppliers/index.haml sandoz 2009-03-22 13:47:31 +01:00
a4900bf8e0 Translation/Genderneutralization in admin/index.html.haml sandoz 2009-03-22 13:42:37 +01:00
de105bea70 SASS: Changed padding of input, textacrea, select sandoz 2009-03-22 13:28:16 +01:00
8cdcb10c69 Translation in foodcoop/members.html.haml sandoz 2009-03-22 13:26:21 +01:00
8171d3d173 Translation in foodcoop/_users.html.haml sandoz 2009-03-22 13:25:32 +01:00
fea8c0993b Translation in profile.html.erb sandoz 2009-03-22 13:05:16 +01:00
8d4acac081 Removed string "Benutzername: in home/profile.html.erb sandoz 2009-03-22 13:01:56 +01:00
584431d00a Translations in shared/_user_form.rhtml sandoz 2009-03-22 13:00:56 +01:00
ceec784e62 Translation in profile.html.erb sandoz 2009-03-22 12:47:14 +01:00
92e2bdd187 Renamed 'Help' to 'Hilfe' in top loginInfo bar sandoz 2009-03-22 12:42:54 +01:00
54715e50fc Changed caption of group orders sum price sandoz 2009-03-22 12:08:42 +01:00
cde1fb3525 Show total price of ordered units per article in finance/balancing sandoz 2009-03-22 11:58:01 +01:00
2e490d1a52 Capitalized first letter of 'netto' and 'brutto' in Captions. sandoz 2009-03-22 11:22:57 +01:00
b189bc31d0 Small hack to make button "+" and "-" to be same size. sandoz 2009-03-20 20:33:06 +01:00
891fc74d91 Merge branch 'master' of git://github.com/bennibu/foodsoft sandoz 2009-03-22 10:56:58 +01:00
3654ba7cf1 Added buttons to in/decrease group order article results. sandoz 2009-03-21 01:56:17 +08:00
f7f13ee7a6 Correct 'brutto'-price to be price.gross not fc_price. sandoz 2009-03-21 01:54:05 +08:00
39fdda4019 Fixed buggy link in finance/balancing/new.html.haml sandoz 2009-03-20 23:32:47 +08:00
f655272448 Removed auto-created fixtures in stock_takings.yml sandoz 2009-03-20 23:00:42 +08:00
a5349191b7 Small hack to make button "+" and "-" to be same size. sandoz 2009-03-20 20:33:06 +01:00
6da9190b03 Added buttons to in/decrease group order article results. sandoz 2009-03-20 18:56:17 +01:00
8fbce954e3 Correct 'brutto'-price to be price.gross not fc_price. sandoz 2009-03-20 18:54:05 +01:00
2c52944956 Fixed buggy link in finance/balancing/new.html.haml sandoz 2009-03-20 16:32:47 +01:00
192fbd4662 Removed auto-created fixtures in stock_takings.yml sandoz 2009-03-20 16:00:42 +01:00
da08365816 Fixed bug order.profit calculation. Order.profit will also be saved, when order is closed. Benjamin Meichsner 2009-03-17 19:43:41 +01:00
843e4a7233 Added ability to send private messages. Benjamin Meichsner 2009-03-17 18:28:09 +01:00
e4c394d881 New foodcoop configuration option. Use own mailinglist instead of messaging system. Benjamin Meichsner 2009-03-17 18:13:00 +01:00
312e51e8dc Fixed bug in group_order.price updates, when finishing an order. Benjamin Meichsner 2009-03-17 10:47:00 +01:00
1791243b25 Fixed bug when distuingish between finished and closed orders. Benjamin Meichsner 2009-03-13 00:06:20 +01:00
20d4177990 Added net|gross sum for deliveries-show-page. (Fixed #193) Benjamin Meichsner 2009-03-11 18:03:28 +01:00
35251576fa Fixed failures in show-view of StockOrders. (#195) Benjamin Meichsner 2009-03-11 17:08:12 +01:00
714197eea1 Made order-finish-confirm-message consistently. Fixed #196 Benjamin Meichsner 2009-03-11 17:00:51 +01:00
ce2156d75f Send order-finish-notifications in background. Benjamin Meichsner 2009-03-11 16:58:31 +01:00
37c9e2aeaf Fixed wrong price value of GroupOrder when finishing an order. Benjamin Meichsner 2009-03-11 16:34:36 +01:00
dd940fb414 Send messages directly instead of using controller filter. Litte improvements to the messages lists. Benjamin Meichsner 2009-03-09 13:02:43 +01:00
de4f1d573b Fixed bug in order_result-message. Benjamin Meichsner 2009-03-09 00:10:43 +01:00
d680885660 Fixed bugs in message system. Benjamin Meichsner 2009-03-06 20:08:11 +01:00
a30444a602 Fixed bug in messaging system. Moved navigation 'messages' to 'foodcoop' tab. Benjamin Meichsner 2009-03-06 19:38:06 +01:00
a29053b4e9 Some language fixes. Finished migration path. Benjamin Meichsner 2009-03-01 18:45:34 +01:00
857475af1b Revert "First parts of new 'web-app-theme'." This is fun stuff and should be managed in another branch. Benjamin Meichsner 2009-02-18 12:01:51 +01:00
c04819e8c4 First parts of new 'web-app-theme'. Benjamin Meichsner 2009-02-18 11:41:03 +01:00
3ea8d5a2ef Refactoring of message system. Benjamin Meichsner 2009-02-18 01:06:35 +01:00
a0e10141dc Translations and other little improvements. Benjamin Meichsner 2009-02-12 21:38:41 +01:00
951d19db6a Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views! Benjamin Meichsner 2009-02-12 18:32:20 +01:00
2bb4cdb9d6 Fixed bug in ordering page. Benjamin Meichsner 2009-02-12 14:35:29 +01:00
8cb8701c60 Fixed bug in commenting orders. Benjamin Meichsner 2009-02-12 14:30:25 +01:00
86b2b28dc9 Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices. Benjamin Meichsner 2009-02-11 18:09:04 +01:00
325d47b22f Changed behaviour of acts_as_paraniod. Finder wrapper removed an replaced by simple named_scope 'without_deleted'. Benjamin Meichsner 2009-02-11 15:23:59 +01:00
cd9636a650 Improved the creation/updating of deliveries. Benjamin Meichsner 2009-02-10 20:06:08 +01:00
67743cd014 Implement notification for upcoming tasks via a daily fired rake-task. Benjamin Meichsner 2009-02-10 15:07:47 +01:00
053593f718 Translations for articles-pages. Benjamin Meichsner 2009-02-10 13:26:10 +01:00
6202e05841 Last part of order refactoring. Now order_article create/update is possible. Benjamin Meichsner 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. Benjamin Meichsner 2009-02-07 15:19:07 +01:00
24b66ee8d4 Small bugfix in shared view. Translations on start-page. Benjamin Meichsner 2009-02-06 21:18:20 +01:00
96442477d1 Fixed broken links in tasks-module. Translated some views into german. Benjamin Meichsner 2009-02-06 20:51:14 +01:00
85eb27079f Fixed wrong datetime-settings in fixtures. Benjamin Meichsner 2009-02-06 19:30:35 +01:00
0a87294ed4 Fixed bug in deliveries. Extended test fixtures. Benjamin Meichsner 2009-02-06 17:06:08 +01:00
46d0a9c485 Updated database-schema. Benjamin Meichsner 2009-02-06 16:40:05 +01:00
c17b63b192 Second part of stock-integration. Benjamin Meichsner 2009-02-06 16:26:35 +01:00
1912a3fd80 First part of stock-integratino. Orders with supplier_id == 0 become stockorders. Benjamin Meichsner 2009-02-05 16:40:02 +01:00
251ced4fa1 Introduced group_order_article.result to save the result for each group/article. Benjamin Meichsner 2009-02-04 16:41:01 +01:00
6fd5d825f9 Order-refactoring part II. Benjamin Meichsner 2009-02-03 21:14:48 +01:00
f7b9582261 Bugfixing in memberships-filter. Benjamin Meichsner 2009-02-02 17:28:59 +01:00
aec93d4b73 Fixed bugs from last commit and in ExceptionNotification-config. Benjamin Meichsner 2009-02-02 17:12:08 +01:00
0a2a79237a Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing. Benjamin Meichsner 2009-02-02 16:35:43 +01:00
aa47a24fda Refactoring of invitations. Benjamin Meichsner 2009-02-02 00:09:50 +01:00
d75c206db5 Fixed some wrong links in startpage. Added gettext-help for controllers. Benjamin Meichsner 2009-02-01 23:09:03 +01:00
7f09bb55e4 Fixed some wrong links in admin-startpage and bugs in ordergroup-model. Benjamin Meichsner 2009-02-01 21:53:08 +01:00
eedee9f070 Fixed gug in startpage. Benjamin Meichsner 2009-02-01 21:08:04 +01:00
80947b0059 Fixed bug from last commit. User.ordergroup ist now an 'Ordergroup'\! Benjamin Meichsner 2009-02-01 21:04:35 +01:00
e16bebd042 Removed acts-as-statemachine. Replaces User.find_ordergroup with ActiveRecord-Association 'has_one :ordergroup'. Benjamin Meichsner 2009-02-01 20:56:23 +01:00
ec402ffa7b Fixed order.close workflow. (formerly known as order.balance) Benjamin Meichsner 2009-01-30 22:27:55 +01:00
288566f000 Moved 'shared' partial into shared-folder. Easer to maintain. Benjamin Meichsner 2009-01-30 19:02:35 +01:00
190a777278 Order refactoring part two: Balancing workflow was adapted to the new order schema. Article modification is still missing. Benjamin Meichsner 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. Benjamin Meichsner 2009-01-29 01:57:51 +01:00
80287aeea4 Updating README_DEVEL and fixing environment.rb so foodsoft runs on a clean system. lasse 2009-01-27 06:30:42 +08:00
fc45345e0d Introduced acts_as_paranoid. Avoid deleting of suppliers and articles. (for consistency of order-results) Benjamin Meichsner 2009-01-20 19:37:15 +01:00
b820577382 Update License (to GPL3) and install instructions. Benjamin Meichsner 2009-01-20 15:59:06 +01:00
2630ca2b14 Removed finance-controller for more clarity. Benjamin Meichsner 2009-01-19 16:40:06 +01:00
ff6b460cfc Improved delivery-invoice-workflow. Benjamin Meichsner 2009-01-18 17:42:51 +01:00
936e6ef69a Refactoring of articles and article_categories. articles are now a nested resource of supplier. Benjamin Meichsner 2009-01-16 16:19:26 +01:00
b38025869a Introduced StockChange. Implemented first part of stockit-logic with updating article's quantity. Benjamin Meichsner 2009-01-16 02:17:49 +01:00
7ff0467b16 Some fixes of bugs during last commit. Benjamin Meichsner 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. Benjamin Meichsner 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). Benjamin Meichsner 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. Benjamin Meichsner 2009-01-14 12:46:01 +01:00
2d5dc03b90 Groups are now workgroups. First part of moving groups-logic into admin-namespace. Benjamin Meichsner 2009-01-13 19:01:56 +01:00