wvengen
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
wvengen
d08f120b27
show message when ignoring articles due to missing order number
2014-01-24 22:20:29 +01:00
wvengen
23b38b5a46
fix category heading
2013-10-10 19:22:43 +02:00
Benjamin Meichsner
71e02ab569
Merge branch 'rails3' into rails3-to-master
...
Conflicts:
app/views/suppliers/shared_suppliers.haml
2013-09-02 13:31:40 +02:00
wvengen
76645ebd12
add default tax percentage to app_config
2013-07-06 23:11:50 +02:00
wvengen
3da27734c7
allow import of files with categories that do not exist (map to no category)
2013-07-06 17:49:10 +02:00
Benjamin Meichsner
25fbb47320
Merge branch 'rails3-allow-multiple-suppliers' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-rails3-allow-multiple-suppliers
2013-06-12 10:40:20 +02:00
Robert Waltemath
c194d2545f
Allowing SharedSuppliers to have multiple Suppliers. Should fix bennibu#107.
2013-06-04 11:28:25 +02:00
wvengen
5e2a3fb3f0
fix articles controller i18n
...
Conflicts:
app/controllers/articles_controller.rb
2013-04-12 16:17:12 +02:00
wvengen
f6ba21832d
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/articles_controller.rb
app/views/articles/_form.html.haml
app/views/articles/sync.html.haml
app/views/finance/balancing/_edit_note.html.haml
app/views/finance/group_order_articles/_form.html.haml
app/views/finance/order_articles/_edit.html.haml
app/views/finance/order_articles/_new.html.haml
app/views/group_orders/show.html.haml
app/views/invites/_modal_form.html.haml
2013-04-12 15:45:24 +02:00
Benjamin Meichsner
13e921a632
Fixed some errors in articles#sync. Show better error messages.
2013-04-08 01:00:49 +02:00
wvengen
75a1051668
finish articles i18n, controller+model
2013-03-22 00:59:42 +01:00
Benjamin Meichsner
e275403cdd
Do not destroy articles in supplier sync. Mark them as deleted.
2013-03-18 19:05:11 +01:00
Benjamin Meichsner
07581b7ecf
Removed acts_as_paranoid. Implemented own version.
2013-03-16 17:57:38 +01:00
Julius
a511da9ae3
Prevent stock_articles from appearing in supplier article index
2013-01-30 21:21:49 +01:00
benni
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
benni
fc1c173718
Fixed articles module.
2012-10-28 18:03:50 +01:00
benni
f30e57dd49
Fixed articles views.
2012-10-19 01:12:47 +02:00
benni
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +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
3f133bb8c3
Added client side validations. Fixed shared sync.
2011-05-19 22:35:13 +02:00
benni
013637a4fc
Refactored shared article import. Added meta search gem.
2011-05-19 22:22:05 +02:00
benni
1e33411516
refactored some js stuff. Fixed forms in article modul.
2011-05-19 19:49:37 +02:00
benni
9388e918a7
Implemented fancy box for ajax forms. Refactored articles modul.
2011-05-18 17:37:10 +02:00
benni
0decbb36e1
Refactored article_categories.
2011-05-18 16:10:30 +02:00
Benjamin Meichsner
27bec1f860
Remember per_page number when updating multiple articles. Closes #36
2009-08-13 17:23:14 +02: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
053593f718
Translations for articles-pages.
2009-02-10 13:26:10 +01:00
Benjamin Meichsner
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
Benjamin Meichsner
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
Benjamin Meichsner
ff6b460cfc
Improved delivery-invoice-workflow.
2009-01-18 17:42:51 +01:00
Benjamin Meichsner
936e6ef69a
Refactoring of articles and article_categories. articles are now a nested resource of supplier.
2009-01-16 16:19:26 +01:00
Benjamin Meichsner
5b9a7e05df
Initial commit of foodsoft 2
2009-01-06 11:49:19 +01:00
