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

205 commits

Author SHA1 Message Date
Robert Waltemath
805071f3fb Added checkbox to ignore warnings. Added translations. 2013-09-04 10:52:14 +02:00
Benjamin Meichsner
51a91f376d Updated locales from localeapp. 2013-09-02 13:34:30 +02:00
wvengen
3e4c535bb1 update translations and localeapp roundtrip 2013-07-18 19:27:52 +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
dfe1cee4cd german i18n + mini fix 2013-07-18 16:23:29 +02:00
wvengen
1d12e09342 update translations and localeapp roundtrip 2013-07-18 16:22:38 +02:00
Julius
b303b48853 Merge branch 'master' into improve-delivery-workflow-further 2013-07-13 21:08:50 +02:00
wvengen
3fd498d29f translations update 2013-07-13 12:37:20 +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
wvengen
db8a929f0b Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks 
Great!
 2013-07-11 12:48:41 -07:00
Julius
54afbb7af5 Add locales for stock_changes index 2013-07-11 19:21:56 +02:00
Robert Waltemath
65c0b555c2 Added warning/ hint when updating periodic task. 2013-07-11 10:30:55 +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
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
02e2ce4bc3 Update locales 2013-07-07 14:30:13 +02:00
Julius Rapp
d3ccfd1929 Add hint to change name of copied StockArticle 2013-07-07 14:16:06 +02:00
wvengen
9ef208fa13 small translation changes 2013-06-29 03:02:05 +02:00
wvengen
b807e9d059 beautify order mail 2013-06-29 02:54:00 +02:00
wvengen
9b0db5bb0b translation updates: capitalisations, order_result mail 2013-06-29 02:46:20 +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
5df4c8f8a6 Update locales for delivery form 2013-06-26 15:21:11 +02:00
Julius
dd70b84ef0 Linearize and clean up delivery form 2013-06-26 15:16:52 +02:00
wvengen
e450cf404e harmonize order cycle translations 2013-06-25 00:16:30 +02:00
Robert Waltemath
c27127c745 Added i18n strings. 2013-06-24 11:53:52 +02:00
Robert Waltemath
2e1a3eb47f Removed unused I18n strings. 2013-06-22 11:23:08 +02:00
wvengen
cab6ada8b8 small invoice i18n cleanup/refactoring 2013-06-21 14:24:05 +02:00
wvengen
c5c4b1f93f small translation updates 2013-06-21 13:54:36 +02:00
wvengen
3cfd8b2d44 fix i18n key 2013-06-21 13:25:52 +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
9502ca28dd Merge latest changes in master 2013-06-17 15:47:08 +02:00
wvengen
713c030213 i18n and translate missing entry 2013-06-15 18:43:42 +02:00
wvengen
8c08de9eae translation fixes, clarifications and additions 2013-06-15 17:59:15 +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
Julius
885b11dba8 Add english translations for novel delivery functionality 2013-06-14 12:33:16 +02:00
Manuel Wiedenmann
ba923a8f16 updates locale files 2013-06-14 02:53:17 +02:00
Julius
65f61e09d5 Improve delivery workflow; introduce sortable tables; use js.erb for deliveries 2013-06-13 23:36:22 +02:00
wvengen
ca9841dd02 fixup translation string order for localeapp roundtrip 2013-06-13 00:09:04 +02:00
wvengen
d63e1f8066 translation updates previously missed 2013-06-12 23:20:02 +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
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
8929f69dc4 add missing i18n text 2013-06-06 02:42:38 +02:00
wvengen
3d05900067 make translation roundtrip over localeapp work without changes 2013-06-06 02:28:58 +02:00
wvengen
fb6196b78b fix translation errors and inconsistencies between German and English 2013-06-06 01:54:50 +02:00
wvengen
bf94a4b472 remove superfluous newlines in German translation 2013-06-06 01:33:04 +02:00
wvengen
c4b5a658c0 move German translations to single file 2013-06-06 01:15:56 +02:00
Robert Waltemath
981944b869 Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks 
Conflicts:
	Gemfile
	db/schema.rb
 2013-03-15 17:59:19 +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
e0b781fca6 split locales into directory, and load from there 2013-02-01 17:56:34 +01:00
benni
bae09624b7 Avoid deleting categories which still have articles. 2012-12-11 10:53:01 +01:00
benni
620ec946f1 Merge branch 'master' into master-rails3-merging 
Conflicts:
	.gitignore
	.rbenv-version
	app/controllers/finance/balancing_controller.rb
	app/views/finance/balancing/_order_article_form.html.haml

Fixed updating current price in finance balancing.
 2012-12-11 10:32:59 +01:00
