Remove/rename several deprecated model fields from order and partner apps.

docs/source/releases/v3.0.rst

@@ -25,6 +25,9 @@ What's new in Oscar 3.0?
 Backwards incompatible changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+- The ``StockRecord.price_excl_tax`` field has been renamed to ``StockRecord.price``.
+  Projects that have forked the ``partner`` app will need to generate their own migration
+  to rename this field.
 
 Bug fixes
 ~~~~~~~~~
@@ -33,6 +36,19 @@ Bug fixes
 Removal of deprecated features
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+- Several deprecated model fields have been removed in Oscar 3.0:
+
+   - ``order.Line.est_dispatch_date``
+   - ``order.Line.unit_cost_price``
+   - ``order.Line.unit_retail_price``
+   - ``partner.StockRecord.cost_price``
+   - ``partner.StockRecord.price_retail``
+
+  Oscar ships with migrations that remove these fields. If you want to continue using them,
+  please make sure you add the fields back to your forked app before migrating. Projects
+  that have forked the ``order`` and ``partner`` apps will need to generate their own
+  migrations to remove these fields.
+
 
 Minor changes
 ~~~~~~~~~~~~~

sandbox/fixtures/child_products.json

@@ -1,542 +1,532 @@
 [
 {
-    "pk": 1, 
-    "model": "catalogue.productclass", 
+    "pk": 1,
+    "model": "catalogue.productclass",
     "fields": {
-        "track_stock": true, 
-        "options": [], 
-        "requires_shipping": true, 
-        "name": "T-shirt", 
+        "track_stock": true,
+        "options": [],
+        "requires_shipping": true,
+        "name": "T-shirt",
         "slug": "t-shirt"
     }
 },
 {
-    "pk": 1, 
-    "model": "catalogue.category", 
+    "pk": 1,
+    "model": "catalogue.category",
     "fields": {
-        "description": "", 
-        "numchild": 0, 
-        "slug": "clothing", 
-        "depth": 1, 
+        "description": "",
+        "numchild": 0,
+        "slug": "clothing",
+        "depth": 1,
         "path": "0001",
-        "image": "", 
+        "image": "",
         "name": "Clothing"
     }
 },
 {
-    "pk": 1, 
-    "model": "catalogue.productcategory", 
+    "pk": 1,
+    "model": "catalogue.productcategory",
     "fields": {
-        "category": 1, 
+        "category": 1,
         "product": 1
     }
 },
 {
-    "pk": 2, 
-    "model": "catalogue.productcategory", 
+    "pk": 2,
+    "model": "catalogue.productcategory",
     "fields": {
-        "category": 1, 
+        "category": 1,
         "product": 5
     }
 },
 {
-    "pk": 3, 
-    "model": "catalogue.productcategory", 
+    "pk": 3,
+    "model": "catalogue.productcategory",
     "fields": {
-        "category": 1, 
+        "category": 1,
         "product": 8
     }
 },
 {
-    "pk": 1, 
-    "model": "catalogue.product", 
+    "pk": 1,
+    "model": "catalogue.product",
     "fields": {
-        "rating": null, 
-        "description": "", 
-        "parent": null, 
-        "title": "Oscar T-shirt", 
-        "date_updated": "2013-12-12T16:33:57.426Z", 
-        "upc": "", 
-        "is_discountable": true, 
-        "date_created": "2013-12-12T16:33:57.426Z", 
-        "product_options": [], 
-        "slug": "oscar-t-shirt", 
+        "rating": null,
+        "description": "",
+        "parent": null,
+        "title": "Oscar T-shirt",
+        "date_updated": "2013-12-12T16:33:57.426Z",
+        "upc": "",
+        "is_discountable": true,
+        "date_created": "2013-12-12T16:33:57.426Z",
+        "product_options": [],
+        "slug": "oscar-t-shirt",
         "product_class": 1,
         "structure": "parent"
     }
 },
 {
-    "pk": 2, 
-    "model": "catalogue.product", 
+    "pk": 2,
+    "model": "catalogue.product",
     "fields": {
-        "rating": null, 
-        "description": "", 
-        "parent": 1, 
-        "title": "", 
-        "date_updated": "2013-12-12T16:34:14.023Z", 
-        "upc": "", 
-        "is_discountable": true, 
-        "date_created": "2013-12-12T16:34:14.023Z", 
-        "product_options": [], 
-        "slug": "oscar-t-shirt", 
+        "rating": null,
+        "description": "",
+        "parent": 1,
+        "title": "",
+        "date_updated": "2013-12-12T16:34:14.023Z",
+        "upc": "",
+        "is_discountable": true,
+        "date_created": "2013-12-12T16:34:14.023Z",
+        "product_options": [],
+        "slug": "oscar-t-shirt",
         "product_class": null,
         "structure": "child"
     }
 },
 {
-    "pk": 3, 
-    "model": "catalogue.product", 
+    "pk": 3,
+    "model": "catalogue.product",
     "fields": {
-        "rating": null, 
-        "description": "", 
-        "parent": 1, 
-        "title": "", 
-        "date_updated": "2013-12-12T16:34:32.170Z", 
-        "upc": "", 
-        "is_discountable": true, 
-        "date_created": "2013-12-12T16:34:32.170Z", 
-        "product_options": [], 
-        "slug": "oscar-t-shirt", 
+        "rating": null,
+        "description": "",
+        "parent": 1,
+        "title": "",
+        "date_updated": "2013-12-12T16:34:32.170Z",
+        "upc": "",
+        "is_discountable": true,
+        "date_created": "2013-12-12T16:34:32.170Z",
+        "product_options": [],
+        "slug": "oscar-t-shirt",
         "product_class": null,
         "structure": "child"
     }
 },
 {
-    "pk": 4, 
-    "model": "catalogue.product", 
+    "pk": 4,
+    "model": "catalogue.product",
     "fields": {
-        "rating": null, 
-        "description": "", 
-        "parent": 1, 
-        "title": "", 
-        "date_updated": "2013-12-12T17:32:15.016Z", 
-        "upc": "", 
-        "is_discountable": true, 
-        "date_created": "2013-12-12T17:32:15.016Z", 
-        "product_options": [], 
-        "slug": "oscar-t-shirt", 
+        "rating": null,
+        "description": "",
+        "parent": 1,
+        "title": "",
+        "date_updated": "2013-12-12T17:32:15.016Z",
+        "upc": "",
+        "is_discountable": true,
+        "date_created": "2013-12-12T17:32:15.016Z",
+        "product_options": [],
+        "slug": "oscar-t-shirt",
         "product_class": null,
         "structure": "child"
     }
 },
 {
-    "pk": 5, 
-    "model": "catalogue.product", 
+    "pk": 5,
+    "model": "catalogue.product",
     "fields": {
-        "rating": null, 
-        "description": "", 
-        "parent": null, 
-        "title": "commandlinefu T-shirt", 
-        "date_updated": "2013-12-13T11:34:21.810Z", 
-        "upc": "", 
-        "is_discountable": true, 
-        "date_created": "2013-12-13T11:34:21.810Z", 
-        "product_options": [], 
-        "slug": "commandlinefu-t-shirt", 
+        "rating": null,
+        "description": "",
+        "parent": null,
+        "title": "commandlinefu T-shirt",
+        "date_updated": "2013-12-13T11:34:21.810Z",
+        "upc": "",
+        "is_discountable": true,
+        "date_created": "2013-12-13T11:34:21.810Z",
+        "product_options": [],
+        "slug": "commandlinefu-t-shirt",
         "product_class": 1,
         "structure": "parent"
     }
 },
 {
-    "pk": 6, 
-    "model": "catalogue.product", 
+    "pk": 6,
+    "model": "catalogue.product",
     "fields": {
-        "rating": null, 
-        "description": "", 
-        "parent": 5, 
-        "title": "", 
-        "date_updated": "2013-12-13T11:37:08.138Z", 
-        "upc": "", 
-        "is_discountable": true, 
-        "date_created": "2013-12-13T11:37:08.138Z", 
-        "product_options": [], 
-        "slug": "commandlinefu-t-shirt", 
+        "rating": null,
+        "description": "",
+        "parent": 5,
+        "title": "",
+        "date_updated": "2013-12-13T11:37:08.138Z",
+        "upc": "",
+        "is_discountable": true,
+        "date_created": "2013-12-13T11:37:08.138Z",
+        "product_options": [],
+        "slug": "commandlinefu-t-shirt",
         "product_class": null,
         "structure": "child"
     }
 },
 {
-    "pk": 7, 
-    "model": "catalogue.product", 
+    "pk": 7,
+    "model": "catalogue.product",
     "fields": {
-        "rating": null, 
-        "description": "", 
-        "parent": 5, 
-        "title": "", 
-        "date_updated": "2013-12-13T11:37:45.834Z", 
-        "upc": "", 
-        "is_discountable": true, 
-        "date_created": "2013-12-13T11:37:45.834Z", 
-        "product_options": [], 
-        "slug": "commandlinefu-t-shirt", 
+        "rating": null,
+        "description": "",
+        "parent": 5,
+        "title": "",
+        "date_updated": "2013-12-13T11:37:45.834Z",
+        "upc": "",
+        "is_discountable": true,
+        "date_created": "2013-12-13T11:37:45.834Z",
+        "product_options": [],
+        "slug": "commandlinefu-t-shirt",
         "product_class": null,
         "structure": "child"
     }
 },
 {
-    "pk": 8, 
-    "model": "catalogue.product", 
+    "pk": 8,
+    "model": "catalogue.product",
     "fields": {
-        "rating": null, 
-        "description": "", 
-        "parent": null, 
+        "rating": null,
+        "description": "",
+        "parent": null,
         "title": "Django T-shirt",
-        "date_updated": "2013-12-13T11:38:15.107Z", 
-        "upc": "", 
-        "is_discountable": true, 
-        "date_created": "2013-12-13T11:38:15.107Z", 
-        "product_options": [], 
+        "date_updated": "2013-12-13T11:38:15.107Z",
+        "upc": "",
+        "is_discountable": true,
+        "date_created": "2013-12-13T11:38:15.107Z",
+        "product_options": [],
         "slug": "django-t-shirt",
         "product_class": 1,
         "structure": "parent"
     }
 },
 {
-    "pk": 9, 
-    "model": "catalogue.product", 
+    "pk": 9,
+    "model": "catalogue.product",
     "fields": {
-        "rating": null, 
-        "description": "", 
-        "parent": 8, 
-        "title": "", 
-        "date_updated": "2013-12-13T11:38:49.769Z", 
-        "upc": "", 
-        "is_discountable": true, 
-        "date_created": "2013-12-13T11:38:49.769Z", 
-        "product_options": [], 
+        "rating": null,
+        "description": "",
+        "parent": 8,
+        "title": "",
+        "date_updated": "2013-12-13T11:38:49.769Z",
+        "upc": "",
+        "is_discountable": true,
+        "date_created": "2013-12-13T11:38:49.769Z",
+        "product_options": [],
         "slug": "django-t-shirt",
         "product_class": null,
         "structure": "child"
     }
 },
 {
-    "pk": 10, 
-    "model": "catalogue.product", 
+    "pk": 10,
+    "model": "catalogue.product",
     "fields": {
-        "rating": null, 
-        "description": "", 
-        "parent": 8, 
-        "title": "", 
-        "date_updated": "2013-12-13T11:39:12.859Z", 
-        "upc": "", 
-        "is_discountable": true, 
-        "date_created": "2013-12-13T11:39:12.859Z", 
-        "product_options": [], 
+        "rating": null,
+        "description": "",
+        "parent": 8,
+        "title": "",
+        "date_updated": "2013-12-13T11:39:12.859Z",
+        "upc": "",
+        "is_discountable": true,
+        "date_created": "2013-12-13T11:39:12.859Z",
+        "product_options": [],
         "slug": "django-t-shirt",
         "product_class": null,
         "structure": "child"
     }
 },
 {
-    "pk": 11, 
-    "model": "catalogue.product", 
+    "pk": 11,
+    "model": "catalogue.product",
     "fields": {
-        "rating": null, 
-        "description": "", 
-        "parent": 8, 
-        "title": "", 
-        "date_updated": "2013-12-13T11:39:53.073Z", 
-        "upc": "", 
-        "is_discountable": true, 
-        "date_created": "2013-12-13T11:39:53.073Z", 
-        "product_options": [], 
+        "rating": null,
+        "description": "",
+        "parent": 8,
+        "title": "",
+        "date_updated": "2013-12-13T11:39:53.073Z",
+        "upc": "",
+        "is_discountable": true,
+        "date_created": "2013-12-13T11:39:53.073Z",
+        "product_options": [],
         "slug": "django-t-shirt",
         "product_class": null,
         "structure": "child"
     }
 },
 {
-    "pk": 1, 
-    "model": "catalogue.productattribute", 
+    "pk": 1,
+    "model": "catalogue.productattribute",
     "fields": {
-        "required": true, 
-        "product_class": 1, 
-        "option_group": 1, 
-        "code": "size", 
-        "type": "option", 
+        "required": true,
+        "product_class": 1,
+        "option_group": 1,
+        "code": "size",
+        "type": "option",
         "name": "Size"
     }
 },
 {
-    "pk": 1, 
-    "model": "catalogue.productattributevalue", 
+    "pk": 1,
+    "model": "catalogue.productattributevalue",
     "fields": {
-        "value_date": null, 
-        "value_integer": null, 
-        "product": 2, 
-        "value_float": null, 
-        "entity_content_type": null, 
-        "value_text": null, 
-        "attribute": 1, 
-        "value_richtext": null, 
-        "entity_object_id": null, 
-        "value_image": "", 
-        "value_option": 1, 
-        "value_boolean": null, 
+        "value_date": null,
+        "value_integer": null,
+        "product": 2,
+        "value_float": null,
+        "entity_content_type": null,
+        "value_text": null,
+        "attribute": 1,
+        "value_richtext": null,
+        "entity_object_id": null,
+        "value_image": "",
+        "value_option": 1,
+        "value_boolean": null,
         "value_file": ""
     }
 },
 {
-    "pk": 2, 
-    "model": "catalogue.productattributevalue", 
+    "pk": 2,
+    "model": "catalogue.productattributevalue",
     "fields": {
-        "value_date": null, 
-        "value_integer": null, 
-        "product": 3, 
-        "value_float": null, 
-        "entity_content_type": null, 
-        "value_text": null, 
-        "attribute": 1, 
-        "value_richtext": null, 
-        "entity_object_id": null, 
-        "value_image": "", 
-        "value_option": 2, 
-        "value_boolean": null, 
+        "value_date": null,
+        "value_integer": null,
+        "product": 3,
+        "value_float": null,
+        "entity_content_type": null,
+        "value_text": null,
+        "attribute": 1,
+        "value_richtext": null,
+        "entity_object_id": null,
+        "value_image": "",
+        "value_option": 2,
+        "value_boolean": null,
         "value_file": ""
     }
 },
 {
-    "pk": 3, 
-    "model": "catalogue.productattributevalue", 
+    "pk": 3,
+    "model": "catalogue.productattributevalue",
     "fields": {
-        "value_date": null, 
-        "value_integer": null, 
-        "product": 4, 
-        "value_float": null, 
-        "entity_content_type": null, 
-        "value_text": null, 
-        "attribute": 1, 
-        "value_richtext": null, 
-        "entity_object_id": null, 
-        "value_image": "", 
-        "value_option": 3, 
-        "value_boolean": null, 
+        "value_date": null,
+        "value_integer": null,
+        "product": 4,
+        "value_float": null,
+        "entity_content_type": null,
+        "value_text": null,
+        "attribute": 1,
+        "value_richtext": null,
+        "entity_object_id": null,
+        "value_image": "",
+        "value_option": 3,
+        "value_boolean": null,
         "value_file": ""
     }
 },
 {
-    "pk": 4, 
-    "model": "catalogue.productattributevalue", 
+    "pk": 4,
+    "model": "catalogue.productattributevalue",
     "fields": {
-        "value_date": null, 
-        "value_integer": null, 
-        "product": 6, 
-        "value_float": null, 
-        "entity_content_type": null, 
-        "value_text": null, 
-        "attribute": 1, 
-        "value_richtext": null, 
-        "entity_object_id": null, 
-        "value_image": "", 
-        "value_option": 1, 
-        "value_boolean": null, 
+        "value_date": null,
+        "value_integer": null,
+        "product": 6,
+        "value_float": null,
+        "entity_content_type": null,
+        "value_text": null,
+        "attribute": 1,
+        "value_richtext": null,
+        "entity_object_id": null,
+        "value_image": "",
+        "value_option": 1,
+        "value_boolean": null,
         "value_file": ""
     }
 },
 {
-    "pk": 5, 
-    "model": "catalogue.productattributevalue", 
+    "pk": 5,
+    "model": "catalogue.productattributevalue",
     "fields": {
-        "value_date": null, 
-        "value_integer": null, 
-        "product": 7, 
-        "value_float": null, 
-        "entity_content_type": null, 
-        "value_text": null, 
-        "attribute": 1, 
-        "value_richtext": null, 
-        "entity_object_id": null, 
-        "value_image": "", 
-        "value_option": 2, 
-        "value_boolean": null, 
+        "value_date": null,
+        "value_integer": null,
+        "product": 7,
+        "value_float": null,
+        "entity_content_type": null,
+        "value_text": null,
+        "attribute": 1,
+        "value_richtext": null,
+        "entity_object_id": null,
+        "value_image": "",
+        "value_option": 2,
+        "value_boolean": null,
         "value_file": ""
     }
 },
 {
-    "pk": 6, 
-    "model": "catalogue.productattributevalue", 
+    "pk": 6,
+    "model": "catalogue.productattributevalue",
     "fields": {
-        "value_date": null, 
-        "value_integer": null, 
-        "product": 9, 
-        "value_float": null, 
-        "entity_content_type": null, 
-        "value_text": null, 
-        "attribute": 1, 
-        "value_richtext": null, 
-        "entity_object_id": null, 
-        "value_image": "", 
-        "value_option": 1, 
-        "value_boolean": null, 
+        "value_date": null,
+        "value_integer": null,
+        "product": 9,
+        "value_float": null,
+        "entity_content_type": null,
+        "value_text": null,
+        "attribute": 1,
+        "value_richtext": null,
+        "entity_object_id": null,
+        "value_image": "",
+        "value_option": 1,
+        "value_boolean": null,
         "value_file": ""
     }
 },
 {
-    "pk": 7, 
-    "model": "catalogue.productattributevalue", 
+    "pk": 7,
+    "model": "catalogue.productattributevalue",
     "fields": {
-        "value_date": null, 
-        "value_integer": null, 
-        "product": 10, 
-        "value_float": null, 
-        "entity_content_type": null, 
-        "value_text": null, 
-        "attribute": 1, 
-        "value_richtext": null, 
-        "entity_object_id": null, 
-        "value_image": "", 
-        "value_option": 2, 
-        "value_boolean": null, 
+        "value_date": null,
+        "value_integer": null,
+        "product": 10,
+        "value_float": null,
+        "entity_content_type": null,
+        "value_text": null,
+        "attribute": 1,
+        "value_richtext": null,
+        "entity_object_id": null,
+        "value_image": "",
+        "value_option": 2,
+        "value_boolean": null,
         "value_file": ""
     }
 },
 {
-    "pk": 8, 
-    "model": "catalogue.productattributevalue", 
+    "pk": 8,
+    "model": "catalogue.productattributevalue",
     "fields": {
-        "value_date": null, 
-        "value_integer": null, 
-        "product": 11, 
-        "value_float": null, 
-        "entity_content_type": null, 
-        "value_text": null, 
-        "attribute": 1, 
-        "value_richtext": null, 
-        "entity_object_id": null, 
-        "value_image": "", 
-        "value_option": 3, 
-        "value_boolean": null, 
+        "value_date": null,
+        "value_integer": null,
+        "product": 11,
+        "value_float": null,
+        "entity_content_type": null,
+        "value_text": null,
+        "attribute": 1,
+        "value_richtext": null,
+        "entity_object_id": null,
+        "value_image": "",
+        "value_option": 3,
+        "value_boolean": null,
         "value_file": ""
     }
 },
 {
-    "pk": 1, 
-    "model": "catalogue.attributeoptiongroup", 
+    "pk": 1,
+    "model": "catalogue.attributeoptiongroup",
     "fields": {
         "name": "Sizes"
     }
 },
 {
-    "pk": 1, 
-    "model": "catalogue.attributeoption", 
+    "pk": 1,
+    "model": "catalogue.attributeoption",
     "fields": {
-        "group": 1, 
+        "group": 1,
         "option": "Small"
     }
 },
 {
-    "pk": 2, 
-    "model": "catalogue.attributeoption", 
+    "pk": 2,
+    "model": "catalogue.attributeoption",
     "fields": {
-        "group": 1, 
+        "group": 1,
         "option": "Medium"
     }
 },
 {
-    "pk": 3, 
-    "model": "catalogue.attributeoption", 
+    "pk": 3,
+    "model": "catalogue.attributeoption",
     "fields": {
-        "group": 1, 
+        "group": 1,
         "option": "Large"
     }
 },
 {
-    "pk": 2, 
-    "model": "partner.partner", 
+    "pk": 2,
+    "model": "partner.partner",
     "fields": {
-        "code": "clothing-partner", 
-        "name": "Clothing partner", 
+        "code": "clothing-partner",
+        "name": "Clothing partner",
         "users": []
     }
 },
 {
-    "pk": 1, 
-    "model": "partner.stockrecord", 
-    "fields": {
-        "price_currency": "GBP", 
-        "product": 6, 
-        "partner_sku": "clf-large", 
-        "price_retail": null, 
-        "date_updated": "2013-12-13T11:37:08.232Z", 
-        "num_in_stock": 0, 
-        "num_allocated": null, 
-        "low_stock_threshold": null, 
-        "date_created": "2013-12-13T11:37:08.232Z", 
-        "partner": 2, 
-        "price_excl_tax": "10", 
-        "cost_price": null
-    }
-},
-{
-    "pk": 2, 
-    "model": "partner.stockrecord", 
-    "fields": {
-        "price_currency": "GBP", 
-        "product": 7, 
-        "partner_sku": "clf-med", 
-        "price_retail": null, 
-        "date_updated": "2013-12-13T11:37:45.928Z", 
-        "num_in_stock": 0, 
-        "num_allocated": null, 
-        "low_stock_threshold": null, 
-        "date_created": "2013-12-13T11:37:45.928Z", 
-        "partner": 2, 
-        "price_excl_tax": "10", 
-        "cost_price": null
-    }
-},
-{
-    "pk": 3, 
-    "model": "partner.stockrecord", 
-    "fields": {
-        "price_currency": "GBP", 
-        "product": 9, 
-        "partner_sku": "tng-small", 
-        "price_retail": null, 
-        "date_updated": "2013-12-13T11:38:49.858Z", 
-        "num_in_stock": 100, 
-        "num_allocated": null, 
-        "low_stock_threshold": null, 
-        "date_created": "2013-12-13T11:38:49.858Z", 
-        "partner": 2, 
-        "price_excl_tax": "15", 
-        "cost_price": null
-    }
-},
-{
-    "pk": 4, 
-    "model": "partner.stockrecord", 
-    "fields": {
-        "price_currency": "GBP", 
-        "product": 10, 
-        "partner_sku": "tng-med", 
-        "price_retail": null, 
-        "date_updated": "2013-12-13T11:39:12.947Z", 
-        "num_in_stock": 200, 
-        "num_allocated": null, 
-        "low_stock_threshold": null, 
-        "date_created": "2013-12-13T11:39:12.947Z", 
-        "partner": 2, 
-        "price_excl_tax": "15", 
-        "cost_price": null
-    }
-},
-{
-    "pk": 5, 
-    "model": "partner.stockrecord", 
-    "fields": {
-        "price_currency": "GBP", 
-        "product": 11, 
-        "partner_sku": "tng-large", 
-        "price_retail": null, 
-        "date_updated": "2013-12-13T11:39:53.162Z", 
-        "num_in_stock": 0, 
-        "num_allocated": null, 
-        "low_stock_threshold": null, 
-        "date_created": "2013-12-13T11:39:53.162Z", 
-        "partner": 2, 
-        "price_excl_tax": "15", 
-        "cost_price": null
+    "pk": 1,
+    "model": "partner.stockrecord",
+    "fields": {
+        "price_currency": "GBP",
+        "product": 6,
+        "partner_sku": "clf-large",
+        "date_updated": "2013-12-13T11:37:08.232Z",
+        "num_in_stock": 0,
+        "num_allocated": null,
+        "low_stock_threshold": null,
+        "date_created": "2013-12-13T11:37:08.232Z",
+        "partner": 2,
+        "price": "10"
+    }
+},
+{
+    "pk": 2,
+    "model": "partner.stockrecord",
+    "fields": {
+        "price_currency": "GBP",
+        "product": 7,
+        "partner_sku": "clf-med",
+        "date_updated": "2013-12-13T11:37:45.928Z",
+        "num_in_stock": 0,
+        "num_allocated": null,
+        "low_stock_threshold": null,
+        "date_created": "2013-12-13T11:37:45.928Z",
+        "partner": 2,
+        "price": "10"
+    }
+},
+{
+    "pk": 3,
+    "model": "partner.stockrecord",
+    "fields": {
+        "price_currency": "GBP",
+        "product": 9,
+        "partner_sku": "tng-small",
+        "date_updated": "2013-12-13T11:38:49.858Z",
+        "num_in_stock": 100,
+        "num_allocated": null,
+        "low_stock_threshold": null,
+        "date_created": "2013-12-13T11:38:49.858Z",
+        "partner": 2,
+        "price": "15"
+    }
+},
+{
+    "pk": 4,
+    "model": "partner.stockrecord",
+    "fields": {
+        "price_currency": "GBP",
+        "product": 10,
+        "partner_sku": "tng-med",
+        "date_updated": "2013-12-13T11:39:12.947Z",
+        "num_in_stock": 200,
+        "num_allocated": null,
+        "low_stock_threshold": null,
+        "date_created": "2013-12-13T11:39:12.947Z",
+        "partner": 2,
+        "price": "15"
+    }
+},
+{
+    "pk": 5,
+    "model": "partner.stockrecord",
+    "fields": {
+        "price_currency": "GBP",
+        "product": 11,
+        "partner_sku": "tng-large",
+        "date_updated": "2013-12-13T11:39:53.162Z",
+        "num_in_stock": 0,
+        "num_allocated": null,
+        "low_stock_threshold": null,
+        "date_created": "2013-12-13T11:39:53.162Z",
+        "partner": 2,
+        "price": "15"
     }
 }
 ]

sandbox/fixtures/multi-stockrecord-product.json

@@ -81,15 +81,13 @@
         "price_currency": "GBP",
         "product": 1,
         "partner_sku": "a1",
-        "price_retail": null,
         "date_updated": "2013-07-18T12:25:41.107Z",
         "num_in_stock": 5,
         "num_allocated": null,
         "low_stock_threshold": null,
         "date_created": "2013-07-18T12:25:41.107Z",
         "partner": 1,
-        "price_excl_tax": "20",
-        "cost_price": null
+        "price": "20"
     }
 },
 {
@@ -99,15 +97,13 @@
         "price_currency": "GBP",
         "product": 1,
         "partner_sku": "a2",
-        "price_retail": null,
         "date_updated": "2013-07-18T12:25:49.939Z",
         "num_in_stock": 15,
         "num_allocated": null,
         "low_stock_threshold": null,
         "date_created": "2013-07-18T12:25:49.939Z",
         "partner": 1,
-        "price_excl_tax": "10",
-        "cost_price": null
+        "price": "10"
     }
 }
 ]

