Bloomerp 1.0.0.dev22__tar.gz → 1.0.0.dev24__tar.gz

{bloomerp-1.0.0.dev22 → bloomerp-1.0.0.dev24}/Bloomerp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Bloomerp
-Version: 1.0.0.dev22
+Version: 1.0.0.dev24
 Summary: Bloomerp is an open-source Business Management Software framework that lets you create fully functional business management applications just by defining your Django database models.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{bloomerp-1.0.0.dev22 → bloomerp-1.0.0.dev24}/Bloomerp.egg-info/SOURCES.txt

@@ -85,6 +85,7 @@ bloomerp/management/commands/get_urls.py
 bloomerp/management/commands/save_application_fields.py
 bloomerp/management/commands/validate_bloomerp.py
 bloomerp/migrations/0001_initial.py
+bloomerp/migrations/0002_workspace_single_module_context.py
 bloomerp/migrations/__init__.py
 bloomerp/model_fields/code_field.py
 bloomerp/model_fields/file_field.py
@@ -149,11 +150,9 @@ bloomerp/models/workspaces/workspace.py
 bloomerp/modules/__init__.py
 bloomerp/modules/automation.py
 bloomerp/modules/core.py
-bloomerp/modules/data.py
 bloomerp/modules/definition.py
 bloomerp/modules/misc.py
 bloomerp/modules/users.py
-bloomerp/modules/website.py
 bloomerp/sdk/base.py
 bloomerp/sdk/javascript.py
 bloomerp/sdk/python.py

