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

582 Commits

Author SHA1 Message Date
Benjamin Meichsner 18f6cadca2 Ensure mail privacy in message reply and show view. 
Thanks to @JuliusR for reporting.
 2013-03-24 01:37:58 +01:00
Benjamin Meichsner da72d3a61c Only show undeleted articles in delivery/stock_taking forms. 
Fixed 100.
 2013-03-23 18:25:54 +01:00
Benjamin Meichsner 80b203a8da Fixed missing templates in accept invitation action. 2013-03-23 17:51:33 +01:00
wvengen f81e315d6f finish i18n of models without view 2013-03-22 01:21:44 +01:00
wvengen 75a1051668 finish articles i18n, controller+model 2013-03-22 00:59:42 +01:00
wvengen aabeb1a332 finish articles i18n 2013-03-22 00:20:37 +01:00
wvengen 7af796c09c Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/admin/ordergroups_controller.rb
	app/controllers/finance/balancing_controller.rb
	app/controllers/suppliers_controller.rb
	app/views/articles/_article.html.haml
	app/views/finance/balancing/_summary.haml
	app/views/finance/balancing/new.html.haml
	app/views/group_orders/_form.html.haml
	app/views/home/_apple_bar.html.haml
	app/views/suppliers/index.haml
 2013-03-21 22:08:09 +01:00
Benjamin Meichsner 22550029b3 Added missing ajax support for messages index. Fixed #101 2013-03-20 23:31:13 +01:00
Benjamin Meichsner e275403cdd Do not destroy articles in supplier sync. Mark them as deleted. 2013-03-18 19:05:11 +01:00
Benjamin Meichsner 528295884e Allow deleting of category, when there are only deleted articles left. 2013-03-17 20:13:11 +01:00
Benjamin Meichsner 931bb1d7ca Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3 2013-03-17 20:03:18 +01:00
Benjamin Meichsner 6745b79bb9 Allow importing articles again, when article was deleted before. 2013-03-17 20:02:14 +01:00
bennibu 28343fc124 Merge pull request #99 from balkansalat/rails3-fix-stock-ordering-2 
Prevent sold-out articles from being removed from stock order when editing
 2013-03-17 11:50:56 -07:00
bennibu 033d3459a0 Merge pull request #98 from balkansalat/rails3-stock-taking-article-name 
Prevent article name from being truncated in StockTaking form
 2013-03-17 11:41:32 -07:00
bennibu bd0c251313 Merge pull request #97 from balkansalat/rails3-stockit-increase 
Fix stockit increase formula in javascript
 2013-03-17 11:34:16 -07:00
Benjamin Meichsner 59de2e42a9 Fixed showing deleted articles when asking for available articles. 2013-03-17 18:36:34 +01:00
Benjamin Meichsner dd0bd0ad7e Fixed updating order article in stockit balancing. 2013-03-17 18:33:04 +01:00
Benjamin Meichsner f7e885de7e Fixed bug in fax template when there are missing supplier infos. 2013-03-17 18:10:48 +01:00
Benjamin Meichsner 3a9ec5a3dd Fixed wiki site-map, when there is no homepage. 2013-03-17 17:57:35 +01:00
Benjamin Meichsner 707f989768 Fixed routes in redirect after direct_close of orders. 2013-03-17 17:50:50 +01:00
Benjamin Meichsner 329c451774 Fixed articles sync view. 2013-03-17 17:47:37 +01:00
Benjamin Meichsner c05b3e0e19 Balancing: Do not update oder summary automaticly when changing group orders. 2013-03-17 15:47:50 +01:00
Benjamin Meichsner 9cc98b4662 Added some more eager loading for balancing view. 2013-03-17 15:12:14 +01:00
Benjamin Meichsner 07581b7ecf Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
Julius 6aa0e0b736 Rename and comment new functions for fixing stock ordering 2013-03-15 08:50:55 +01:00
Julius 396e220369 Prevent article names from being truncated in StockTaking form 2013-03-14 22:30:22 +01:00
Julius 3208321319 Fix stockit increase formula for present behavior 2013-03-14 21:55:10 +01:00
Julius 8d0761a6c8 Merge branch 'rails3-fix-stock-ordering' into rails3-fix-stock-ordering-2 2013-03-14 21:14:42 +01:00
Benjamin Meichsner 8bafb3f4b2 Show supplier name for articles in stockit order. 2013-03-12 19:08:18 +01:00
Benjamin Meichsner 0d3564492b Fixed bug in sorting articles in balancing view. 2013-03-12 18:54:51 +01:00
Benjamin Meichsner c4376f35bf Removed article from includes in as it does not work with acts_as_paranoid. 
See also https://github.com/goncalossilva/rails3_acts_as_paranoid/issues/62.
Better we remove acts_as_paranoid and filter manually?
 2013-03-12 12:50:56 +01:00
