mirror of
				https://github.com/inventree/InvenTree.git
				synced 2025-10-31 05:05:42 +00:00 
			
		
		
		
	resort imports
This commit is contained in:
		| @@ -1,17 +1,16 @@ | ||||
| from django.contrib import admin | ||||
|  | ||||
| from import_export.admin import ImportExportModelAdmin | ||||
| from import_export.resources import ModelResource | ||||
| from import_export.fields import Field | ||||
| import import_export.widgets as widgets | ||||
|  | ||||
| from .models import Company | ||||
| from .models import SupplierPart | ||||
| from .models import SupplierPriceBreak | ||||
| from .models import ManufacturerPart, ManufacturerPartAttachment, ManufacturerPartParameter | ||||
| from import_export.admin import ImportExportModelAdmin | ||||
| from import_export.fields import Field | ||||
| from import_export.resources import ModelResource | ||||
|  | ||||
| from part.models import Part | ||||
|  | ||||
| from .models import (Company, ManufacturerPart, ManufacturerPartAttachment, | ||||
|                      ManufacturerPartParameter, SupplierPart, | ||||
|                      SupplierPriceBreak) | ||||
|  | ||||
|  | ||||
| class CompanyResource(ModelResource): | ||||
|     """ Class for managing Company data import/export """ | ||||
|   | ||||
| @@ -2,25 +2,24 @@ | ||||
| Provides a JSON API for the Company app | ||||
| """ | ||||
|  | ||||
| from django_filters.rest_framework import DjangoFilterBackend | ||||
| from django_filters import rest_framework as rest_filters | ||||
|  | ||||
| from rest_framework import filters | ||||
| from rest_framework import generics | ||||
|  | ||||
| from django.urls import include, re_path | ||||
| from django.db.models import Q | ||||
| from django.urls import include, re_path | ||||
|  | ||||
| from django_filters import rest_framework as rest_filters | ||||
| from django_filters.rest_framework import DjangoFilterBackend | ||||
| from rest_framework import filters, generics | ||||
|  | ||||
| from InvenTree.helpers import str2bool | ||||
| from InvenTree.api import AttachmentMixin | ||||
| from InvenTree.helpers import str2bool | ||||
|  | ||||
| from .models import Company | ||||
| from .models import ManufacturerPart, ManufacturerPartAttachment, ManufacturerPartParameter | ||||
| from .models import SupplierPart, SupplierPriceBreak | ||||
|  | ||||
| from .serializers import CompanySerializer | ||||
| from .serializers import ManufacturerPartSerializer, ManufacturerPartAttachmentSerializer, ManufacturerPartParameterSerializer | ||||
| from .serializers import SupplierPartSerializer, SupplierPriceBreakSerializer | ||||
| from .models import (Company, ManufacturerPart, ManufacturerPartAttachment, | ||||
|                      ManufacturerPartParameter, SupplierPart, | ||||
|                      SupplierPriceBreak) | ||||
| from .serializers import (CompanySerializer, | ||||
|                           ManufacturerPartAttachmentSerializer, | ||||
|                           ManufacturerPartParameterSerializer, | ||||
|                           ManufacturerPartSerializer, SupplierPartSerializer, | ||||
|                           SupplierPriceBreakSerializer) | ||||
|  | ||||
|  | ||||
| class CompanyList(generics.ListCreateAPIView): | ||||
|   | ||||
| @@ -2,14 +2,13 @@ | ||||
| Django Forms for interacting with Company app | ||||
| """ | ||||
|  | ||||
| from InvenTree.forms import HelperForm | ||||
| from InvenTree.fields import RoundingDecimalFormField | ||||
|  | ||||
| from django.utils.translation import gettext_lazy as _ | ||||
| import django.forms | ||||
| from django.utils.translation import gettext_lazy as _ | ||||
|  | ||||
| from .models import Company | ||||
| from .models import SupplierPriceBreak | ||||
| from InvenTree.fields import RoundingDecimalFormField | ||||
| from InvenTree.forms import HelperForm | ||||
|  | ||||
| from .models import Company, SupplierPriceBreak | ||||
|  | ||||
|  | ||||
| class CompanyImageDownloadForm(HelperForm): | ||||
|   | ||||
| @@ -4,32 +4,26 @@ Company database model definitions | ||||
|  | ||||
| import os | ||||
|  | ||||
| from django.utils.translation import gettext_lazy as _ | ||||
| from django.core.validators import MinValueValidator | ||||
| from django.core.exceptions import ValidationError | ||||
|  | ||||
| from django.db import models | ||||
| from django.db.models import Sum, Q, UniqueConstraint | ||||
|  | ||||
| from django.apps import apps | ||||
| from django.core.exceptions import ValidationError | ||||
| from django.core.validators import MinValueValidator | ||||
| from django.db import models | ||||
| from django.db.models import Q, Sum, UniqueConstraint | ||||
| from django.urls import reverse | ||||
|  | ||||
| from moneyed import CURRENCIES | ||||
| from django.utils.translation import gettext_lazy as _ | ||||
|  | ||||
| from markdownx.models import MarkdownxField | ||||
|  | ||||
| from moneyed import CURRENCIES | ||||
| from stdimage.models import StdImageField | ||||
|  | ||||
| from InvenTree.helpers import getMediaUrl, getBlankImage, getBlankThumbnail | ||||
| from InvenTree.fields import InvenTreeURLField | ||||
| from InvenTree.models import InvenTreeAttachment | ||||
| from InvenTree.status_codes import PurchaseOrderStatus | ||||
|  | ||||
| import InvenTree.validators | ||||
|  | ||||
| import common.models | ||||
| import common.settings | ||||
| import InvenTree.validators | ||||
| from common.settings import currency_code_default | ||||
| from InvenTree.fields import InvenTreeURLField | ||||
| from InvenTree.helpers import getBlankImage, getBlankThumbnail, getMediaUrl | ||||
| from InvenTree.models import InvenTreeAttachment | ||||
| from InvenTree.status_codes import PurchaseOrderStatus | ||||
|  | ||||
|  | ||||
| def rename_company_image(instance, filename): | ||||
|   | ||||
| @@ -5,22 +5,19 @@ JSON serializers for Company app | ||||
| from django.utils.translation import gettext_lazy as _ | ||||
|  | ||||
| from rest_framework import serializers | ||||
|  | ||||
| from sql_util.utils import SubqueryCount | ||||
|  | ||||
| from InvenTree.serializers import InvenTreeAttachmentSerializer | ||||
| from InvenTree.serializers import InvenTreeDecimalField | ||||
| from InvenTree.serializers import InvenTreeImageSerializerField | ||||
| from InvenTree.serializers import InvenTreeModelSerializer | ||||
| from InvenTree.serializers import InvenTreeMoneySerializer | ||||
|  | ||||
| from common.settings import currency_code_default, currency_code_mappings | ||||
| from InvenTree.serializers import (InvenTreeAttachmentSerializer, | ||||
|                                    InvenTreeDecimalField, | ||||
|                                    InvenTreeImageSerializerField, | ||||
|                                    InvenTreeModelSerializer, | ||||
|                                    InvenTreeMoneySerializer) | ||||
| from part.serializers import PartBriefSerializer | ||||
|  | ||||
| from .models import Company | ||||
| from .models import ManufacturerPart, ManufacturerPartAttachment, ManufacturerPartParameter | ||||
| from .models import SupplierPart, SupplierPriceBreak | ||||
|  | ||||
| from common.settings import currency_code_default, currency_code_mappings | ||||
| from .models import (Company, ManufacturerPart, ManufacturerPartAttachment, | ||||
|                      ManufacturerPartParameter, SupplierPart, | ||||
|                      SupplierPriceBreak) | ||||
|  | ||||
|  | ||||
| class CompanyBriefSerializer(InvenTreeModelSerializer): | ||||
|   | ||||
| @@ -1,6 +1,7 @@ | ||||
| from rest_framework import status | ||||
| from django.urls import reverse | ||||
|  | ||||
| from rest_framework import status | ||||
|  | ||||
| from InvenTree.api_tester import InvenTreeAPITestCase | ||||
|  | ||||
| from .models import Company | ||||
|   | ||||
| @@ -1,9 +1,9 @@ | ||||
| """ Unit tests for Company views (see views.py) """ | ||||
|  | ||||
| from django.test import TestCase | ||||
| from django.urls import reverse | ||||
| from django.contrib.auth import get_user_model | ||||
| from django.contrib.auth.models import Group | ||||
| from django.test import TestCase | ||||
| from django.urls import reverse | ||||
|  | ||||
|  | ||||
| class CompanyViewTestBase(TestCase): | ||||
|   | ||||
| @@ -1,13 +1,14 @@ | ||||
| from django.test import TestCase | ||||
| from django.core.exceptions import ValidationError | ||||
|  | ||||
| import os | ||||
| from decimal import Decimal | ||||
|  | ||||
| from .models import Company, Contact, ManufacturerPart, SupplierPart | ||||
| from .models import rename_company_image | ||||
| from django.core.exceptions import ValidationError | ||||
| from django.test import TestCase | ||||
|  | ||||
| from part.models import Part | ||||
|  | ||||
| from .models import (Company, Contact, ManufacturerPart, SupplierPart, | ||||
|                      rename_company_image) | ||||
|  | ||||
|  | ||||
| class CompanySimpleTest(TestCase): | ||||
|  | ||||
|   | ||||
| @@ -6,7 +6,6 @@ from django.urls import include, re_path | ||||
|  | ||||
| from . import views | ||||
|  | ||||
|  | ||||
| company_detail_urls = [ | ||||
|  | ||||
|     re_path(r'^thumb-download/', views.CompanyImageDownloadFromURL.as_view(), name='company-image-download'), | ||||
|   | ||||
| @@ -2,26 +2,21 @@ | ||||
| Django views for interacting with Company app | ||||
| """ | ||||
|  | ||||
| import io | ||||
|  | ||||
| from django.core.files.base import ContentFile | ||||
| from django.urls import reverse | ||||
| from django.utils.translation import gettext_lazy as _ | ||||
| from django.views.generic import DetailView, ListView | ||||
|  | ||||
| from django.urls import reverse | ||||
| from django.core.files.base import ContentFile | ||||
|  | ||||
| from PIL import Image | ||||
| import requests | ||||
| import io | ||||
| from PIL import Image | ||||
|  | ||||
| from InvenTree.views import AjaxUpdateView | ||||
| from InvenTree.views import InvenTreeRoleMixin | ||||
|  | ||||
| from .models import Company | ||||
| from .models import ManufacturerPart | ||||
| from .models import SupplierPart | ||||
| from InvenTree.views import AjaxUpdateView, InvenTreeRoleMixin | ||||
| from plugin.views import InvenTreePluginViewMixin | ||||
|  | ||||
| from .forms import CompanyImageDownloadForm | ||||
|  | ||||
| from plugin.views import InvenTreePluginViewMixin | ||||
| from .models import Company, ManufacturerPart, SupplierPart | ||||
|  | ||||
|  | ||||
| class CompanyIndex(InvenTreeRoleMixin, ListView): | ||||
|   | ||||
		Reference in New Issue
	
	Block a user