dafbb077b6
wiki-syntax: Use markup instead of textile.
2009-05-07 17:59:34 +02:00
4c57c57827
Changed default order of articles on balancing page.
2009-05-04 17:56:52 +02:00
e8fa912e8c
Removed contact data from ordergroups-page. Added names of users and date of last order.
2009-05-04 17:06:08 +02:00
ecc0340a70
Added message-link and notes to new foodcoop/ordergroups page.
2009-04-20 14:33:24 +02:00
a3fbc2d37b
Merge branch 'master' of git@github.com:bennibu/foodsoft
2009-04-20 14:13:47 +02:00
4db8184daa
Fixed some bugs in orders lists. Closes #3
2009-04-20 14:11:11 +02:00
e71cacfe50
Fixed typing error and changed default foodcoop tab to /tasks
2009-04-20 13:58:22 +02:00
fac0c05a46
Hide private messages on start page.
2009-04-20 13:54:39 +02:00
b1f16d5342
Calculate total prices correctly. ( Closes #6 )
2009-04-18 18:08:33 +02:00
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
e95cdad5ec
Added ordergroups view to foodcoop namespace.
...
* For now just a searchable list. Nothing more.
2009-04-18 15:39:07 +02:00
c6187ebade
Fixed bug in password reset feature.
...
* Translated messages
* Cleaned up some code
2009-04-17 12:06:36 +02:00
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
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
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
36f9bffdb8
Allow input of decimal numbers for GroupOrderArticle-result.
2009-04-05 15:23:21 +02:00
40886b71f9
Fixed Bug in balancing controller when adding an ordergroup-result.
2009-04-05 14:59:55 +02:00
d62d45e4a4
Hide zero results in matrix pdf.
2009-04-03 23:32:24 +02:00
de1aa2ac38
Headers and table improvements for matrix pdf. Fixed #204
2009-04-03 19:20:16 +02:00
578002501b
Hide ordergroups with result = 0.
2009-04-03 18:01:19 +02:00
30aa04b710
Made sort by order_number balancing view work.
2009-04-03 17:50:17 +02:00
596f5657bc
Fixed remote and non-remote link mixtures bug.
2009-04-03 17:35:00 +02:00
8fb4334610
Modified sort_link helper method to allo non ajax links.
2009-04-03 17:16:39 +02:00
45c7e29ebb
Added field description to tooltip
...
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-03 22:14:51 +08:00
8c1bf93809
Translated "Sort by this field" tooltip
...
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-03 22:14:50 +08:00
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
2db8aec0e5
Improved warning message when finishing an order.
...
* Hope this makes unwanted ending of an order like last week less
possible.
* Finally Closes #159
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-03 22:14:46 +08:00
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
412d145c83
Removed ensureUTF8 filter. It's no longer required.
2009-03-24 17:32:56 +01:00
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
1c24127928
First part of multiple foodcoop installation.
2009-03-24 17:01:10 +01:00
3309248865
Removed restriction on create for invoices with the same delivery date.
2009-03-24 10:45:41 +01:00
37199bae1d
Implemented pagination for messages overview.
2009-03-23 11:31:36 +01:00
759217763e
Added pagination to task archiv.
2009-03-23 11:23:41 +01:00
f018db5b15
Translated tasks/workgroup page.
2009-03-23 11:08:56 +01:00
549c03f223
Updated workgroups page.
...
* Make use of render :collection helper.
* Translated some links.
2009-03-23 10:57:41 +01:00
1772e8840c
Translated pagination links.
2009-03-23 10:47:42 +01:00
48b6515c08
Genderchanged string 'Lieferant'
...
* Since s.b. started this already. I changed every string 'Lieferant' to
'Lieferantin' to give note on female existance in this world :-)
2009-03-22 15:04:29 +01:00
7c6a01b0fc
Genderneutralization in stockit/index.html.haml
...
* Genderneutralized string 'Lieferant'
2009-03-22 15:04:29 +01:00
1c62bf8786
Genderneutralized/Fixed strings in suppliers/index.haml
...
* Genderneutralized 'Lieferanten'
* Fixed string 'ArtikelDatenbank'
* Fixed string 'KundenNr'
2009-03-22 15:04:28 +01:00
a4900bf8e0
Translation/Genderneutralization in admin/index.html.haml
...
* Translated 'Nick' to 'Benutzername'
* Genderneutralized 'Neueste Benutzer'
* Genderneutralized '...Gruppen und Benutzer...'
* Changed 'Name' to 'Gruppenname' in section 'Neueste Gruppen'
2009-03-22 15:04:28 +01:00
8cdcb10c69
Translation in foodcoop/members.html.haml
...
* Renamed "Sort by Ordergroups :"
* Removed whitespace before ':'
* Improved German Grammar. Hope you agree :-)
2009-03-22 14:16:53 +01:00
8171d3d173
Translation in foodcoop/_users.html.haml
...
* Transalated 'Nick' to 'Benutzername'
2009-03-22 14:16:53 +01:00
fea8c0993b
Translation in profile.html.erb
...
* Translated "cancal membership" and warning.
2009-03-22 14:16:53 +01:00
8d4acac081
Removed string "Benutzername: in home/profile.html.erb
...
* I think it doubles it self to have the same string again on the next
line. Hope you find it more beautiful too :-)
2009-03-22 14:16:52 +01:00
584431d00a
Translations in shared/_user_form.rhtml
...
* Added German text in order not to user default text.
2009-03-22 14:16:52 +01:00
ceec784e62
Translation in profile.html.erb
...
* Renamed "Nickname" to "Benutzername"
* Removed also '#' in end of line.
2009-03-22 14:16:52 +01:00
92e2bdd187
Renamed 'Help' to 'Hilfe' in top loginInfo bar
2009-03-22 14:16:52 +01:00
54715e50fc
Changed caption of group orders sum price
...
* Changed caption of order_article.group_orders_sum[:price] to be "Summe
(FC-Preis)" in _group_order_articles.html
* Trying to improve clarification of diffrent prices.
2009-03-22 14:16:52 +01:00
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
2e490d1a52
Capitalized first letter of 'netto' and 'brutto' in Captions.
2009-03-22 14:16:52 +01:00
6da9190b03
Added buttons to in/decrease group order article results.
2009-03-20 20:37:13 +01:00
8fbce954e3
Correct 'brutto'-price to be price.gross not fc_price.
...
* We want to be more consistent in the use of diffrent price types:
* netto, brutto, fc_price
2009-03-20 20:28:44 +01:00
2c52944956
Fixed buggy link in finance/balancing/new.html.haml
...
* Link to "Rechnung anlegen" did not send supplier id.
2009-03-20 16:32:47 +01:00
da08365816
Fixed bug order.profit calculation.
...
Order.profit will also be saved, when order is closed.
2009-03-17 19:43:41 +01:00
843e4a7233
Added ability to send private messages.
2009-03-17 18:28:09 +01:00
e4c394d881
New foodcoop configuration option. Use own mailinglist instead of messaging system.
2009-03-17 18:13:00 +01:00
312e51e8dc
Fixed bug in group_order.price updates, when finishing an order.
2009-03-17 10:47:00 +01:00
1791243b25
Fixed bug when distuingish between finished and closed orders.
2009-03-13 00:06:20 +01:00
20d4177990
Added net|gross sum for deliveries-show-page. ( Fixed #193 )
2009-03-11 18:03:28 +01:00
35251576fa
Fixed failures in show-view of StockOrders. ( #195 )
2009-03-11 17:08:12 +01:00
714197eea1
Made order-finish-confirm-message consistently. Fixed #196
2009-03-11 17:00:51 +01:00
ce2156d75f
Send order-finish-notifications in background.
2009-03-11 16:58:31 +01:00
37c9e2aeaf
Fixed wrong price value of GroupOrder when finishing an order.
2009-03-11 16:34:36 +01:00
dd940fb414
Send messages directly instead of using controller filter. Litte improvements to the messages lists.
2009-03-09 13:02:43 +01:00
de4f1d573b
Fixed bug in order_result-message.
2009-03-09 00:10:43 +01:00
d680885660
Fixed bugs in message system.
2009-03-06 20:08:11 +01:00
a30444a602
Fixed bug in messaging system. Moved navigation 'messages' to 'foodcoop' tab.
2009-03-06 19:38:06 +01:00
a29053b4e9
Some language fixes. Finished migration path.
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.
...
This reverts commit c04819e8c4
2009-02-18 12:01:51 +01:00
c04819e8c4
First parts of new 'web-app-theme'.
2009-02-18 11:41:03 +01:00
3ea8d5a2ef
Refactoring of message system.
2009-02-18 01:06:35 +01:00
a0e10141dc
Translations and other little improvements.
2009-02-12 21:38:41 +01:00
951d19db6a
Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views!
2009-02-12 18:32:20 +01:00
2bb4cdb9d6
Fixed bug in ordering page.
2009-02-12 14:35:29 +01:00
8cb8701c60
Fixed bug in commenting orders.
2009-02-12 14:30:25 +01:00
86b2b28dc9
Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices.
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'.
2009-02-11 15:23:59 +01:00
cd9636a650
Improved the creation/updating of deliveries.
2009-02-10 20:06:08 +01:00
67743cd014
Implement notification for upcoming tasks via a daily fired rake-task.
2009-02-10 15:07:47 +01:00
053593f718
Translations for articles-pages.
2009-02-10 13:26:10 +01:00
6202e05841
Last part of order refactoring. Now order_article create/update is possible.
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.
2009-02-07 15:19:07 +01:00
24b66ee8d4
Small bugfix in shared view. Translations on start-page.
2009-02-06 21:18:20 +01:00
96442477d1
Fixed broken links in tasks-module. Translated some views into german.
2009-02-06 20:51:14 +01:00
0a87294ed4
Fixed bug in deliveries. Extended test fixtures.
2009-02-06 17:06:08 +01:00
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
1912a3fd80
First part of stock-integratino. Orders with supplier_id == 0 become stockorders.
2009-02-05 16:40:02 +01:00
251ced4fa1
Introduced group_order_article.result to save the result for each group/article.
2009-02-04 16:41:01 +01:00
6fd5d825f9
Order-refactoring part II.
2009-02-03 21:14:48 +01:00
f7b9582261
Bugfixing in memberships-filter.
2009-02-02 17:28:59 +01:00
aec93d4b73
Fixed bugs from last commit and in ExceptionNotification-config.
2009-02-02 17:12:08 +01:00
0a2a79237a
Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing.
2009-02-02 16:35:43 +01:00
aa47a24fda
Refactoring of invitations.
2009-02-02 00:09:50 +01:00
d75c206db5
Fixed some wrong links in startpage. Added gettext-help for controllers.
2009-02-01 23:09:03 +01:00
7f09bb55e4
Fixed some wrong links in admin-startpage and bugs in ordergroup-model.
2009-02-01 21:53:08 +01:00
eedee9f070
Fixed gug in startpage.
2009-02-01 21:08:04 +01:00
80947b0059
Fixed bug from last commit. User.ordergroup ist now an 'Ordergroup'\!
2009-02-01 21:04:35 +01:00
e16bebd042
Removed acts-as-statemachine. Replaces User.find_ordergroup with ActiveRecord-Association 'has_one :ordergroup'.
2009-02-01 20:56:23 +01:00
ec402ffa7b
Fixed order.close workflow. (formerly known as order.balance)
2009-01-30 22:27:55 +01:00
288566f000
Moved 'shared' partial into shared-folder. Easer to maintain.
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.
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.
2009-01-29 01:57:51 +01:00
fc45345e0d
Introduced acts_as_paranoid. Avoid deleting of suppliers and articles. (for consistency of order-results)
2009-01-20 19:37:15 +01:00
2630ca2b14
Removed finance-controller for more clarity.
2009-01-19 16:40:06 +01:00
ff6b460cfc
Improved delivery-invoice-workflow.
2009-01-18 17:42:51 +01:00
936e6ef69a
Refactoring of articles and article_categories. articles are now a nested resource of supplier.
2009-01-16 16:19:26 +01:00
b38025869a
Introduced StockChange. Implemented first part of stockit-logic with updating article's quantity.
2009-01-16 02:17:49 +01:00
7ff0467b16
Some fixes of bugs during last commit.
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.
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).
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.
2009-01-14 12:46:01 +01:00
2d5dc03b90
Groups are now workgroups. First part of moving groups-logic into admin-namespace.
2009-01-13 19:01:56 +01:00
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
47398c6a70
Moved balancing logic into new namespace 'finance'.
2009-01-10 22:22:16 +01:00
c282cae79c
Moved financial_transaction into the new finance-namespace.
2009-01-10 21:28:22 +01:00
1d85b880f2
Created namespace 'finance' and moved invoices into it.
2009-01-10 19:36:58 +01:00
30f3d199d3
Introduced invoices and deliveries. Integration (especially of deliveries) isn't finished yet.
2009-01-08 16:33:27 +01:00
1894f27fe0
Fixed deprecation warning in will_paginate-helper.
2009-01-08 14:27:06 +01:00
fb5884fbf6
Finished pdf-replacement. Improved Matrix.
2009-01-08 14:10:51 +01:00
a6c7b04e33
Replaced rfpdf with prawn and prawnto. Start to convert pdf-views.
2009-01-07 15:29:23 +01:00
da309f03b0
Add missing method for gettext-string-converter.
2009-01-06 15:55:29 +01:00
9f8d0d28ac
Removed gettext and simplified_localization-plugin. L18n is now the appropriate module.
...
Upgraded to rails 2.2.2 and replaced complex foodsoft.rb-loader with simple
initializers/load_app_config.rb. Multiple foodcoops option is temporarly deactivated.
2009-01-06 15:45:19 +01:00
5b9a7e05df
Initial commit of foodsoft 2
2009-01-06 11:49:19 +01:00
Benjamin Meichsner
sandoz
sandoz