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

545 Commits

Author SHA1 Message Date
Robert Waltemath bb25bdc6eb Improved error data passing. 2013-09-03 17:37:49 +02:00
Robert Waltemath 1c9fad0a7b Added validation for removed but ordered articles. 2013-09-03 12:09:33 +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 37e5b0c25c add balancing integration spec 2013-07-26 18:34:03 +02:00
wvengen b9599ce455 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
 2013-07-18 20:28:56 +02:00
wvengen 74bfc85562 Merge remote-tracking branch 'fsmanuel/master' into master. 
Updated migration date to today.

Conflicts:
	db/schema.rb
 2013-07-18 18:48:49 +02:00
wvengen 1fed9834b3 fix tooltip after bootstrap update 2013-07-17 11:31:27 +02:00
wvengen eef4626107 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
	app/views/deliveries/_form.html.haml
 2013-07-17 11:04:28 +02:00
Julius 7fd8abf381 Replace 'own' js table sorting by stupidtable plugin 2013-07-16 22:01:56 +02:00
wvengen 9fb6597980 Merge branch 'master' into updated-gems 2013-07-16 00:00:55 +02:00
Julius 0e66414534 Allow creation of StockArticles also if there are no Articles for a supplier in delivery form 2013-07-14 22:00:38 +02:00
Julius b303b48853 Merge branch 'master' into improve-delivery-workflow-further 2013-07-13 21:08:50 +02:00
wvengen 126f7e7459 Merge pull request #150 from foodcoop-rostock/stock_article_quantity_history 
Show StockChanges index
 2013-07-13 03:16:31 -07:00
Julius 730dc7cf2a Move StockChanges#index to StockArticles#history 2013-07-13 09:32:27 +02:00
Julius e5eff07abd Move Select2 for stock_article_creation to tfoot of delivery form 2013-07-12 21:15:12 +02:00
wvengen f57038ff56 show quantity/tolerance in order screen when unit_quantity=1 2013-07-11 23:20:37 +02:00
wvengen db8a929f0b Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks 
Great!
 2013-07-11 12:48:41 -07:00