sandbox/fixtures/orders.json

@@ -47,7 +47,6 @@
         "stockrecord": 6,
         "partner_sku": "9780553380958",
         "line_price_excl_tax": "7.99",
-        "unit_retail_price": null,
         "partner_line_reference": "",
         "partner_name": "Book partner",
         "line_price_incl_tax": "7.99",
@@ -56,10 +55,8 @@
         "line_price_before_discounts_excl_tax": "7.99",
         "upc": "9780553380958",
         "line_price_before_discounts_incl_tax": "7.99",
-        "est_dispatch_date": null,
         "partner_line_notes": "",
         "unit_price_incl_tax": "7.99",
-        "unit_cost_price": null,
         "partner": 3,
         "order": 1,
         "quantity": 1

src/oscar/apps/dashboard/catalogue/forms.py

@@ -80,7 +80,7 @@ class StockRecordForm(forms.ModelForm):
                 if field_name in self.fields:
                     del self.fields[field_name]
         else:
-            for field_name in ['price_excl_tax', 'num_in_stock']:
+            for field_name in ['price', 'num_in_stock']:
                 if field_name in self.fields:
                     self.fields[field_name].required = True
 
@@ -88,7 +88,7 @@ class StockRecordForm(forms.ModelForm):
         model = StockRecord
         fields = [
             'partner', 'partner_sku',
-            'price_currency', 'price_excl_tax', 'price_retail', 'cost_price',
+            'price_currency', 'price',
             'num_in_stock', 'low_stock_threshold',
         ]
 