Robert Waltemath
1cdb9e8501 Outlined new concept for multiple periodically recurring tasks (#3). 2012-11-28 10:13:54 +01:00
benni
0236fb5a60 Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
benni
552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
benni
699fb9b233 Fixed wiki pages. 2012-10-09 02:31:10 +02:00
benni
acdb331e36 Improved tasks. 2012-10-08 21:52:03 +02:00
benni
52e62f8ddb Fixed messages. New styling for token input plugin. 2012-10-08 18:19:15 +02:00
benni
ab81ef09d5 Replace will_paginate with kaminari. Fixed foodcoop/users page. 2012-10-08 15:24:32 +02:00
benni
29a6cd8b62 Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00
benni
cd91436f7f Allow ignoring apple restriction for specific ordergroup. 2012-09-30 13:34:16 +02:00
benni
ff4ab44bcc Add option to restrict ordering when not enough apples. 2012-09-29 17:52:25 +02:00
benni
6f7682d6a0 Fixed new user invite. 2012-08-06 12:00:40 +02:00
benni
fc8418bc8e Some fixes in group forms. 2012-07-31 18:48:41 +02:00
benni
f759552022 Fixed user settings. 2012-07-31 18:21:42 +02:00
benni
af3c07f031 Simplifiying balancing view part 2. Lets call it finished. 2012-07-27 18:03:46 +02:00
benni
467874a8a5 Simplify balancing view. Part 1 of ... 2012-06-21 17:19:00 +02:00
benni
b295f62322 Updated finance/invoices 2012-04-20 18:33:47 +02:00
benni
ad508b207b Updated to rails 3.0.12. remove old gettext code. 2012-04-15 19:59:39 +02:00
benni
b3c64ecb85 Fixed order views. 2011-06-20 00:26:17 +02:00
benni
88b268cb0b Refactoring of order comments. 2011-06-19 20:47:27 +02:00
benni
172db1d37e Admin namespace beendet. 2011-06-10 13:22:15 +02:00
benni
c173cf4a6a my_profile and admin/ordergroups. 2011-06-10 01:36:04 +02:00
benni
a787b3cf24 Admin/users refactored. 2011-06-09 22:03:27 +02:00
benni
ea6348bc5c Refactored finance/ordergroups|transactions module. 2011-06-09 21:35:05 +02:00
benni
fc1d130113 Refactored stockit, delivery an stock_takings. 2011-05-27 14:09:01 +02:00
benni
1e33411516 refactored some js stuff. Fixed forms in article modul. 2011-05-19 19:49:37 +02:00
benni
9388e918a7 Implemented fancy box for ajax forms. Refactored articles modul. 2011-05-18 17:37:10 +02:00
benni
0decbb36e1 Refactored article_categories. 2011-05-18 16:10:30 +02:00
benni
0b1682af7c Fixed suppliers module. 2011-05-18 15:52:06 +02:00
benni
772cf87c92 Fixed wiki module. 2011-05-18 15:29:38 +02:00
benni
d5552059ce Refactored messages modul, but refactoring is still neccessary. 2011-05-18 14:47:17 +02:00
benni
1cf63fc40b Some fixes to home view. 2011-05-16 10:34:14 +02:00
benni
06f2cc2007 Fixed and refactored foodcoop/workgroups. 2011-05-16 00:34:43 +02:00
benni
2e56bfe895 Some fixes for tasks. 2011-05-14 19:02:52 +02:00
benni
03d84aed1d Added simple form for easier form building. 2011-05-14 17:06:32 +02:00
benni
0757be8319 Updated rails i18n translations. 2011-05-14 16:34:10 +02:00
benni
e589ad5274 Updated rails i18n translations. 2011-05-13 22:44:18 +02:00
Benjamin Meichsner
ca1c5d7db4 Start with I18n implementation. 2010-05-15 11:11:09 +02:00
Benjamin Meichsner
709425855e Added validation for unit_quantity and localization for article attributes. 2009-07-21 15:09:55 +02:00
Benjamin Meichsner
86b2b28dc9 Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices. 2009-02-11 18:09:04 +01:00
Benjamin Meichsner
c17b63b192 Second part of stock-integration. 
Introduced StockArticle and a special page for ordering from stock. StockChanges will be created and the StockArticle.quantity
updated in 'order.close!'.
 2009-02-06 16:26:35 +01:00
Benjamin Meichsner
aa47a24fda Refactoring of invitations. 2009-02-02 00:09:50 +01:00
Benjamin Meichsner
7f09bb55e4 Fixed some wrong links in admin-startpage and bugs in ordergroup-model. 2009-02-01 21:53:08 +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
9f8d0d28ac Removed gettext and simplified_localization-plugin. L18n is now the appropriate module. 
Upgraded to rails 2.2.2 and replaced complex foodsoft.rb-loader with simple
initializers/load_app_config.rb. Multiple foodcoops option is temporarly deactivated.
 2009-01-06 15:45:19 +01:00