edan_f0

Historie

Maik Hoepfel 7495405bb6 Merge branch 'master' into feature/variants_dashboard This mostly pulls in the tables2 work. I opted to just use master's branch product_list template, and will add the variants column that I added as part of #1441 as a tables2 column. Conflicts: oscar/apps/catalogue/abstract_models.py oscar/apps/dashboard/catalogue/views.py oscar/templates/oscar/dashboard/catalogue/product_list.html		před 11 roky
..
__init__.py	Fixed validation issue in catalogue dashboard for parent products.	před 13 roky
catalogue_form_tests.py	Update tests and release notes for updated child product editing	před 11 roky
order_form_tests.py	Fixed date filters for order stats form	před 13 roky
voucher_form_tests.py	Change wording for voucher form test	před 11 roky