src/oscar/apps/order/abstract_models.py

@@ -543,10 +543,6 @@ class AbstractLine(models.Model):
         _("Price before discounts (excl. tax)"),
         decimal_places=2, max_digits=12)
 
-    # Deprecated - will be removed in Oscar 2.1
-    unit_cost_price = models.DecimalField(
-        _("Unit Cost Price"), decimal_places=2, max_digits=12, blank=True,
-        null=True)
     # Normal site price for item (without discounts)
     unit_price_incl_tax = models.DecimalField(
         _("Unit Price (inc. tax)"), decimal_places=2, max_digits=12,
@@ -554,19 +550,11 @@ class AbstractLine(models.Model):
     unit_price_excl_tax = models.DecimalField(
         _("Unit Price (excl. tax)"), decimal_places=2, max_digits=12,
         blank=True, null=True)
-    # Deprecated - will be removed in Oscar 2.1
-    unit_retail_price = models.DecimalField(
-        _("Unit Retail Price"), decimal_places=2, max_digits=12,
-        blank=True, null=True)
 
     # Partners often want to assign some status to each line to help with their
     # own business processes.
     status = models.CharField(_("Status"), max_length=255, blank=True)
 
-    # Deprecated - will be removed in Oscar 2.1
-    est_dispatch_date = models.DateField(
-        _("Estimated Dispatch Date"), blank=True, null=True)
-
     #: Order status pipeline.  This should be a dict where each (key, value)
     #: corresponds to a status and the possible statuses that can follow that
     #: one.

src/oscar/apps/order/migrations/0010_auto_20200724_0909.py

@@ -0,0 +1,25 @@
+# Generated by Django 2.2.10 on 2020-07-24 08:09
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('order', '0009_surcharge'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='line',
+            name='est_dispatch_date',
+        ),
+        migrations.RemoveField(
+            model_name='line',
+            name='unit_cost_price',
+        ),
+        migrations.RemoveField(
+            model_name='line',
+            name='unit_retail_price',
+        ),
+    ]

