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
6745b79bb9
Allow importing articles again, when article was deleted before.
2013-03-17 20:02:14 +01:00
329c451774
Fixed articles sync view.
2013-03-17 17:47:37 +01:00
07581b7ecf
Removed acts_as_paranoid. Implemented own version.
2013-03-16 17:57:38 +01:00
50873addf8
Fixed deleting of articles. Added missing id.
2013-03-09 16:46:33 +01:00
cb537bc11c
start articles i18n
2013-03-09 00:40:07 +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
1d9815731c
Removed fancybox. Fixed profile, my ordergroup and tasks.
2012-11-12 09:18:44 +01:00
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
fc1c173718
Fixed articles module.
2012-10-28 18:03:50 +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
e9383e0d17
Remove searching shared articles by list.
...
This is necessary to go with newest fixes in sharedlists app.
2012-10-13 22:19:01 +02:00
4a8e286d98
Fixed encoding issues with ruby > 1.9.2..
2012-04-16 08:49:54 +02:00
3f133bb8c3
Added client side validations. Fixed shared sync.
2011-05-19 22:35:13 +02:00
013637a4fc
Refactored shared article import. Added meta search gem.
2011-05-19 22:22:05 +02:00
1e33411516
refactored some js stuff. Fixed forms in article modul.
2011-05-19 19:49:37 +02:00
9388e918a7
Implemented fancy box for ajax forms. Refactored articles modul.
2011-05-18 17:37:10 +02:00
27bec1f860
Remember per_page number when updating multiple articles. Closes #36
2009-08-13 17:23:14 +02: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
a0e10141dc
Translations and other little improvements.
2009-02-12 21:38:41 +01:00
053593f718
Translations for articles-pages.
2009-02-10 13:26:10 +01:00
6fd5d825f9
Order-refactoring part II.
2009-02-03 21:14:48 +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
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
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
5b9a7e05df
Initial commit of foodsoft 2
2009-01-06 11:49:19 +01:00
wvengen
Benjamin Meichsner
Benjamin Meichsner
sandoz