Commit Graph

11 Commits

Author SHA1 Message Date
Julius 9753e6db00 Resolve merge conflicts with i18n 2013-06-10 20:05:47 +02:00
Julius 0f4614eb31 Add percent sign for tax in forms 2013-06-06 17:58:02 +02:00
wvengen f1d6df9ecc move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02: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
Julius 396e220369 Prevent article names from being truncated in StockTaking form 2013-03-14 22:30:22 +01:00
wvengen 02f04be6e8 finish stock_takings i18n + controller 2013-02-13 01:20:20 +01:00
benni 8f7e21b918 Fixed stockit. 2012-10-29 18:28:17 +01:00
benni fc1d130113 Refactored stockit, delivery an stock_takings. 2011-05-27 14:09:01 +02:00
sandoz 48b6515c08 Genderchanged string 'Lieferant'
* Since s.b. started this already. I changed every string 'Lieferant' to
 'Lieferantin' to give note on female existance in this world :-)
2009-03-22 15:04:29 +01:00
Benjamin Meichsner a0e10141dc Translations and other little improvements. 2009-02-12 21:38:41 +01:00
Benjamin Meichsner 951d19db6a Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views! 2009-02-12 18:32:20 +01:00