{bloomerp-1.0.0.dev22 → bloomerp-1.0.0.dev24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Bloomerp
-Version: 1.0.0.dev22
+Version: 1.0.0.dev24
 Summary: Bloomerp is an open-source Business Management Software framework that lets you create fully functional business management applications just by defining your Django database models.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{bloomerp-1.0.0.dev22 → bloomerp-1.0.0.dev24}/bloomerp/components/global_search.py

@@ -164,11 +164,11 @@ def _collect_object_results(
             truncated = True
             matching_objects = matching_objects[:remaining_slots]
 
-        modules = module_registry.get_modules_for_model(model)
+        module = module_registry.get_module_for_model(model)
         results.append(
             {
                 "model_label": model._meta.verbose_name_plural.title(),
-                "module_labels": [module.name for module in modules] if modules else [],
+                "module_labels": [item.name for item in module_registry.get_lineage(module.full_id or module.id)] if module else [],
                 "objects": matching_objects,
             }
         )
@@ -388,7 +388,7 @@ def global_search(request: HttpRequest) -> HttpResponse:
                         context["slash_error"] = "Module not found."
                     else:
                         context["search_scope"] = {"module": module.name}
-                        models = module_registry.get_models_for_module(module.id)
+                        models = module_registry.get_models_for_module(module.id, include_descendants=True)
                         context["object_results"], truncated = _collect_object_results(
                             request,
                             permission_manager,
@@ -416,7 +416,7 @@ def global_search(request: HttpRequest) -> HttpResponse:
                             models = [
                                 model
                                 for model in models
-                                if model in module_registry.get_models_for_module(module.id)
+                                if model in module_registry.get_models_for_module(module.id, include_descendants=True)
                             ]
                             context["search_scope"] = {
                                 "module": module.name,

{bloomerp-1.0.0.dev22 → bloomerp-1.0.0.dev24}/bloomerp/config/definition.py

@@ -74,10 +74,10 @@ class BloomerpConfig(BaseModel):
     """
 
     auto_generate_api_endpoints : bool = True
+    require_staff_for_access: bool = True
 
     vite_dev_server_url : Optional[str] = 'http://localhost:5173'
 
     auth: BloomerpAuthSettings = Field(default_factory=BloomerpAuthSettings)
     
 
-

{bloomerp-1.0.0.dev22 → bloomerp-1.0.0.dev24}/bloomerp/field_types.py

@@ -217,11 +217,14 @@ class Lookup(Enum):
     
 @dataclass
 class FieldOption:
-    id:str
-    label:str
-    primitive_input_type:Literal['text', 'number', 'bool', 'list']
-    description:Optional[str] = None
+    id: str
+    label: str
+    primitive_input_type: Literal['text', 'number', 'bool', 'list', 'model', 'choices', 'callable']
+    description: Optional[str] = None
     required: bool = False
+    default_value: Any = None
+    choices: list[str] | None = None  # valid values when primitive_input_type='choices'
+    mutually_exclusive_with: list[str] = dataclass_field(default_factory=list)
 
 NULL_FIELD_OPTION = FieldOption(
     "null",
@@ -300,14 +303,16 @@ AUTO_NOW_FIELD_OPTION = FieldOption(
     "auto_now",
     "Auto Update On Save",
     "bool",
-    "Automatically update this field to the current date/time on each save."
+    "Automatically update this field to the current date/time on each save.",
+    mutually_exclusive_with=["auto_now_add"],
 )
 
 AUTO_NOW_ADD_FIELD_OPTION = FieldOption(
     "auto_now_add",
     "Auto Set On Create",
     "bool",
-    "Automatically set this field to the current date/time when the object is created."
+    "Automatically set this field to the current date/time when the object is created.",
+    mutually_exclusive_with=["auto_now"],
 )
 
 RELATED_NAME_FIELD_OPTION = FieldOption(
@@ -317,7 +322,33 @@ RELATED_NAME_FIELD_OPTION = FieldOption(
     "Optional related_name used on the reverse side of relationships."
 )
 
+VERBOSE_NAME_FIELD_OPTION = FieldOption(
+    "verbose_name",
+    "Label",
+    "text",
+    "Human-readable name shown as the field label in forms and admin."
+)
+
+TO_FIELD_OPTION = FieldOption(
+    "to",
+    "Related Model",
+    "model",
+    "The model this field points to.",
+    required=True,
+)
+
+ON_DELETE_FIELD_OPTION = FieldOption(
+    "on_delete",
+    "On Delete Behaviour",
+    "choices",
+    "What happens to this object when the related object is deleted.",
+    required=True,
+    default_value="CASCADE",
+    choices=["CASCADE", "PROTECT", "SET_NULL", "SET_DEFAULT", "DO_NOTHING"],
+)
+
 COMMON_FIELD_OPTIONS = [
+    VERBOSE_NAME_FIELD_OPTION,
     NULL_FIELD_OPTION,
     BLANK_FIELD_OPTION,
     UNIQUE_FIELD_OPTION,
@@ -332,8 +363,11 @@ COMMON_TEXT_FIELD_OPTIONS = [
 ]
 
 COMMON_RELATION_FIELD_OPTIONS = [
+    TO_FIELD_OPTION,
+    VERBOSE_NAME_FIELD_OPTION,
     NULL_FIELD_OPTION,
     BLANK_FIELD_OPTION,
+    DB_INDEX_FIELD_OPTION,
     RELATED_NAME_FIELD_OPTION,
     HELP_TEXT_FIELD_OPTION,
 ]
@@ -755,7 +789,10 @@ class FieldType(Enum):
         default_model_field_args={
             "on_delete": models.CASCADE,
         },
-        field_options=COMMON_RELATION_FIELD_OPTIONS,
+        field_options=[
+            *COMMON_RELATION_FIELD_OPTIONS,
+            ON_DELETE_FIELD_OPTION,
+        ],
     )
     
     ONE_TO_ONE_FIELD = FieldTypeDefinition(
@@ -773,6 +810,7 @@ class FieldType(Enum):
         },
         field_options=[
             *COMMON_RELATION_FIELD_OPTIONS,
+            ON_DELETE_FIELD_OPTION,
             UNIQUE_FIELD_OPTION,
         ],
     )
@@ -792,6 +830,8 @@ class FieldType(Enum):
             "is_m2m": True
         },
         field_options=[
+            TO_FIELD_OPTION,
+            VERBOSE_NAME_FIELD_OPTION,
             BLANK_FIELD_OPTION,
             RELATED_NAME_FIELD_OPTION,
             HELP_TEXT_FIELD_OPTION,
@@ -819,7 +859,10 @@ class FieldType(Enum):
             Lookup.EQUALS_USER,
             Lookup.FOREIGN_EQUALS
         ],
-        field_options=COMMON_RELATION_FIELD_OPTIONS,
+        field_options=[
+            *COMMON_RELATION_FIELD_OPTIONS,
+            ON_DELETE_FIELD_OPTION,
+        ],
     )
     
     # Other Fields

bloomerp-1.0.0.dev24/bloomerp/migrations/0002_workspace_single_module_context.py

@@ -0,0 +1,29 @@
+# Generated by Codex on 2026-04-21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bloomerp", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name="workspace",
+            name="unique_default_workspace_per_user_module_context",
+        ),
+        migrations.RemoveField(
+            model_name="workspace",
+            name="sub_module_id",
+        ),
+        migrations.AddConstraint(
+            model_name="workspace",
+            constraint=models.UniqueConstraint(
+                fields=("user", "module_id"),
+                condition=models.Q(("is_default", True)),
+                name="unique_default_workspace_per_user_module_context",
+            ),
+        ),
+    ]

{bloomerp-1.0.0.dev22 → bloomerp-1.0.0.dev24}/bloomerp/models/definition.py

@@ -1,8 +1,9 @@
-from typing import Literal, Optional
+import inspect
+from typing import Any, Literal, Optional
 from bloomerp.config.definition import BloomerpConfig
 from bloomerp.models.base_bloomerp_model import FieldLayout
 from bloomerp.field_types import Lookup
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 from django.conf import settings
 
 class ApiFilterRule(BaseModel):
@@ -235,7 +236,7 @@ class BloomerpModelConfig(BaseModel):
     Used to define certain bloomerp related meta data on a model. 
 
     Settings are:
-        - modules: a list of modules to which this model belongs.
+        - module: the canonical module to which this model belongs.
         - layout: a layout object defining how the default CRUD layout for users is.
 
     Usage
@@ -249,7 +250,7 @@ class BloomerpModelConfig(BaseModel):
     ``` 
     """
 
-    modules: Optional[list[str]] = None
+    module: str | type | None = None
 
     layout: Optional[FieldLayout] = None
 
@@ -259,6 +260,34 @@ class BloomerpModelConfig(BaseModel):
 
     api_settings: Optional[ApiSettings] = None
 
+    @field_validator("module", mode="before")
+    @classmethod
+    def normalize_module(cls, value: Any) -> str | None:
+        if value in (None, ""):
+            return None
+
+        if isinstance(value, str):
+            return value
+
+        try:
+            from bloomerp.modules.definition import BloomerpModule, ModuleConfig
+        except Exception:
+            return value
+
+        if isinstance(value, ModuleConfig):
+            return value.full_id or value.id
+
+        if inspect.isclass(value):
+            if issubclass(value, ModuleConfig):
+                module = value()
+                return module.full_id or module.id
+
+            if issubclass(value, BloomerpModule):
+                module = value.to_config()
+                return module.full_id or module.id
+
+        return value
+
     def get_public_access_rules(self, action: str) -> list[PublicAccessRule]:
         if self.api_settings is None:
             return []

{bloomerp-1.0.0.dev22 → bloomerp-1.0.0.dev24}/bloomerp/models/project_management/todo.py

@@ -8,6 +8,7 @@ from django.contrib.contenttypes.fields import GenericForeignKey
 from django.core.exceptions import ValidationError
 
 from bloomerp.models.base_bloomerp_model import FieldLayout, LayoutItem, LayoutRow
+from bloomerp.models.definition import BloomerpModelConfig
 
 class TodoPriority(models.TextChoices):
     URGENT = ('urgent', 'Urgent')
@@ -38,12 +39,9 @@ class Todo(BloomerpModel):
     """
     The todo model is for Bloomerp's internal project management module.
     """
-    class Meta(BloomerpModel.Meta):
-        managed = True
-        db_table = 'bloomerp_todo'
-
-    class Bloomerp:
-        field_layout = FieldLayout(
+    bloomerp_config = BloomerpModelConfig(
+        module="misc",
+        layout=FieldLayout(
             rows=[
                 LayoutRow(
                     title="Details",
@@ -55,8 +53,8 @@ class Todo(BloomerpModel):
                         LayoutItem(id="priority", colspan=1),
                         LayoutItem(id="assigned_to", colspan=1),
                         LayoutItem(id="assigned_to", colspan=1),
-                        LayoutItem(id="content", colspan=4)
-                    ]
+                        LayoutItem(id="content", colspan=4),
+                    ],
                 ),
                 LayoutRow(
                     title="Users",
@@ -64,10 +62,15 @@ class Todo(BloomerpModel):
                     items=[
                         LayoutItem(id="requested_by"),
                         LayoutItem(id="requested_by"),
-                    ]
-                )
+                    ],
+                ),
             ]
-        )
+        ),
+    )
+
+    class Meta(BloomerpModel.Meta):
+        managed = True
+        db_table = 'bloomerp_todo'
 
     avatar = None
     allow_string_search = False # Do not allow string search for todos (we dont want to-do's to be searchable in the search bar)
