Rename basket Line properties for clarity

Previous names were ambiguous as to whether discounts were being
included or excluded.

docs/source/releases/v0.6.rst

@@ -238,7 +238,6 @@ Several classes and functions have had signature changes:
   ``AnonymousUserProductReviewForm``, have been replaced by a new
   :class:`oscar.apps.catalogue.reviews.forms.ProductReviewForm``.
 
-
 Loading shipping methods
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -270,7 +269,18 @@ Beware of shipping methods that are configured via constructor arguments, like
 :class:`~oscar.apps.shipping.methods.FixedPrice`.  Shipping methods will be
 reworked for Oscar 0.7.
 
-Address Model changes
+Basket model changes
+~~~~~~~~~~~~~~~~~~~~~
+
+Several properties of the basket ``Line`` model have been renamed:
+
+* ``Line.line_price_excl_tax_and_discounts`` has been renamed to 
+  ``Line.line_price_exlc_tax_incl_discounts``.
+
+* ``Line.line_price_incl_tax_and_discounts`` has been renamed to 
+  ``Line.line_price_inlc_tax_incl_discounts``.
+
+Address model changes
 ~~~~~~~~~~~~~~~~~~~~~
 
 * The ``UserAddress.salutation`` and ``UserAddress.name`` methods are now

oscar/apps/basket/abstract_models.py

@@ -364,7 +364,7 @@ class AbstractBasket(models.Model):
         """
         Return total line price excluding tax
         """
-        return self._get_total('line_price_excl_tax_and_discounts')
+        return self._get_total('line_price_excl_tax_incl_discounts')
 
     @property
     def total_tax(self):
@@ -376,7 +376,7 @@ class AbstractBasket(models.Model):
         """
         Return total price inclusive of tax and discounts
         """
-        return self._get_total('line_price_incl_tax_and_discounts')
+        return self._get_total('line_price_incl_tax_incl_discounts')
 
     @property
     def total_incl_tax_excl_discounts(self):
@@ -749,7 +749,7 @@ class AbstractLine(models.Model):
         return self.quantity * self.unit_price_excl_tax
 
     @property
-    def line_price_excl_tax_and_discounts(self):
+    def line_price_excl_tax_incl_discounts(self):
         if self._discount_excl_tax:
             return self.line_price_excl_tax - self._discount_excl_tax
         if self._discount_incl_tax:
@@ -761,7 +761,7 @@ class AbstractLine(models.Model):
         return self.line_price_excl_tax
 
     @property
-    def line_price_incl_tax_and_discounts(self):
+    def line_price_incl_tax_incl_discounts(self):
         # We use whichever discount value is set.  If the discount value was
         # calculated against the tax-exclusive prices, then the line price
         # including tax

oscar/apps/order/utils.py

@@ -150,8 +150,8 @@ class OrderCreator(object):
             'upc': product.upc,
             'quantity': basket_line.quantity,
             # Price details
-            'line_price_excl_tax': basket_line.line_price_excl_tax_and_discounts,
-            'line_price_incl_tax': basket_line.line_price_incl_tax_and_discounts,
+            'line_price_excl_tax': basket_line.line_price_excl_tax_incl_discounts,
+            'line_price_incl_tax': basket_line.line_price_incl_tax_incl_discounts,
             'line_price_before_discounts_excl_tax': basket_line.line_price_excl_tax,
             'line_price_before_discounts_incl_tax': basket_line.line_price_incl_tax,
             # Reporting details