src/oscar/apps/order/utils.py

@@ -179,13 +179,8 @@ class OrderCreator(object):
             'line_price_before_discounts_incl_tax':
             basket_line.line_price_incl_tax,
             # Reporting details
-            'unit_cost_price': stockrecord.cost_price,
             'unit_price_incl_tax': basket_line.unit_price_incl_tax,
             'unit_price_excl_tax': basket_line.unit_price_excl_tax,
-            'unit_retail_price': stockrecord.price_retail,
-            # Shipping details
-            'est_dispatch_date':
-            basket_line.purchase_info.availability.dispatch_date
         }
         extra_line_fields = extra_line_fields or {}
         if hasattr(settings, 'OSCAR_INITIAL_LINE_STATUS'):

src/oscar/apps/partner/abstract_models.py

@@ -109,24 +109,12 @@ class AbstractStockRecord(models.Model):
     price_currency = models.CharField(
         _("Currency"), max_length=12, default=get_default_currency)
 
-    # This is the base price for calculations - tax should be applied by the
-    # appropriate method.  We don't store tax here as its calculation is highly
-    # domain-specific.  It is NULLable because some items don't have a fixed
-    # price but require a runtime calculation (possible from an external
-    # service). Current field name `price_excl_tax` is deprecated and will be
-    # renamed into `price` in Oscar 2.1.
-    price_excl_tax = models.DecimalField(
-        _("Price (excl. tax)"), decimal_places=2, max_digits=12,
-        blank=True, null=True)
-
-    # Deprecated - will be removed in Oscar 2.1
-    price_retail = models.DecimalField(
-        _("Price (retail)"), decimal_places=2, max_digits=12,
-        blank=True, null=True)
-
-    # Deprecated - will be removed in Oscar 2.1
-    cost_price = models.DecimalField(
-        _("Cost Price"), decimal_places=2, max_digits=12,
+    # This is the base price for calculations - whether this is inclusive or exclusive of
+    # tax depends on your implementation, as this is highly domain-specific.
+    # It is nullable because some items don't have a fixed
+    # price but require a runtime calculation (possibly from an external service).
+    price = models.DecimalField(
+        _("Price"), decimal_places=2, max_digits=12,
         blank=True, null=True)
 
     #: Number of items in stock

src/oscar/apps/partner/admin.py

@@ -7,7 +7,7 @@ StockRecord = get_model('partner', 'StockRecord')
 
 
 class StockRecordAdmin(admin.ModelAdmin):
-    list_display = ('product', 'partner', 'partner_sku', 'price_excl_tax', 'num_in_stock')
+    list_display = ('product', 'partner', 'partner_sku', 'price', 'num_in_stock')
     list_filter = ('partner',)
 
 

src/oscar/apps/partner/importers.py

@@ -101,8 +101,7 @@ class CatalogueImporter(object):
 
         return item
 
-    def _create_stockrecord(self, item, partner_name, partner_sku,
-                            price_excl_tax, num_in_stock, stats):
+    def _create_stockrecord(self, item, partner_name, partner_sku, price, num_in_stock, stats):
         # Create partner and stock record
         partner, _ = Partner.objects.get_or_create(
             name=partner_name)
@@ -114,7 +113,7 @@ class CatalogueImporter(object):
         stock.product = item
         stock.partner = partner
         stock.partner_sku = partner_sku
-        stock.price_excl_tax = D(price_excl_tax)
+        stock.price = D(price)
         stock.num_in_stock = num_in_stock
         stock.save()
 

src/oscar/apps/partner/migrations/0006_auto_20200724_0909.py

@@ -0,0 +1,31 @@
+# Generated by Django 2.2.10 on 2020-07-24 08:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('partner', '0005_auto_20181115_1953'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='stockrecord',
+            name='cost_price',
+        ),
+        migrations.RemoveField(
+            model_name='stockrecord',
+            name='price_retail',
+        ),
+        migrations.AlterField(
+            model_name='stockrecord',
+            name='price_excl_tax',
+            field=models.DecimalField(blank=True, decimal_places=2, max_digits=12, null=True, verbose_name='Price'),
+        ),
+        migrations.RenameField(
+            model_name='stockrecord',
+            old_name='price_excl_tax',
+            new_name='price',
+        ),
+    ]