Benjamin Meichsner 6196bdae41 Added some eager loading for balancing new. 2013-03-12 12:38:08 +01:00
Benjamin Meichsner 40d9195eac Fixed broken group_orders after editing order. 
Caution, when using the model.association = models operator,
the after save callbacks are not triggerd! See Order#save_order_articles
 2013-03-12 11:26:14 +01:00
Benjamin Meichsner c18fb20115 Ensure to get also deleted entries in belongs_to assoc. 2013-03-10 19:39:59 +01:00
Benjamin Meichsner b0e12d177e Fixed editing an order and take care of group_orders. 2013-03-10 19:22:26 +01:00
Benjamin Meichsner 762d529894 Added info link for apple restriction feature. 2013-03-09 18:14:53 +01:00
Benjamin Meichsner 50873addf8 Fixed deleting of articles. Added missing id. 2013-03-09 16:46:33 +01:00
wvengen 19527f8425 fix some link handling in i18n (using html_safe) 2013-03-09 00:48:52 +01:00
wvengen cb537bc11c start articles i18n 2013-03-09 00:40:07 +01:00
wvengen b81f414ae5 finish finance/order_articles i18n + en translation 2013-03-08 23:35:50 +01:00
Robert Waltemath 63d8a3a1a6 Do not exclude ordered articles (with zero quantity) when editing orders. 2013-03-07 20:43:02 +01:00
Robert Waltemath 93a99c45d8 Revert "Do not subtract articles in open orders when calculating quantity." 
This reverts commit 6bf3b241e6.
 2013-03-07 20:39:35 +01:00
Robert Waltemath 6bf3b241e6 Do not subtract articles in open orders when calculating quantity. 2013-03-06 14:19:06 +01:00
wvengen c9b2d01fa5 i18n last merge 2013-03-06 01:24:57 +01:00
wvengen 2d382df1f1 Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/controllers/stockit_controller.rb
	app/models/ordergroup.rb
	app/models/workgroup.rb
	app/views/stockit/index.html.haml
 2013-03-06 01:01:12 +01:00
wvengen 2b03a15a9a finish finance invoice i18n and en translation 2013-02-27 12:31:01 +01:00
wvengen d9949681a2 localize invite model 2013-02-27 11:59:03 +01:00
Julius 467b53c009 Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3-ajaxArticleDelete 2013-02-25 11:14:48 +01:00
Julius 0e1bd5c75e Improve (AJAX) deletion of StockArticles 2013-02-25 11:12:28 +01:00
Benjamin Meichsner 2d1ae0ad97 Fixed bad syntax (from already dropped meta_where gem). 
Thanks to wvengen, closed #91

Conflicts:

	app/models/workgroup.rb
 2013-02-25 10:51:01 +01:00
Benjamin Meichsner 3fb5c313ee Show usefull error message for uniqueness_of_name with acts_as_paranoid. 
Fixed #88

Conflicts:

	app/models/ordergroup.rb
 2013-02-25 10:49:55 +01:00
Julius 5dc3fc30ad Revert 099e2b9b06 2013-02-25 10:29:47 +01:00
Julius 8f15cfb446 Revert 396a47b6af 2013-02-25 10:13:44 +01:00
Julius ccf0d010b4 Apply AJAX for deleting a StockArticle 2013-02-25 10:02:21 +01:00
Benjamin Meichsner 6685012a3e Fixed bad syntax (from already dropped meta_where gem). 
Thanks to wvengen, closed #91
 2013-02-24 23:56:56 +01:00
Benjamin Meichsner 82178161fa Show usefull error message for uniqueness_of_name with acts_as_paranoid. 
Fixed #88
 2013-02-24 23:26:16 +01:00
