Merge pull request #108 from SchrodingersGat/qr-code

Qr code
This commit is contained in:
Oliver 2019-04-13 07:57:54 +10:00 committed by GitHub
commit b0bdaab213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 38 additions and 2 deletions

View File

@ -54,12 +54,14 @@ INSTALLED_APPS = [
'company.apps.CompanyConfig',
'build.apps.BuildConfig',
# Third part add-ons
'django_filters',
'rest_framework',
'simple_history',
'crispy_forms',
'import_export',
'django_cleanup',
'qr_code',
]
MIDDLEWARE = [

View File

@ -222,6 +222,7 @@ class StockList(generics.ListCreateAPIView):
filter_fields = [
'part',
'uuid',
'location',
'supplier_part',
'customer',

View File

@ -38,7 +38,7 @@ class CreateStockItemForm(HelperForm):
class MoveStockItemForm(forms.ModelForm):
note = forms.CharField(label='Notes', required=True)
note = forms.CharField(label='Notes', required=True, help_text='Add note (required)')
class Meta:
model = StockItem

View File

@ -0,0 +1,19 @@
# Generated by Django 2.2 on 2019-04-12 15:06
from django.db import migrations, models
import uuid
class Migration(migrations.Migration):
dependencies = [
('stock', '0005_stockitemtracking_quantity'),
]
operations = [
migrations.AddField(
model_name='stockitem',
name='uuid',
field=models.UUIDField(blank=True, default=uuid.uuid4, editable=False),
),
]

View File

@ -11,6 +11,7 @@ from django.db.models.signals import pre_delete
from django.dispatch import receiver
from datetime import datetime
import uuid
from InvenTree.models import InvenTreeTree
@ -116,6 +117,9 @@ class StockItem(models.Model):
('part', 'serial'),
]
# UUID for generating QR codes
uuid = models.UUIDField(default=uuid.uuid4, blank=True, editable=False)
# The 'master' copy of the part of which this stock item is an instance
part = models.ForeignKey('part.Part', on_delete=models.CASCADE, related_name='locations')

View File

@ -60,6 +60,7 @@ class StockItemSerializer(serializers.ModelSerializer):
model = StockItem
fields = [
'pk',
'uuid',
'url',
'part',
'supplier_part',

View File

@ -2,6 +2,8 @@
{% load static %}
{% block content %}
{% load qr_code %}
<div class='row'>
<div class='col-sm-6'>
<h3>Stock Item Details</h3>
@ -29,11 +31,17 @@
</div>
</div>
{% qr_from_text item.uuid size="s" image_format="png" error_correction="L" %}
<table class="table table-striped">
<tr>
<td>Part</td>
<td><a href="{% url 'part-stock' item.part.id %}">{{ item.part.name }}</td>
</tr>
<tr>
<td>UUID</td>
<td>{{ item.uuid }}</td>
</tr>
{% if item.belongs_to %}
<tr>
<td>Belongs To</td>

View File

@ -8,3 +8,4 @@ pygments>=2.2.0
django-crispy-forms>=1.7.2
django-import-export>=1.0.0
django-cleanup>=2.1.0
django-qr-code==1.0.0