src/oscar/apps/partner/strategy.py

@@ -229,17 +229,17 @@ class StockRequired(object):
 class NoTax(object):
     """
     Pricing policy mixin for use with the ``Structured`` base strategy.
-    This mixin specifies zero tax and uses the ``price_excl_tax`` from the
+    This mixin specifies zero tax and uses the ``price`` from the
     stockrecord.
     """
 
     def pricing_policy(self, product, stockrecord):
         # Check stockrecord has the appropriate data
-        if not stockrecord or stockrecord.price_excl_tax is None:
+        if not stockrecord or stockrecord.price is None:
             return UnavailablePrice()
         return FixedPrice(
             currency=stockrecord.price_currency,
-            excl_tax=stockrecord.price_excl_tax,
+            excl_tax=stockrecord.price,
             tax=D('0.00'))
 
     def parent_pricing_policy(self, product, children_stock):
@@ -250,7 +250,7 @@ class NoTax(object):
         stockrecord = stockrecords[0]
         return FixedPrice(
             currency=stockrecord.price_currency,
-            excl_tax=stockrecord.price_excl_tax,
+            excl_tax=stockrecord.price,
             tax=D('0.00'))
 
 
@@ -265,14 +265,14 @@ class FixedRateTax(object):
     exponent = D('0.01')  # Default to two decimal places
 
     def pricing_policy(self, product, stockrecord):
-        if not stockrecord or stockrecord.price_excl_tax is None:
+        if not stockrecord or stockrecord.price is None:
             return UnavailablePrice()
         rate = self.get_rate(product, stockrecord)
         exponent = self.get_exponent(stockrecord)
-        tax = (stockrecord.price_excl_tax * rate).quantize(exponent)
+        tax = (stockrecord.price * rate).quantize(exponent)
         return TaxInclusiveFixedPrice(
             currency=stockrecord.price_currency,
-            excl_tax=stockrecord.price_excl_tax,
+            excl_tax=stockrecord.price,
             tax=tax)
 
     def parent_pricing_policy(self, product, children_stock):
@@ -284,11 +284,11 @@ class FixedRateTax(object):
         stockrecord = stockrecords[0]
         rate = self.get_rate(product, stockrecord)
         exponent = self.get_exponent(stockrecord)
-        tax = (stockrecord.price_excl_tax * rate).quantize(exponent)
+        tax = (stockrecord.price * rate).quantize(exponent)
 
         return FixedPrice(
             currency=stockrecord.price_currency,
-            excl_tax=stockrecord.price_excl_tax,
+            excl_tax=stockrecord.price,
             tax=tax)
 
     def get_rate(self, product, stockrecord):
