inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 04:26:44 +00:00
Code

updates

Browse Source
This commit is contained in:
Oliver Walters 2017-03-29 23:19:53 +11:00
parent b2eca2aa48
commit 8ba4ea344e
5 changed files with 77 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
InvenTree/part/models.py
View File

@ -1,5 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.utils.translation import ugettext as _
from django.db import models from django.db import models
from django.db.models import Sum from django.db.models import Sum
from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.core.exceptions import ObjectDoesNotExist, ValidationError
@ -88,12 +88,15 @@ class PartParameterTemplate(models.Model):
PARAM_TEXT = 20 PARAM_TEXT = 20
PARAM_BOOL = 30 PARAM_BOOL = 30
PARAM_TYPE_CODES = {
PARAM_NUMERIC: _("Numeric"),
PARAM_TEXT: _("Text"),
PARAM_BOOL: _("Bool")
}
format = models.IntegerField( format = models.IntegerField(
default=PARAM_NUMERIC, default=PARAM_NUMERIC,
choices=[ choices=PARAM_TYPE_CODES.items())
(PARAM_NUMERIC, "Numeric"),
(PARAM_TEXT, "Text"),
(PARAM_BOOL, "Boolean")])
def __str__(self): def __str__(self):
return "{name} ({units})".format( return "{name} ({units})".format(

7
InvenTree/project/admin.py
View File

@ -1,6 +1,6 @@
from django.contrib import admin from django.contrib import admin
from .models import ProjectCategory, Project, ProjectPart from .models import ProjectCategory, Project, ProjectPart, ProjectRun
class ProjectCategoryAdmin(admin.ModelAdmin): class ProjectCategoryAdmin(admin.ModelAdmin):
@ -14,6 +14,11 @@ class ProjectAdmin(admin.ModelAdmin):
class ProjectPartAdmin(admin.ModelAdmin): class ProjectPartAdmin(admin.ModelAdmin):
list_display = ('part', 'project', 'quantity') list_display = ('part', 'project', 'quantity')
class ProjectRunAdmin(admin.ModelAdmin):
list_display = ('project', 'quantity', 'run_date')
admin.site.register(ProjectCategory, ProjectCategoryAdmin) admin.site.register(ProjectCategory, ProjectCategoryAdmin)
admin.site.register(Project, ProjectAdmin) admin.site.register(Project, ProjectAdmin)
admin.site.register(ProjectPart, ProjectPartAdmin) admin.site.register(ProjectPart, ProjectPartAdmin)
admin.site.register(ProjectRun, ProjectRunAdmin)

11
InvenTree/project/models.py
View File

@ -1,4 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.utils.translation import ugettext as _
from django.db import models from django.db import models
@ -46,16 +47,18 @@ class ProjectPart(models.Model):
OVERAGE_PERCENT = 0 OVERAGE_PERCENT = 0
OVERAGE_ABSOLUTE = 1 OVERAGE_ABSOLUTE = 1
OVARAGE_CODES = {
OVERAGE_PERCENT: _("Percent"),
OVERAGE_ABSOLUTE: _("Absolute")
}
part = models.ForeignKey(Part, on_delete=models.CASCADE) part = models.ForeignKey(Part, on_delete=models.CASCADE)
project = models.ForeignKey(Project, on_delete=models.CASCADE) project = models.ForeignKey(Project, on_delete=models.CASCADE)
quantity = models.PositiveIntegerField(default=1) quantity = models.PositiveIntegerField(default=1)
overage = models.FloatField(default=0) overage = models.FloatField(default=0)
overage_type = models.PositiveIntegerField( overage_type = models.PositiveIntegerField(
default=1, default=1,
choices=[ choices=OVARAGE_CODES.items())
(OVERAGE_PERCENT, "Percent"),
(OVERAGE_ABSOLUTE, "Absolute")
])
def __str__(self): def __str__(self):
return "{quan} x {name}".format( return "{quan} x {name}".format(

34
InvenTree/stock/models.py
View File

@ -1,5 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.utils.translation import ugettext as _
from django.db import models from django.db import models
from part.models import Part from part.models import Part
@ -19,21 +19,27 @@ class StockItem(models.Model):
updated = models.DateField(auto_now=True) updated = models.DateField(auto_now=True)
# Stock status types # Stock status types
ITEM_IN_PROGRESS = 0 ITEM_IN_STOCK = 10
ITEM_INCOMING = 5 ITEM_INCOMING = 15
ITEM_DAMAGED = 10 ITEM_IN_PROGRESS = 20
ITEM_ATTENTION = 20 ITEM_COMPLETE = 25
ITEM_COMPLETE = 50 ITEM_ATTENTION = 50
ITEM_DAMAGED = 55
ITEM_DESTROYED = 60
ITEM_STATUS_CODES = {
ITEM_IN_STOCK: _("In stock"),
ITEM_INCOMING: _("Incoming"),
ITEM_IN_PROGRESS: _("In progress"),
ITEM_COMPLETE: _("Complete"),
ITEM_ATTENTION: _("Attention needed"),
ITEM_DAMAGED: _("Damaged"),
ITEM_DESTROYED: _("Destroyed")
}
status = models.PositiveIntegerField( status = models.PositiveIntegerField(
default=ITEM_IN_PROGRESS, default=ITEM_IN_STOCK,
choices=[ choices=ITEM_STATUS_CODES.items())
(ITEM_IN_PROGRESS, "In progress"),
(ITEM_INCOMING, "Incoming"),
(ITEM_DAMAGED, "Damaged"),
(ITEM_ATTENTION, "Requires attention"),
(ITEM_COMPLETE, "Complete")
])
# If stock item is incoming, an (optional) ETA field # If stock item is incoming, an (optional) ETA field
expected_arrival = models.DateField(null=True, blank=True) expected_arrival = models.DateField(null=True, blank=True)

6
InvenTree/supplier/models.py
View File

@ -32,7 +32,7 @@ class SupplierPart(models.Model):
- A Part may be available from multiple suppliers - A Part may be available from multiple suppliers
""" """
part = models.ForeignKey(Part, part = models.ForeignKey(Part,null=True,blank=True,
on_delete=models.CASCADE) on_delete=models.CASCADE)
supplier = models.ForeignKey(Supplier, supplier = models.ForeignKey(Supplier,
on_delete=models.CASCADE) on_delete=models.CASCADE)
@ -55,8 +55,8 @@ class SupplierPart(models.Model):
lead_time = models.DurationField(blank=True, null=True) lead_time = models.DurationField(blank=True, null=True)
def __str__(self): def __str__(self):
return "{mpn} - {supplier}".format( return "{sku} - {supplier}".format(
mpn=self.MPN, sku=self.SKU,
supplier=self.supplier.name) supplier=self.supplier.name)