inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-16 01:36:29 +00:00
Code Activity

Improved list and detail views for supplier

Browse Source 
Huzzah for bootstrap
This commit is contained in:
Oliver
2018-04-15 13:49:47 +10:00
parent 9e6c7350f9
commit 8232baeed7
17 changed files with 201 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/InvenTree/models.py
View File

@@ -15,7 +15,7 @@ class Company(models.Model):
abstract = True
name = models.CharField(max_length=100, unique=True)
description = models.CharField(max_length=500, blank=True)
description = models.CharField(max_length=500)
website = models.URLField(blank=True)
address = models.CharField(max_length=200,
blank=True)
@@ -43,7 +43,7 @@ class InvenTreeTree(models.Model):
name = models.CharField(max_length=100, unique=True)
description = models.CharField(max_length=250, blank=True)
description = models.CharField(max_length=250)
# When a category is deleted, graft the children onto its parent
parent = models.ForeignKey('self',

11
InvenTree/InvenTree/urls.py
View File

@@ -11,7 +11,7 @@ from part.urls import part_urls
from stock.urls import stock_api_urls, stock_api_loc_urls
from stock.urls import stock_urls
from supplier.urls import supplier_api_urls, supplier_api_part_urls
#from supplier.urls import supplier_api_urls, supplier_api_part_urls
from supplier.urls import supplier_urls
from django.conf import settings
@@ -46,8 +46,8 @@ apipatterns = [
url(r'^bom/', include(bom_api_urls)),
# Supplier URLs
url(r'^supplier/', include(supplier_api_urls)),
url(r'^supplier-part/', include(supplier_api_part_urls)),
#url(r'^supplier/', include(supplier_api_urls)),
#url(r'^supplier-part/', include(supplier_api_part_urls)),
#url(r'^price-break/', include(price_break_urls)),
#url(r'^manufacturer/', include(manu_urls)),
#url(r'^customer/', include(cust_urls)),
@@ -69,15 +69,14 @@ apipatterns = [
urlpatterns = [
# API URL
url(r'^api/', include(apipatterns)),
#url(r'^api/', include(apipatterns)),
#url(r'^api-doc/', include_docs_urls(title='InvenTree API')),
url(r'^part/', include(part_urls)),
url(r'^stock/', include(stock_urls)),
url(r'^supplier/', include(supplier_urls)),
url(r'^track/', include(tracking_urls)),
url(r'^api-doc/', include_docs_urls(title='InvenTree API')),
url(r'^admin/', admin.site.urls),
url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')),
]