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

761 Commits

Author SHA1 Message Date
wvengen e20898c5ee Merge branch 'tests-rspec' into master-spec 2013-09-10 11:37:05 +02:00
wvengen 12c0636941 fix i18n buglets (closes #167) 2013-09-10 10:27:13 +02:00
wvengen 7de57715f2 Merge branch 'master' into tests-rspec 
Conflicts:
	Gemfile
 2013-09-07 01:11:24 +02:00
Benjamin Meichsner a0760ebfdb Fixed delivering emails to users. 
There was a bug in User#receive_email? Return values are now true or false, not '1' or '0'.
 2013-09-06 11:40:40 +02:00
Robert Waltemath 9f22615a25 Order tasks with same date by name. 2013-09-05 10:16:57 +02:00
Robert Waltemath 805071f3fb Added checkbox to ignore warnings. Added translations. 2013-09-04 10:52:14 +02:00
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 bb20e9abea Merge branch 'master' into tests-rspec 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-07-24 21:25:36 +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
Manuel Wiedenmann c85a7fcc5c fixes User#receive_email? 2013-07-18 16:58:04 +02:00
Manuel Wiedenmann dfe1cee4cd german i18n + mini fix 2013-07-18 16:23:29 +02:00
Manuel Wiedenmann 0401572580 Merge pull request #1 from foodcoop-adam/extended-i18n 
cleanup of profile layout + set session on login
 2013-07-18 07:19:20 -07:00
Manuel Wiedenmann 206709aa61 sets session[:locale] = user.locale after login 2013-07-18 16:09:32 +02:00
wvengen b81472d91b Merge pull request #159 from foodcoop-rostock/improve-delivery-workflow-further-stupid 
Move client-side sorting into separate javascript file.
 2013-07-17 01:54:18 -07:00
wvengen ebe93e292b Merge pull request #141 from foodcoop-rostock/improve-delivery-workflow-further 
Improve delivery workflow
 2013-07-17 01:43:59 -07:00
Julius 9f464706b4 Undo senseless indentation correction 2 2013-07-16 22:04:44 +02:00
Julius 3b91b9f7c6 Undo senseless indentation correction 2013-07-16 22:03:47 +02:00
Julius 7fd8abf381 Replace 'own' js table sorting by stupidtable plugin 2013-07-16 22:01:56 +02:00
Julius 4fafdcb7ad Remove broken font-size fix which is no longer needed 2013-07-15 21:58:09 +02:00
wvengen db80fbd807 Merge branch 'master' into tests-rspec 2013-07-15 18:45:04 +02:00
wvengen 5e9a49b2c7 make uniqueness_of_name validations work again (closes foodcoops/foodsoft#157) 2013-07-15 18:03:02 +02:00
wvengen 3ed8e0bc84 allow longer supplier phone number 2013-07-15 17:57:00 +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 12506e54b8 Remove stock_changes_helper.rb 2013-07-13 09:34:19 +02:00
Julius 730dc7cf2a Move StockChanges#index to StockArticles#history 2013-07-13 09:32:27 +02:00
Julius edaf91b029 Inline before_filter of stock_changes_controller 2013-07-12 22:19:11 +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
Julius 7c27017306 Link delivery/stock_taking/order in stock_changes index 2013-07-11 18:37:55 +02:00
Julius ffcb9490c9 Make stock_changes readonly in index view 2013-07-11 18:20:24 +02:00
Robert Waltemath 65c0b555c2 Added warning/ hint when updating periodic task. 2013-07-11 10:30:55 +02:00
wvengen 2ef7e58b0b Merge pull request #146 from foodcoop-adam/add-only-undeleted-articles 
only add undeleted articles in balancing screen
 2013-07-10 13:05:50 -07:00
wvengen 33d3b9c466 merge branch minimum_balance into master (closes #133) 2013-07-10 22:03:57 +02:00
Julius de9541a0df Ask how to fetch readonly associations 2013-07-09 21:49:39 +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
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 5fcc14a36d Fix trailing '*/' in application.css 2013-07-08 20:46:05 +02:00
wvengen 1eeec23c80 only add undeleted articles in balancing screen 2013-07-08 02:31:54 +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 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
wvengen a6688b3b43 import manufacturer and origin too (closes #140) 2013-07-06 17:48:40 +02:00
wvengen 497c9e0cf1 fix closed group_order totals 2013-07-02 12:01:25 +02:00
wvengen d7540bdd20 fix i18n key 2013-06-30 13:08:13 +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
wvengen 9d406bbc08 make resque worker function on non-multi-coop-installs too 2013-06-29 01:48:57 +02:00
wvengen 0978b84f4d set user language on login to override session 2013-06-28 13:30:26 +02:00
Robert Waltemath e5d790021c Add repeated symbol to task list. 2013-06-27 10:22:22 +02:00
Julius 69060a6da6 Fix ordering of stock_changes in delivery 2 2013-06-27 09:10:46 +02:00
Julius d0ccf07bc5 Merge latest changes in master of http://github.com/foodcoops/foodsoft 2013-06-26 20:23:11 +02:00
Julius a29d52dcae Fix ordering of stock_changes in delivery (case-insensitive ordering did not work properly for all database flavors) 2013-06-26 20:14:33 +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 befe89d4ef fix tolerance display in group_order form 2013-06-26 01:36:44 +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
wvengen 7dbe1363ed fix adding article balancing failing with 'already taken' (closes foodcoops/foodsoft#125) 2013-06-24 13:32:07 +02:00
Robert Waltemath c27127c745 Added i18n strings. 2013-06-24 11:53:52 +02:00
Robert Waltemath 3d1faa9ed3 Skip save callback when migrating data. 2013-06-24 10:36:14 +02:00
Robert Waltemath d081a2c66b Validate done/weekly combination only on creation of task. 2013-06-24 09:49:06 +02:00
Robert Waltemath 577945e591 Add validation for task.done in combination with periodic task. 2013-06-22 18:56:17 +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 ef329b5647 Added up and down migration for weekly task data. 2013-06-22 17:35:45 +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
wvengen 931b3bef5e fix touch event twice bug (complements ac62dcce9d) 2013-06-20 01:20:13 +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
Julius cc5574f8b5 Revert ac62dcce9d 2013-06-18 09:10:31 +02:00
wvengen 1e984df3aa more beautiful ordergroup edit form 2013-06-18 01:35:12 +02:00
Julius 6e6cce1cb7 Add Select2 jQuery plugin 2013-06-17 16:15:19 +02:00
Julius 9502ca28dd Merge latest changes in master 2013-06-17 15:47:08 +02:00
Julius a9938df443 Clean up sort functionality; Remove title attributes due to hard I18n 2013-06-17 15:43:42 +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