0b4cfde1b2
put footer below body, now that is allowed in html5
2014-01-09 14:47:05 +01:00
dcb17e04b5
do not show article hint in order view after all, since "old price" is
...
actually the price of the current article, which will probably be
different in the future
2014-01-09 13:24:40 +01:00
bea2706005
fix receive dynamic update (complements 90c81de872)
2014-01-09 13:19:27 +01:00
124341c7d6
receive helper and i18n cleanup
2014-01-09 13:01:10 +01:00
90c81de872
update receive delta column + responsive css
2014-01-09 12:20:54 +01:00
5a7c9b817c
fix receive js for document updates [ci skip]
2014-01-09 10:14:05 +01:00
65e79d7e1b
small receive usability changes
2014-01-08 19:28:39 +01:00
6e60f94484
small receive-related i18n updates
2014-01-08 12:52:29 +01:00
563993fffa
Complete I18n of current receive screen
2014-01-08 00:06:50 +01:00
d7c771d10a
Continue I18n of receive screen
2014-01-06 23:48:39 +01:00
8479678530
Improve unlock button for receiving OrderArticles manually adjusted
...
Conflicts:
app/views/orders/_edit_amount.html.haml
2014-01-04 20:51:42 +01:00
aa57cee96f
do not show units fields in receive edit order article screen
2014-01-04 20:46:13 +01:00
b800da9b9b
use helper in ajax update too
2014-01-03 14:52:44 +01:00
9219d099c8
ui update for packages display
2014-01-03 12:42:36 +01:00
4c9e84ecc6
change layout of receive unlock
2014-01-03 12:40:43 +01:00
014a62aa11
use disabled property for input and fix style
2014-01-03 10:59:42 +01:00
f1ae2724c6
fix unit quantity display after ajax update
2014-01-03 10:45:15 +01:00
5ead0fb441
show correct price
2014-01-03 10:44:57 +01:00
f230d39055
Merge price columns in receive form into one
...
Conflicts:
app/views/orders/_edit_amount.html.haml
2014-01-03 10:36:57 +01:00
2ec3d38238
Set readonly property with javascript by .prop instead of .attr
2014-01-03 10:33:23 +01:00
98f59a3de3
Readonly receive input if GroupOrderArticle result has manually been changed
...
Conflicts:
app/helpers/orders_helper.rb
app/views/orders/_edit_amount.html.haml
2014-01-03 10:33:09 +01:00
a439f26b67
ui design update
2014-01-02 22:30:04 +01:00
8e52fca304
Do not set quantity of newly created OrderArticles to 1
2014-01-02 19:17:46 +01:00
033aa90698
Use OrderArticle#create in receive form instead of Order#add_article
2014-01-02 19:16:09 +01:00
baa5f16cfc
Free order_article resource from finance namespace; also unlock for role_orders
2014-01-02 19:14:41 +01:00
9ed906f425
Correct haml comment from '#' to '-#'
2014-01-02 19:14:37 +01:00
cf1e68f11d
Allow to edit OrderArticle in Order#receive form
2014-01-02 19:14:33 +01:00
41ea9ed66e
hide receive screen for stock orders
2013-12-21 17:36:25 +01:00
aa6041d337
show all articles in receive screen (not just of this order)
2013-12-21 17:33:06 +01:00
bb331f99a7
fix units_to_order display [ci skip]
2013-12-19 00:45:39 +01:00
68c4affb02
better disabled button
2013-12-18 22:22:34 +01:00
7f813f2c0f
fix order add_article
2013-12-18 22:16:19 +01:00
84fe791078
update balancing screen
2013-12-18 22:10:38 +01:00
873a1ff108
update texts
2013-12-18 21:58:15 +01:00
4fede30a19
hide invoice columns until implemented
2013-12-18 21:53:31 +01:00
82d1c41e9f
update show order
2013-12-18 21:46:34 +01:00
d299fa4870
move receive screen to orders
2013-12-18 21:08:58 +01:00
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
a0c6cf8afe
fix warning without text
2013-12-18 16:04:30 +01:00
135e938d3d
i18n cleanups (affects #137 )
2013-11-23 12:05:29 +01:00
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
de948d7692
fix and cleanup routing (closes foodcoops#190)
2013-10-30 02:27:04 +01:00
e4f0a1e3ed
start of making nickname optional
2013-09-20 22:40:13 +02:00
805071f3fb
Added checkbox to ignore warnings. Added translations.
2013-09-04 10:52:14 +02:00
bb25bdc6eb
Improved error data passing.
2013-09-03 17:37:49 +02:00
1c9fad0a7b
Added validation for removed but ordered articles.
2013-09-03 12:09:33 +02:00
f57038ff56
show quantity/tolerance in order screen when unit_quantity=1
2013-07-11 23:20:37 +02:00
f1d6df9ecc
move commonly used verbs to common i18n identifier
2013-04-04 02:49:52 +02:00
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
07581b7ecf
Removed acts_as_paranoid. Implemented own version.
2013-03-16 17:57:38 +01:00
20533a5163
fix orders i18n
2013-02-11 15:34:31 +01:00
2d58054d1c
added order for interpolation
2013-02-10 15:05:31 +07:00
e06524ca37
finish ordergroups and orders i18n + controller
2013-02-08 01:52:20 +01:00
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
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
c17ff281c3
Save and display creator of Order
2012-11-12 14:24:49 +01:00
f4f10b1e4c
Introduced actionbar. Some fixes for balancing page.
2012-11-12 13:13:01 +01:00
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
16de9124fe
Fixes orders.
2012-10-30 00:20:47 +01:00
f30e57dd49
Fixed articles views.
2012-10-19 01:12:47 +02:00
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
92649d3053
Removed acts_as_ordered. Fixed bug in group_orders archive.
2012-10-03 20:08:54 +02:00
eb532babd6
Refactored pdf generation with newest prawn.
2012-10-02 02:50:48 +02:00
ec2e761e7f
Fixed multi coop routing and changed config accessors.
2012-08-24 19:52:38 +02:00
4a8e286d98
Fixed encoding issues with ruby > 1.9.2..
2012-04-16 08:49:54 +02:00
ad508b207b
Updated to rails 3.0.12. remove old gettext code.
2012-04-15 19:59:39 +02:00
b3c64ecb85
Fixed order views.
2011-06-20 00:26:17 +02:00
88b268cb0b
Refactoring of order comments.
2011-06-19 20:47:27 +02:00
38b5dcba1f
Refactored ordering part two. Integrated stock order.
2011-06-19 19:56:04 +02:00
afb2c26ab3
Fixed orders form.
2011-06-10 13:53:51 +02:00
fbf6a283a0
Fixed bug in orders index if order.ends.nil?
2010-06-19 12:25:35 +02:00
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
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
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
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
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
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
a29053b4e9
Some language fixes. Finished migration path.
2009-03-01 18:45:34 +01:00
951d19db6a
Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views!
2009-02-12 18:32:20 +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
6202e05841
Last part of order refactoring. Now order_article create/update is possible.
2009-02-09 20:12:56 +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
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
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
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
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
wvengen
Julius
Robert Waltemath
Benjamin Meichsner
Manuel Wiedenmann
Benjamin Meichsner
sandoz