Commit Graph

10 Commits

Author SHA1 Message Date
wvengen 98e7189d31 Merge branch 'master' into i18n
Conflicts:
	app/assets/javascripts/application.js
2013-10-18 12:30:34 +02:00
wvengen 4e61e764df fix haml indentation errors 2013-10-17 16:35:50 +02:00
wvengen c3d22e883d i18n simple_form move of suppliers 2013-10-09 23:12:26 +02:00
wvengen eb1e02015e finish suppliers i18n 2013-02-08 00:11:58 +01:00
benni 9af26e1da6 Fixed deliveries. 2012-10-17 20:45:52 +02:00
sandoz 8d243c8e60 Show supplier email in suppliers/show.haml
* Closes: #38
2009-08-15 12:29:08 +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 ff6b460cfc Improved delivery-invoice-workflow. 2009-01-18 17:42:51 +01:00
Benjamin Meichsner 30f3d199d3 Introduced invoices and deliveries. Integration (especially of deliveries) isn't finished yet. 2009-01-08 16:33:27 +01:00
Benjamin Meichsner 5b9a7e05df Initial commit of foodsoft 2 2009-01-06 11:49:19 +01:00