Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
2,329 Commits 22 Branches 1 Tag 31 MiB
Commit Graph

23 Commits

Author SHA1 Message Date
wvengen 6ce1b7f928 Handle errors in upload and sync form 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 647b7f0430 allow to synchronize all articles of a shared supplier 2014-09-02 12:58:31 +02:00
wvengen 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
wvengen c322545f85 fix i18n buglet 2014-02-06 10:15:20 +01:00
wvengen d08f120b27 show message when ignoring articles due to missing order number 2014-01-24 22:20:29 +01:00
wvengen a9dff7f1df add missing i18n 2013-10-04 10:25:53 +02:00
wvengen bbcad49831 start moving from simple_form i18n to activerecord 2013-10-03 16:03:13 +02:00
wvengen 1674dcf851 fix i18n of article sync 2013-10-03 14:36:53 +02:00
Benjamin Meichsner eee5d4a896 Fixed indentation bug in sync template. 2013-06-16 15:10:50 +02:00
Julius 9753e6db00 Resolve merge conflicts with i18n 2013-06-10 20:05:47 +02:00
Robert Waltemath b7416b2210 Fixed percent sign in sync-view. 2013-06-10 11:01:31 +02:00
Julius 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
Julius 0f4614eb31 Add percent sign for tax in forms 2013-06-06 17:58:02 +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 f1d6df9ecc move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
wvengen aabeb1a332 finish articles i18n 2013-03-22 00:20:37 +01:00
Benjamin Meichsner 329c451774 Fixed articles sync view. 2013-03-17 17:47:37 +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
Renamed from app/views/articles/sync_articles.haml (Browse further)