Julius f230d39055 Merge price columns in receive form into one ... Conflicts: app/views/orders/_edit_amount.html.haml		2014-01-03 10:36:57 +01:00
..
assets	ui design update	2014-01-02 22:30:04 +01:00
controllers	Readonly receive input if GroupOrderArticle result has manually been changed	2014-01-03 10:33:09 +01:00
documents	i18n simple_form move of fax pdf	2013-10-09 23:41:15 +02:00
helpers	Merge price columns in receive form into one	2014-01-03 10:36:57 +01:00
inputs	Improved tasks.	2012-10-08 21:52:03 +02:00
mailers	user display changes in model and mailer	2013-09-22 14:38:56 +02:00
models	Fix calculation of OrderArticle.total_price and .total_gross_price	2014-01-03 10:33:31 +01:00
views	Merge price columns in receive form into one	2014-01-03 10:36:57 +01:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00