|
|
12adfe4289
|
update article category implemented
|
2023-02-20 19:56:45 +01:00 |
|
|
|
3ffdb424d5
|
replace deprecated update_attributes with update
|
2022-10-26 13:19:27 +02:00 |
|
Patrick Gansterer
|
ea2862fdef
|
Run rubocop --fix-layout and remove encoding comments
|
2021-03-02 09:12:19 +01:00 |
|
JuliusR
|
4043433539
|
fix searching in external article database (#772)
|
2020-10-17 12:21:04 +02:00 |
|
Patrick Gansterer
|
5a9cc811c9
|
Add download for articles
|
2020-06-22 16:35:22 +02:00 |
|
Patrick Gansterer
|
2100c738af
|
Change deprecated *_filter methods to *_action
|
2019-10-29 09:41:01 +01:00 |
|
JuliusR
|
71bdf3bfcc
|
Allow to copy articles (PR #673, #541)
|
2019-10-14 07:25:34 +00:00 |
|
wvengen
|
25deefced1
|
Move setting availability to sync method
|
2019-03-24 22:14:10 +01:00 |
|
wvengen
|
6a7b0ae409
|
Fix sync ignored article count
|
2016-04-16 21:15:53 +02:00 |
|
wvengen
|
b07e855235
|
Make compatible with Ruby 2.0
|
2015-06-05 15:35:19 +02:00 |
|
wvengen
|
5d47171b76
|
Improve upload error handling
|
2015-04-17 18:44:38 +02:00 |
|
wvengen
|
c30ec67548
|
Allow synchronising units when uploading
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
4d1e102f47
|
Checkbox to remove articles not in upload
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
6ce1b7f928
|
Handle errors in upload and sync form
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
d5a7f6a074
|
Move file import logic to model
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
16e9210035
|
Fix title of new upload screen
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
07ba6f0535
|
Import multiple spreadsheet formats. Make upload work like sync.
|
2015-04-11 02:52:57 +02:00 |
|
wvengen
|
7e0aa66936
|
Use more boolean comparators where it makes sense
|
2015-01-14 22:56:32 +01:00 |
|
wvengen
|
ee1874a15f
|
fix upload error
|
2014-09-10 14:42:44 +02:00 |
|
wvengen
|
647b7f0430
|
allow to synchronize all articles of a shared supplier
|
2014-09-02 12:58:31 +02:00 |
|
wvengen
|
d9c61b2db3
|
allow to match category names on import/sync
|
2014-09-02 12:58:31 +02:00 |
|
wvengen
|
0014435663
|
improved shared database import ui
|
2014-05-13 17:01:24 +02:00 |
|
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 |
|
