mirror of
https://github.com/inventree/InvenTree.git
synced 2025-06-18 13:05:42 +00:00
PEP style fixes
This commit is contained in:
@ -2,15 +2,10 @@ from django.contrib import admin
|
||||
from import_export.admin import ImportExportModelAdmin
|
||||
|
||||
from .models import Company
|
||||
#from .models import SupplierOrder
|
||||
|
||||
|
||||
class CompanyAdmin(ImportExportModelAdmin):
|
||||
list_display = ('name', 'website', 'contact')
|
||||
|
||||
|
||||
#class SupplierOrderAdmin(admin.ModelAdmin):
|
||||
# list_display = ('internal_ref', 'supplier', 'issued_date', 'delivery_date', 'status')
|
||||
|
||||
|
||||
admin.site.register(Company, CompanyAdmin)
|
||||
#admin.site.register(SupplierOrder, SupplierOrderAdmin)
|
||||
|
@ -1,7 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django_filters.rest_framework import FilterSet, DjangoFilterBackend
|
||||
from django_filters.rest_framework import DjangoFilterBackend
|
||||
from rest_framework import filters
|
||||
from rest_framework import generics, permissions
|
||||
|
||||
@ -46,4 +46,4 @@ class CompanyList(generics.ListCreateAPIView):
|
||||
company_api_urls = [
|
||||
|
||||
url(r'^.*$', CompanyList.as_view(), name='api-company-list'),
|
||||
]
|
||||
]
|
||||
|
@ -28,6 +28,7 @@ class EditSupplierOrderForm(forms.ModelForm):
|
||||
]
|
||||
"""
|
||||
|
||||
|
||||
class EditCompanyForm(forms.ModelForm):
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
|
25
InvenTree/company/migrations/0003_auto_20180423_1117.py
Normal file
25
InvenTree/company/migrations/0003_auto_20180423_1117.py
Normal file
@ -0,0 +1,25 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.11.12 on 2018-04-23 11:17
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('company', '0002_auto_20180422_1201'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='company',
|
||||
name='is_supplier',
|
||||
field=models.BooleanField(default=True),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='company',
|
||||
name='name',
|
||||
field=models.CharField(help_text='Company name', max_length=100, unique=True),
|
||||
),
|
||||
]
|
@ -3,10 +3,7 @@ from __future__ import unicode_literals
|
||||
|
||||
import os
|
||||
|
||||
from django.utils.translation import ugettext as _
|
||||
|
||||
from django.db import models
|
||||
from django.core.validators import MinValueValidator
|
||||
|
||||
|
||||
def rename_company_image(instance, filename):
|
||||
@ -22,7 +19,7 @@ def rename_company_image(instance, filename):
|
||||
if ext:
|
||||
fn += '.' + ext
|
||||
|
||||
return os.path.join(base,fn)
|
||||
return os.path.join(base, fn)
|
||||
|
||||
|
||||
class Company(models.Model):
|
||||
@ -51,7 +48,7 @@ class Company(models.Model):
|
||||
|
||||
is_customer = models.BooleanField(default=False)
|
||||
|
||||
is_supplier = models.BooleanField(default=False)
|
||||
is_supplier = models.BooleanField(default=True)
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
@ -66,4 +63,3 @@ class Company(models.Model):
|
||||
@property
|
||||
def has_parts(self):
|
||||
return self.part_count > 0
|
||||
|
||||
|
@ -1,9 +1,8 @@
|
||||
from rest_framework import serializers
|
||||
|
||||
from part.models import Part
|
||||
|
||||
from .models import Company
|
||||
|
||||
|
||||
class CompanySerializer(serializers.HyperlinkedModelSerializer):
|
||||
|
||||
class Meta:
|
||||
|
@ -1,40 +1,15 @@
|
||||
from django.shortcuts import get_object_or_404
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.http import HttpResponseRedirect
|
||||
|
||||
from django.views.generic import DetailView, ListView
|
||||
from django.views.generic.edit import UpdateView, DeleteView, CreateView
|
||||
|
||||
from part.models import Part
|
||||
from .models import Company
|
||||
#from .models import SupplierOrder
|
||||
|
||||
from .forms import EditCompanyForm
|
||||
#from .forms import EditSupplierOrderForm
|
||||
|
||||
"""
|
||||
class SupplierOrderDetail(DetailView):
|
||||
context_object_name = 'order'
|
||||
model = SupplierOrder
|
||||
template_name = 'company/order_detail.html'
|
||||
queryset = SupplierOrder.objects.all()
|
||||
|
||||
|
||||
class SupplierOrderCreate(CreateView):
|
||||
model = SupplierOrder
|
||||
form_class = EditSupplierOrderForm
|
||||
context_object_name = 'supplier'
|
||||
template_name = 'company/order_create.html'
|
||||
|
||||
def get_initial(self):
|
||||
initials = super(SupplierOrderCreate, self).get_initial().copy()
|
||||
|
||||
s_id = self.request.GET.get('supplier', None)
|
||||
|
||||
if s_id:
|
||||
initials['supplier'] = get_object_or_404(Supplier, pk=s_id)
|
||||
|
||||
return initials
|
||||
"""
|
||||
|
||||
class CompanyIndex(ListView):
|
||||
model = Company
|
||||
@ -54,7 +29,6 @@ class CompanyIndex(ListView):
|
||||
return queryset
|
||||
|
||||
|
||||
|
||||
class CompanyDetail(DetailView):
|
||||
context_obect_name = 'company'
|
||||
template_name = 'company/detail.html'
|
||||
@ -86,5 +60,3 @@ class CompanyDelete(DeleteView):
|
||||
return super(CompanyDelete, self).post(request, *args, **kwargs)
|
||||
else:
|
||||
return HttpResponseRedirect(self.get_object().get_absolute_url())
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user