wvengen
9990e059d4
fix i18n
2013-11-25 15:24:20 +01:00
wvengen
bd1b932775
add receive screen, quantities for model, redistribution
2013-11-25 14:17:31 +01:00
wvengen
17bbb0705b
fix i18n
2013-10-02 17:23:49 +02:00
wvengen
6cfaa4979a
show lines with zero units but with member orders in balancing screen ( closes foodcoops/foodsoft#179 )
2013-10-02 16:32:29 +02:00
wvengen
f224735718
remember what member ordered when deleted in balancing screen
2013-09-17 14:19:46 +02:00
wvengen
1bb257c41b
remember member order when order article is deleted + test
2013-09-13 15:37:30 +02:00
wvengen
7dbe1363ed
fix adding article balancing failing with 'already taken' ( closes foodcoops/foodsoft#125 )
2013-06-24 13:32:07 +02:00
wvengen
7af796c09c
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
2013-03-21 22:08:09 +01:00
Benjamin Meichsner
dd0bd0ad7e
Fixed updating order article in stockit balancing.
2013-03-17 18:33:04 +01:00
Benjamin Meichsner
707f989768
Fixed routes in redirect after direct_close of orders.
2013-03-17 17:50:50 +01:00
Benjamin Meichsner
c05b3e0e19
Balancing: Do not update oder summary automaticly when changing group orders.
2013-03-17 15:47:50 +01:00
Benjamin Meichsner
9cc98b4662
Added some more eager loading for balancing view.
2013-03-17 15:12:14 +01:00
Benjamin Meichsner
07581b7ecf
Removed acts_as_paranoid. Implemented own version.
2013-03-16 17:57:38 +01:00
Benjamin Meichsner
0d3564492b
Fixed bug in sorting articles in balancing view.
2013-03-12 18:54:51 +01:00
Benjamin Meichsner
c4376f35bf
Removed article from includes in as it does not work with acts_as_paranoid.
...
See also https://github.com/goncalossilva/rails3_acts_as_paranoid/issues/62 .
Better we remove acts_as_paranoid and filter manually?
2013-03-12 12:50:56 +01:00
Benjamin Meichsner
6196bdae41
Added some eager loading for balancing new.
2013-03-12 12:38:08 +01:00
wvengen
569cdce2db
finish finance controller i18n
2013-02-22 00:44:39 +01:00
Manuel Wiedenmann
640e9799aa
i18n financial_transactions + controller
2013-02-11 10:21:39 +07:00
Manuel Wiedenmann
8be93c33f8
i18n finance + controller
2013-02-10 15:05:31 +07:00
benni
807d476e44
Fixed missing scoping by ordergroup in financial index.
2012-12-22 14:23:58 +01:00
benni
620ec946f1
Merge branch 'master' into master-rails3-merging
...
Conflicts:
.gitignore
.rbenv-version
app/controllers/finance/balancing_controller.rb
app/views/finance/balancing/_order_article_form.html.haml
Fixed updating current price in finance balancing.
2012-12-11 10:32:59 +01:00
benni
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
benni
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
benni
5fb0bc2444
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
2012-08-24 11:11:40 +02:00
benni
af3c07f031
Simplifiying balancing view part 2. Lets call it finished.
2012-07-27 18:03:46 +02:00
davidrabel
2c1385c9ce
Preisänderungen beim Abrechnen können auch global angewandt werden.
2012-07-18 22:16:08 +02:00
benni
467874a8a5
Simplify balancing view. Part 1 of ...
2012-06-21 17:19:00 +02:00
benni
6bd4bbec86
Deactivated broken links in balancing.
2012-05-12 11:18:46 +02:00
benni
c49edb79a2
Fixed edit_not in balancing.
2012-05-12 10:55:20 +02:00
benni
b295f62322
Updated finance/invoices
2012-04-20 18:33:47 +02:00
benni
4a8e286d98
Fixed encoding issues with ruby > 1.9.2..
2012-04-16 08:49:54 +02:00
benni
6ddef7267a
Refactored items_per_page. Start on admin/workgroups.
2011-06-10 12:18:55 +02:00
benni
ea6348bc5c
Refactored finance/ordergroups|transactions module.
2011-06-09 21:35:05 +02:00
Benjamin Meichsner
21f128ef1d
Handle bad entries when creating new order articles in balancing
...
controller.
2009-09-07 13:31:03 +02:00
Benjamin Meichsner
a1ca9f368d
Fixed bug when adding new article to a stock order (balancing
...
controller)
2009-09-07 10:57:49 +02:00
Benjamin Meichsner
f0caabfb53
Check account balance after creating a transaction.
2009-08-04 13:13:46 +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
4c57c57827
Changed default order of articles on balancing page.
2009-05-04 17:56:52 +02: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
Benjamin Meichsner
40886b71f9
Fixed Bug in balancing controller when adding an ordergroup-result.
2009-04-05 14:59:55 +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
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
sandoz
3654ba7cf1
Added buttons to in/decrease group order article results.
...
Signed-off-by: bennibu <benni@dresdener27.de>
2009-03-21 05:39:02 +08:00
Benjamin Meichsner
a0e10141dc
Translations and other little improvements.
2009-02-12 21:38:41 +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
6202e05841
Last part of order refactoring. Now order_article create/update is possible.
2009-02-09 20:12:56 +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
251ced4fa1
Introduced group_order_article.result to save the result for each group/article.
2009-02-04 16:41:01 +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
