Create the Asset Database (#363)

2026-03-03 10:38:23 +00:00 · 2019-12-04 23:14:27 +00:00
parent 5210afc772
commit 4f036af85a
97 changed files with 2577 additions and 344 deletions
--- a/assets/init.py
+++ b/assets/init.py
--- a/assets/admin.py
+++ b/assets/admin.py
@@ -0,0 +1,37 @@
+from django.contrib import admin
+from assets import models as assets
+
+
+@admin.register(assets.AssetCategory)
+class AssetCategoryAdmin(admin.ModelAdmin):
+    list_display = ['id', 'name']
+    ordering = ['id']
+
+
+@admin.register(assets.AssetStatus)
+class AssetStatusAdmin(admin.ModelAdmin):
+    list_display = ['id', 'name']
+    ordering = ['id']
+
+
+@admin.register(assets.Supplier)
+class SupplierAdmin(admin.ModelAdmin):
+    list_display = ['id', 'name']
+    ordering = ['id']
+
+
+@admin.register(assets.Asset)
+class AssetAdmin(admin.ModelAdmin):
+    list_display = ['id', 'asset_id', 'description', 'category', 'status']
+    list_filter = ['is_cable', 'category']
+    search_fields = ['id', 'asset_id', 'description']
+
+
+@admin.register(assets.Connector)
+class ConnectorAdmin(admin.ModelAdmin):
+    list_display = ['id', '__str__', 'current_rating', 'voltage_rating', 'num_pins']
+
+
+admin.AdminSite.site_header = 'PyAssets - TEC\'s Asset System'
+admin.AdminSite.site_title = 'PyAssets Admin'
+admin.AdminSite.index_title = 'System Administration'
--- a/assets/apps.py
+++ b/assets/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class AssetsConfig(AppConfig):
+    name = 'assets'
--- a/assets/filters.py
+++ b/assets/filters.py
@@ -0,0 +1,9 @@
+import django_filters
+
+from assets import models
+
+
+class AssetFilter(django_filters.FilterSet):
+    class Meta:
+        model = models.Asset
+        fields = ['asset_id', 'description', 'category', 'status']
--- a/assets/forms.py
+++ b/assets/forms.py
@@ -0,0 +1,30 @@
+from django import forms
+
+from assets import models
+
+
+class AssetForm(forms.ModelForm):
+    class Meta:
+        model = models.Asset
+        fields = '__all__'
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['date_sold'].widget.format = '%Y-%m-%d'
+        self.fields['date_acquired'].widget.format = '%Y-%m-%d'
+
+
+class AssetSearchForm(forms.Form):
+    query = forms.CharField(required=False)
+    category = forms.ModelMultipleChoiceField(models.AssetCategory.objects.all(), required=False)
+    status = forms.ModelMultipleChoiceField(models.AssetStatus.objects.all(), required=False)
+
+
+class SupplierForm(forms.ModelForm):
+    class Meta:
+        model = models.Supplier
+        fields = '__all__'
+
+
+class SupplierSearchForm(forms.Form):
+    query = forms.CharField(required=False)
--- a/assets/management/init.py
+++ b/assets/management/init.py
--- a/assets/management/commands/init.py
+++ b/assets/management/commands/init.py
--- a/assets/management/commands/deleteSampleData.py
+++ b/assets/management/commands/deleteSampleData.py
@@ -0,0 +1,23 @@
+from django.core.management.base import BaseCommand, CommandError
+
+from assets import models
+
+
+class Command(BaseCommand):
+    help = 'Deletes testing sample data'
+
+    def handle(self, *args, **kwargs):
+        from django.conf import settings
+
+        if not (settings.DEBUG):
+            raise CommandError('You cannot run this command in production')
+
+        self.delete_objects(models.AssetCategory)
+        self.delete_objects(models.AssetStatus)
+        self.delete_objects(models.Supplier)
+        self.delete_objects(models.Connector)
+        self.delete_objects(models.Asset)
+
+    def delete_objects(self, model):
+        for object in model.objects.all():
+            object.delete()
--- a/assets/management/commands/generateSampleAssetsData.py
+++ b/assets/management/commands/generateSampleAssetsData.py
@@ -0,0 +1,114 @@
+from django.core.management.base import BaseCommand, CommandError
+from django.utils import timezone
+
+from assets import models
+
+
+class Command(BaseCommand):
+    help = 'Creates some sample data for testing'
+
+    def handle(self, *args, **kwargs):
+        from django.conf import settings
+
+        if not (settings.DEBUG or settings.STAGING):
+            raise CommandError('You cannot run this command in production')
+
+        random.seed('Some object to see the random number generator')
+
+        self.create_categories()
+        self.create_statuses()
+        self.create_suppliers()
+        self.create_assets()
+        self.create_connectors()
+        self.create_cables()
+
+    def create_categories(self):
+        categories = ['Case', 'Video', 'General', 'Sound', 'Lighting', 'Rigging']
+
+        for cat in categories:
+            models.AssetCategory.objects.create(name=cat)
+
+    def create_statuses(self):
+        statuses = [('In Service', True), ('Lost', False), ('Binned', False), ('Sold', False), ('Broken', False)]
+
+        for stat in statuses:
+            models.AssetStatus.objects.create(name=stat[0], should_show=stat[1])
+
+    def create_suppliers(self):
+        suppliers = ["Acme, inc.", "Widget Corp", "123 Warehousing", "Demo Company", "Smith and Co.", "Foo Bars", "ABC Telecom", "Fake Brothers", "QWERTY Logistics", "Demo, inc.", "Sample Company", "Sample, inc", "Acme Corp", "Allied Biscuit", "Ankh-Sto Associates", "Extensive Enterprise", "Galaxy Corp", "Globo-Chem", "Mr. Sparkle", "Globex Corporation", "LexCorp", "LuthorCorp", "North Central Positronics", "Omni Consimer Products", "Praxis Corporation", "Sombra Corporation", "Sto Plains Holdings", "Tessier-Ashpool", "Wayne Enterprises", "Wentworth Industries", "ZiffCorp", "Bluth Company", "Strickland Propane", "Thatherton Fuels", "Three Waters", "Water and Power", "Western Gas & Electric", "Mammoth Pictures", "Mooby Corp", "Gringotts", "Thrift Bank", "Flowers By Irene", "The Legitimate Businessmens Club", "Osato Chemicals", "Transworld Consortium", "Universal Export", "United Fried Chicken", "Virtucon", "Kumatsu Motors", "Keedsler Motors", "Powell Motors", "Industrial Automation", "Sirius Cybernetics Corporation", "U.S. Robotics and Mechanical Men", "Colonial Movers", "Corellian Engineering Corporation", "Incom Corporation", "General Products", "Leeding Engines Ltd.", "Blammo",  # noqa
+                     "Input, Inc.", "Mainway Toys", "Videlectrix", "Zevo Toys", "Ajax", "Axis Chemical Co.", "Barrytron", "Carrys Candles", "Cogswell Cogs", "Spacely Sprockets", "General Forge and Foundry", "Duff Brewing Company", "Dunder Mifflin", "General Services Corporation", "Monarch Playing Card Co.", "Krustyco", "Initech", "Roboto Industries", "Primatech", "Sonky Rubber Goods", "St. Anky Beer", "Stay Puft Corporation", "Vandelay Industries", "Wernham Hogg", "Gadgetron", "Burleigh and Stronginthearm", "BLAND Corporation", "Nordyne Defense Dynamics", "Petrox Oil Company", "Roxxon", "McMahon and Tate", "Sixty Second Avenue", "Charles Townsend Agency", "Spade and Archer", "Megadodo Publications", "Rouster and Sideways", "C.H. Lavatory and Sons", "Globo Gym American Corp", "The New Firm", "SpringShield", "Compuglobalhypermeganet", "Data Systems", "Gizmonic Institute", "Initrode", "Taggart Transcontinental", "Atlantic Northern", "Niagular", "Plow King", "Big Kahuna Burger", "Big T Burgers and Fries", "Chez Quis", "Chotchkies", "The Frying Dutchman", "Klimpys", "The Krusty Krab", "Monks Diner", "Milliways", "Minuteman Cafe", "Taco Grande", "Tip Top Cafe", "Moes Tavern", "Central Perk", "Chasers"]  # noqa
+
+        for supplier in suppliers:
+            models.Supplier.objects.create(name=supplier)
+
+    def create_assets(self):
+        asset_description = ['Large cable', 'Shiny thing', 'New lights', 'Really expensive microphone', 'Box of fuse flaps', 'Expensive tool we didn\'t agree to buy', 'Cable drums', 'Boring amount of tape', 'Video stuff no one knows how to use', 'More amplifiers', 'Heatshrink']
+
+        categories = models.AssetCategory.objects.all()
+        statuses = models.AssetStatus.objects.all()
+        suppliers = models.Supplier.objects.all()
+
+        for i in range(100):
+            asset = models.Asset.objects.create(
+                asset_id='{}'.format(models.Asset.get_available_asset_id()),
+                description=random.choice(asset_description),
+                category=random.choice(categories),
+                status=random.choice(statuses),
+                date_acquired=timezone.now().date()
+            )
+
+            if i % 4 == 0:
+                asset.parent = models.Asset.objects.order_by('?').first()
+
+            if i % 3 == 0:
+                asset.purchased_from = random.choice(suppliers)
+
+            asset.save()
+
+    def create_cables(self):
+        asset_description = ['The worm', 'Harting without a cap', 'Heavy cable', 'Extension lead', 'IEC cable that we should remember to prep']
+
+        csas = [0.75, 1.00, 1.25, 2.5, 4]
+        lengths = [1, 2, 5, 10, 15, 20, 25, 30, 50, 100]
+        cores = [3, 5]
+        circuits = [1, 2, 3, 6]
+        categories = models.AssetCategory.objects.all()
+        statuses = models.AssetStatus.objects.all()
+        suppliers = models.Supplier.objects.all()
+        connectors = models.Connector.objects.all()
+
+        for i in range(100):
+            asset = models.Asset.objects.create(
+                asset_id='{}'.format(models.Asset.get_available_asset_id()),
+                description=random.choice(asset_description),
+                category=random.choice(categories),
+                status=random.choice(statuses),
+                date_acquired=timezone.now().date(),
+
+                is_cable=True,
+                plug=random.choice(connectors),
+                socket=random.choice(connectors),
+                csa=random.choice(csas),
+                length=random.choice(lengths),
+                circuits=random.choice(circuits),
+                cores=random.choice(circuits)
+            )
+
+            if i % 4 == 0:
+                asset.parent = models.Asset.objects.order_by('?').first()
+
+            if i % 3 == 0:
+                asset.purchased_from = random.choice(suppliers)
+
+            asset.save()
+
+    def create_connectors(self):
+        connectors = [
+            {"description": "13A UK", "current_rating": 13, "voltage_rating": 230, "num_pins": 3},
+            {"description": "16A", "current_rating": 16, "voltage_rating": 230, "num_pins": 3},
+            {"description": "32/3", "current_rating": 32, "voltage_rating": 400, "num_pins": 5},
+            {"description": "Socapex", "current_rating": 23, "voltage_rating": 600, "num_pins": 19},
+        ]
+        for connector in connectors:
+            conn = models.Connector.objects.create(** connector)
+            conn.save()
--- a/assets/management/commands/import_old_db.py
+++ b/assets/management/commands/import_old_db.py
@@ -0,0 +1,229 @@
+import os
+import datetime
+import xml.etree.ElementTree as ET
+from django.core.management.base import BaseCommand
+from django.conf import settings
+
+from assets import models
+
+
+class Command(BaseCommand):
+    help = 'Imports old db from XML dump'
+
+    epoch = datetime.date(1970, 1, 1)
+
+    def handle(self, *args, **options):
+        self.import_categories()
+        self.import_statuses()
+        self.import_suppliers()
+        self.import_collections()
+        self.import_assets()
+        self.import_cables()
+
+    @staticmethod
+    def xml_path(file):
+        return os.path.join(settings.BASE_DIR, 'data/DB_Dump/{}'.format(file))
+
+    @staticmethod
+    def parse_xml(file):
+        tree = ET.parse(file)
+
+        return tree.getroot()
+
+    def import_categories(self):
+        # 0: updated, 1: created
+        tally = [0, 0]
+        root = self.parse_xml(self.xml_path('TEC_Asset_Categories.xml'))
+
+        for child in root:
+            obj, created = models.AssetCategory.objects.update_or_create(
+                pk=int(child.find('AssetCategoryID').text),
+                name=child.find('AssetCategory').text
+            )
+
+            if created:
+                tally[1] += 1
+            else:
+                tally[0] += 1
+
+        print('Categories - Updated: {}, Created: {}'.format(tally[0], tally[1]))
+
+    def import_statuses(self):
+        # 0: updated, 1: created
+        tally = [0, 0]
+        root = self.parse_xml(self.xml_path('TEC_Asset_Status_new.xml'))
+
+        for child in root:
+            obj, created = models.AssetStatus.objects.update_or_create(
+                pk=int(child.find('StatusID').text),
+                name=child.find('Status').text
+            )
+
+            if created:
+                tally[1] += 1
+            else:
+                tally[0] += 1
+
+        print('Statuses - Updated: {}, Created: {}'.format(tally[0], tally[1]))
+
+    def import_suppliers(self):
+        # 0: updated, 1: created
+        tally = [0, 0]
+        root = self.parse_xml(self.xml_path('TEC_Asset_Suppliers_new.xml'))
+
+        for child in root:
+            obj, created = models.Supplier.objects.update_or_create(
+                pk=int(child.find('Supplier_x0020_Id').text),
+                name=child.find('Supplier_x0020_Name').text
+            )
+
+            if created:
+                tally[1] += 1
+            else:
+                tally[0] += 1
+
+        print('Suppliers - Updated: {}, Created: {}'.format(tally[0], tally[1]))
+
+    def import_assets(self):
+        # 0: updated, 1: created
+        tally = [0, 0]
+        root = self.parse_xml(self.xml_path('TEC_Assets.xml'))
+
+        for child in root:
+            defaults = dict()
+
+            # defaults['pk'] = int(child.find('ID').text)
+            defaults['asset_id'] = child.find('AssetID').text
+
+            try:
+                defaults['description'] = child.find('AssetDescription').text
+            except AttributeError:
+                defaults['description'] = 'None'
+
+            defaults['category'] = models.AssetCategory.objects.get(pk=int(child.find('AssetCategoryID').text))
+            defaults['status'] = models.AssetStatus.objects.get(pk=int(child.find('StatusID').text))
+
+            try:
+                defaults['serial_number'] = child.find('SerialNumber').text
+            except AttributeError:
+                pass
+
+            try:
+                defaults['purchased_from'] = models.Supplier.objects.get(pk=int(child.find('Supplier_x0020_Id').text))
+            except AttributeError:
+                pass
+
+            try:
+                defaults['date_acquired'] = datetime.datetime.strptime(child.find('DateAcquired').text, '%d/%m/%Y').date()
+            except AttributeError:
+                defaults['date_acquired'] = self.epoch
+
+            try:
+                defaults['date_sold'] = datetime.datetime.strptime(child.find('DateSold').text, '%d/%m/%Y').date()
+            except AttributeError:
+                pass
+
+            try:
+                defaults['purchase_price'] = float(child.find('Replacement_x0020_Value').text)
+            except AttributeError:
+                pass
+
+            try:
+                defaults['salvage_value'] = float(child.find('SalvageValue').text)
+            except AttributeError:
+                pass
+
+            try:
+                defaults['comments'] = child.find('Comments').text
+            except AttributeError:
+                pass
+
+            try:
+                date = child.find('NextSchedMaint').text.split('T')[0]
+                defaults['next_sched_maint'] = datetime.datetime.strptime(date, '%Y-%m-%d').date()
+            except AttributeError:
+                pass
+
+            print(defaults)
+
+            obj, created = models.Asset.objects.update_or_create(**defaults)
+
+            if created:
+                tally[1] += 1
+            else:
+                tally[0] += 1
+
+        print('Assets - Updated: {}, Created: {}'.format(tally[0], tally[1]))
+
+    def import_collections(self):
+        tally = [0, 0]
+        root = self.parse_xml(self.xml_path('TEC_Cable_Collections.xml'))
+
+        for child in root:
+            defaults = dict()
+
+            defaults['pk'] = int(child.find('ID').text)
+            defaults['name'] = child.find('Cable_x0020_Trunk').text
+
+            obj, created = models.Collection.objects.update_or_create(**defaults)
+
+            if created:
+                tally[1] += 1
+            else:
+                tally[0] += 1
+
+        print('Collections - Updated: {}, Created: {}'.format(tally[0], tally[1]))
+
+    def import_cables(self):
+        tally = [0, 0]
+        root = self.parse_xml(self.xml_path('TEC_Cables.xml'))
+
+        for child in root:
+            defaults = dict()
+
+            defaults['asset_id'] = child.find('Asset_x0020_Number').text
+
+            try:
+                defaults['description'] = child.find('Type_x0020_of_x0020_Cable').text
+            except AttributeError:
+                defaults['description'] = 'None'
+
+            defaults['is_cable'] = True
+            defaults['category'] = models.AssetCategory.objects.get(pk=9)
+
+            try:
+                defaults['length'] = child.find('Length_x0020__x0028_m_x0029_').text
+            except AttributeError:
+                pass
+
+            defaults['status'] = models.AssetStatus.objects.get(pk=int(child.find('Status').text))
+
+            try:
+                defaults['comments'] = child.find('Comments').text
+            except AttributeError:
+                pass
+
+            try:
+                collection_id = int(child.find('Collection').text)
+                if collection_id != 0:
+                    defaults['collection'] = models.Collection.objects.get(pk=collection_id)
+            except AttributeError:
+                pass
+
+            try:
+                defaults['purchase_price'] = float(child.find('Purchase_x0020_Price').text)
+            except AttributeError:
+                pass
+
+            defaults['date_acquired'] = self.epoch
+
+            print(defaults)
+
+            obj, created = models.Asset.objects.update_or_create(**defaults)
+
+            if created:
+                tally[1] += 1
+            else:
+                tally[0] += 1
+
+        print('Collections - Updated: {}, Created: {}'.format(tally[0], tally[1]))
--- a/assets/management/commands/update_old_db_file.py
+++ b/assets/management/commands/update_old_db_file.py
@@ -0,0 +1,110 @@
+import os
+import datetime
+import xml.etree.ElementTree as ET
+from django.core.management.base import BaseCommand
+from django.conf import settings
+
+
+class Command(BaseCommand):
+    help = 'Imports old db from XML dump'
+
+    epoch = datetime.date(1970, 1, 1)
+
+    def handle(self, *args, **options):
+        # self.update_statuses()
+        # self.update_suppliers()
+        self.update_cable_statuses()
+
+    @staticmethod
+    def xml_path(file):
+        return os.path.join(settings.BASE_DIR, 'data/DB_Dump/{}'.format(file))
+
+    @staticmethod
+    def parse_xml(file):
+        tree = ET.parse(file)
+
+        return tree.getroot()
+
+    def update_statuses(self):
+        file = self.xml_path('TEC_Assets.xml')
+        tree = ET.parse(file)
+        root = tree.getroot()
+
+        # map old status pk to new status pk
+        status_map = {
+            2: 2,
+            3: 4,
+            4: 3,
+            5: 5,
+            6: 1
+        }
+
+        for child in root:
+            status = int(child.find('StatusID').text)
+            child.find('StatusID').text = str(status_map[status])
+
+        tree.write(file)
+
+    def update_suppliers(self):
+        old_file = self.xml_path('TEC_Asset_Suppliers.xml')
+        old_tree = ET.parse(old_file)
+        old_root = old_tree.getroot()
+
+        new_file = self.xml_path('TEC_Asset_Suppliers_new.xml')
+        new_tree = ET.parse(new_file)
+        new_root = new_tree.getroot()
+
+        # map old supplier pk to new supplier pk
+        supplier_map = dict()
+
+        def find_in_old(name, root):
+            for child in root:
+                found_id = child.find('Supplier_x0020_Id').text
+                found_name = child.find('Supplier_x0020_Name').text
+
+                if found_name == name:
+                    return found_id
+
+        for new_child in new_root:
+            new_id = new_child.find('Supplier_x0020_Id').text
+            new_name = new_child.find('Supplier_x0020_Name').text
+
+            old_id = find_in_old(new_name, old_root)
+
+            supplier_map[int(old_id)] = int(new_id)
+
+        file = self.xml_path('TEC_Assets.xml')
+        tree = ET.parse(file)
+        root = tree.getroot()
+
+        for child in root:
+            try:
+                supplier = int(child.find('Supplier_x0020_Id').text)
+                child.find('Supplier_x0020_Id').text = str(supplier_map[supplier])
+            except AttributeError:
+                pass
+
+        tree.write(file)
+
+    def update_cable_statuses(self):
+        file = self.xml_path('TEC_Cables.xml')
+        tree = ET.parse(file)
+        root = tree.getroot()
+
+        # map old status pk to new status pk
+        status_map = {
+            0: 7,
+            1: 3,
+            3: 2,
+            4: 5,
+            6: 6,
+            7: 1,
+            8: 4,
+            9: 2,
+        }
+
+        for child in root:
+            status = int(child.find('Status').text)
+            child.find('Status').text = str(status_map[status])
+
+        tree.write(file)
--- a/assets/migrations/0001_initial.py
+++ b/assets/migrations/0001_initial.py
@@ -0,0 +1,86 @@
+# Generated by Django 2.0.2 on 2018-02-28 16:06
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Asset',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('asset_id', models.IntegerField()),
+                ('description', models.CharField(max_length=120)),
+                ('serial_number', models.CharField(blank=True, max_length=150, null=True)),
+                ('date_acquired', models.DateField()),
+                ('date_sold', models.DateField(blank=True, null=True)),
+                ('purchase_price', models.IntegerField()),
+                ('salvage_value', models.IntegerField(blank=True, null=True)),
+                ('comments', models.TextField(blank=True, null=True)),
+                ('next_sched_maint', models.DateField(blank=True, null=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='AssetCategory',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=80)),
+            ],
+            options={
+                'verbose_name': 'Asset Category',
+                'verbose_name_plural': 'Asset Categories',
+            },
+        ),
+        migrations.CreateModel(
+            name='AssetStatus',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=80)),
+            ],
+            options={
+                'verbose_name': 'Asset Status',
+                'verbose_name_plural': 'Asset Statuses',
+            },
+        ),
+        migrations.CreateModel(
+            name='Collection',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=80)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Supplier',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=80)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='category',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.AssetCategory'),
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='collection',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.Collection'),
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='purchased_from',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='assets.Supplier'),
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='status',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.AssetStatus'),
+        ),
+    ]
--- a/assets/migrations/0002_auto_20180301_1654.py
+++ b/assets/migrations/0002_auto_20180301_1654.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.2 on 2018-03-01 16:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='asset',
+            name='asset_id',
+            field=models.IntegerField(blank=True),
+        ),
+    ]
--- a/assets/migrations/0003_auto_20180301_1700.py
+++ b/assets/migrations/0003_auto_20180301_1700.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.2 on 2018-03-01 17:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0002_auto_20180301_1654'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='asset',
+            name='purchase_price',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+    ]
--- a/assets/migrations/0004_auto_20180301_1711.py
+++ b/assets/migrations/0004_auto_20180301_1711.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.2 on 2018-03-01 17:11
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0003_auto_20180301_1700'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='asset',
+            name='collection',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='assets.Collection'),
+        ),
+    ]
--- a/assets/migrations/0005_auto_20180301_1725.py
+++ b/assets/migrations/0005_auto_20180301_1725.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.2 on 2018-03-01 17:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0004_auto_20180301_1711'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='asset',
+            name='asset_id',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+    ]
--- a/assets/migrations/0006_auto_20180728_1451_squashed_0021_auto_20190105_1156.py
+++ b/assets/migrations/0006_auto_20180728_1451_squashed_0021_auto_20190105_1156.py
@@ -0,0 +1,148 @@
+# Generated by Django 2.1.5 on 2019-01-05 19:54
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    replaces = [('assets', '0006_auto_20180728_1451'), ('assets', '0007_auto_20181215_1447'), ('assets', '0008_auto_20181215_1448'), ('assets', '0009_auto_20181215_1640'), ('assets', '0010_auto_20181215_1640'), ('assets', '0011_auto_20181215_1749'), ('assets', '0012_auto_20181215_1813'), ('assets', '0013_asset_parent'), ('assets', '0014_auto_20190103_1615'), ('assets', '0015_auto_20190103_1617'), ('assets', '0016_remove_asset_collection'), ('assets', '0017_delete_collection'), ('assets', '0018_auto_20190103_1708'), ('assets', '0019_auto_20190103_1723'), ('assets', '0020_auto_20190103_1729'), ('assets', '0021_auto_20190105_1156')]
+
+    dependencies = [
+        ('assets', '0005_auto_20180301_1725'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='asset',
+            name='asset_id',
+            field=models.IntegerField(blank=True, null=True, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='asset',
+            name='purchase_price',
+            field=models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True),
+        ),
+        migrations.AlterField(
+            model_name='asset',
+            name='salvage_value',
+            field=models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True),
+        ),
+        migrations.AlterField(
+            model_name='asset',
+            name='asset_id',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='is_cable',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='length',
+            field=models.DecimalField(blank=True, decimal_places=1, max_digits=10, null=True),
+        ),
+        migrations.AlterField(
+            model_name='asset',
+            name='asset_id',
+            field=models.CharField(blank=True, max_length=10, null=True),
+        ),
+        migrations.AlterField(
+            model_name='asset',
+            name='asset_id',
+            field=models.CharField(default='', max_length=10),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='parent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=None, related_name='asset_parent', to='assets.Asset'),
+        ),
+        migrations.RemoveField(
+            model_name='asset',
+            name='collection',
+        ),
+        migrations.DeleteModel(
+            name='Collection',
+        ),
+        migrations.CreateModel(
+            name='Cable',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('asset_id', models.CharField(max_length=10)),
+                ('description', models.CharField(max_length=120)),
+                ('serial_number', models.CharField(blank=True, max_length=150, null=True)),
+                ('date_acquired', models.DateField()),
+                ('date_sold', models.DateField(blank=True, null=True)),
+                ('purchase_price', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
+                ('salvage_value', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
+                ('comments', models.TextField(blank=True, null=True)),
+                ('next_sched_maint', models.DateField(blank=True, null=True)),
+                ('is_cable', models.BooleanField(default=False)),
+                ('length', models.DecimalField(blank=True, decimal_places=1, help_text='m', max_digits=10, null=True)),
+                ('csa', models.DecimalField(blank=True, decimal_places=2, help_text='mm^2', max_digits=10, null=True)),
+                ('circuits', models.IntegerField(blank=True, null=True)),
+                ('cores', models.IntegerField(blank=True, null=True)),
+                ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.AssetCategory')),
+                ('parent', models.ForeignKey(blank=True, null=True, on_delete=None, related_name='asset_parent', to='assets.Cable')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Connector',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('description', models.CharField(max_length=80)),
+                ('current_rating', models.DecimalField(decimal_places=2, help_text='Amps', max_digits=10)),
+                ('voltage_rating', models.IntegerField(default=0, help_text='Volts')),
+                ('num_pins', models.IntegerField(blank=True, null=True)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='cable',
+            name='plug',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='plug', to='assets.Connector'),
+        ),
+        migrations.AddField(
+            model_name='cable',
+            name='purchased_from',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='assets.Supplier'),
+        ),
+        migrations.AddField(
+            model_name='cable',
+            name='socket',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='socket', to='assets.Connector'),
+        ),
+        migrations.AddField(
+            model_name='cable',
+            name='status',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.AssetStatus'),
+        ),
+        migrations.AlterField(
+            model_name='asset',
+            name='comments',
+            field=models.TextField(blank=True, default=''),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='asset',
+            name='serial_number',
+            field=models.CharField(blank=True, default='', max_length=150),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='cable',
+            name='comments',
+            field=models.TextField(blank=True, default=''),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='cable',
+            name='serial_number',
+            field=models.CharField(blank=True, default='', max_length=150),
+            preserve_default=False,
+        ),
+    ]
--- a/assets/migrations/0007_auto_20190108_0202_squashed_0014_auto_20191017_2052.py
+++ b/assets/migrations/0007_auto_20190108_0202_squashed_0014_auto_20191017_2052.py
@@ -0,0 +1,176 @@
+# Generated by Django 2.0.13 on 2019-12-04 17:37
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    replaces = [('assets', '0007_auto_20190108_0202'), ('assets', '0008_auto_20191002_1931'), ('assets', '0009_auto_20191008_2148'), ('assets', '0010_auto_20191013_2123'), ('assets', '0011_auto_20191013_2247'), ('assets', '0012_auto_20191014_0012'), ('assets', '0013_auto_20191016_1446'), ('assets', '0014_auto_20191017_2052')]
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('assets', '0006_auto_20180728_1451_squashed_0021_auto_20190105_1156'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='asset',
+            name='parent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='asset_parent', to='assets.Asset'),
+        ),
+        migrations.AlterField(
+            model_name='cable',
+            name='parent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='asset_parent', to='assets.Cable'),
+        ),
+        migrations.AlterField(
+            model_name='connector',
+            name='voltage_rating',
+            field=models.IntegerField(help_text='Volts'),
+        ),
+        migrations.AlterModelOptions(
+            name='asset',
+            options={'base_manager_name': 'objects'},
+        ),
+        migrations.AlterModelOptions(
+            name='cable',
+            options={'base_manager_name': 'objects'},
+        ),
+        migrations.RemoveField(
+            model_name='asset',
+            name='length',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='asset_id',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='category',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='comments',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='date_acquired',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='date_sold',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='description',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='id',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='is_cable',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='next_sched_maint',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='parent',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='purchase_price',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='purchased_from',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='salvage_value',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='serial_number',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='status',
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='polymorphic_ctype',
+            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_assets.asset_set+', to='contenttypes.ContentType'),
+        ),
+        migrations.AlterField(
+            model_name='asset',
+            name='asset_id',
+            field=models.CharField(max_length=10, unique=True),
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='plug',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='socket',
+        ),
+        migrations.AlterModelOptions(
+            name='asset',
+            options={},
+        ),
+        migrations.RemoveField(
+            model_name='asset',
+            name='polymorphic_ctype',
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='circuits',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='cores',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='csa',
+            field=models.DecimalField(blank=True, decimal_places=2, help_text='mm^2', max_digits=10, null=True),
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='length',
+            field=models.DecimalField(blank=True, decimal_places=1, help_text='m', max_digits=10, null=True),
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='plug',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='plug', to='assets.Connector'),
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='socket',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='socket', to='assets.Connector'),
+        ),
+        migrations.DeleteModel(
+            name='Cable',
+        ),
+        migrations.AlterModelOptions(
+            name='asset',
+            options={'ordering': ['asset_id'], 'permissions': (('asset_finance', 'Can see financial data for assets'), ('view_asset', 'Can view an asset'))},
+        ),
+        migrations.AddField(
+            model_name='assetstatus',
+            name='should_show',
+            field=models.BooleanField(default=True, help_text='Should this be shown by default in the asset list.'),
+        ),
+        migrations.AlterModelOptions(
+            name='supplier',
+            options={'permissions': (('view_supplier', 'Can view a supplier'),)},
+        ),
+    ]
--- a/assets/migrations/init.py
+++ b/assets/migrations/init.py
--- a/assets/models.py
+++ b/assets/models.py
@@ -0,0 +1,141 @@
+import re
+from django.core.exceptions import ValidationError
+from django.db import models, connection
+from django.urls import reverse
+
+
+class AssetCategory(models.Model):
+    class Meta:
+        verbose_name = 'Asset Category'
+        verbose_name_plural = 'Asset Categories'
+
+    name = models.CharField(max_length=80)
+
+    def __str__(self):
+        return self.name
+
+
+class AssetStatus(models.Model):
+    class Meta:
+        verbose_name = 'Asset Status'
+        verbose_name_plural = 'Asset Statuses'
+
+    name = models.CharField(max_length=80)
+    should_show = models.BooleanField(default=True, help_text="Should this be shown by default in the asset list.")
+
+    def __str__(self):
+        return self.name
+
+
+class Supplier(models.Model):
+    name = models.CharField(max_length=80)
+
+    class Meta:
+        permissions = (
+            ('view_supplier', 'Can view a supplier'),
+        )
+
+    def get_absolute_url(self):
+        return reverse('supplier_list')
+
+    def __str__(self):
+        return self.name
+
+
+class Connector(models.Model):
+    description = models.CharField(max_length=80)
+    current_rating = models.DecimalField(decimal_places=2, max_digits=10, help_text='Amps')
+    voltage_rating = models.IntegerField(help_text='Volts')
+    num_pins = models.IntegerField(blank=True, null=True)
+
+    def __str__(self):
+        return self.description
+
+
+class Asset(models.Model):
+    class Meta:
+        ordering = ['asset_id']
+        permissions = (
+            ('asset_finance', 'Can see financial data for assets'),
+            ('view_asset', 'Can view an asset')
+        )
+
+    parent = models.ForeignKey(to='self', related_name='asset_parent', blank=True, null=True, on_delete=models.SET_NULL)
+    asset_id = models.CharField(max_length=10, unique=True)
+    description = models.CharField(max_length=120)
+    category = models.ForeignKey(to=AssetCategory, on_delete=models.CASCADE)
+    status = models.ForeignKey(to=AssetStatus, on_delete=models.CASCADE)
+    serial_number = models.CharField(max_length=150, blank=True)
+    purchased_from = models.ForeignKey(to=Supplier, on_delete=models.CASCADE, blank=True, null=True)
+    date_acquired = models.DateField()
+    date_sold = models.DateField(blank=True, null=True)
+    purchase_price = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10)
+    salvage_value = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10)
+    comments = models.TextField(blank=True)
+    next_sched_maint = models.DateField(blank=True, null=True)
+
+    # Cable assets
+    is_cable = models.BooleanField(default=False)
+    plug = models.ForeignKey(Connector, on_delete=models.SET_NULL, related_name='plug', blank=True, null=True)
+    socket = models.ForeignKey(Connector, on_delete=models.SET_NULL, related_name='socket', blank=True, null=True)
+    length = models.DecimalField(decimal_places=1, max_digits=10, blank=True, null=True, help_text='m')
+    csa = models.DecimalField(decimal_places=2, max_digits=10, blank=True, null=True, help_text='mm^2')
+    circuits = models.IntegerField(blank=True, null=True)
+    cores = models.IntegerField(blank=True, null=True)
+
+    def get_available_asset_id():
+        sql = """
+        SELECT MIN(CAST(a.asset_id AS int))+1
+        FROM assets_asset a
+        LEFT OUTER JOIN assets_asset b ON
+            (CAST(a.asset_id AS int) + 1 = CAST(b.asset_id AS int))
+        WHERE b.asset_id IS NULL AND CAST(a.asset_id AS int) >= %s;
+        """
+        with connection.cursor() as cursor:
+            cursor.execute(sql, [9000])
+            row = cursor.fetchone()
+            if row[0] is None:
+                return 9000
+            else:
+                return row[0]
+
+    def get_absolute_url(self):
+        return reverse('asset_detail', kwargs={'pk': self.asset_id})
+
+    def __str__(self):
+        out = str(self.asset_id) + ' - ' + self.description
+        if self.is_cable:
+            out += '{} - {}m - {}'.format(self.plug, self.length, self.socket)
+        return out
+
+    def clean(self):
+        errdict = {}
+        if self.date_sold and self.date_acquired > self.date_sold:
+            errdict["date_sold"] = ["Cannot sell an item before it is acquired"]
+
+        self.asset_id = self.asset_id.upper()
+        if re.search("^[a-zA-Z0-9]+$", self.asset_id) is None:
+                errdict["asset_id"] = ["An Asset ID can only consist of letters and numbers"]
+
+        if self.purchase_price and self.purchase_price < 0:
+            errdict["purchase_price"] = ["A price cannot be negative"]
+
+        if self.salvage_value and self.salvage_value < 0:
+            errdict["salvage_value"] = ["A price cannot be negative"]
+
+        if self.is_cable:
+            if not self.length or self.length <= 0:
+                errdict["length"] = ["The length of a cable must be more than 0"]
+            if not self.csa or self.csa <= 0:
+                errdict["csa"] = ["The CSA of a cable must be more than 0"]
+            if not self.circuits or self.circuits <= 0:
+                errdict["circuits"] = ["There must be at least one circuit in a cable"]
+            if not self.cores or self.cores <= 0:
+                errdict["cores"] = ["There must be at least one core in a cable"]
+            if self.socket is None:
+                errdict["socket"] = ["A cable must have a socket"]
+            if self.plug is None:
+                errdict["plug"] = ["A cable must have a plug"]
+
+        if errdict != {}:  # If there was an error when validation
+            raise ValidationError(errdict)
--- a/assets/static/js/csrf.js
+++ b/assets/static/js/csrf.js
@@ -0,0 +1,23 @@
+$.ajaxSetup({
+     beforeSend: function(xhr, settings) {
+         function getCookie(name) {
+             var cookieValue = null;
+             if (document.cookie && document.cookie != '') {
+                 var cookies = document.cookie.split(';');
+                 for (var i = 0; i < cookies.length; i++) {
+                     var cookie = jQuery.trim(cookies[i]);
+                     // Does this cookie string begin with the name we want?
+                     if (cookie.substring(0, name.length + 1) == (name + '=')) {
+                         cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                         break;
+                     }
+                 }
+             }
+             return cookieValue;
+         }
+         if (!(/^http:.*/.test(settings.url) || /^https:.*/.test(settings.url))) {
+             // Only send the token to relative URLs i.e. locally.
+             xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'));
+         }
+     }
+});
--- a/assets/templates/asset_create.html
+++ b/assets/templates/asset_create.html
@@ -0,0 +1,62 @@
+{% extends 'base_assets.html' %}
+{% load widget_tweaks %}
+{% load asset_templatetags %}
+{% block title %}Asset {{ object.asset_id }}{% endblock %}
+
+
+{% block content %}
+
+<div class="page-header">
+  <h1>
+      {% if duplicate %}
+          Duplication of Asset: {{ previous_asset_id }}
+      {% else %}
+          Create Asset
+      {% endif %}
+  </h1>
+</div>
+{% if duplicate %}
+<form method="post" id="asset_update_form" action="{% url 'asset_duplicate' pk=previous_asset_id%}">
+  {% else %}
+  <form method="post" id="asset_update_form" action="{% url 'asset_create'%}">
+    {% endif %}
+    {% include 'form_errors.html' %}
+    {% csrf_token %}
+    <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
+    <div class="row">
+      <div class="col-sm-12">
+        {% include 'partials/asset_form.html' %}
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-md-6">
+        {% include 'partials/purchasedetails_form.html' %}
+      </div>
+      <div class="col-md-6" hidden="true" id="cable-table">
+        {% include 'partials/cable_form.html' %}
+      </div>
+      <div class="col-md-4">
+        {% include 'partials/parent_form.html' %}
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-md-12">
+        {% include 'partials/asset_buttons.html' %}
+      </div>
+    </div>
+  </form>
+
+  {% endblock %}
+
+  {% block js%}
+  <script>
+    function checkIfCableHidden() {
+      if (document.getElementById("id_is_cable").checked) {
+        document.getElementById("cable-table").hidden = false;
+      } else {
+        document.getElementById("cable-table").hidden = true;
+      }
+    }
+    checkIfCableHidden();
+  </script>
+  {%endblock%}
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -0,0 +1,65 @@
+{% extends 'base_assets.html' %}
+{% block title %}Asset List{% endblock %}
+{% load paginator from filters %}
+{% load widget_tweaks %}
+
+{% block content %}
+
+<div class="page-header">
+  <h1 class="text-center">Asset List</h1>
+</div>
+
+<form id="asset-search-form" method="get" class="form-inline pull-right">
+  <div class="input-group pull-right" style="width: auto;">
+    {% render_field form.query|add_class:'form-control' placeholder='Search by Asset ID/Description' style="width: 250px"%}
+    <label for="query" class="sr-only">Asset ID/Description:</label>
+    <span class="input-group-btn"><button type="submit" class="btn btn-default">Search</button></span>
+  </div>
+  <br>
+  <div style="margin-top: 1em;" class="pull-right">
+      <div class="form-group">
+        <label for="category" class="sr-only">Category</label>
+        {% render_field form.category|attr:'multiple'|add_class:'form-control selectpicker' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
+      </div>
+      <div class="form-group">
+        <label for="status" class="sr-only">Status</label>
+        {% render_field form.status|attr:'multiple'|add_class:'form-control selectpicker' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
+      </div>
+      <!---TODO: Auto filter whenever an option is selected, instead of using a button -->
+      <button type="submit" class="btn btn-default">Filter</button>
+    </div>
+</form>
+
+<table class="table">
+  <thead>
+    <tr>
+      <th>Asset ID</th>
+      <th>Description</th>
+      <th>Category</th>
+      <th>Status</th>
+      <th class="hidden-xs">Quick Links</th>
+    </tr>
+  </thead>
+  <tbody id="asset_table_body">
+    {% include 'partials/asset_list_table_body.html' %}
+  </tbody>
+</table>
+
+{% if is_paginated %}
+<div class="text-center">
+  {% paginator %}
+</div>
+{% endif %}
+
+{% endblock %}
+
+{% load static %}
+{% block css %}
+    <link rel="stylesheet" href="{% static "css/bootstrap-select.min.css" %}"/>
+    <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
+{% endblock %}
+
+{% block preload_js %}
+    <script src="{% static "js/bootstrap-select.js" %}"></script>
+    <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
+{% endblock %}
--- a/assets/templates/asset_update.html
+++ b/assets/templates/asset_update.html
@@ -0,0 +1,63 @@
+{% extends 'base_assets.html' %}
+{% load widget_tweaks %}
+{% load asset_templatetags %}
+{% block title %}Asset {{ object.asset_id }}{% endblock %}
+
+
+{% block content %}
+
+<div class="page-header">
+  <h1>
+      {% if edit and object %}
+          Edit Asset: {{ object.asset_id }}
+      {% else %}
+          Asset: {{ object.asset_id }}
+      {% endif %}
+  </h1>
+</div>
+<form method="post" id="asset_update_form" action="{% url 'asset_update' pk=object.asset_id%}">
+  {% include 'form_errors.html' %}
+  {% csrf_token %}
+  <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
+  <div class="row">
+    <div class="col-sm-12">
+      {% include 'partials/asset_form.html' %}
+    </div>
+  </div>
+  <div class="row">
+    {% if perms.asset.asset_financial %}
+    <div class="col-md-6">
+      {% include 'partials/purchasedetails_form.html' %}
+    </div>
+    {%endif%}
+    <div class="col-md-6" 
+    {% if not object.is_cable %} hidden="true" {% endif %} id="cable-table">
+      {% include 'partials/cable_form.html' %}
+    </div>
+    <div class="col-md-4">
+      {% include 'partials/parent_form.html' %}
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      {% include 'partials/asset_buttons.html' %}
+    </div>
+  </div>
+</form>
+
+{% endblock %}
+
+{% block js%}
+{% if edit %}
+<script>
+  function checkIfCableHidden() {
+    if (document.getElementById("id_is_cable").checked) {
+      document.getElementById("cable-table").hidden = false;
+    } else {
+      document.getElementById("cable-table").hidden = true;
+    }
+  }
+  checkIfCableHidden();
+</script>
+{% endif %}
+{% endblock %}
--- a/assets/templates/asset_update_search_results.html
+++ b/assets/templates/asset_update_search_results.html
@@ -0,0 +1,16 @@
+{% for asset in object_list %}
+    <a href="javascript:void(0);" onclick="insertInParentField({{ asset.pk }}, '{{ asset }}')">
+        {{ asset.asset_id }} - {{ asset.description }}
+    </a>
+    <br>
+    {% empty %}
+    No assets match given ID
+{% endfor %}
+
+<script>
+    function insertInParentField(pk, str) {
+        $('#hidden_parent_id').val(pk);
+        $('#parent_id').val(str);
+        M.updateTextFields();
+    }
+</script>
--- a/assets/templates/partials/asset_buttons.html
+++ b/assets/templates/partials/asset_buttons.html
@@ -0,0 +1,25 @@
+{% if edit and object %}
+<!--edit-->
+<button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
+<a class="btn btn-default" href="{% url 'asset_duplicate' object.pk %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
+{% elif duplicate %}
+<!--duplicate-->
+<button type="submit" class="btn btn-default"><i class="glyphicon glyphicon-ok-sign"></i> Create Duplicate</button>
+{% elif create %}
+<!--create-->
+<button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
+{% else %}
+<!--detail view-->
+<div class="btn-group">
+    <a href="{% url 'asset_update' object.asset_id %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a>
+    <a class="btn btn-default" href="{% url 'asset_duplicate' object.asset_id %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
+</div>
+{% endif %}
+{% if create or edit or duplicate %}
+<br>
+<button type="reset" class="btn btn-link" onclick="
+{%if duplicate%}
+{% url 'asset_detail' previous_asset_id %}
+{%else%}
+history.back(){%endif%}">Cancel</button>
+{% endif %}
--- a/assets/templates/partials/asset_form.html
+++ b/assets/templates/partials/asset_form.html
@@ -0,0 +1,61 @@
+{% load widget_tweaks %}
+{% load asset_templatetags %}
+<div class="panel panel-default">
+  <div class="panel-heading">
+    Asset Details
+  </div>
+  <div class="panel-body">
+    {% if create or edit or duplicate %}
+    <div class="form-group">
+        <label for="{{ form.asset_id.id_for_label }}">Asset ID</label>
+        {% if duplicate %}
+        {% render_field form.asset_id|add_class:'form-control' value=object.asset_id %}
+        {% elif object.asset_id %}
+        {% render_field form.asset_id|attr:'readonly'|add_class:'disabled_input form-control' value=object.asset_id %}
+        {% else %}
+        {% render_field form.asset_id|add_class:'form-control' %}
+        {% endif %}
+    </div>
+    <div class="form-group">
+      <label for="{{ form.description.id_for_label }}">Description</label>
+      {% render_field form.description|add_class:'form-control' value=object.description %}
+    </div>
+    <div class="form-group">
+      <label for="{{ form.category.id_for_label }}" >Category</label>
+      {% render_field form.category|add_class:'form-control'%}
+    </div>
+    {% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %} <label for="{{ form.is_cable.id_for_label }}">Cable?</label>
+    <div class="form-group">
+      <label for="{{ form.status.id_for_label }}" >Status</label>
+      {% render_field form.status|add_class:'form-control'%}
+    </div>
+    <div class="form-group">
+      <label for="{{ form.serial_number.id_for_label }}">Serial Number</label>
+      {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %}
+    </div>
+    <!---TODO: Lower default number of lines in comments box-->
+    <div class="form-group">
+      <label for="{{ form.comments.id_for_label }}">Comments</label>
+      {% render_field form.comments|add_class:'form-control' %}
+    </div>
+    {% else %}
+    <dt>Asset ID</dt>
+    <dd>{{ object.asset_id }}</dd>
+
+    <dt>Description</dt>
+    <dd style="overflow-wrap: break-word;">{{ object.description }}</dd>
+
+    <dt>Category</dt>
+    <dd>{{ object.category }}</dd>
+
+    <dt>Status</dt>
+    <dd>{{ object.status }}</dd>
+
+    <dt>Serial Number</dt>
+    <dd>{{ object.serial_number|default:'-' }}</dd>
+
+    <dt>Comments</dt>
+    <dd style="overflow-wrap: break-word;">{{ object.comments|default:'-'|linebreaksbr }}</dd>
+    {% endif %}
+  </div>
+</div>
--- a/assets/templates/partials/asset_list_table_body.html
+++ b/assets/templates/partials/asset_list_table_body.html
@@ -0,0 +1,33 @@
+{% for item in object_list %}
+    {#                <li><a href="{% url 'asset_detail' item.pk %}">{{ item.asset_id }} - {{ item.description }}</a></li>#}
+    <!---TODO: When the ability to filter the list is added, remove the colours from the filter - specifically, stop greying out sold/binned stuff if it is being searched for-->    <tr class="
+                {% if item.status.name == 'Broken' %}
+                  danger
+                {% elif item.status.name == 'Scrapped'%}
+                  warning
+                {% elif item.status.name == 'Sold'%}
+                  warning
+                {% elif item.status.name == 'Lost'%}
+                  danger
+                {% elif item.status.name == 'Not Built Yet'%}
+                  info
+                {% elif item.status.name == 'Active'%}
+                  success
+                {% endif %}
+                ">
+        <td style="vertical-align: middle;"><a href="{% url 'asset_detail' item.asset_id %}">{{ item.asset_id }}</a></td>
+        <td style="vertical-align: middle; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; max-width: 25vw">{{ item.description }}</td>
+        <td style="vertical-align: middle;">{{ item.category }}</td>
+        <td style="vertical-align: middle;">{{ item.status }}</td>
+        <td class="hidden-xs">
+
+            <div class="btn-group" role="group">
+                <a type="button" class="btn btn-default btn-sm" href="{% url 'asset_detail' item.asset_id %}"><i class="glyphicon glyphicon-eye-open"></i> View</a>
+                {% if perms.assets.change_asset %}
+                <a type="button" class="btn btn-default btn-sm" href="{% url 'asset_update' item.asset_id %}"><i class="glyphicon glyphicon-edit"></i> Edit</a>
+                <a type="button" class="btn btn-default btn-sm" href="{% url 'asset_duplicate' item.asset_id %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
+                {% endif %}
+            </div>
+        </td>
+    </tr>
+{% endfor %}
--- a/assets/templates/partials/asset_picker.html
+++ b/assets/templates/partials/asset_picker.html
@@ -0,0 +1,65 @@
+<select name="parent" id="parent_id" class="selectpicker">
+    {% if object.parent%}
+    <option value="{{object.parent.pk}}" selected>{{object.parent.description}}</option>
+    {% endif %}
+</select>
+
+{% load static %}
+{% block css %}
+    <link rel="stylesheet" href="{% static "css/bootstrap-select.min.css" %}"/>
+    <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
+{% endblock %}
+
+{% block preload_js %}
+    <script src="{% static "js/bootstrap-select.js" %}"></script>
+    <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
+{% endblock %}
+
+{% block js %}
+{{ js.super }}
+<script>
+$('#parent_id')
+    .selectpicker({
+        liveSearch: true
+    })
+    .ajaxSelectPicker({
+        ajax: {
+            url: '{% url 'asset_search_json'%}',
+            type: "get",
+            data: function () {
+                var params = {
+                    {% verbatim %}query: '{{{q}}}'{% endverbatim  %}
+                };
+                return params;
+            }
+        },
+        locale: {
+            emptyTitle: 'Search for item...'
+        },
+        preprocessData: function(data){
+            var assets = [];
+            if(data.length){
+                var len = data.length;
+                for(var i = 0; i < len; i++){
+                    var curr = data[i];
+                    assets.push(
+                        {
+                            'value': curr.id,
+                            'text': curr.label,
+                            'disabled': false
+                        }
+                    );
+                }
+                assets.push(
+                {
+                    'value': null,
+                    'text': "No parent"
+                });
+            }
+            
+            return assets;
+        },
+        preserveSelected: false
+    });
+</script>
+{% endblock js %}
--- a/assets/templates/partials/cable_form.html
+++ b/assets/templates/partials/cable_form.html
@@ -0,0 +1,61 @@
+{% load widget_tweaks %}
+{% load asset_templatetags %}
+<div class="panel panel-default">
+  <div class="panel-heading">
+    Cable Details
+  </div>
+  <div class="panel-body">
+    {% if create or edit or duplicate %}
+    <div class="form-group">
+      <label for="{{ form.plug.id_for_label }}">Plug</label>
+      {% render_field form.plug|add_class:'form-control'%}
+    </div>
+    <div class="form-group">
+      <label for="{{ form.socket.id_for_label }}">Socket</label>
+      {% render_field form.socket|add_class:'form-control'%}
+    </div>
+    <div class="form-group">
+      <label for="{{ form.length.id_for_label }}">Length</label>
+      <div class="input-group">
+        {% render_field form.length|add_class:'form-control' %}
+        <span class="input-group-addon">{{ form.length.help_text }}</span>
+      </div>
+    </div>
+    <div class="form-group">
+      <label for="{{ form.csa.id_for_label }}">Cross Sectional Area</label>
+      <div class="input-group">
+        {% render_field form.csa|add_class:'form-control' value=object.csa %}
+        <span class="input-group-addon">{{ form.csa.help_text }}</span>
+      </div>
+    </div>
+    <div class="form-group">
+      <label for="{{ form.circuits.id_for_label }}">Circuits</label>
+      {% render_field form.circuits|add_class:'form-control' value=object.circuits %}
+    </div>
+    <div class="form-group">
+      <label for="{{ form.cores.id_for_label }}">Cores</label>
+      {% render_field form.cores|add_class:'form-control' value=object.cores %}
+    </div>
+    {% else %}
+    <dl>
+      <dt>Socket</dt>
+      <dd>{{ object.socket|default_if_none:'-' }}</dd>
+
+      <dt>Plug</dt>
+      <dd>{{ object.plug|default_if_none:'-' }}</dd>
+
+      <dt>Length</dt>
+      <dd>{{ object.length|default_if_none:'-' }}m</dd>
+
+      <dt>Cross Sectional Area</dt>
+      <dd>{{ object.csa|default_if_none:'-' }}m^2</dd>
+
+      <dt>Circuits</dt>
+      <dd>{{ object.circuits|default_if_none:'-' }}</dd>
+
+      <dt>Cores</dt>
+      <dd>{{ object.cores|default_if_none:'-' }}</dd>
+    </dl>
+    {% endif %}
+  </div>
+</div>
--- a/assets/templates/partials/parent_form.html
+++ b/assets/templates/partials/parent_form.html
@@ -0,0 +1,41 @@
+{% load widget_tweaks %}
+{% load asset_templatetags %}
+<div class="panel panel-default">
+  <div class="panel-heading">
+    Collection Details
+  </div>
+  <div class="panel-body">
+    {% if create or edit or duplicate %}
+    <div class="form-group">
+      <label for="selectpicker">Set Parent</label>
+      {% include 'partials/asset_picker.html' %}
+    </div>
+    {% else %}
+    <dl>
+      <dt>Parent</dt>
+      <dd>
+        {% if object.parent %}
+        <a href="{% url 'asset_detail' object.parent.asset_id %}">
+        {{ object.parent.asset_id }} - {{ object.parent.description }}
+        </a>
+        {% else %}
+        <span>-</span>
+        {% endif %}
+      </dd>
+
+      <dt>Children</dt>
+      {% if object.asset_parent.all %}
+      {% for child in object.asset_parent.all %}
+      <dd>
+        <a href="{% url 'asset_detail' child.asset_id %}">
+        {{ child.asset_id }} - {{ child.description }}
+        </a>
+      </dd>
+      {% endfor %}
+      {% else %}
+      <dd><span>-</span></dd>
+      {% endif %}
+    </dl>
+    {% endif%}
+  </div>
+</div>
--- a/assets/templates/partials/purchasedetails_form.html
+++ b/assets/templates/partials/purchasedetails_form.html
@@ -0,0 +1,68 @@
+{% load widget_tweaks %}
+{% load asset_templatetags %}
+<div class="panel panel-default">
+  <div class="panel-heading">
+    Purchase Details
+  </div>
+  <div class="panel-body">
+    {% if create or edit or duplicate %}
+    <div class="form-group">
+      <label for="{{ form.purchased_from.id_for_label }}">Purchased From</label>
+      {% include 'partials/supplier_picker.html' %}
+    </div>
+
+    <div class="form-group">
+      <label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label>
+      <div class="input-group">
+        <span class="input-group-addon">£</span>
+        {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %}
+      </div>
+    </div>
+
+    <div class="form-group">
+      <label for="{{ form.salvage_value.id_for_label }}">Salvage Value</label>
+      <div class="input-group">
+        <span class="input-group-addon">£</span>
+        {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %}
+      </div>
+    </div>
+
+    <div class="form-group">
+      <label for="{{ form.date_acquired.id_for_label }}" >Date Acquired</label>
+      {% if object.date_acquired%}
+      {% with date_acq=object.date_acquired|date:"Y-m-d" %}
+      {% render_field form.date_acquired|add_class:'form-control'|attr:'type="date"' value=date_acq %}
+      {% endwith %}
+      {% else %}
+      <input type="date" name="date_acquired" value="{% now "Y-m-d" %}"
+                    class="form-control" id="id_date_acquired">
+                {% endif %}
+              </div>
+
+      <div class="form-group">
+        <label for="{{ form.date_sold.id_for_label }}">Date Sold</label>
+        {% with date_sol=object.form.date_sold|date:"Y-m-d" %}
+        {% render_field form.date_sold|add_class:'form-control'|attr:'type="date"' value=date_sol %}
+        {% endwith %}
+      </div>
+      {% else %}
+      <dl>
+        <dt>Purchased From</dt>
+        <dd>{{ object.purchased_from|default_if_none:'-' }}</dd>
+
+        <dt>Purchase Price</dt>
+        <dd>£{{ object.purchase_price|default_if_none:'-' }}</dd>
+
+        <dt>Salvage Value</dt>
+        <dd>£{{ object.salvage_value|default_if_none:'-' }}</dd>
+
+        <dt>Date Acquired</dt>
+        <dd>{{ object.date_acquired|default_if_none:'-' }}</dd>
+        {% if object.date_sold %}
+        <dt>Date Sold</dt>
+        <dd>{{ object.date_sold|default_if_none:'-' }}</dd>
+        {% endif %}
+      </dl>
+      {% endif %}
+    </div>
+  </div>
--- a/assets/templates/partials/render_field.html
+++ b/assets/templates/partials/render_field.html
@@ -0,0 +1,16 @@
+{% load widget_tweaks %}
+
+  <!---TODO: Assign form-control class in here--->
+<div class="form-group">
+    <label for="{{ field.id_for_label }}">{{ label|default:field.label }}</label>
+    {% if css %}
+    {% render_field  field|add_class:css %}
+    {% elif disable_if_filled and field.value %}
+    {% render_field  field|attr:'disabled' %}
+    {% elif css and disable_if_filled %}
+    {% render_field  field|add_class:css|attr:'disabled' %}
+    {% else %}
+    {{ field }}
+    {% endif %}
+    <span class="helper-text" data-error="{{ field.errors.text }}"></span>
+</div>
--- a/assets/templates/partials/supplier_picker.html
+++ b/assets/templates/partials/supplier_picker.html
@@ -0,0 +1,64 @@
+<select name="purchased_from" id="supplier_id" class="selectpicker">
+    {% if object.parent%}
+    <option value="{{object.parent.pk}}" selected>{{object.parent.name}}</option>
+    {% endif %}
+</select>
+
+{% load static %}
+{% block css %}
+    <link rel="stylesheet" href="{% static "css/bootstrap-select.min.css" %}"/>
+    <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
+{% endblock %}
+
+{% block preload_js %}
+    <script src="{% static "js/bootstrap-select.js" %}"></script>
+    <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
+{% endblock %}
+
+{% block js %}
+{{ js.super }}
+<script>
+$('#supplier_id')
+    .selectpicker({
+        liveSearch: true
+    })
+    .ajaxSelectPicker({
+        ajax: {
+            url: '{% url 'supplier_search_json'%}',
+            type: "get",
+            data: function () {
+                var params = {
+                    {% verbatim %}query: '{{{q}}}'{% endverbatim  %}
+                };
+                return params;
+            }
+        },
+        locale: {
+            emptyTitle: 'Search for supplier...'
+        },
+        preprocessData: function(data){
+            var suppliers = [];
+            if(data.length){
+                var len = data.length;
+                for(var i = 0; i < len; i++){
+                    var curr = data[i];
+                    suppliers.push(
+                        {
+                            'value': curr.id,
+                            'text': curr.name,
+                            'disabled': false
+                        }
+                    );
+                }
+                suppliers.push(
+                {
+                    'value': null,
+                    'text': "(no selection)"
+                });
+            }
+            return suppliers;
+        },
+        preserveSelected: false
+    });
+</script>
+{% endblock js %}
--- a/assets/templates/supplier_detail.html
+++ b/assets/templates/supplier_detail.html
@@ -0,0 +1,6 @@
+{% extends 'base_assets.html' %}
+{% block title %}Detail{% endblock %}
+
+{% block content %}
+{{ object }}
+{% endblock %}
--- a/assets/templates/supplier_list.html
+++ b/assets/templates/supplier_list.html
@@ -0,0 +1,46 @@
+{% extends 'base_assets.html' %}
+{% block title %}Supplier List{% endblock %}
+{% load paginator from filters %}
+{% load widget_tweaks %}
+
+{% block content %}
+
+<div class="page-header">
+    <h1>Supplier List</h1>
+</div>
+
+<form id="supplier-search-form" method="get" class="form-inline pull-right">
+    {% csrf_token %}
+    <div class="input-group pull-right" style="width: auto;">
+        {% render_field form.query|add_class:'form-control' placeholder='Search by Name' style="width: 250px"%}
+        <label for="query" class="sr-only">Name:</label>
+        <span class="input-group-btn"><button type="submit" class="btn btn-default">Search</button></span>
+    </div>
+</form>
+
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th>Supplier</th>
+      <th>Quick Links</th>
+    </tr>
+  </thead>
+  <tbody id="asset_table_body">
+    {% for item in object_list %}
+    <tr>
+      <td>{{ item.name }}</td>
+      <td>
+        <a href="{% url 'supplier_update' item.pk %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a>
+      </td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
+
+{% if is_paginated %}
+<div class="text-center">
+  {% paginator %}
+</div>
+{% endif %}
+
+{% endblock %}
--- a/assets/templates/supplier_update.html
+++ b/assets/templates/supplier_update.html
@@ -0,0 +1,20 @@
+{% extends 'base_assets.html' %}
+{% block title %}Edit{% endblock %}
+
+{% block content %}
+
+    <div class="page-header">
+        <h1>Supplier
+        {% if object %}
+           Edit: {{ object.name }}
+        {% else %}
+            Create
+        {% endif %}</h1>
+    </div>
+    <form method="post">
+        {% csrf_token %}
+            {{ form }}
+
+        <input type="submit" value="Save" class="btn btn-success">
+    </form>
+{% endblock %}
--- a/assets/templatetags/init.py
+++ b/assets/templatetags/init.py
--- a/assets/templatetags/asset_templatetags.py
+++ b/assets/templatetags/asset_templatetags.py
@@ -0,0 +1,21 @@
+from django import template
+from django.template.defaultfilters import stringfilter
+from django.utils.safestring import SafeData, mark_safe
+from django.utils.text import normalize_newlines
+from django.utils.html import escape
+
+register = template.Library()
+
+
+@register.filter(is_safe=True, needs_autoescape=True)
+@stringfilter
+def linebreaksn(value, autoescape=True):
+    """
+    Convert all newlines in a piece of plain text to jQuery line breaks
+    (`\n`).
+    """
+    autoescape = autoescape and not isinstance(value, SafeData)
+    value = normalize_newlines(value)
+    if autoescape:
+        value = escape(value)
+    return mark_safe(value.replace('\n', '\\n'))
--- a/assets/urls.py
+++ b/assets/urls.py
@@ -0,0 +1,22 @@
+from django.urls import path
+from assets import views
+
+from PyRIGS.decorators import permission_required_with_403
+
+urlpatterns = [
+    path('', views.AssetList.as_view(), name='asset_index'),
+    path('asset/list/', views.AssetList.as_view(), name='asset_list'),
+    path('asset/id/<str:pk>/', views.AssetDetail.as_view(), name='asset_detail'),
+    path('asset/create/', permission_required_with_403('assets.create_asset')(views.AssetCreate.as_view()), name='asset_create'),
+    path('asset/id/<str:pk>/edit/', permission_required_with_403('assets.change_asset')(views.AssetEdit.as_view()), name='asset_update'),
+    path('asset/id/<str:pk>/duplicate/', permission_required_with_403('assets.create_asset')(views.AssetDuplicate.as_view()), name='asset_duplicate'),
+
+    path('asset/search/', views.AssetSearch.as_view(), name='asset_search_json'),
+
+    path('supplier/list', views.SupplierList.as_view(), name='supplier_list'),
+    path('supplier/<int:pk>', views.SupplierDetail.as_view(), name='supplier_detail'),
+    path('supplier/create', permission_required_with_403('assets.create_supplier')(views.SupplierCreate.as_view()), name='supplier_create'),
+    path('supplier/<int:pk>/edit', permission_required_with_403('assets.edit_supplier')(views.SupplierUpdate.as_view()), name='supplier_update'),
+
+    path('supplier/search/', views.SupplierSearch.as_view(), name='supplier_search_json'),
+]
--- a/assets/views.py
+++ b/assets/views.py
@@ -0,0 +1,205 @@
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.http import JsonResponse
+from django.views import generic
+from django.views.decorators.csrf import csrf_exempt
+from django.utils.decorators import method_decorator
+from django.urls import reverse
+from django.db.models import Q
+from assets import models, forms
+
+
+@method_decorator(csrf_exempt, name='dispatch')
+class AssetList(LoginRequiredMixin, generic.ListView):
+    model = models.Asset
+    template_name = 'asset_list.html'
+    paginate_by = 40
+    ordering = ['-pk']
+    hide_hidden_status = True
+
+    def get_initial(self):
+        initial = {'status': models.AssetStatus.objects.filter(should_show=True)}
+        return initial
+
+    def get_queryset(self):
+        if self.request.method == 'POST':
+            self.form = forms.AssetSearchForm(data=self.request.POST)
+        elif self.request.method == 'GET' and len(self.request.GET) > 0:
+            self.form = forms.AssetSearchForm(data=self.request.GET)
+        else:
+            self.form = forms.AssetSearchForm(data=self.get_initial())
+        form = self.form
+        if not form.is_valid():
+            return self.model.objects.none()
+
+        # TODO Feedback to user when search fails
+        query_string = form.cleaned_data['query'] or ""
+        if len(query_string) == 0:
+            queryset = self.model.objects.all()
+        elif len(query_string) >= 3:
+            queryset = self.model.objects.filter(Q(asset_id__exact=query_string) | Q(description__icontains=query_string))
+        else:
+            queryset = self.model.objects.filter(Q(asset_id__exact=query_string))
+
+        if form.cleaned_data['category']:
+            queryset = queryset.filter(category__in=form.cleaned_data['category'])
+
+        if len(form.cleaned_data['status']) > 0:
+            queryset = queryset.filter(status__in=form.cleaned_data['status'])
+        elif self.hide_hidden_status:
+            queryset = queryset.filter(status__in=models.AssetStatus.objects.filter(should_show=True))
+
+        return queryset
+
+    def get_context_data(self, **kwargs):
+        context = super(AssetList, self).get_context_data(**kwargs)
+        context["form"] = self.form
+
+        context["categories"] = models.AssetCategory.objects.all()
+
+        context["statuses"] = models.AssetStatus.objects.all()
+        return context
+
+
+class AssetSearch(AssetList):
+    hide_hidden_status = False
+
+    def render_to_response(self, context, **response_kwargs):
+        result = []
+
+        for asset in context["object_list"]:
+            result.append({"id": asset.pk, "label": (asset.asset_id + " | " + asset.description)})
+
+        return JsonResponse(result, safe=False)
+
+
+class AssetIDUrlMixin:
+    def get_object(self, queryset=None):
+        pk = self.kwargs.get(self.pk_url_kwarg)
+        queryset = models.Asset.objects.filter(asset_id=pk)
+        try:
+            # Get the single item from the filtered queryset
+            obj = queryset.get()
+        except queryset.model.DoesNotExist:
+            raise Http404(_("No %(verbose_name)s found matching the query") %
+                          {'verbose_name': queryset.model._meta.verbose_name})
+        return obj
+
+
+class AssetDetail(LoginRequiredMixin, AssetIDUrlMixin, generic.DetailView):
+    model = models.Asset
+    template_name = 'asset_update.html'
+
+
+class AssetEdit(LoginRequiredMixin, AssetIDUrlMixin, generic.UpdateView):
+    template_name = 'asset_update.html'
+    model = models.Asset
+    form_class = forms.AssetForm
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['edit'] = True
+        context["connectors"] = models.Connector.objects.all()
+
+        return context
+
+    def get_success_url(self):
+        return reverse("asset_detail", kwargs={"pk": self.object.asset_id})
+
+
+class AssetCreate(LoginRequiredMixin, generic.CreateView):
+    template_name = 'asset_create.html'
+    model = models.Asset
+    form_class = forms.AssetForm
+
+    def get_context_data(self, **kwargs):
+        context = super(AssetCreate, self).get_context_data(**kwargs)
+        context["create"] = True
+        context["connectors"] = models.Connector.objects.all()
+
+        return context
+
+    def get_initial(self, *args, **kwargs):
+        initial = super().get_initial(*args, **kwargs)
+        initial["asset_id"] = models.Asset.get_available_asset_id()
+        return initial
+
+    def get_success_url(self):
+        return reverse("asset_detail", kwargs={"pk": self.object.asset_id})
+
+
+class DuplicateMixin:
+    def get(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        self.object.pk = None
+        return self.render_to_response(self.get_context_data())
+
+
+class AssetDuplicate(DuplicateMixin, AssetIDUrlMixin, AssetCreate):
+    model = models.Asset
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["create"] = None
+        context["duplicate"] = True
+        context['previous_asset_id'] = self.get_object().asset_id
+        return context
+
+
+class SupplierList(generic.ListView):
+    model = models.Supplier
+    template_name = 'supplier_list.html'
+    paginate_by = 40
+    ordering = ['name']
+
+    def get_queryset(self):
+        if self.request.method == 'POST':
+            self.form = forms.SupplierSearchForm(data=self.request.POST)
+        elif self.request.method == 'GET':
+            self.form = forms.SupplierSearchForm(data=self.request.GET)
+        else:
+            self.form = forms.SupplierSearchForm(data={})
+        form = self.form
+        if not form.is_valid():
+            return self.model.objects.none()
+
+        query_string = form.cleaned_data['query'] or ""
+        if len(query_string) == 0:
+            queryset = self.model.objects.all()
+        else:
+            queryset = self.model.objects.filter(Q(name__icontains=query_string))
+
+        return queryset
+
+    def get_context_data(self, **kwargs):
+        context = super(SupplierList, self).get_context_data(**kwargs)
+        context["form"] = self.form
+        return context
+
+
+class SupplierSearch(SupplierList):
+    hide_hidden_status = False
+
+    def render_to_response(self, context, **response_kwargs):
+        result = []
+
+        for supplier in context["object_list"]:
+            result.append({"id": supplier.pk, "name": supplier.name})
+
+        return JsonResponse(result, safe=False)
+
+
+class SupplierDetail(generic.DetailView):
+    model = models.Supplier
+    template_name = 'supplier_detail.html'
+
+
+class SupplierCreate(generic.CreateView):
+    model = models.Supplier
+    form_class = forms.SupplierForm
+    template_name = 'supplier_update.html'
+
+
+class SupplierUpdate(generic.UpdateView):
+    model = models.Supplier
+    form_class = forms.SupplierForm
+    template_name = 'supplier_update.html'