@@ -174,4 +177,4 @@ class Todo(BloomerpModel):
 
         return super().clean()
 
-    
+    

{bloomerp-1.0.0.dev22 → bloomerp-1.0.0.dev24}/bloomerp/models/users/user.py

@@ -16,6 +16,7 @@ from bloomerp.models.workspaces.sidebar_item import Sidebar
 
 
 USER_CONFIG = BloomerpModelConfig(
+    module="users",
     layout=FieldLayout()
 )
 
@@ -32,9 +33,6 @@ class AbstractBloomerpUser(
     string_search_fields = ['first_name+last_name', 'username']
     allow_string_search = True
 
-    class Bloomerp:
-        modules = ["users"]
-    
     # ------------------------------------------------
     # User Preferences
     # ------------------------------------------------
@@ -125,6 +123,8 @@ class AbstractBloomerpUser(
         )
     
 class User(AbstractBloomerpUser):
+    bloomerp_config = USER_CONFIG
+
     class Meta(BloomerpModel.Meta):
         db_table = "auth_user"
         swappable = "AUTH_USER_MODEL"

{bloomerp-1.0.0.dev22 → bloomerp-1.0.0.dev24}/bloomerp/models/workspaces/workspace.py

@@ -11,7 +11,7 @@ class Workspace(AbsoluteUrlModelMixin, models.Model):
         db_table = 'bloomerp_workspace'
         constraints = [
             models.UniqueConstraint(
-                fields=["user", "module_id", "sub_module_id"],
+                fields=["user", "module_id"],
                 condition=models.Q(is_default=True),
                 name="unique_default_workspace_per_user_module_context",
             ),
@@ -25,10 +25,6 @@ class Workspace(AbsoluteUrlModelMixin, models.Model):
         settings.AUTH_USER_MODEL, 
         on_delete=models.CASCADE
         )
-    sub_module_id = models.CharField(
-        max_length=255, 
-        default=""
-        )
     module_id = models.CharField(
         max_length=255, 
         default=""
@@ -47,22 +43,20 @@ class Workspace(AbsoluteUrlModelMixin, models.Model):
         return self.name
 
     @classmethod
-    def get_default_for_user(cls, user, module_id: str = "", sub_module_id: str = ""):
+    def get_default_for_user(cls, user, module_id: str = ""):
         return cls.objects.filter(
             user=user,
             module_id=module_id,
-            sub_module_id=sub_module_id,
             is_default=True,
         ).order_by("pk").first()
 
     @classmethod
-    def get_or_create_for_user(cls, user, module_id: str = "", sub_module_id: str = ""):
+    def get_or_create_for_user(cls, user, module_id: str = ""):
         from bloomerp.services.sectioned_layout_services import get_default_workspace_layout, layout_has_items
 
         workspace = cls.get_default_for_user(
             user=user,
             module_id=module_id,
-            sub_module_id=sub_module_id,
         )
         if workspace:
             if not layout_has_items(workspace.layout):
@@ -73,7 +67,6 @@ class Workspace(AbsoluteUrlModelMixin, models.Model):
             name=str(_("Default")),
             user=user,
             module_id=module_id,
-            sub_module_id=sub_module_id,
             layout=get_default_workspace_layout().model_dump(),
             is_default=True,
         )

bloomerp-1.0.0.dev24/bloomerp/modules/automation.py

@@ -0,0 +1,10 @@
+from .definition import BloomerpModule
+
+class AutomationModule(BloomerpModule):
+    id = "automation"
+    code = "automation"
+    icon = "fa-solid fa-robot"
+    name = "Automation"
+    description = "With automation, streamline and optimize your business processes by creating automated workflows."
+
+  

bloomerp-1.0.0.dev24/bloomerp/modules/core.py

@@ -0,0 +1,10 @@
+from .definition import BloomerpModule
+
+class CoreModule(BloomerpModule):
+    id = "core"
+    code = "core"
+    icon = "fa-solid fa-cogs"
+    name = "Core"
+    description = "Core functionalities and features of the ERP system."
+
+