Merged master and company migrations

InvenTree/company/apps.py

@@ -9,7 +9,7 @@ from django.conf import settings
 
 from PIL import UnidentifiedImageError
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("inventree")
 
 
 class CompanyConfig(AppConfig):

InvenTree/company/migrations/0033_auto_20210410_1528.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.0.7 on 2021-04-08 17:18
+# Generated by Django 3.0.7 on 2021-04-10 05:28
 
 from django.db import migrations, models
 
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('company', '0034_supplierpart_update'),
+        ('company', '0032_auto_20210403_1837'),
     ]
 
     operations = [

InvenTree/company/migrations/0034_manufacturerpart.py

@@ -6,7 +6,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('company', '0032_auto_20210403_1837'),
+        ('company', '0033_auto_20210410_1528'),
     ]
 
     operations = [

InvenTree/company/migrations/0035_supplierpart_update.py

@@ -71,8 +71,8 @@ def supplierpart_make_manufacturer_parts(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('company', '0032_auto_20210403_1837'),
-        ('company', '0033_manufacturerpart'),
+        ('company', '0033_auto_20210410_1528'),
+        ('company', '0034_manufacturerpart'),
     ]
 
     operations = [

InvenTree/company/models.py

@@ -97,7 +97,12 @@ class Company(models.Model):
                             help_text=_('Company name'),
                             verbose_name=_('Company name'))
 
-    description = models.CharField(max_length=500, blank=True, verbose_name=_('Company description'), help_text=_('Description of the company'))
+    description = models.CharField(
+        max_length=500,
+        verbose_name=_('Company description'),
+        help_text=_('Description of the company'),
+        blank=True,
+    )
 
     website = models.URLField(blank=True, verbose_name=_('Website'), help_text=_('Company website URL'))
 

InvenTree/company/templates/company/supplier_part_stock.html

@@ -22,7 +22,7 @@
         params: {
             supplier_part: {{ part.id }},
             location_detail: true,
-            part_detail: true,
+            part_detail: false,
         },
         groupByField: 'location',
         buttons: ['#stock-options'],

InvenTree/company/test_migrations.py

@@ -109,11 +109,11 @@ class TestManufacturerField(MigratorTestCase):
 
 class TestManufacturerPart(MigratorTestCase):
     """
-    Tests for migration 0033 and 0034 which added and transitioned to the ManufacturerPart model
+    Tests for migration 0034 and 0035 which added and transitioned to the ManufacturerPart model
     """
 
-    migrate_from = ('company', '0032_auto_20210403_1837')
-    migrate_to = ('company', '0034_supplierpart_update')
+    migrate_from = ('company', '0033_auto_20210410_1528')
+    migrate_to = ('company', '0035_supplierpart_update')
 
     def prepare(self):
         """