diff --git a/InvenTree/plugin/__init__.py b/InvenTree/plugin/__init__.py index b8e40e4271..32bababe2c 100644 --- a/InvenTree/plugin/__init__.py +++ b/InvenTree/plugin/__init__.py @@ -5,7 +5,7 @@ Utility file to enable simper imports from .registry import registry from .plugin import InvenTreePluginBase from .integration import IntegrationPluginBase -from .action import ActionPlugin +from .base.action.action import ActionPlugin from .helpers import MixinNotImplementedError, MixinImplementationError diff --git a/InvenTree/plugin/action.py b/InvenTree/plugin/base/action/action.py similarity index 91% rename from InvenTree/plugin/action.py rename to InvenTree/plugin/base/action/action.py index 9586355aea..fd43848cc2 100644 --- a/InvenTree/plugin/action.py +++ b/InvenTree/plugin/base/action/action.py @@ -4,7 +4,7 @@ import logging import warnings -from plugin.builtin.action.mixins import ActionMixin +from plugin.base.action.mixins import ActionMixin import plugin.integration diff --git a/InvenTree/plugin/builtin/action/mixins.py b/InvenTree/plugin/base/action/mixins.py similarity index 100% rename from InvenTree/plugin/builtin/action/mixins.py rename to InvenTree/plugin/base/action/mixins.py diff --git a/InvenTree/plugin/builtin/action/simpleactionplugin.py b/InvenTree/plugin/builtin/action/simpleactionplugin.py index 01a0829887..b7acd2d5f6 100644 --- a/InvenTree/plugin/builtin/action/simpleactionplugin.py +++ b/InvenTree/plugin/builtin/action/simpleactionplugin.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """sample implementation for ActionPlugin""" -from plugin.action import ActionPlugin +from plugin.base.action.action import ActionPlugin class SimpleActionPlugin(ActionPlugin): diff --git a/InvenTree/plugin/mixins/__init__.py b/InvenTree/plugin/mixins/__init__.py index 1f75e1200c..5b959e317c 100644 --- a/InvenTree/plugin/mixins/__init__.py +++ b/InvenTree/plugin/mixins/__init__.py @@ -6,7 +6,7 @@ from ..base.integration.mixins import APICallMixin, AppMixin, LabelPrintingMixin from common.notifications import SingleNotificationMethod, BulkNotificationMethod -from ..builtin.action.mixins import ActionMixin +from ..base.action.mixins import ActionMixin from ..builtin.barcodes.mixins import BarcodeMixin __all__ = [ diff --git a/InvenTree/plugin/test_action.py b/InvenTree/plugin/test_action.py index 2a9e4a9a37..299833ccd1 100644 --- a/InvenTree/plugin/test_action.py +++ b/InvenTree/plugin/test_action.py @@ -2,7 +2,7 @@ from django.test import TestCase -from plugin.action import ActionPlugin +from plugin.base.action.action import ActionPlugin class ActionPluginTests(TestCase):