Merge remote-tracking branch 'upstream/master' into django-q

InvenTree/company/migrations/0033_auto_20210410_1528.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.7 on 2021-04-10 05:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('company', '0032_auto_20210403_1837'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='company',
+            name='description',
+            field=models.CharField(blank=True, help_text='Description of the company', max_length=500, verbose_name='Company description'),
+        ),
+    ]

InvenTree/company/models.py

@@ -95,7 +95,12 @@ class Company(models.Model):
                             help_text=_('Company name'),
                             verbose_name=_('Company name'))
 
-    description = models.CharField(max_length=500, 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'],