Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
1640 commits 22 branches 1 tag 31 MiB
Commit graph

1089 commits

Author SHA1 Message Date
wvengen
3e1d561a5e fix user form field order and autocompletion 2013-12-22 13:28:33 +01:00
wvengen
df9cff0eee Do not escape mailing list wiki link in the message form (foodcoops#227) 2013-12-22 01:59:33 +01:00
wvengen
537ac52f4e Merge pull request #227 from foodcoop-rostock/fix-escape-new-message-hint 
Do not escape mailing list links in message form
 2013-12-21 16:14:20 -08:00
Julius
3099e740ca Do not escape mailing list links in message form 2013-12-21 22:52:39 +01:00
wvengen
a28c6031a4 fix receive exception when input is set to nil 2013-12-21 17:39:20 +01:00
wvengen
41ea9ed66e hide receive screen for stock orders 2013-12-21 17:36:25 +01:00
wvengen
aa6041d337 show all articles in receive screen (not just of this order) 2013-12-21 17:33:06 +01:00
wvengen
bb331f99a7 fix units_to_order display [ci skip] 2013-12-19 00:45:39 +01:00
wvengen
54e98474b1 remove unused helper [ci skip] 2013-12-18 22:35:01 +01:00
wvengen
68c4affb02 better disabled button 2013-12-18 22:22:34 +01:00
wvengen
3d511ea2fb only show receive in finance when access to ordering 2013-12-18 22:19:36 +01:00
wvengen
7f813f2c0f fix order add_article 2013-12-18 22:16:19 +01:00
wvengen
84fe791078 update balancing screen 2013-12-18 22:10:38 +01:00
wvengen
873a1ff108 update texts 2013-12-18 21:58:15 +01:00
wvengen
4fede30a19 hide invoice columns until implemented 2013-12-18 21:53:31 +01:00
wvengen
82d1c41e9f update show order 2013-12-18 21:46:34 +01:00
wvengen
d299fa4870 move receive screen to orders 2013-12-18 21:08:58 +01:00
wvengen
94b4454a1b add receive to order screen, and distinguish between finished and closed orders to put it in nicely 2013-12-18 19:21:39 +01:00
wvengen
1ab09b41bd fix articles_for_select2 helper 2013-12-18 17:34:45 +01:00
wvengen
2b511ee559 Merge branch 'master' into fresh-flow 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2013-12-18 17:03:26 +01:00
wvengen
a0c6cf8afe fix warning without text 2013-12-18 16:04:30 +01:00
wvengen
94b2c8eac3 Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup 
Conflicts:
	app/views/deliveries/_stock_article_form.html.haml
	config/locales/de.yml
	config/locales/en.yml
 2013-12-17 15:58:47 +01:00
wvengen
b26b124b0c Merge pull request #211 from foodcoop-adam/group_order-cleanup 
make order result calculation a bit cleaner
 2013-12-17 06:29:15 -08:00
wvengen
c5b1236f21 Merge pull request #218 from foodcoop-adam/article-dialog 
Edit article user-interface update
 2013-12-17 06:29:04 -08:00
wvengen
5af82eb55c Merge pull request #219 from foodcoop-rostock/publish-subscribe-from-scratch 
Publish/subscribe pattern for DOM updates after AJAX database manipulation
 2013-12-17 06:28:25 -08:00
wvengen
452db61af8 i18n fix (thanks @JuliusR) 2013-12-14 23:52:59 +01:00
Julius
9b92d6ff10 Mark two i18n issues 2013-12-14 14:48:58 +01:00
wvengen
142e8a0473 i18n fixes 2013-12-14 13:34:58 +01:00
wvengen
4e54388b83 Merge remote-tracking branch 'foodcoop-rostock/question-form-i18n' into feature-i18n-cleanup 2013-12-14 13:20:03 +01:00
wvengen
46ab4dcc01 proper i18n of last ordergroup order (thanks @JuliusR) 2013-12-14 13:15:47 +01:00
wvengen
d67a0083f1 fix price hint escaping (thanks @JuliusR) 2013-12-14 13:15:16 +01:00
Julius
40e9e82295 Mark two i18n issues 2013-12-14 10:03:32 +01:00
wvengen
d448707b1a i18n cleanup (affects foodcoops#137) 2013-12-12 00:13:19 +01:00
wvengen
b53cb36714 give proper block to link_to_ordering (closes #201) 2013-12-11 22:58:50 +01:00
wvengen
e25570d870 Merge remote-tracking branch 'tg-x/master' 
Conflicts:
	app/views/shared/_open_orders.html.haml
 2013-12-11 22:39:37 +01:00
wvengen
3f497e9274 allow more than two columns in horizontal form 2013-12-10 23:41:45 +01:00
wvengen
675f0e6d16 fix workgroup link task list 2013-12-10 19:12:29 +01:00
wvengen
e42e27957d improve task i18n (affects foodcoops#137) 2013-12-10 17:58:32 +01:00
wvengen
da737793e8 workaround help block margin issue [ci skip] 2013-12-10 16:50:04 +01:00
wvengen
85b6ff908b make new article dialog more responsive 2013-12-10 16:41:26 +01:00
wvengen
58de1a231b update price during editing as well 2013-12-10 13:30:15 +01:00
Julius
30b35cdd11 Improve usability of supplier selection for stock_articles in delivery form 2013-12-09 00:03:07 +01:00
Julius
cdb87a8389 Highlight created/updated stock_article in StockArticle#index view 2013-12-07 17:10:40 +01:00
Julius
012327dd7c Slightly cleanup delivery form 2013-12-07 16:57:53 +01:00
Julius
bceabfec5c Apply publish/subscribe pattern to stock_article manipulation in delivery form 2013-12-07 16:42:25 +01:00
Julius Rapp
11117738ce Resolve merge conflicts 2013-12-07 11:50:37 +01:00
Julius Rapp
dd08e277c7 AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates 2013-12-07 11:20:44 +01:00
wvengen
112fa3be23 fix forgotten i18n string (affects foodcoops#137) 2013-12-06 23:08:28 +01:00
wvengen
111c061efa more i18n cleanup (affects foodcoops#137) 2013-12-06 22:53:59 +01:00
wvengen
a475a27f79 i18n cleanup (affects foodcoops#137) 2013-12-06 22:43:36 +01:00
Julius Rapp
e99752e483 disable escape of html from local (one place) 2013-12-06 18:33:35 +01:00
wvengen
62ca3cb634 small layout cleanup [ci skip] 2013-12-06 14:49:13 +01:00
wvengen
2f10210c76 remove unimplemented unit_divide box 2013-12-06 14:38:28 +01:00
wvengen
c99aa7aab6 add availability to article edit dialog 2013-12-06 14:33:51 +01:00
wvengen
923b579bd1 Merge branch 'master' into article-dialog 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2013-12-06 14:26:50 +01:00
wvengen
3937400683 fix modal dialog margin [ci skip] 2013-12-06 14:26:04 +01:00
wvengen
1c4b9591a2 fix edit article dialog title 2013-12-06 12:34:14 +01:00
wvengen
05b934e79f update fc price dynamically in article edit form 2013-12-06 12:19:13 +01:00
wvengen
b1e81dc1d7 make simple_form see that first_name is required 2013-12-03 22:04:22 +01:00
wvengen
c900cf4988 make product redistribution work! 2013-11-27 00:06:25 +01:00
wvengen
2d99141229 only allow to add articles not already present in receive 2013-11-26 13:31:07 +01:00
wvengen
beabe22a01 simplify model 2013-11-26 13:22:44 +01:00
wvengen
9cb9bf6c1a focus newly added input in receive 2013-11-26 13:00:34 +01:00
wvengen
853e8ba9d2 add package images [ci skip] 2013-11-25 15:25:13 +01:00
wvengen
9990e059d4 fix i18n 2013-11-25 15:24:20 +01:00
wvengen
9c340ec08e more clarity whether a number is number units or boxes 2013-11-25 15:13:54 +01:00
wvengen
bd1b932775 add receive screen, quantities for model, redistribution 2013-11-25 14:17:31 +01:00
wvengen
1f08ee4759 Merge remote-tracking branch 'foodcoops/master' into feature-link_to_group_order 
Conflicts:
	app/views/shared/_open_orders.html.haml
 2013-11-25 10:11:56 +01:00
wvengen
810656a53b small link_to_ordering refactoring 2013-11-25 10:04:44 +01:00
wvengen
9a0100e382 Merge pull request #207 from sjmulder/bug/130 
Remove apple-touch-icon link
 2013-11-25 00:39:52 -08:00
wvengen
935fdedd66 hide row when information not present 2013-11-24 02:16:15 +01:00
wvengen
20bd86fe65 make heading_helper work with empty _short translation 2013-11-24 01:59:44 +01:00
wvengen
e5471b9f73 more i18n cleanup 2013-11-24 01:47:34 +01:00
wvengen
652a392b37 simplify i18n and fix some small ui issues 2013-11-23 17:49:43 +01:00
wvengen
135e938d3d i18n cleanups (affects #137) 2013-11-23 12:05:29 +01:00
wvengen
ed9a6cca39 make result calculation a bit cleaner 2013-11-22 23:40:44 +01:00
wvengen
84191ddcd0 first shot on improving edit article form 
(see also foodcoops#209)
 2013-11-20 23:46:11 +01:00
Sijmen Mulder
630aa383cb Remove apple-touch-icon links 
Safari will fall back to request the default touch icons if the href of the
link 404s, so having them point at nothing generates 4 404s for nothing.
 2013-11-19 22:57:55 +01:00
wvengen
66ac3be81f Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
 2013-11-18 11:42:49 +01:00
wvengen
9b47e5d6c4 use dynamic conditional in validation, to enable different foodcoops having different use_nick configuration values 2013-11-18 11:31:30 +01:00
wvengen
588898d7b0 do not error when calling shared_article on non-shared article 2013-11-13 23:20:48 +01:00
tg(x)
de9453fa24 dashboard: link to view order page 2013-11-13 16:42:32 +01:00
wvengen
a5a29aff5c Merge pull request #195 from foodcoop-adam/grouporder-many-products 
Allow large product lists in member order
 2013-11-12 08:41:48 -08:00
wvengen
bb5a67033d Merge pull request #194 from foodcoop-adam/plugin-move 
Better support for plugins (engines) + move wiki to plugin
 2013-11-12 03:46:15 -08:00
wvengen
768796407f Merge pull request #192 from foodcoop-adam/cleanup-stale 
Cleanup unused views&controllers
 2013-11-11 09:05:19 -08:00
wvengen
ce3b89c910 make authentication methods more readable (thanks @fsmanuel) 2013-11-11 16:23:20 +01:00
wvengen
891b9a21c0 fix and improve i18n of "My Ordergroup" 2013-11-09 14:19:54 +01:00
wvengen
ec85c1de44 doc update [ci skip] 2013-11-07 20:46:05 +01:00
wvengen
a535fbc517 allow large product lists in member order 2013-11-05 10:55:28 +01:00
wvengen
f4e4d11bae workaround for integration test problem 2013-11-01 20:27:53 +01:00
wvengen
13c8af3642 use abbr instead of acronym for heading helper 2013-11-01 12:49:21 +01:00
wvengen
f7a0103553 clearer login field name 2013-10-30 21:28:35 +01:00
wvengen
3588962329 remove unused layout 2013-10-30 20:53:01 +01:00
wvengen
fef17604c5 remove unused autocomplete templates 2013-10-30 20:50:56 +01:00
wvengen
5ead67f88c remove unused memberships controller/view 2013-10-30 20:46:59 +01:00
wvengen
6e9954c86f remove user referencing page as it is not being used anyway 2013-10-30 11:04:22 +01:00
wvengen
de948d7692 fix and cleanup routing (closes foodcoops#190) 2013-10-30 02:27:04 +01:00
wvengen
70c12b7c1f move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
wvengen
c37ed74942 Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/foodcoop/users/_users.html.haml
 2013-10-29 19:15:52 +01:00
wvengen
e13ca74df3 fix new user form 2013-10-29 19:11:33 +01:00
wvengen
9ba425aafa fallback for when nick is nil 2013-10-29 19:05:24 +01:00
wvengen
e968919cce beautify map invocations of users 2013-10-29 18:46:55 +01:00
wvengen
3275e9ba31 small i18n bug 2013-10-22 00:09:11 +02:00
wvengen
98e7189d31 Merge branch 'master' into i18n 
Conflicts:
	app/assets/javascripts/application.js
 2013-10-18 12:30:34 +02:00
wvengen
51e6a7aeb0 Merge pull request #149 from foodcoop-adam/updated-gems 
run bundle update and make it work again
 2013-10-18 03:12:59 -07:00
wvengen
e1eb6031c8 load fr translation for datepicker 2013-10-17 16:48:34 +02:00
wvengen
4e61e764df fix haml indentation errors 2013-10-17 16:35:50 +02:00
wvengen
389b45a505 fix stockit i18n reference 2013-10-10 19:23:37 +02:00
wvengen
23b38b5a46 fix category heading 2013-10-10 19:22:43 +02:00
wvengen
d64590a534 more robustness 2013-10-10 17:50:10 +02:00
wvengen
34a4951e28 Merge branch 'master' into i18n 
Conflicts:
	Gemfile
	config/locales/de.yml
	config/locales/en.yml
 2013-10-09 23:57:43 +02:00
wvengen
6c17c17982 i18n simple_form move of fax pdf 2013-10-09 23:41:15 +02:00
wvengen
67e29620f4 i18n simple_form move of invoices 2013-10-09 23:37:08 +02:00
wvengen
6ba971fe15 i18n simple_form move of deliveries 2013-10-09 23:19:40 +02:00
wvengen
c3d22e883d i18n simple_form move of suppliers 2013-10-09 23:12:26 +02:00
wvengen
78c81b194c i18n simple_form move of foodcoop 2013-10-09 23:00:07 +02:00
wvengen
552af7925d i18n simple_form move of tasks 2013-10-09 22:41:23 +02:00
wvengen
762292ef8e small i18n move 2013-10-09 22:29:19 +02:00
wvengen
b8ff431634 clean up price tooltips javascript 2013-10-09 10:43:41 +02:00
wvengen
bdce1b5872 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-10-09 10:37:02 +02:00
Julius
28644dc334 Force update in Order#finish; rescue if error raised 2013-10-08 19:58:11 +02:00
wvengen
a32a3757d2 Merge pull request #180 from foodcoop-rostock/search-article-list-modified 
Search articles in group_orders form
 2013-10-08 02:21:35 -07:00
Julius
10d1615cd8 Prepare tooltip for next bootstrap version (as in 1fed9834b3) 2013-10-05 22:28:04 +02:00
Julius
3a948e9b73 Move list.js extensions to plugins 2013-10-04 18:28:45 +02:00
wvengen
dce92b9d7c i18n ordering javascript 2013-10-04 15:01:24 +02:00
wvengen
64a597c689 use i18n-js 2013-10-04 15:01:10 +02:00
wvengen
a9dff7f1df add missing i18n 2013-10-04 10:25:53 +02:00
Julius
ac1341d5b0 Merge branch 'master' of http://github.com/foodcoops/foodsoft into article-price-tooltip 2013-10-03 23:22:31 +02:00
Julius
9a9a782bc4 Complete StockArticle#show view 2013-10-03 23:21:53 +02:00
Julius
fef8c6d99f Move StockArticle#history to StockArticle#show 2013-10-03 22:24:21 +02:00
Julius
a3e82f5304 Add article price tooltip to StockTaking form 2013-10-03 22:14:41 +02:00
Julius
26e207aeb1 Reuse some list.js standard template functions (thanks to wvengen https://gist.github.com/wvengen/6784056) 2013-10-03 16:10:18 +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
wvengen
1870276cd2 show user name with use_nick is false 2013-10-02 23:43:09 +02:00
wvengen
1946cd1ab3 make user creation possible again 2013-10-02 23:33:24 +02:00
wvengen
bc5795b052 small model change 2013-10-02 23:29:21 +02:00
wvengen
17bbb0705b fix i18n 2013-10-02 17:23:49 +02:00
wvengen
a8ace3bc79 add missing i18n 2013-10-02 17:13:49 +02:00
wvengen
1d8fefcfb7 small i18n update 2013-10-02 17:08:24 +02:00
wvengen
6cfaa4979a show lines with zero units but with member orders in balancing screen (closes foodcoops/foodsoft#179) 2013-10-02 16:32:29 +02:00
Julius
d36f2dd4ac Fix minor delivery bug 2013-09-30 11:04:55 +02:00
Julius
c1ac95e440 list.unlist.js: Use jQuery's toggleClass instead of native if-else (just for briefness) 2013-09-25 20:58:53 +02:00
Julius
a87ced2646 Hide article category if no article matches the search 2013-09-24 21:21:08 +02:00
Julius
9f083dd4d0 Add button to clear article search (list.js customization) 2013-09-23 21:31:54 +02:00
Julius
3c8f56b24f Add dismiss button to sidebars in group_order form (idea stolen from foodcoops#143) 2013-09-22 22:07:34 +02:00
Julius
6ec81ace18 Always show article category headers (do not unlist them on list.js search) 2013-09-22 22:04:29 +02:00
Julius
891293af84 Add delay to list.js search 2013-09-22 21:50:59 +02:00
wvengen
ea3db22306 user display changes in model and mailer 2013-09-22 14:38:56 +02:00
wvengen
f6c2fd9a9d more user display changes 2013-09-22 02:15:35 +02:00
wvengen
6d3db7636a make search work without nickname usage 2013-09-20 23:18:06 +02:00
wvengen
17c1ee803f fix typo breaking invitation 2013-09-20 23:15:44 +02:00
wvengen
e4f0a1e3ed start of making nickname optional 2013-09-20 22:40:13 +02:00
wvengen
a77c3b59b1 allow to login with email instead of nick as well + tests 2013-09-20 22:39:19 +02:00
Benjamin Meichsner
2060261c89 Merge pull request #144 from foodcoop-adam/fix-closed-group_order-totals 
fix closed group_order totals
 2013-09-19 03:14:40 -07:00
Julius
14d4d2f12d Add list.js for filtering articles (another try for foodcoops#143) 2013-09-18 23:28:18 +02:00
wvengen
c7f28a3b5c use plain Ruby memoization to fix deprecation (closes #121) 2013-09-18 22:46:58 +02:00
wvengen
ebb22ccb53 Merge branch 'master' into fix-closed-group_order-totals 
Conflicts:
	db/schema.rb
 2013-09-18 18:14:07 +02:00
Benjamin Meichsner
b015ceea0b Merge branch 'warn-uncheck-ordered-article' of https://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-warn-uncheck-ordered-article 2013-09-18 17:50:30 +02:00
Benjamin Meichsner
857eb64a45 Merge pull request #173 from foodcoop-adam/keep-member-order-on-orderarticle-deletion 
Keep member order on orderarticle deletion
 2013-09-18 08:32:33 -07:00
Benjamin Meichsner
7e659e2374 Merge branch 'order-display-improvements' of https://github.com/foodcoop-adam/foodsoft into foodcoop-adam-order-display-improvements 2013-09-18 17:16:04 +02:00
wvengen
0abb63279f Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
 2013-09-18 13:00:26 +02:00
Robert Waltemath
142de28ade Split up messages for stock/ supplier orders. 2013-09-18 10:50:56 +02:00
Robert Waltemath
e728e76729 Merge branch 'master' into warn-uncheck-ordered-article 2013-09-17 17:10:56 +02:00
wvengen
6d4aa5ed40 Merge pull request #163 from foodcoop-rostock/order-tasks-alphabetically 
Order tasks with same date by name.
 2013-09-17 05:45:13 -07:00
wvengen
f224735718 remember what member ordered when deleted in balancing screen 2013-09-17 14:19:46 +02:00
wvengen
b11706f30a sort ordergroups in order screen and pdfs 2013-09-17 00:25:38 +02:00
wvengen
8ca95f396f make both ordered and received products visible in order screens and pdfs 2013-09-16 23:52:58 +02:00
wvengen
1bb257c41b remember member order when order article is deleted + test 2013-09-13 15:37:30 +02:00
wvengen
b235592656 add total to order pdf, layout changes (closes foodcoops/foodsoft#138) 2013-09-10 11:59:32 +02:00
wvengen
39b3dee050 do not show empty fields on fax pdf (closes foodcoops/foodsoft#108) 2013-09-10 11:59:32 +02:00
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
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
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
1fed9834b3 fix tooltip after bootstrap update 2013-07-17 11:31:27 +02:00
wvengen
ccea97c2b3 update bootstrap assets 2013-07-17 11:31:12 +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
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
wvengen
9fb6597980 Merge branch 'master' into updated-gems 2013-07-16 00:00:55 +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
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
5fcc14a36d Fix trailing '*/' in application.css 2013-07-08 20:46:05 +02:00
wvengen
e9e7135639 run bundle update and make it work again 2013-07-08 14:32:24 +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