Merge remote-tracking branch 'inventree/master'

InvenTree/company/forms.py

@@ -58,7 +58,7 @@ class EditSupplierPartForm(HelperForm):
             'base_cost',
             'multiple',
             'packaging',
-            'lead_time'
+            # 'lead_time'
         ]
 
 

InvenTree/company/migrations/0007_remove_supplierpart_lead_time.py

@@ -0,0 +1,17 @@
+# Generated by Django 2.2.5 on 2019-09-12 12:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('company', '0006_supplierpricebreak_currency'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='supplierpart',
+            name='lead_time',
+        ),
+    ]

InvenTree/company/models.py

@@ -250,7 +250,8 @@ class SupplierPart(models.Model):
     
     multiple = models.PositiveIntegerField(default=1, validators=[MinValueValidator(1)], help_text='Order multiple')
 
-    lead_time = models.DurationField(blank=True, null=True)
+    # TODO - Reimplement lead-time as a charfield with special validation (pattern matching).
+    # lead_time = models.DurationField(blank=True, null=True)
 
     @property
     def manufacturer_string(self):

InvenTree/company/templates/company/partdetail.html

@@ -93,8 +93,8 @@ InvenTree | {{ company.name }} - Parts
                 {{ pb.cost }}
                 {% if pb.currency %}{{ pb.currency.suffix }}{% endif %}
                 <div class='btn-group' style='float: right;'>
-                    <button title='Edit Price Break' class='btn btn-primary pb-edit-button btn-sm' type='button' url="{% url 'price-break-edit' pb.id %}"><span class='glyphicon glyphicon-small glyphicon-edit'></span></button>
+                    <button title='Edit Price Break' class='btn btn-default btn-sm' type='button' url="{% url 'price-break-edit' pb.id %}"><span class='glyphicon glyphicon-edit'></span></button>
-                    <button title='Delete Price Break' class='btn btn-danger pb-delete-button btn-sm' type='button' url="{% url 'price-break-delete' pb.id %}"><span class='glyphicon glyphicon-small glyphicon-trash'></span></button>
+                    <button title='Delete Price Break' class='btn btn-default btn-sm' type='button' url="{% url 'price-break-delete' pb.id %}"><span class='glyphicon glyphicon-trash'></span></button>
                 </div>
             </td>
         </tr>

InvenTree/part/templates/part/supplier.html

@@ -9,6 +9,7 @@
 
 <div id='button-toolbar'>
     <button class="btn btn-success" id='supplier-create'>New Supplier Part</button>
+    {% if 0 %}
     <div id='opt-dropdown' class="dropdown" style='float: right;'>
         <button id='supplier-part-options' class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
             <span class="caret"></span></button>
@@ -16,6 +17,7 @@
                 <li><a href='#' id='supplier-part-delete' title='Delete supplier parts'>Delete</a></li>
             </ul>
     </div>
+    {% endif %}
 </div>
 
 <table class="table table-striped table-condensed" id='supplier-table' data-toolbar='#button-toolbar'>
@@ -58,9 +60,12 @@
             }
         },
         columns: [
+            /*
+            // TODO - Re-enable the checkbox column for performing actions on multiple supplier parts
             {
                 checkbox: true,
             },
+            */
             {
                 sortable: true,
                 field: 'supplier_name',