Rohan Mitchell a3042118c7 Merge branch 'group-reports' ...

Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
	config/routes.rb

2012-10-26 17:14:49 +11:00

..

admin

Merge branch 'group-reports'

2012-10-26 17:14:49 +11:00

base_controller_decorator.rb

When merging orders, set distributor when target order distributor is nil

2012-10-09 08:42:29 +11:00

home_controller_decorator.rb

Move distributors helper out of spree namespace

2012-10-25 10:45:39 +11:00

orders_controller_decorator.rb

WIP: Move Supplier, Distributor, DistributorSet and ProductDistribution models out of Spree namespace

2012-10-25 10:45:39 +11:00

products_controller_decorator.rb

Move distributors helper out of spree namespace

2012-10-25 10:45:39 +11:00

taxons_controller_decorator.rb

Move distributors helper out of spree namespace

2012-10-25 10:45:39 +11:00