-
{{ part.name }}
+
{{ part.name }}
{% if part.description %}
{{ part.description }}
{% endif %}
diff --git a/InvenTree/static/css/inventree.css b/InvenTree/static/css/inventree.css
index 3acb4b6e69..dca981fc48 100644
--- a/InvenTree/static/css/inventree.css
+++ b/InvenTree/static/css/inventree.css
@@ -1,30 +1,3 @@
-table, th, td {
- border: 1px solid black;
- border-collapse: collapse;
- margin-left: 5px;
- margin-right: 5px;
- margin-top: 10px;
- margin-bottom: 10px;
-}
-
-th, td {
- padding-top: 5px;
- padding-bottom: 5px;
- padding-left: 10px;
- padding-right: 10px;
-}
-
-th {
- text-align: left;
-}
-
-table tr:nth-child(even) {
- background-color: #eee;
-}
-table tr:nth-child(odd) {
- background-color: #fff;
-}
-
.navbar-brand {
float: left;
}
diff --git a/InvenTree/stock/migrations/0006_auto_20180415_0302.py b/InvenTree/stock/migrations/0006_auto_20180415_0302.py
new file mode 100644
index 0000000000..14e02a167a
--- /dev/null
+++ b/InvenTree/stock/migrations/0006_auto_20180415_0302.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-04-15 03:02
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('stock', '0005_auto_20180415_0107'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='stocklocation',
+ name='description',
+ field=models.CharField(max_length=250),
+ ),
+ ]
diff --git a/InvenTree/supplier/migrations/0005_auto_20180415_0255.py b/InvenTree/supplier/migrations/0005_auto_20180415_0255.py
new file mode 100644
index 0000000000..5561db90d5
--- /dev/null
+++ b/InvenTree/supplier/migrations/0005_auto_20180415_0255.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-04-15 02:55
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('supplier', '0004_auto_20180414_0624'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='customer',
+ name='description',
+ field=models.CharField(max_length=500),
+ ),
+ migrations.AlterField(
+ model_name='manufacturer',
+ name='description',
+ field=models.CharField(max_length=500),
+ ),
+ migrations.AlterField(
+ model_name='supplier',
+ name='description',
+ field=models.CharField(max_length=500),
+ ),
+ ]
diff --git a/InvenTree/supplier/templates/supplier/detail.html b/InvenTree/supplier/templates/supplier/detail.html
index 9337b700db..8674c34878 100644
--- a/InvenTree/supplier/templates/supplier/detail.html
+++ b/InvenTree/supplier/templates/supplier/detail.html
@@ -2,26 +2,55 @@
{% block content %}
-
-- Name: {{ supplier.name }}
-- Description: {{ supplier.description }}
-- Website: {{ supplier.website }}
-- Contact: {{ supplier.contact }}
-
+
+
+
{{ supplier.name }}
+
{{ supplier.description }}
+
+
+
+ {% if supplier.website %}
+
+ | Website | {{ supplier.website }} |
+
+ {% endif %}
+ {% if supplier.address %}
+
+ | Address | {{ supplier.address }} |
+
+ {% endif %}
+ {% if supplier.phone %}
+
+ | Phone | {{ supplier.phone }} |
+
+ {% endif %}
+ {% if supplier.email %}
+
+ | Email | {{ supplier.email }} |
+
+ {% endif %}
+ {% if supplier.contact %}
+
+ | Contact | {{ supplier.contact }} |
+
+ {% endif %}
+
+
+
+
- | Part |
SKU |
+ Part |
Manufacturer |
MPN |
URL |
{% for part in supplier.parts.all %}
- | {{ part.part.name }} |
{{ part.SKU }} |
+ {{ part.part.name }} |
Manufacturer name goes here |
MPN goes here |
{{ part.URL }} |
diff --git a/InvenTree/supplier/templates/supplier/index.html b/InvenTree/supplier/templates/supplier/index.html
index b266c9e7dd..7ea5193e6c 100644
--- a/InvenTree/supplier/templates/supplier/index.html
+++ b/InvenTree/supplier/templates/supplier/index.html
@@ -2,18 +2,21 @@
{% block content %}
-
-
- | Supplier |
- Description |
- URL |
-
+Suppliers
+
{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/supplier/urls.py b/InvenTree/supplier/urls.py
index bc7f0d4711..3548c59f5d 100644
--- a/InvenTree/supplier/urls.py
+++ b/InvenTree/supplier/urls.py
@@ -1,9 +1,10 @@
-from django.conf.urls import url
+from django.conf.urls import url, include
from django.views.generic.base import RedirectView
from . import views
from . import api
+"""
cust_urls = [
# Customer detail
url(r'^(?P[0-9]+)/?$', api.CustomerDetail.as_view(), name='customer-detail'),
@@ -45,11 +46,21 @@ supplier_api_urls = [
url(r'^\?.*/?$', api.SupplierList.as_view()),
url(r'^$', api.SupplierList.as_view())
]
+"""
+
+supplier_detail_urls = [
+ #url(r'edit/?', views.SupplierEdit.as_view(), name='supplier-edit'),
+ #url(r'delete/?', views.SupplierDelete.as_view(), name='supplier-delete'),
+
+ url(r'^.*$', views.SupplierDetail.as_view(), name='supplier-detail'),
+]
supplier_urls = [
- url(r'^(?P\d+)/', views.detail, name='supplier-detail'),
url(r'^part/(?P\d+)/', views.partDetail, name='supplier-part-detail'),
- url(r'', views.index, name='supplier-index'),
+
+ url(r'^(?P\d+)/', include(supplier_detail_urls)),
+
+ url(r'', views.SupplierIndex.as_view(), name='supplier-index'),
# Redirect any other patterns
url(r'^.*$', RedirectView.as_view(url='', permanent=False), name='supplier-index'),
diff --git a/InvenTree/supplier/views.py b/InvenTree/supplier/views.py
index a6fd62000f..d90fe28309 100644
--- a/InvenTree/supplier/views.py
+++ b/InvenTree/supplier/views.py
@@ -1,27 +1,26 @@
-from django.http import HttpResponse
-from django.template import loader
-
from django.shortcuts import get_object_or_404, render
+from django.http import HttpResponseRedirect
+from django.urls import reverse
+
+from django.views.generic import DetailView, ListView
+from django.views.generic.edit import UpdateView, DeleteView, CreateView
from .models import Supplier, SupplierPart
-def index(request):
- """ The supplier index page simply displays all the suppliers
- """
+class SupplierIndex(ListView):
+ model = Supplier
+ template_name = 'supplier/index.html'
+ context_object_name = 'suppliers'
+ paginate_by = 50
- suppliers = Supplier.objects.order_by('name')
-
- return render(request, 'supplier/index.html', {'suppliers' : suppliers})
+ def get_queryset(self):
+ return Supplier.objects.order_by('name')
-def detail(request, pk):
- """ The supplier detail page shown detailed information
- on a particular supplier
- """
-
- supplier = get_object_or_404(Supplier, pk=pk)
-
- return render(request, 'supplier/detail.html', {'supplier' : supplier})
+class SupplierDetail(DetailView):
+ context_obect = 'supplier'
+ template_name = 'supplier/detail.html'
+ queryset = Supplier.objects.all()
def partDetail(request, pk):
