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

1415 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benjamin Meichsner
eddf20b063 Added TOC (Table of contents) for wiki pages. 2009-06-11 17:59:21 +02:00
Benjamin Meichsner
255a4cd6c7 Fixed problems in interacting of acts_as_versioned and optimistic locking. 2009-05-20 15:26:53 +02:00
Benjamin Meichsner
2660d86b89 Added table of contents to wiki page. 2009-05-20 14:06:40 +02:00
Benjamin Meichsner
d371839eba Prefer textile over markup because markup doesn't support any tables. bähh. 2009-05-20 13:03:58 +02:00
Benjamin Meichsner
7de45543c4 Added page-preview feature to wiki module. 2009-05-20 12:42:01 +02:00
Benjamin Meichsner
0fb8ee214f Added helpful links to submenu. 2009-05-20 11:54:18 +02:00
Benjamin Meichsner
2af35e55bc Improved stockit overiew. Fixed article ordering by suppliers. 2009-05-17 16:50:13 +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
e59ce8c313 Added deliveries counter to suppliers overview. 2009-05-17 16:18:14 +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
43fc7b06f8 Upgrade foodsoft to rails 2.3.2. 2009-05-17 15:01:36 +02:00
Benjamin Meichsner
c03f3da21a Added more info to delivery/show for easier comparision of invoice amount and sum of delivered items. 2009-05-15 17:58:02 +02:00
Benjamin Meichsner
053c665270 Added version control for wiki pages. 2009-05-15 17:32:45 +02:00
Benjamin Meichsner
7ba6bc3680 Added optimistic locking to wiki pages. 2009-05-15 13:54:42 +02:00
Benjamin Meichsner
f83d2659de Added better routing for wiki-root-path. 2009-05-15 13:53:45 +02:00
Benjamin Meichsner
0d11e68bad Added syntax help to wiki form. 2009-05-13 17:32:43 +02:00
Benjamin Meichsner
8bfa83118c Update ordergroup values after deleting an ordered article. Closes #11 
* TODO: Implement callbacks to avoid such mistakes.
 2009-05-13 13:04:39 +02:00
Benjamin Meichsner
8b8a7c08cd Fixed bug in ArticlePrice history. Closes #12 2009-05-13 12:52:35 +02:00
Benjamin Meichsner
7e4409bc11 Few improvements to wiki module. 2009-05-07 18:15:14 +02:00
Benjamin Meichsner
dafbb077b6 wiki-syntax: Use markup instead of textile. 2009-05-07 17:59:34 +02:00
Benjamin Meichsner
4c57c57827 Changed default order of articles on balancing page. 2009-05-04 17:56:52 +02:00
Benjamin Meichsner
e8fa912e8c Removed contact data from ordergroups-page. Added names of users and date of last order. 2009-05-04 17:06:08 +02:00
Benjamin Meichsner
ecc0340a70 Added message-link and notes to new foodcoop/ordergroups page. 2009-04-20 14:33:24 +02:00
Benjamin Meichsner
a3fbc2d37b Merge branch 'master' of git@github.com:bennibu/foodsoft 2009-04-20 14:13:47 +02:00
Benjamin Meichsner
4db8184daa Fixed some bugs in orders lists. Closes #3 2009-04-20 14:11:11 +02:00
Benjamin Meichsner
e71cacfe50 Fixed typing error and changed default foodcoop tab to /tasks 2009-04-20 13:58:22 +02:00
Benjamin Meichsner
fac0c05a46 Hide private messages on start page. 2009-04-20 13:54:39 +02:00
sandoz
b1f16d5342 Calculate total prices correctly. (Closes #6) 2009-04-18 18:08:33 +02:00
sandoz
e32e97d178 Added "ordergroups" view to list the ordergroups 
* You can search in the name.
* You can show only active order groups (order in last 3 months)
* Future feature: generate text and pdf files for the box
  labels
 2009-04-18 15:39:07 +02:00
sandoz
e95cdad5ec Added ordergroups view to foodcoop namespace. 
* For now just a searchable list. Nothing more.
 2009-04-18 15:39:07 +02:00
Benjamin Meichsner
c6187ebade Fixed bug in password reset feature. 
* Translated messages
* Cleaned up some code
 2009-04-17 12:06:36 +02:00
sandoz
394b4b161f Merge branch 'master' of git://github.com/bennibu/foodsoft 2009-04-07 18:23:44 +02:00
sandoz
582e4b1c1b Beautified navigation on top of page. 
Signed-off-by: bennibu <benni@dresdener27.de>
 2009-04-07 18:08:36 +08:00
sandoz
00696c0e64 Replaced account balance by available funds on start page. 
* Closes #206

Signed-off-by: bennibu <benni@dresdener27.de>
 2009-04-07 18:08:35 +08:00
sandoz
e3f9df0a0c Replaced account_balance by available_funds in ordergroup view. 
Signed-off-by: bennibu <benni@dresdener27.de>
 2009-04-07 18:08:33 +08:00
sandoz
1e011256e9 Remove all non-digits before sorting by order number in finance/balancing 
* Since order_number is a string, there can be more than a-zA-Z + digits

Signed-off-by: bennibu <benni@dresdener27.de>
 2009-04-07 18:08:30 +08:00
sandoz
15cec5b8f9 Merge branch 'master' of git://github.com/bennibu/foodsoft 2009-04-06 19:36:44 +02:00
Benjamin Meichsner
36f9bffdb8 Allow input of decimal numbers for GroupOrderArticle-result. 2009-04-05 15:23:21 +02:00
Benjamin Meichsner
40886b71f9 Fixed Bug in balancing controller when adding an ordergroup-result. 2009-04-05 14:59:55 +02:00
Benjamin Meichsner
d62d45e4a4 Hide zero results in matrix pdf. 2009-04-03 23:32:24 +02:00
Benjamin Meichsner
de1aa2ac38 Headers and table improvements for matrix pdf. Fixed #204 2009-04-03 19:20:16 +02:00
Benjamin Meichsner
578002501b Hide ordergroups with result = 0. 2009-04-03 18:01:19 +02:00
Benjamin Meichsner
30aa04b710 Made sort by order_number balancing view work. 2009-04-03 17:50:17 +02:00
Benjamin Meichsner
596f5657bc Fixed remote and non-remote link mixtures bug. 2009-04-03 17:35:00 +02:00
Benjamin Meichsner
8fb4334610 Modified sort_link helper method to allo non ajax links. 2009-04-03 17:16:39 +02:00
sandoz
c9931b0e4e Merge branch 'master' of git://github.com/bennibu/foodsoft 2009-04-03 16:18:41 +02:00
sandoz
45c7e29ebb Added field description to tooltip 
Signed-off-by: bennibu <benni@dresdener27.de>
 2009-04-03 22:14:51 +08:00
sandoz
8c1bf93809 Translated "Sort by this field" tooltip 
Signed-off-by: bennibu <benni@dresdener27.de>
 2009-04-03 22:14:50 +08:00
sandoz
5a7fe17437 Make list of ordered articles sortable in _edit_results_by_articles 
* For the moment you can sort by article name and order number

Signed-off-by: bennibu <benni@dresdener27.de>
 2009-04-03 22:14:48 +08:00