Julius 469abb753d Merge branch 'master' into improve-delivery-workflow-further 2013-07-11 19:24:37 +02:00
Julius 620686fa46 Merge branch 'master' into stock_article_quantity_history 2013-07-11 19:23:52 +02:00
wvengen 33d3b9c466 merge branch minimum_balance into master (closes #133) 2013-07-10 22:03:57 +02:00
Julius ef62a18ac9 Add StockChanges index 2013-07-09 21:46:04 +02:00
Julius 5ed2659bc6 Fix StockArticle update in Delivery form 2013-07-09 17:08:59 +02:00
Julius 164b3f7415 Replace deprecated $.fn.live in delivery form 2013-07-08 22:49:49 +02:00
wvengen 33b27d2fa7 proper usage of jQuery.on(), and update javascript in views as well 2013-07-08 22:41:06 +02:00
Julius f76b9da1e9 Separate columns for article price and unit in delivery form 2013-07-08 22:19:27 +02:00
Julius a6228bdcf2 Style bootstrap tooltip; show FC share in article price info 2013-07-08 22:10:36 +02:00
Julius bba70dc875 Change DOM sort style to match existing style 2013-07-08 21:51:15 +02:00
Julius ff1317b17b Add hint to copy stock_article if price change desired in delivery process 2013-07-08 21:02:43 +02:00
Julius Rapp a5565b436f Resolve merge conflicts 2013-07-07 14:58:57 +02:00
Julius Rapp 1ebd4e3ce6 Use foodsoft button and table styles (no btn-group, no table-condensed) 2013-07-07 14:19:30 +02:00
Julius Rapp 4a208c83c0 Separate actions for new StockArticle 2013-07-07 14:14:32 +02:00
wvengen d397132f7b be safe even with locale string 2013-07-07 02:31:42 +02:00
wvengen 8080cd6b7e pass locale to datepicker, use gem for that 2013-07-07 01:47:22 +02:00
wvengen a6688b3b43 import manufacturer and origin too (closes #140) 2013-07-06 17:48:40 +02:00
wvengen b807e9d059 beautify order mail 2013-06-29 02:54:00 +02:00
wvengen f11d10ff07 update order result mail (fixing html quoting of quotes) 2013-06-29 02:22:01 +02:00
Robert Waltemath e5d790021c Add repeated symbol to task list. 2013-06-27 10:22:22 +02:00
Julius d0ccf07bc5 Merge latest changes in master of http://github.com/foodcoops/foodsoft 2013-06-26 20:23:11 +02:00
Julius 8a79dfd167 Add tooltip for article prices 2013-06-26 20:06:38 +02:00
Julius 2ee7f716ae Improve delivery validation: StockArticles must not be associated more than once 2013-06-26 17:58:55 +02:00
Julius dd70b84ef0 Linearize and clean up delivery form 2013-06-26 15:16:52 +02:00
wvengen c31e864c73 internationalise currency in order screen 2013-06-26 01:17:04 +02:00
wvengen dddd11d8f0 do not autocapitalize or autocorrect on login fields to avoid login errors on iPad/iPhone 2013-06-26 00:42:09 +02:00
Robert Waltemath c27127c745 Added i18n strings. 2013-06-24 11:53:52 +02:00
Robert Waltemath a7fd7a7936 Removed obsolete code of old workgroup-centric weekly task concept. 2013-06-22 18:14:11 +02:00
Robert Waltemath 990397a7f0 Delete only the FOLLOWING tasks. 2013-06-21 22:04:36 +02:00
Robert Waltemath c52e482743 Exclude tasks from groups when changing attributes. 2013-06-21 20:54:24 +02:00
wvengen cab6ada8b8 small invoice i18n cleanup/refactoring 2013-06-21 14:24:05 +02:00
wvengen 906093b3ce small i18n fixes and clarifications 2013-06-21 13:49:34 +02:00
Robert Waltemath 6b62fc90d8 Now creating periodic task via button 2013-06-21 13:48:48 +02:00
wvengen 3cfd8b2d44 fix i18n key 2013-06-21 13:25:52 +02:00
Julius bf32e72414 Improve delivery form validation 2013-06-19 11:21:55 +02:00
wvengen c48ce138f3 cleanup of profile layout 2013-06-18 12:25:05 +02:00
Julius 04c9770e80 Complete I18n 2013-06-18 10:59:53 +02:00
Julius cc1a839246 Allow to create stock_article as copy of article in delivery form 2013-06-18 10:48:19 +02:00
wvengen 1e984df3aa more beautiful ordergroup edit form 2013-06-18 01:35:12 +02:00
Julius 9502ca28dd Merge latest changes in master 2013-06-17 15:47:08 +02:00
Benjamin Meichsner eee5d4a896 Fixed indentation bug in sync template. 2013-06-16 15:10:50 +02:00
Benjamin Meichsner 8c4da55561 Merge branch 'show-percent-sign' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-show-percent-sign 2013-06-16 14:55:48 +02:00
Manuel Wiedenmann 6569579c02 styles the preferences in user profile 2013-06-14 22:38:07 +02:00
Julius b5acd9b116 Merge master branch of base 2013-06-14 18:59:17 +02:00
Manuel Wiedenmann 5b7ec86ed6 Merge branch master into i18n 2013-06-14 02:02:57 +02:00
Julius 3a48d1576f Remove broken sort-by-price; comment redundancy of stock_change template 2013-06-13 23:51:37 +02:00
Julius 65f61e09d5 Improve delivery workflow; introduce sortable tables; use js.erb for deliveries 2013-06-13 23:36:22 +02:00
wvengen 3d1847fabb small i18n and translation updates 2013-06-12 22:44:51 +02:00
Robert Waltemath 4037ef12da Users may delete all tasks of a group, i.e. delete the whole group. 2013-06-12 12:02:13 +02:00
Benjamin Meichsner f4a0e29297 Fixed bug in with new shared multiple suppliers feature. 2013-06-12 10:47:54 +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 46b07a6136 Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks 
Conflicts:
	config/locales/de.yml
 2013-06-12 10:00:11 +02:00
Julius 49cfa9aded Cleanup StockArticle creation during delivery 2013-06-11 15:05:19 +02:00
Julius e28f3eda65 Fix StockArticle creation during delivery; small cleanups 2013-06-11 13:10:18 +02:00
wvengen b7f71f5859 fix reset password breakage by avoiding encoding ampersand in url (closes #123) 2013-06-11 00:01:57 +02:00
Julius 9753e6db00 Resolve merge conflicts with i18n 2013-06-10 20:05:47 +02:00
Robert Waltemath 6bdb7b35f0 Showing/allowing multiple suppliers per shared supplier in shared-supplier-listing. 2013-06-10 11:37:59 +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
Manuel Wiedenmann 0061e45198 removes routes locale constrain and fixes some bugs 2013-06-06 04:29:53 +02:00
Manuel Wiedenmann 60c4c5510a adds a new user settings system + migration + rake task/worker updates 2013-06-06 03:40:15 +02:00
wvengen 8929f69dc4 add missing i18n text 2013-06-06 02:42:38 +02:00
wvengen 3b7cbf71e0 fix i18n typos 2013-05-16 00:05:47 +02:00
wvengen 8b559269c9 add deliveries, pages, tasks translation in English 2013-05-06 12:43:57 +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
wvengen 692c70d324 finish pages i18n 2013-04-12 00:59:45 +02:00
wvengen 1a8c8537a4 finish tasks i18n 2013-04-12 00:00:02 +02:00
wvengen 6c65799025 use more beautiful close mark 2013-04-10 17:34:24 +02:00
wvengen 3f82138d84 finish deliveries i18n 2013-04-10 17:02:16 +02:00
Benjamin Meichsner 93f4239db6 Fixed wrong articles total in group_order#show. 
Conflicts:

	app/views/group_orders/show.html.haml
 2013-04-10 10:54:56 +02:00
Benjamin Meichsner d4b9370541 Fixed setting all user setting to false in user profile. 2013-04-10 10:52:41 +02:00
Benjamin Meichsner 5b81c53a73 Fixed setting all user setting to false in user profile. 2013-04-08 15:08:57 +02:00
Benjamin Meichsner 4966aae0ad Fixed modal forms. Submit form when hitting enter. 2013-04-08 14:27:23 +02:00
Benjamin Meichsner 9c21a14c7e Update group results when editing order article in balancing. 2013-04-08 14:26:40 +02:00
Benjamin Meichsner 220343128c Fixed wrong articles total in group_order#show. 2013-04-08 13:39:02 +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 ec1ef0289b finish i18n of article_categories + translation 2013-04-04 00:44:07 +02:00
wvengen 0bb080526a Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/login_controller.rb
	app/models/message.rb
	app/views/sessions/new.html.haml
 2013-04-04 00:29:50 +02:00
wvengen e1f5969719 use short form plus title for unit quantity 2013-04-04 00:24:14 +02:00
Benjamin Meichsner 915e1b9e79 Fixed bug in reset password error handling. 2013-03-27 22:12:46 +01:00
wvengen aabeb1a332 finish articles i18n 2013-03-22 00:20:37 +01:00