Skip to content

Commit 637b050

Browse files
committed
Improvements
1 parent b00c865 commit 637b050

13 files changed

Lines changed: 81 additions & 49 deletions

File tree

landolfio/inventory/admin.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
from admin_numeric_filter.admin import (NumericFilterModelAdmin,
2-
SliderNumericFilter)
1+
from admin_numeric_filter.admin import NumericFilterModelAdmin, SliderNumericFilter
32
from admin_numeric_filter.forms import SliderNumericForm
43
from autocompletefilter.admin import AutocompleteFilterMixin
54
from autocompletefilter.filters import AutocompleteListFilter
@@ -13,12 +12,19 @@
1312
from django.utils.html import format_html
1413
from django.utils.translation import gettext_lazy as _
1514
from django_admin_multi_select_filter.filters import (
16-
MultiSelectFieldListFilter, MultiSelectRelatedFieldListFilter)
17-
from queryable_properties.admin import (QueryablePropertiesAdmin,
18-
QueryablePropertiesAdminMixin)
19-
20-
from inventory.admin_inlines import (AttachmentInlineAdmin, RemarkInline,
21-
StatusChangeInline)
15+
MultiSelectFieldListFilter,
16+
MultiSelectRelatedFieldListFilter,
17+
)
18+
from queryable_properties.admin import (
19+
QueryablePropertiesAdmin,
20+
QueryablePropertiesAdminMixin,
21+
)
22+
23+
from inventory.admin_inlines import (
24+
AttachmentInlineAdmin,
25+
RemarkInline,
26+
StatusChangeInline,
27+
)
2228
from inventory.models.asset import Asset
2329
from inventory.models.asset_property import AssetProperty, AssetPropertyValue
2430
from inventory.models.attachment import Attachment

landolfio/inventory/models/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from .asset import Asset, AssetStates
22
from .asset_on_document_line import AssetSubscription
3-
from .asset_property import (AssetProperty, AssetPropertyType,
4-
AssetPropertyValue)
3+
from .asset_property import AssetProperty, AssetPropertyType, AssetPropertyValue
54
from .attachment import Attachment
65
from .category import Category
76
from .collection import Collection

landolfio/inventory/models/asset.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@
1414

1515
logger = logging.getLogger(__name__)
1616
from queryable_properties.managers import QueryablePropertiesManager
17-
from queryable_properties.properties import (AggregateProperty,
18-
RelatedExistenceCheckProperty)
17+
from queryable_properties.properties import (
18+
AggregateProperty,
19+
RelatedExistenceCheckProperty,
20+
)
1921

2022
from inventory.models.category import Category, Size
2123
from inventory.models.collection import Collection

landolfio/inventory_frontend/urls.py

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,28 @@
11
from django.urls import path
22

3-
from .views import (AssetAutocompleteView, AssetCreateMoneybirdView,
4-
AssetCreateView, AssetDeleteMoneybirdView, AssetDeleteView,
5-
AssetDetailView, AssetDisposeMoneybirdView,
6-
AssetLinkMoneybirdView, AssetListView,
7-
AssetRefreshMoneybirdView, AssetSearchView,
8-
AssetUnlinkMoneybirdView, AssetUpdateMoneybirdView,
9-
AssetUpdateView, AttachmentDeleteView,
10-
AttachmentDownloadZipView, AttachmentReorderView,
11-
BulkStatusChangeView, ContactAutocompleteView,
12-
PropertyValueAutocompleteView, PublicIndexView)
3+
from .views import (
4+
AssetAutocompleteView,
5+
AssetCreateMoneybirdView,
6+
AssetCreateView,
7+
AssetDeleteMoneybirdView,
8+
AssetDeleteView,
9+
AssetDetailView,
10+
AssetDisposeMoneybirdView,
11+
AssetLinkMoneybirdView,
12+
AssetListView,
13+
AssetRefreshMoneybirdView,
14+
AssetSearchView,
15+
AssetUnlinkMoneybirdView,
16+
AssetUpdateMoneybirdView,
17+
AssetUpdateView,
18+
AttachmentDeleteView,
19+
AttachmentDownloadZipView,
20+
AttachmentReorderView,
21+
BulkStatusChangeView,
22+
ContactAutocompleteView,
23+
PropertyValueAutocompleteView,
24+
PublicIndexView,
25+
)
1326

