Renamed 'stock' app to 'partner'

examples/recreate_project_tables.sh

@@ -14,7 +14,7 @@ then
 fi
 echo "Recreating all tables in $PROJECT_FOLDER"
 echo "Dropping tables"
-$MANAGE_COMMAND sqlclear promotions analytics payment offer shipping order basket stock image address product | \
+$MANAGE_COMMAND sqlclear promotions analytics payment offer shipping order basket partner image address product | \
 	awk 'BEGIN {print "set foreign_key_checks=0;"} {print $0}' | \
     $MANAGE_COMMAND dbshell && \
     $MANAGE_COMMAND syncdb

examples/vanilla/settings.py

@@ -194,7 +194,7 @@ INSTALLED_APPS = (
     'oscar.apps.payment',
     'oscar.apps.offer',
     'oscar.apps.address',
-    'oscar.apps.stock',
+    'oscar.apps.partner',
     'oscar.apps.image',
     'oscar.apps.customer',
     'oscar.apps.promotions',

oscar/apps/catalogue_import/tests/command.py

@@ -6,7 +6,7 @@ import logging
 from oscar.apps.catalogue_import.utils import Importer
 from oscar.apps.catalogue_import.exceptions import CatalogueImportException
 from oscar.apps.product.models import ItemClass, Item
-from oscar.apps.stock.models import Partner, StockRecord
+from oscar.apps.partner.models import Partner, StockRecord
 from oscar.test.helpers import create_product
 
 TEST_BOOKS_CSV = os.path.join(os.path.dirname(__file__), '../fixtures/books-small.csv')

oscar/apps/catalogue_import/utils.py

@@ -7,7 +7,7 @@ from oscar.core.loading import import_module
 
 import_module('catalogue_import.exceptions', ['CatalogueImportException'], locals())
 import_module('product.models', ['ItemClass', 'Item'], locals())
-import_module('stock.models', ['Partner', 'StockRecord'], locals())
+import_module('partner.models', ['Partner', 'StockRecord'], locals())
 
 
 class Importer(object):

oscar/apps/offer/tests.py

@@ -7,7 +7,7 @@ from django.test.client import Client
 from oscar.apps.offer.models import * 
 from oscar.apps.basket.models import Basket
 from oscar.apps.product.models import Item, ItemClass
-from oscar.apps.stock.models import Partner, StockRecord
+from oscar.apps.partner.models import Partner, StockRecord
 from oscar.test.helpers import create_product
 
 

oscar/apps/order/abstract_models.py

@@ -166,7 +166,7 @@ class AbstractLine(models.Model):
     # We store the partner, their SKU and the title for cases where the product has been
     # deleted from the catalogue.  We also store the partner name in case the partner
     # gets deleted at a later date.
-    partner = models.ForeignKey('stock.Partner', related_name='order_lines', blank=True, null=True, on_delete=models.SET_NULL)
+    partner = models.ForeignKey('partner.Partner', related_name='order_lines', blank=True, null=True, on_delete=models.SET_NULL)
     partner_name = models.CharField(_("Partner name"), max_length=128)
     partner_sku = models.CharField(_("Partner SKU"), max_length=128)
     title = models.CharField(_("Title"), max_length=255)
@@ -183,7 +183,6 @@ class AbstractLine(models.Model):
     # Price information before discounts are applied
     line_price_before_discounts_incl_tax = models.DecimalField(decimal_places=2, max_digits=12)
     line_price_before_discounts_excl_tax = models.DecimalField(decimal_places=2, max_digits=12)
-    
 
     # REPORTING FIELDS        
     # Cost price (the price charged by the fulfilment partner for this product).

oscar/apps/order/fixtures/sample-order.json

@@ -39,10 +39,12 @@
         "model": "order.line", 
         "fields": {
 			"partner": 1,
+			"partner_name": "test partner",
+			"partner_sku": "123",
             "partner_line_notes": null, 
+			"title": "test",
             "product": 8, 
             "line_price_excl_tax": "69.90", 
-            "partner_sku": null, 
             "line_price_incl_tax": "69.90", 
             "line_price_before_discounts_incl_tax": "69.90", 
             "line_price_before_discounts_excl_tax": "69.90", 
@@ -55,10 +57,12 @@
         "model": "order.line", 
         "fields": {
 			"partner": 1,
+			"partner_name": "test partner",
+			"partner_sku": "1234",
             "partner_line_notes": null, 
+			"title": "test",
             "product": 9, 
             "line_price_excl_tax": "68.80", 
-            "partner_sku": null, 
             "line_price_incl_tax": "68.80", 
             "line_price_before_discounts_incl_tax": "68.80", 
             "line_price_before_discounts_excl_tax": "68.80", 
@@ -358,14 +362,14 @@
     }, 
     {
         "pk": 1, 
-        "model": "stock.partner", 
+        "model": "partner.partner", 
         "fields": {
             "name": "Prolog"
         }
     }, 
     {
         "pk": 1, 
-        "model": "stock.stockrecord", 
+        "model": "partner.stockrecord", 
         "fields": {
             "price_currency": "GBP", 
             "product": 1, 
@@ -378,7 +382,7 @@
     }, 
     {
         "pk": 2, 
-        "model": "stock.stockrecord", 
+        "model": "partner.stockrecord", 
         "fields": {
             "price_currency": "GBP", 
             "product": 2, 
@@ -391,7 +395,7 @@
     }, 
     {
         "pk": 3, 
-        "model": "stock.stockrecord", 
+        "model": "partner.stockrecord", 
         "fields": {
             "price_currency": "GBP", 
             "product": 3, 
@@ -404,7 +408,7 @@
     }, 
     {
         "pk": 4, 
-        "model": "stock.stockrecord", 
+        "model": "partner.stockrecord", 
         "fields": {
             "price_currency": "GBP", 
             "product": 4, 
@@ -417,7 +421,7 @@
     }, 
     {
         "pk": 5, 
-        "model": "stock.stockrecord", 
+        "model": "partner.stockrecord", 
         "fields": {
             "price_currency": "GBP", 
             "product": 5, 
@@ -430,7 +434,7 @@
     }, 
     {
         "pk": 6, 
-        "model": "stock.stockrecord", 
+        "model": "partner.stockrecord", 
         "fields": {
             "price_currency": "GBP", 
             "product": 6, 
@@ -443,7 +447,7 @@
     }, 
     {
         "pk": 7, 
-        "model": "stock.stockrecord", 
+        "model": "partner.stockrecord", 
         "fields": {
             "price_currency": "GBP", 
             "product": 7, 
@@ -456,7 +460,7 @@
     }, 
     {
         "pk": 8, 
-        "model": "stock.stockrecord", 
+        "model": "partner.stockrecord", 
         "fields": {
             "price_currency": "GBP", 
             "product": 8, 
@@ -469,7 +473,7 @@
     }, 
     {
         "pk": 9, 
-        "model": "stock.stockrecord", 
+        "model": "partner.stockrecord", 
         "fields": {
             "price_currency": "GBP", 
             "product": 9, 
@@ -482,7 +486,7 @@
     }, 
     {
         "pk": 10, 
-        "model": "stock.stockrecord", 
+        "model": "partner.stockrecord", 
         "fields": {
             "price_currency": "GBP", 
             "product": 10, 

oscar/apps/stock/abstract_models.py → oscar/apps/partner/abstract_models.py

@@ -2,7 +2,7 @@ from django.conf import settings
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-from oscar.apps.stock.wrappers import get_partner_wrapper
+from oscar.apps.partner.wrappers import get_partner_wrapper
 
 
 class AbstractPartner(models.Model):
@@ -38,7 +38,7 @@ class AbstractStockRecord(models.Model):
     fields such as lead_time, report_code, min_quantity.
     """
     product = models.OneToOneField('product.Item')
-    partner = models.ForeignKey('stock.Partner')
+    partner = models.ForeignKey('partner.Partner')
     partner_sku = models.CharField(_("Partner SKU"), max_length=128, blank=True)
     
     # Price info:

oscar/apps/stock/admin.py → oscar/apps/partner/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 
 from oscar.core.loading import import_module
-models = import_module('stock.models', ['Partner', 'StockRecord'])
+models = import_module('partner.models', ['Partner', 'StockRecord'])
 
 class StockRecordAdmin(admin.ModelAdmin):
     list_display = ('product', 'partner', 'partner_sku', 'price_excl_tax', 'cost_price', 'num_in_stock')

oscar/apps/stock/models.py → oscar/apps/partner/models.py

@@ -1,4 +1,5 @@
-from oscar.apps.stock.abstract_models import *
+from oscar.apps.partner.abstract_models import *
+
 
 class Partner(AbstractPartner):
     pass

oscar/apps/stock/tests.py → oscar/apps/partner/tests.py

@@ -6,7 +6,7 @@ from django.utils import unittest
 from django.core.exceptions import ValidationError
 
 from oscar.apps.product.models import Item, ItemClass
-from oscar.apps.stock.models import Partner, StockRecord
+from oscar.apps.partner.models import Partner, StockRecord
 from oscar.test.helpers import create_product
 
 class DummyWrapper(object):
@@ -55,7 +55,7 @@ class CustomWrapperTests(unittest.TestCase):
     def setUp(self):
         self._old_setting = settings.OSCAR_PARTNER_WRAPPERS
         settings.OSCAR_PARTNER_WRAPPERS = {
-            'Acme': 'oscar.apps.stock.tests.DummyWrapper'                                
+            'Acme': 'oscar.apps.partner.tests.DummyWrapper'                                
         }
         
     def tearDown(self):

oscar/apps/product/tests.py

@@ -5,7 +5,7 @@ from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse
 
 from oscar.apps.product.models import Item, ItemClass
-from oscar.apps.stock.models import Partner, StockRecord
+from oscar.apps.partner.models import Partner, StockRecord
 
 
 class ItemTests(unittest.TestCase):

oscar/test/helpers.py

@@ -1,5 +1,5 @@
 from oscar.apps.product.models import ItemClass, Item
-from oscar.apps.stock.models import Partner, StockRecord
+from oscar.apps.partner.models import Partner, StockRecord
 
 def create_product(price=None, title="Dummy title", item_class="Dummy item class", 
                      partner="Dummy partner", upc="dummy_101", num_in_stock=10):

oscar/tests.py

@@ -2,7 +2,7 @@ from oscar.apps.address.tests import *
 from oscar.apps.basket.tests import *
 from oscar.apps.order.tests import *
 from oscar.apps.product.tests import *
-from oscar.apps.stock.tests import *
+from oscar.apps.partner.tests import *
 from oscar.apps.checkout.tests import *
 from oscar.apps.payment.tests import *
 from oscar.apps.offer.tests import *