wvengen
bb331f99a7
fix units_to_order display [ci skip]
2013-12-19 00:45:39 +01:00
wvengen
68c4affb02
better disabled button
2013-12-18 22:22:34 +01:00
wvengen
7f813f2c0f
fix order add_article
2013-12-18 22:16:19 +01:00
wvengen
84fe791078
update balancing screen
2013-12-18 22:10:38 +01:00
wvengen
873a1ff108
update texts
2013-12-18 21:58:15 +01:00
wvengen
4fede30a19
hide invoice columns until implemented
2013-12-18 21:53:31 +01:00
wvengen
82d1c41e9f
update show order
2013-12-18 21:46:34 +01:00
wvengen
d299fa4870
move receive screen to orders
2013-12-18 21:08:58 +01:00
wvengen
94b4454a1b
add receive to order screen, and distinguish between finished and closed orders to put it in nicely
2013-12-18 19:21:39 +01:00
wvengen
a0c6cf8afe
fix warning without text
2013-12-18 16:04:30 +01:00
wvengen
135e938d3d
i18n cleanups (affects #137 )
2013-11-23 12:05:29 +01:00
wvengen
66ac3be81f
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/home/ordergroup.html.haml
app/views/login/new_password.html.haml
app/views/shared/_auto_complete_users.rhtml
app/views/shared/memberships/_current_members.rhtml
app/views/shared/memberships/_non_members.rhtml
2013-11-18 11:42:49 +01:00
wvengen
de948d7692
fix and cleanup routing (closes foodcoops#190)
2013-10-30 02:27:04 +01:00
wvengen
e4f0a1e3ed
start of making nickname optional
2013-09-20 22:40:13 +02:00
Robert Waltemath
805071f3fb
Added checkbox to ignore warnings. Added translations.
2013-09-04 10:52:14 +02:00
Robert Waltemath
bb25bdc6eb
Improved error data passing.
2013-09-03 17:37:49 +02:00
Robert Waltemath
1c9fad0a7b
Added validation for removed but ordered articles.
2013-09-03 12:09:33 +02:00
wvengen
f57038ff56
show quantity/tolerance in order screen when unit_quantity=1
2013-07-11 23:20:37 +02:00
wvengen
f1d6df9ecc
move commonly used verbs to common i18n identifier
2013-04-04 02:49:52 +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
07581b7ecf
Removed acts_as_paranoid. Implemented own version.
2013-03-16 17:57:38 +01:00
wvengen
20533a5163
fix orders i18n
2013-02-11 15:34:31 +01:00
Manuel Wiedenmann
2d58054d1c
added order for interpolation
2013-02-10 15:05:31 +07:00
wvengen
e06524ca37
finish ordergroups and orders i18n + controller
2013-02-08 01:52:20 +01:00
benni
0dff5ea784
Fixed some bugs in tasks, apple feature:
...
* Update ordergroup stats when task is destroyed.
* Removed assigned caching attribute in task object.
* A lot of eager loading for tasks controller.
2012-12-16 19:07:45 +01:00
benni
0edd29dfd4
Merge branch 'master' into master-to-rails3
...
Conflicts:
Gemfile
README_DEVEL
app/controllers/articles_controller.rb
app/controllers/orders_controller.rb
app/controllers/tasks_controller.rb
app/models/task.rb
app/views/articles/_import_search_results.haml
app/views/articles/index.haml
app/views/messages/new.haml
app/views/ordering/_order_head.haml
app/views/ordering/my_order_result.haml
app/views/orders/show.haml
app/views/stockit/new.html.haml
db/schema.rb
2012-12-14 18:10:46 +01:00
Julius
c17ff281c3
Save and display creator of Order
2012-11-12 14:24:49 +01:00
benni
f4f10b1e4c
Introduced actionbar. Some fixes for balancing page.
2012-11-12 13:13:01 +01:00
benni
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
benni
16de9124fe
Fixes orders.
2012-10-30 00:20:47 +01:00
benni
f30e57dd49
Fixed articles views.
2012-10-19 01:12:47 +02:00
benni
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
benni
92649d3053
Removed acts_as_ordered. Fixed bug in group_orders archive.
2012-10-03 20:08:54 +02:00
benni
eb532babd6
Refactored pdf generation with newest prawn.
2012-10-02 02:50:48 +02:00
benni
ec2e761e7f
Fixed multi coop routing and changed config accessors.
2012-08-24 19:52:38 +02:00
benni
4a8e286d98
Fixed encoding issues with ruby > 1.9.2..
2012-04-16 08:49:54 +02:00
benni
ad508b207b
Updated to rails 3.0.12. remove old gettext code.
2012-04-15 19:59:39 +02:00
benni
b3c64ecb85
Fixed order views.
2011-06-20 00:26:17 +02:00
benni
88b268cb0b
Refactoring of order comments.
2011-06-19 20:47:27 +02:00
benni
38b5dcba1f
Refactored ordering part two. Integrated stock order.
2011-06-19 19:56:04 +02:00
benni
afb2c26ab3
Fixed orders form.
2011-06-10 13:53:51 +02:00
Benjamin Meichsner
fbf6a283a0
Fixed bug in orders index if order.ends.nil?
2010-06-19 12:25:35 +02:00
Benjamin Meichsner
2309fbe76b
Reduced max articles per page for article matrix.
...
Sometimes the last column wasn't displayed correctly.
2009-10-20 23:13:08 +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
sandoz
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
Benjamin Meichsner
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
sandoz
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
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
