viehlieb
4b5775e107
include foodsoft-article-import
...
use filetypes for manual uploading bnn, odin, foodsoft file
use opts in .parse
adapt specs to include file format
add specs for odin, bnn, foodsoft files
adapt localize input to remove ',' separator and replace with '.'
remove depr foodsoftfile.rb and spreadsheet.rb
remove todo
2023-02-24 18:54:33 +01:00
viehlieb
5c04a43f61
update article category implemented
...
adapt tests
add translations
adapt test
fix bug
2023-02-24 18:54:32 +01:00
4043433539
fix searching in external article database ( #772 )
2020-10-17 12:21:04 +02:00
5a9cc811c9
Add download for articles
2020-06-22 16:35:22 +02:00
6d9c35db20
Move to apparition for integration tests
2019-10-28 17:58:14 +00:00
71bdf3bfcc
Allow to copy articles (PR #673 , #541 )
2019-10-14 07:25:34 +00:00
366d92e421
Fix sync with unavailable by default ( #649 )
2019-04-03 18:53:23 +02:00
c62104a388
Get rid of duplicated confirm_delete translations
2016-03-04 23:13:28 +01:00
c30ec67548
Allow synchronising units when uploading
2015-04-11 02:52:57 +02:00
4d1e102f47
Checkbox to remove articles not in upload
2015-04-11 02:52:57 +02:00
6ce1b7f928
Handle errors in upload and sync form
2015-04-11 02:52:57 +02:00
0d92007274
Improve upload form
2015-04-11 02:52:57 +02:00
16e9210035
Fix title of new upload screen
2015-04-11 02:52:57 +02:00
07ba6f0535
Import multiple spreadsheet formats. Make upload work like sync.
2015-04-11 02:52:57 +02:00
507651f5ba
Move small close button to helper.
...
Workaround for show order deface override nuking attributes of the close button.
2015-04-10 18:58:51 +02:00
647b7f0430
allow to synchronize all articles of a shared supplier
2014-09-02 12:58:31 +02:00
16b78ba2a0
fix shared import paging without query
2014-09-02 12:58:31 +02:00
e7a476e6b6
remove unused season import fields
2014-06-23 17:51:19 +02:00
0014435663
improved shared database import ui
2014-05-13 17:01:24 +02:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
2de4a2a3a0
Merge pull request #256 from wvengen/feature-partial_shared_sync
...
Small change to allow non-shared articles with shared suppliers
2014-02-07 11:24:33 +01:00
c322545f85
fix i18n buglet
2014-02-06 10:15:20 +01:00
d08f120b27
show message when ignoring articles due to missing order number
2014-01-24 22:20:29 +01:00
699be6a6d9
introduce new layout in balancing article screen as well
2013-12-23 16:11:14 +01:00
3f497e9274
allow more than two columns in horizontal form
2013-12-10 23:41:45 +01:00
85b6ff908b
make new article dialog more responsive
2013-12-10 16:41:26 +01:00
58de1a231b
update price during editing as well
2013-12-10 13:30:15 +01:00
62ca3cb634
small layout cleanup [ci skip]
2013-12-06 14:49:13 +01:00
2f10210c76
remove unimplemented unit_divide box
2013-12-06 14:38:28 +01:00
c99aa7aab6
add availability to article edit dialog
2013-12-06 14:33:51 +01:00
923b579bd1
Merge branch 'master' into article-dialog
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
2013-12-06 14:26:50 +01:00
1c4b9591a2
fix edit article dialog title
2013-12-06 12:34:14 +01:00
05b934e79f
update fc price dynamically in article edit form
2013-12-06 12:19:13 +01:00
84191ddcd0
first shot on improving edit article form
...
(see also foodcoops#209)
2013-11-20 23:46:11 +01:00
de948d7692
fix and cleanup routing (closes foodcoops#190)
2013-10-30 02:27:04 +01:00
23b38b5a46
fix category heading
2013-10-10 19:22:43 +02:00
a9dff7f1df
add missing i18n
2013-10-04 10:25:53 +02:00
bbcad49831
start moving from simple_form i18n to activerecord
2013-10-03 16:03:13 +02:00
1674dcf851
fix i18n of article sync
2013-10-03 14:36:53 +02:00
a6688b3b43
import manufacturer and origin too ( closes #140 )
2013-07-06 17:48:40 +02:00
eee5d4a896
Fixed indentation bug in sync template.
2013-06-16 15:10:50 +02:00
9753e6db00
Resolve merge conflicts with i18n
2013-06-10 20:05:47 +02:00
b7416b2210
Fixed percent sign in sync-view.
2013-06-10 11:01:31 +02:00
ff343933dd
Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-show-percent-sign-in-views
2013-06-07 09:49:32 +02:00
0f4614eb31
Add percent sign for tax in forms
2013-06-06 17:58:02 +02:00
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
6c65799025
use more beautiful close mark
2013-04-10 17:34:24 +02:00
4966aae0ad
Fixed modal forms. Submit form when hitting enter.
2013-04-08 14:27:23 +02:00
13e921a632
Fixed some errors in articles#sync. Show better error messages.
2013-04-08 01:00:49 +02:00
f1d6df9ecc
move commonly used verbs to common i18n identifier
2013-04-04 02:49:52 +02:00
viehlieb
JuliusR
Patrick Gansterer
wvengen
wvengen
Benjamin Meichsner
Julius
Robert Waltemath