wvengen b30b424540 Merge branch 'master' into feature-receive ... Conflicts: app/helpers/finance/order_articles_helper.rb		2014-01-09 18:42:29 +01:00
..
assets	update receive delta column + responsive css	2014-01-09 12:20:54 +01:00
controllers	Merge branch 'master' into feature-receive	2014-01-09 18:42:29 +01:00
documents	i18n simple_form move of fax pdf	2013-10-09 23:41:15 +02:00
helpers	receive helper and i18n cleanup	2014-01-09 13:01:10 +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	consider group_order_article without result not manually changed	2014-01-03 13:03:28 +01:00
views	Merge branch 'master' into feature-receive	2014-01-09 18:42:29 +01:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00