1427
app_name = "inventory_frontend"
1528

landolfio/inventory_frontend/views.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
from django.conf import settings
55
from django.contrib import messages
6-
from django.contrib.auth.mixins import (LoginRequiredMixin,
7-
PermissionRequiredMixin)
6+
from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
87
from django.contrib.messages.views import SuccessMessageMixin
98
from django.db.models import Count, Max, OuterRef, Prefetch, Q, Subquery
109
from django.http import JsonResponse
@@ -25,8 +24,7 @@
2524
from inventory.models.location import Location
2625
from inventory.models.remarks import Remark
2726
from inventory.models.status_change import StatusChange
28-
from inventory_frontend.forms import (AssetForm, BulkStatusChangeForm,
29-
StatusChangeForm)
27+
from inventory_frontend.forms import AssetForm, BulkStatusChangeForm, StatusChangeForm
3028

3129

3230
class PublicIndexView(TemplateView):

landolfio/moneybird/admin.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
from django.utils.translation import gettext_lazy as _
44
from django.utils.translation import ngettext
55

6-
from moneybird.models import (MoneybirdDocumentLineModel,
7-
SynchronizableMoneybirdResourceModel)
6+
from moneybird.models import (
7+
MoneybirdDocumentLineModel,
8+
SynchronizableMoneybirdResourceModel,
9+
)
810
from moneybird.resource_types import (
911
get_moneybird_resource_type_for_document_lines_model,
10-
get_moneybird_resource_type_for_model)
12+
get_moneybird_resource_type_for_model,
13+
)
1114
from moneybird.settings import settings
1215

1316

landolfio/moneybird/models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
from moneybird.resource_types import (
66
MoneybirdResourceType,
77
get_moneybird_resource_type_for_document_lines_model,
8-
get_moneybird_resource_type_for_model)
8+
get_moneybird_resource_type_for_model,
9+
)
910

1011

1112
class MoneybirdResourceModel(models.Model):

landolfio/moneybird/resource_types.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
from django.db import IntegrityError
66
from django.utils.module_loading import import_string
77

8-
from moneybird.administration import (Administration,
9-
get_moneybird_administration)
8+
from moneybird.administration import Administration, get_moneybird_administration
109
from moneybird.settings import settings
1110
from moneybird.webhooks.events import WebhookEvent
1211

landolfio/moneybird/resources.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
from moneybird.resource_types import (MoneybirdResource, MoneybirdResourceType,
2-
MoneybirdResourceTypeWithDocumentLines,
3-
SynchronizableMoneybirdResourceType,
4-
get_moneybird_resource_type_for_entity)
1+
from moneybird.resource_types import (
2+
MoneybirdResource,
3+
MoneybirdResourceType,
4+
MoneybirdResourceTypeWithDocumentLines,
5+
SynchronizableMoneybirdResourceType,
6+
get_moneybird_resource_type_for_entity,
7+
)
58
from moneybird.settings import settings
69

710

landolfio/moneybird/synchronization.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
import threading
33
from typing import Generator
44

5-
from moneybird.administration import (Administration,
6-
get_moneybird_administration)
7-
from moneybird.resource_types import (MoneybirdResourceId,
8-
MoneybirdResourceType,
9-
MoneybirdResourceVersion,
10-
SynchronizableMoneybirdResourceType,
11-
get_moneybird_resources)
5+
from moneybird.administration import Administration, get_moneybird_administration
6+
from moneybird.resource_types import (
7+
MoneybirdResourceId,
8+
MoneybirdResourceType,
9+
MoneybirdResourceVersion,
10+
SynchronizableMoneybirdResourceType,
11+
get_moneybird_resources,
12+
)
1213

1314
MAX_REQUEST_SIZE = 100
1415

0 commit comments

Comments
 (0)