@@ -318,11 +318,11 @@ class DeferredTax(object):
     """
 
     def pricing_policy(self, product, stockrecord):
-        if not stockrecord or stockrecord.price_excl_tax is None:
+        if not stockrecord or stockrecord.price is None:
             return UnavailablePrice()
         return FixedPrice(
             currency=stockrecord.price_currency,
-            excl_tax=stockrecord.price_excl_tax)
+            excl_tax=stockrecord.price)
 
     def parent_pricing_policy(self, product, children_stock):
         stockrecords = [x[1] for x in children_stock if x[1] is not None]
@@ -334,7 +334,7 @@ class DeferredTax(object):
 
         return FixedPrice(
             currency=stockrecord.price_currency,
-            excl_tax=stockrecord.price_excl_tax)
+            excl_tax=stockrecord.price)
 
 
 # Example strategy composed of above mixins.  For real projects, it's likely

src/oscar/templates/oscar/checkout/thank_you.html

@@ -136,14 +136,7 @@
                     </div>
                     <div class="col-sm-7">
                         <h3><a href="{{ line.product.get_absolute_url }}">{{ line.description }}</a></h3>
-                        <p>
-                        {% if line.upc %}{{ line.upc }}<br/>{% endif %}
-                        {% if line.est_dispatch_date %}
-                            {% blocktrans with date=line.est_dispatch_date %}
-                                Estimated dispatch: <strong>{{ date }}</strong>
-                            {% endblocktrans %}
-                        {% endif %}
-                        </p>
+                        {% if line.upc %}<p>{{ line.upc }}</p>{% endif %}
                     </div>
                     <div class="col-sm-1 align-center">
                         {{ line.quantity }}

src/oscar/templates/oscar/customer/anon_order.html

@@ -40,7 +40,7 @@
                     <th>{% trans 'Notes' %}</th>
                     <td>{{ address.notes|linebreaks }}</td>
                 </tr>
-            {% endif %} 
+            {% endif %}
         </table>
     {% endwith %}
 
@@ -57,7 +57,6 @@
         <tr>
             <th>{% trans 'Product' %}</th>
             <th>{% trans 'Status' %}</th>
-            <th>{% trans 'Estimated dispatch date' %}</th>
             <th>{% trans 'Quantity' %}</th>
             <th>{% trans 'Line price excl. tax' %}</th>
             <th>{% trans 'Line price incl. tax' %}</th>
@@ -75,7 +74,6 @@
                     {% endif %}
                 </td>
                 <td>{{ line.shipping_status|default:"-" }}</td>
-                <td>{{ line.est_dispatch_date|default:"-" }}</td>
                 <td>{{ line.quantity }}</td>
                 <td>{{ line.line_price_before_discounts_excl_tax|currency:order.currency }}</td>
                 <td>{{ line.line_price_before_discounts_incl_tax|currency:order.currency }}</td>

src/oscar/templates/oscar/customer/order/order_detail.html

@@ -21,7 +21,6 @@
         <thead>
             <tr>
                 <th>{% trans 'Product' %}</th>
-                <th>{% trans 'Dispatch date' %}</th>
                 <th>{% trans 'Qty' %}</th>
                 <th>{% trans 'Line price excl. tax' %}</th>
                 <th>{% trans 'Line price incl. tax' %}</th>
@@ -54,7 +53,6 @@
                                 </p>
                             {% endif %}
                         </td>
-                        <td>{{ line.est_dispatch_date|default:"-" }}</td>
                         <td>{{ line.quantity }}</td>
                         <td>{{ line.line_price_before_discounts_excl_tax|currency:order.currency }}</td>
                         <td>{{ line.line_price_before_discounts_incl_tax|currency:order.currency }}</td>

src/oscar/templates/oscar/dashboard/catalogue/product_update.html

@@ -194,9 +194,7 @@
                                                     <th>{% trans "Low stock threshold" %}</th>
                                                 {% endif %}
                                                 <th>{% trans "Currency" %}</th>
-                                                <th>{% trans "Cost price" %}</th>
-                                                <th>{% trans "Price (excl tax)" %}</th>
-                                                <th>{% trans "Retail price" %}</th>
+                                                <th>{% trans "Price" %}</th>
                                                 <th>{% trans "Delete?" %}</th>
                                             </tr>
                                         </thead>
@@ -220,9 +218,7 @@
                                                         <td>{% include "oscar/dashboard/partials/form_field.html" with field=stockrecord_form.low_stock_threshold nolabel=True %}</td>
                                                     {% endif %}
                                                     <td>{% include "oscar/dashboard/partials/form_field.html" with field=stockrecord_form.price_currency nolabel=True %}</td>
-                                                    <td>{% include "oscar/dashboard/partials/form_field.html" with field=stockrecord_form.cost_price nolabel=True %}</td>
-                                                    <td>{% include "oscar/dashboard/partials/form_field.html" with field=stockrecord_form.price_excl_tax nolabel=True %}</td>
-                                                    <td>{% include "oscar/dashboard/partials/form_field.html" with field=stockrecord_form.price_retail nolabel=True %}</td>
+                                                    <td>{% include "oscar/dashboard/partials/form_field.html" with field=stockrecord_form.price nolabel=True %}</td>
                                                     <td>
                                                         {% include "oscar/dashboard/partials/form_field.html" with field=stockrecord_form.id nolabel=True %}
                                                         {% include "oscar/dashboard/partials/form_field.html" with field=stockrecord_form.DELETE nolabel=True %}

src/oscar/templates/oscar/dashboard/orders/line_detail.html

@@ -92,9 +92,6 @@
                 <tr>
                     <th>{% trans "Partner notes" %}</th><td>{{ line.partner_line_notes|default:"-" }}</td>
                 </tr>
-                <tr>
-                    <th>{% trans "Estimate dispatch date" %}</th><td>{{ line.est_dispatch_date|default:"-" }}</td>
-                </tr>
             </table>
         </div>
     </div>

src/oscar/templates/oscar/dashboard/orders/order_detail.html

@@ -111,7 +111,6 @@
                                     <th>{% trans "Status" %}</th>
                                     <th>{% trans "Supplier" %}</th>
                                     <th>{% trans "Supplier SKU" %}</th>
-                                    <th>{% trans "Est. dispatch date" %}</th>
                                     <th>{% trans "Price excl tax (before discounts)" %}</th>
                                     <th>{% trans "Price inc tax (before discounts)" %}</th>
                                     <th>{% trans "Actions" %}</th>
@@ -145,7 +144,6 @@
                                             {% endif %}
                                         </td>
                                         <td>{{ line.partner_sku }}</td>
-                                        <td>{{ line.est_dispatch_date|default:"-" }}</td>
                                         <td class="text-right">{{ line.line_price_before_discounts_excl_tax|currency:order.currency }}</td>
                                         <td class="text-right">{{ line.line_price_before_discounts_incl_tax|currency:order.currency }}</td>
                                         <td>

src/oscar/test/basket.py

@@ -23,7 +23,7 @@ def add_product(basket, price=None, quantity=1, product=None):
         record = product.stockrecords.all()[0]
     else:
         record = factories.create_stockrecord(
-            product=product, price_excl_tax=price,
+            product=product, price=price,
             num_in_stock=quantity + 1)
     basket.add_product(record.product, quantity)
 

src/oscar/test/factories/__init__.py

@@ -49,7 +49,7 @@ Benefit = get_model('offer', 'Benefit')
 ConditionalOffer = get_model('offer', 'ConditionalOffer')
 
 
-def create_stockrecord(product=None, price_excl_tax=None, partner_sku=None,
+def create_stockrecord(product=None, price=None, partner_sku=None,
                        num_in_stock=None, partner_name=None,
                        currency=settings.OSCAR_DEFAULT_CURRENCY,
                        partner_users=None):
@@ -59,21 +59,21 @@ def create_stockrecord(product=None, price_excl_tax=None, partner_sku=None,
     if partner_users:
         for user in partner_users:
             partner.users.add(user)
-    if price_excl_tax is None:
-        price_excl_tax = D('9.99')
+    if price is None:
+        price = D('9.99')
     if partner_sku is None:
         partner_sku = 'sku_%d_%d' % (product.id, random.randint(0, 10000))
     return product.stockrecords.create(
         partner=partner, partner_sku=partner_sku,
         price_currency=currency,
-        price_excl_tax=price_excl_tax, num_in_stock=num_in_stock)
+        price=price, num_in_stock=num_in_stock)
 
 
 def create_purchase_info(record):
     return PurchaseInfo(
         price=FixedPrice(
             record.price_currency,
-            record.price_excl_tax,
+            record.price,
             D('0.00')  # Default to no tax
         ),
         availability=StockRequired(
@@ -109,7 +109,7 @@ def create_product(upc=None, title="Dùｍϻϒ title",
         price, partner_sku, partner_name, num_in_stock, partner_users]
     if any([field is not None for field in stockrecord_fields]):
         create_stockrecord(
-            product, price_excl_tax=price, num_in_stock=num_in_stock,
+            product, price=price, num_in_stock=num_in_stock,
             partner_users=partner_users, partner_sku=partner_sku,
             partner_name=partner_name)
     return product
@@ -157,8 +157,7 @@ def create_order(number=None, basket=None, user=None, shipping_address=None,
         basket = Basket.objects.create()
         basket.strategy = Default()
         product = create_product()
-        create_stockrecord(
-            product, num_in_stock=10, price_excl_tax=D('10.00'))
+        create_stockrecord(product, num_in_stock=10, price=D('10.00'))
         basket.add_product(product)
     if not basket.id:
         basket.save()

src/oscar/test/factories/order.py

@@ -100,24 +100,16 @@ class OrderLineFactory(factory.DjangoModelFactory):
         lambda l: l.product.stockrecords.first())
     quantity = 1
 
-    line_price_incl_tax = factory.LazyAttribute(
-        lambda obj: tax_add(obj.stockrecord.price_excl_tax) * obj.quantity)
-    line_price_excl_tax = factory.LazyAttribute(
-        lambda obj: obj.stockrecord.price_excl_tax * obj.quantity)
+    line_price_incl_tax = factory.LazyAttribute(lambda obj: tax_add(obj.stockrecord.price) * obj.quantity)
+    line_price_excl_tax = factory.LazyAttribute(lambda obj: obj.stockrecord.price * obj.quantity)
 
     line_price_before_discounts_incl_tax = (
         factory.SelfAttribute('.line_price_incl_tax'))
     line_price_before_discounts_excl_tax = (
         factory.SelfAttribute('.line_price_excl_tax'))
 
-    unit_price_incl_tax = factory.LazyAttribute(
-        lambda obj: tax_add(obj.stockrecord.price_excl_tax))
-    unit_cost_price = factory.LazyAttribute(
-        lambda obj: obj.stockrecord.cost_price)
-    unit_price_excl_tax = factory.LazyAttribute(
-        lambda obj: obj.stockrecord.price_excl_tax)
-    unit_retail_price = factory.LazyAttribute(
-        lambda obj: obj.stockrecord.price_retail)
+    unit_price_incl_tax = factory.LazyAttribute(lambda obj: tax_add(obj.stockrecord.price))
+    unit_price_excl_tax = factory.LazyAttribute(lambda obj: obj.stockrecord.price)
 
     class Meta:
         model = get_model('order', 'Line')

src/oscar/test/factories/partner.py

@@ -29,7 +29,7 @@ class StockRecordFactory(factory.DjangoModelFactory):
     partner = factory.SubFactory(PartnerFactory)
     partner_sku = factory.Sequence(lambda n: 'unit%d' % n)
     price_currency = "GBP"
-    price_excl_tax = D('9.99')
+    price = D('9.99')
     num_in_stock = 100
 
     class Meta:

tests/_site/apps/partner/migrations/0007_auto_20200724_0909.py

@@ -0,0 +1,31 @@
+# Generated by Django 2.2.10 on 2020-07-24 08:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('partner', '0006_auto_20190816_0910'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='stockrecord',
+            name='cost_price',
+        ),
+        migrations.RemoveField(
+            model_name='stockrecord',
+            name='price_retail',
+        ),
+        migrations.AlterField(
+            model_name='stockrecord',
+            name='price_excl_tax',
+            field=models.DecimalField(blank=True, decimal_places=2, max_digits=12, null=True, verbose_name='Price'),
+        ),
+        migrations.RenameField(
+            model_name='stockrecord',
+            old_name='price_excl_tax',
+            new_name='price',
+        ),
+    ]

tests/functional/checkout/__init__.py

@@ -17,14 +17,14 @@ class CheckoutMixin(object):
             requires_shipping=False, track_stock=False)
         product = factories.ProductFactory(product_class=product_class)
         factories.StockRecordFactory(
-            num_in_stock=None, price_excl_tax=D('12.00'), product=product)
+            num_in_stock=None, price=D('12.00'), product=product)
         return product
 
     def add_product_to_basket(self, product=None):
         if product is None:
             product = factories.ProductFactory()
             factories.StockRecordFactory(
-                num_in_stock=10, price_excl_tax=D('12.00'), product=product)
+                num_in_stock=10, price=D('12.00'), product=product)
         detail_page = self.get(product.get_absolute_url())
         form = detail_page.forms['add_to_basket_form']
         form.submit()

tests/functional/dashboard/test_catalogue.py

@@ -127,7 +127,7 @@ class TestAStaffUser(WebTestCase):
         form['stockrecords-0-partner'] = self.partner.id
         form['stockrecords-0-partner_sku'] = '14'
         form['stockrecords-0-num_in_stock'] = '555'
-        form['stockrecords-0-price_excl_tax'] = '13.99'
+        form['stockrecords-0-price'] = '13.99'
         page = form.submit(name='action', value='continue')
 
         self.assertEqual(Product.objects.count(), 1)

tests/functional/test_basket.py

@@ -64,7 +64,7 @@ class AnonAddToBasketViewTests(WebTestCase):
         basket = Basket.objects.get(id=basket_id)
         line = basket.lines.get(product=self.product)
         stockrecord = self.product.stockrecords.all()[0]
-        self.assertEqual(stockrecord.price_excl_tax, line.price_excl_tax)
+        self.assertEqual(stockrecord.price, line.price_excl_tax)
 
 
 class BasketSummaryViewTests(WebTestCase):

tests/integration/basket/test_models.py

@@ -84,7 +84,7 @@ class TestBasketLine(TestCase):
         product = factories.create_product()
         # Tax for the default strategy will be 0
         factories.create_stockrecord(
-            product, price_excl_tax=D('75.00'), num_in_stock=10)
+            product, price=D('75.00'), num_in_stock=10)
         basket.add(product, 1)
 
         self.assertEqual(basket.lines.first().line_tax, D('0'))
@@ -95,7 +95,7 @@ class TestBasketLine(TestCase):
             """ A test strategy where the tax is not known """
 
             def pricing_policy(self, product, stockrecord):
-                return prices.FixedPrice('GBP', stockrecord.price_excl_tax, tax=None)
+                return prices.FixedPrice('GBP', stockrecord.price, tax=None)
 
         basket = Basket()
         basket.strategy = UnknownTaxStrategy()
@@ -114,7 +114,7 @@ class TestAddingAProductToABasket(TestCase):
         self.product = factories.create_product()
         self.record = factories.create_stockrecord(
             currency='GBP',
-            product=self.product, price_excl_tax=D('10.00'))
+            product=self.product, price=D('10.00'))
         self.purchase_info = factories.create_purchase_info(self.record)
         self.basket.add(self.product)
 
@@ -136,7 +136,7 @@ class TestAddingAProductToABasket(TestCase):
     def test_means_another_currency_product_cannot_be_added(self):
         product = factories.create_product()
         factories.create_stockrecord(
-            currency='USD', product=product, price_excl_tax=D('20.00'))
+            currency='USD', product=product, price=D('20.00'))
         with self.assertRaises(ValueError):
             self.basket.add(product)
 
@@ -153,7 +153,7 @@ class TestANonEmptyBasket(TestCase):
         self.basket.strategy = strategy.Default()
         self.product = factories.create_product()
         self.record = factories.create_stockrecord(
-            self.product, price_excl_tax=D('10.00'))
+            self.product, price=D('10.00'))
         self.purchase_info = factories.create_purchase_info(self.record)
         self.basket.add(self.product, 10)
 
@@ -171,21 +171,21 @@ class TestANonEmptyBasket(TestCase):
 
     def test_returns_zero_line_quantity_for_alternative_stockrecord(self):
         record = factories.create_stockrecord(
-            self.product, price_excl_tax=D('5.00'))
+            self.product, price=D('5.00'))
         self.assertEqual(0, self.basket.line_quantity(
             self.product, record))
 
     def test_returns_zero_line_quantity_for_missing_product_and_stockrecord(self):
         product = factories.create_product()
         record = factories.create_stockrecord(
-            product, price_excl_tax=D('5.00'))
+            product, price=D('5.00'))
         self.assertEqual(0, self.basket.line_quantity(
             product, record))
 
     def test_returns_correct_quantity_for_existing_product_and_stockrecord_and_options(self):
         product = factories.create_product()
         record = factories.create_stockrecord(
-            product, price_excl_tax=D('5.00'))
+            product, price=D('5.00'))
         option = Option.objects.create(name="Message")
         options = [{"option": option, "value": "2"}]
 
@@ -198,7 +198,7 @@ class TestANonEmptyBasket(TestCase):
     def test_total_sums_product_totals(self):
         product = factories.create_product()
         factories.create_stockrecord(
-            product, price_excl_tax=D('5.00'))
+            product, price=D('5.00'))
         self.basket.add(product, 1)
         self.assertEqual(self.basket.total_excl_tax, 105)
 
@@ -208,7 +208,7 @@ class TestANonEmptyBasket(TestCase):
         # Add a zero-priced product to the basket
         product = factories.create_product()
         factories.create_stockrecord(
-            product, price_excl_tax=D('0.00'), num_in_stock=10)
+            product, price=D('0.00'), num_in_stock=10)
         basket.add(product, 1)
 
         self.assertEqual(basket.lines.count(), 1)
@@ -218,7 +218,7 @@ class TestANonEmptyBasket(TestCase):
     def test_basket_prices_calculation_for_unavailable_pricing(self):
         new_product = factories.create_product()
         factories.create_stockrecord(
-            new_product, price_excl_tax=D('5.00'))
+            new_product, price=D('5.00'))
         self.basket.add(new_product, 1)
 
         class UnavailableProductStrategy(strategy.Default):
@@ -288,7 +288,7 @@ class TestMergingTwoBaskets(TestCase):
     def setUp(self):
         self.product = factories.create_product()
         self.record = factories.create_stockrecord(
-            self.product, price_excl_tax=D('10.00'))
+            self.product, price=D('10.00'))
         self.purchase_info = factories.create_purchase_info(self.record)
 
         self.main_basket = Basket()

tests/integration/partner/test_availability_mixin.py

@@ -12,7 +12,7 @@ class TestStockRequiredMixin(TestCase):
         self.mixin = strategy.StockRequired()
         self.product = mock.Mock()
         self.stockrecord = mock.Mock()
-        self.stockrecord.price_excl_tax = D('12.00')
+        self.stockrecord.price = D('12.00')
 
     def test_returns_unavailable_without_stockrecord(self):
         policy = self.mixin.availability_policy(

tests/integration/partner/test_import.py

@@ -96,7 +96,7 @@ class ImportSmokeTest(TestCase):
 
     def test_price_is_imported(self):
         stockrecord = self.product.stockrecords.all()[0]
-        self.assertEqual(D('10.32'), stockrecord.price_excl_tax)
+        self.assertEqual(D('10.32'), stockrecord.price)
 
     def test_num_in_stock_is_imported(self):
         stockrecord = self.product.stockrecords.all()[0]

tests/integration/partner/test_models.py

@@ -15,10 +15,10 @@ class TestStockRecord(TestCase):
     def setUp(self):
         self.product = factories.create_product()
         self.stockrecord = factories.create_stockrecord(
-            self.product, price_excl_tax=D('10.00'), num_in_stock=10)
+            self.product, price=D('10.00'), num_in_stock=10)
 
     def test_get_price_excl_tax_returns_correct_value(self):
-        self.assertEqual(D('10.00'), self.stockrecord.price_excl_tax)
+        self.assertEqual(D('10.00'), self.stockrecord.price)
 
     def test_net_stock_level_with_no_allocation(self):
         self.assertEqual(10, self.stockrecord.net_stock_level)
@@ -64,7 +64,7 @@ class TestStockRecordNoStockTrack(TestCase):
     def test_allocate_does_nothing(self):
         product = factories.ProductFactory(product_class=self.product_class)
         stockrecord = factories.create_stockrecord(
-            product, price_excl_tax=D('10.00'), num_in_stock=10)
+            product, price=D('10.00'), num_in_stock=10)
 
         self.assertFalse(stockrecord.can_track_allocations)
         stockrecord.allocate(5)
@@ -76,7 +76,7 @@ class TestStockRecordNoStockTrack(TestCase):
         child_product = factories.ProductFactory(
             parent=parent_product, product_class=None, structure='child')
         stockrecord = factories.create_stockrecord(
-            child_product, price_excl_tax=D('10.00'), num_in_stock=10)
+            child_product, price=D('10.00'), num_in_stock=10)
 
         self.assertFalse(stockrecord.can_track_allocations)
         stockrecord.allocate(5)

tests/integration/partner/test_strategy.py

@@ -53,7 +53,7 @@ class TestDefaultStrategy(TestCase):
         # The availability policy should be independent of price.
         product_class = factories.ProductClassFactory(track_stock=False)
         product = factories.ProductFactory(product_class=product_class, stockrecords=[])
-        factories.StockRecordFactory(price_excl_tax=None, product=product)
+        factories.StockRecordFactory(price=None, product=product)
         info = self.strategy.fetch_for_product(product)
         self.assertTrue(info.availability.is_available_to_buy)
 
@@ -123,7 +123,7 @@ class TestFixedRateTax(TestCase):
 
     def test_pricing_policy_unavailable_if_no_price_excl_tax(self):
         product = factories.ProductFactory(stockrecords=[])
-        factories.StockRecordFactory(price_excl_tax=None, product=product)
+        factories.StockRecordFactory(price=None, product=product)
         info = strategy.UK().fetch_for_product(product)
         self.assertFalse(info.price.exists)
 
@@ -132,6 +132,6 @@ class TestDeferredTax(TestCase):
 
     def test_pricing_policy_unavailable_if_no_price_excl_tax(self):
         product = factories.ProductFactory(stockrecords=[])
-        factories.StockRecordFactory(price_excl_tax=None, product=product)
+        factories.StockRecordFactory(price=None, product=product)
         info = strategy.US().fetch_for_product(product)
         self.assertFalse(info.price.exists)

tests/integration/partner/test_tax_mixin.py

@@ -12,7 +12,7 @@ class TestNoTaxMixin(TestCase):
         self.mixin = strategy.NoTax()
         self.product = mock.Mock()
         self.stockrecord = mock.Mock()
-        self.stockrecord.price_excl_tax = D('12.00')
+        self.stockrecord.price = D('12.00')
 
     def test_returns_no_prices_without_stockrecord(self):
         policy = self.mixin.pricing_policy(
@@ -37,7 +37,7 @@ class TestFixedRateTaxMixin(TestCase):
         self.mixin.rate = D('0.10')
         self.product = mock.Mock()
         self.stockrecord = mock.Mock()
-        self.stockrecord.price_excl_tax = D('12.00')
+        self.stockrecord.price = D('12.00')
 
     def test_returns_no_prices_without_stockrecord(self):
         policy = self.mixin.pricing_policy(
@@ -47,7 +47,7 @@ class TestFixedRateTaxMixin(TestCase):
     def test_returns_correct_tax(self):
         policy = self.mixin.pricing_policy(
             self.product, self.stockrecord)
-        expected_tax = self.stockrecord.price_excl_tax * self.mixin.get_rate(
+        expected_tax = self.stockrecord.price * self.mixin.get_rate(
             self.product, self.stockrecord)
         self.assertEqual(expected_tax, policy.tax)
 

tests/integration/shipping/test_model_method.py

@@ -69,7 +69,7 @@ class ZeroFreeThresholdTest(TestCase):
         self.assertEqual(D('0.00'), charge.incl_tax)
 
     def test_free_shipping_with_nonempty_basket(self):
-        record = factories.create_stockrecord(price_excl_tax=D('5.00'))
+        record = factories.create_stockrecord(price=D('5.00'))
         self.basket.add_product(record.product)
         charge = self.method.calculate(self.basket)
         self.assertEqual(D('0.00'), charge.incl_tax)
@@ -83,7 +83,7 @@ class TestNonZeroFreeThreshold(TestCase):
         self.basket = factories.create_basket(empty=True)
 
     def test_basket_below_threshold(self):
-        record = factories.create_stockrecord(price_excl_tax=D('5.00'))
+        record = factories.create_stockrecord(price=D('5.00'))
         self.basket.add_product(record.product)
 
         charge = self.method.calculate(self.basket)
@@ -91,7 +91,7 @@ class TestNonZeroFreeThreshold(TestCase):
         self.assertEqual(D('10.00'), charge.incl_tax)
 
     def test_basket_on_threshold(self):
-        record = factories.create_stockrecord(price_excl_tax=D('5.00'))
+        record = factories.create_stockrecord(price=D('5.00'))
         self.basket.add_product(record.product, quantity=4)
 
         charge = self.method.calculate(self.basket)
@@ -99,7 +99,7 @@ class TestNonZeroFreeThreshold(TestCase):
         self.assertEqual(D('0.00'), charge.incl_tax)
 
     def test_basket_above_threshold(self):
-        record = factories.create_stockrecord(price_excl_tax=D('5.00'))
+        record = factories.create_stockrecord(price=D('5.00'))
         self.basket.add_product(record.product, quantity=8)
 
         charge = self.method.calculate(self.basket)

tests/unit/fixtures/catalogue.json

@@ -159,9 +159,7 @@
         "partner": 1,
         "partner_sku": "henk",
         "price_currency": "EUR",
-        "price_excl_tax": "400.00",
-        "price_retail": "500.00",
-        "cost_price": "300.00",
+        "price": "400.00",
         "num_in_stock": 23,
         "num_allocated": null,
         "low_stock_threshold": null,
@@ -177,9 +175,7 @@
         "partner": 1,
         "partner_sku": "asdasd",
         "price_currency": "EUR",
-        "price_excl_tax": "23.00",
-        "price_retail": "0.05",
-        "cost_price": null,
+        "price": "23.00",
         "num_in_stock": null,
         "num_allocated": null,
         "low_stock_threshold": null,

tests/unit/fixtures/productattributes.json

@@ -803,9 +803,7 @@
         "partner": 1,
         "partner_sku": "henk",
         "price_currency": "EUR",
-        "price_excl_tax": "400.00",
-        "price_retail": "500.00",
-        "cost_price": "300.00",
+        "price": "400.00",
         "num_in_stock": 23,
         "num_allocated": null,
         "low_stock_threshold": null,
@@ -821,9 +819,7 @@
         "partner": 1,
         "partner_sku": "asdasd",
         "price_currency": "EUR",
-        "price_excl_tax": "23.00",
-        "price_retail": "0.05",
-        "cost_price": null,
+        "price": "23.00",
         "num_in_stock": null,
         "num_allocated": null,
         "low_stock_threshold": null,
@@ -839,9 +835,7 @@
         "partner": 1,
         "partner_sku": "err56",
         "price_currency": "EUR",
-        "price_excl_tax": "234.00",
-        "price_retail": "123.00",
-        "cost_price": null,
+        "price": "234.00",
         "num_in_stock": 345,
         "num_allocated": null,
         "low_stock_threshold": 12,
@@ -857,9 +851,7 @@
         "partner": 1,
         "partner_sku": "23478",
         "price_currency": "EUR",
-        "price_excl_tax": "12.00",
-        "price_retail": "11.00",
-        "cost_price": null,
+        "price": "12.00",
         "num_in_stock": 34,
         "num_allocated": null,
         "low_stock_threshold": 8,