wvengen 569cdce2db finish finance controller i18n 2013-02-22 00:44:39 +01:00
wvengen 8043fd2164 finish foodcoop i18n + controller + model 2013-02-22 00:19:22 +01:00
wvengen c693f697ff workgroups i18n 2013-02-13 01:34:58 +01:00
wvengen 02f04be6e8 finish stock_takings i18n + controller 2013-02-13 01:20:20 +01:00
wvengen 734179a2bd clarify group_orders i18n 2013-02-12 00:06:23 +01:00
wvengen cb2c724abd fix typo 2013-02-11 23:37:52 +01:00
wvengen 20533a5163 fix orders i18n 2013-02-11 15:34:31 +01:00
wvengen a0a974b9ce finish stockit i18n + controllers + model 2013-02-11 11:19:26 +01:00
Manuel Wiedenmann 0065c44b74 i18n finance ordergroups 2013-02-11 10:21:39 +07:00
Manuel Wiedenmann d2cd5b2b02 i18n group order articles 2013-02-11 10:21:39 +07:00
Manuel Wiedenmann 640e9799aa i18n financial_transactions + controller 2013-02-11 10:21:39 +07:00
Manuel Wiedenmann 8be93c33f8 i18n finance + controller 2013-02-10 15:05:31 +07:00
Manuel Wiedenmann 2d58054d1c added order for interpolation 2013-02-10 15:05:31 +07:00
wvengen 22b3f3a491 fix bug in javascript i18n 2013-02-09 10:19:48 +01:00
wvengen 36b18bcfbd finish messages i18n + controller + model 2013-02-09 10:18:52 +01:00
Manuel Wiedenmann 5941bbbf4f i18n feedback + controller 2013-02-09 13:01:44 +07:00
Manuel Wiedenmann 6a564f0a25 admin controllers 2013-02-09 12:47:21 +07:00
wvengen 8d899581bd finish group_orders i18n + controller 2013-02-09 02:01:31 +01:00
wvengen 28c66642f5 finish shared i18n 2013-02-08 19:16:06 +01:00
wvengen e06524ca37 finish ordergroups and orders i18n + controller 2013-02-08 01:52:20 +01:00
wvengen d818ea5d53 finish suppliers controller I18n 2013-02-08 00:31:09 +01:00
wvengen eb1e02015e finish suppliers i18n 2013-02-08 00:11:58 +01:00
wvengen de730808e7 finish mailer i18n 2013-02-06 00:50:59 +01:00
wvengen b12a906a74 finish login i18n + controller 2013-02-05 12:54:55 +01:00
wvengen c5de69bfc5 typo 2013-02-05 12:30:44 +01:00
wvengen 39812bef99 finish layouts i18n, use help url from config, use html language from locale 2013-02-05 12:11:29 +01:00
wvengen 5b53749fe6 fix small format bug in template 2013-02-04 13:13:04 +01:00
wvengen ecce8041a1 invites controller i18n 2013-02-04 13:01:06 +01:00
wvengen 034f6a8f5c finish invites i18n 2013-02-04 12:59:04 +01:00
wvengen 9138f0da03 also internationalize home controller 2013-02-04 02:12:24 +01:00
wvengen 1860e1c4cc also internationalize sessions controller 2013-02-04 02:00:27 +01:00
wvengen 0c09696b2c finish sessions i18n 2013-02-04 01:46:07 +01:00
wvengen 2b11549d33 finished home i18n 2013-02-04 00:46:22 +01:00
Manuel Wiedenmann 64b3d7e17d finished admin/users i18n + dry the admin i18n 2013-02-04 01:38:18 +07:00
Manuel Wiedenmann 75c9338fd9 finished admin/workgroups i18n 2013-02-04 00:36:03 +07:00
Manuel Wiedenmann e949257912 finished admin/ordergroups i18n 2013-02-04 00:10:11 +07:00
Manuel Wiedenmann 42c97520a1 started with admin views 2013-02-03 23:16:42 +07:00
wvengen e0b781fca6 split locales into directory, and load from there 2013-02-01 17:56:34 +01:00
Julius a511da9ae3 Prevent stock_articles from appearing in supplier article index 2013-01-30 21:21:49 +01:00
Julius 2c9fdcd79e Show customer number in fax pdf 2013-01-30 19:46:18 +01:00
Julius 8c7a4f0331 Fix empty dd in horizontal dl 2013-01-29 17:52:44 +01:00
Julius 396a47b6af Improve stock_article_selections 2013-01-28 20:46:35 +01:00
Julius 524819b86f Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3 
Conflicts:
	app/helpers/application_helper.rb
 2013-01-27 22:01:53 +01:00
Benjamin Meichsner 8b2b70f8bf Fixed saving user for new orders. 2013-01-26 16:24:45 +01:00