v0.4.3.4

Removed Deprecated MPTT Dependency
NodeTreeMixIn as Replacement
Migrtation update (no backwards compatibility).

Author: elarroba

Pipfile

@@ -5,7 +5,6 @@ name = "pypi"
 
 [packages]
 django = ">=3.2"
-django-mptt = ">=0.11.0"
 ofxtools = ">=0.8.21"
 jsonschema = ">=3.2.0"
 markdown = ">=3.3.4"

Pipfile.lock

@@ -9,7 +9,7 @@
 default_app_config = 'django_ledger.apps.DjangoLedgerConfig'
 
 """Django Ledger"""
-__version__ = '0.4.3.3'
+__version__ = '0.4.3.4'
 __license__ = 'GPLv3 License'
 
 __author__ = 'Miguel Sanda'

django_ledger/__init__.py

@@ -243,7 +243,7 @@ def commit_txs(self,
 
         JournalEntryModel = lazy_importer.get_journal_entry_model()
 
-        je_model = JournalEntryModel.objects.create(
+        je_model = JournalEntryModel.on_coa.create(
             ledger=je_ledger,
             description=je_desc,
             date=je_date,

django_ledger/io/io_mixin.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.2.4 on 2021-06-18 03:34
+# Generated by Django 3.2.5 on 2021-07-25 21:44
 
 from django.conf import settings
 import django.core.validators
@@ -7,7 +7,6 @@
 import django.db.models.manager
 import django_ledger.io.io_mixin
 import django_ledger.models.entity
-import mptt.fields
 import re
 import uuid
 
@@ -33,17 +32,16 @@ class Migration(migrations.Migration):
                 ('balance_type', models.CharField(choices=[('credit', 'Credit'), ('debit', 'Debit')], max_length=6, verbose_name='Account Balance Type')),
                 ('locked', models.BooleanField(default=False, verbose_name='Locked')),
                 ('active', models.BooleanField(default=False, verbose_name='Active')),
-                ('lft', models.PositiveIntegerField(editable=False)),
-                ('rght', models.PositiveIntegerField(editable=False)),
-                ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)),
-                ('level', models.PositiveIntegerField(editable=False)),
             ],
             options={
                 'verbose_name': 'Account',
                 'verbose_name_plural': 'Accounts',
                 'ordering': ['-created'],
                 'abstract': False,
             },
+            managers=[
+                ('on_coa', django.db.models.manager.Manager()),
+            ],
         ),
         migrations.CreateModel(
             name='BillModel',
@@ -132,13 +130,9 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(blank=True, max_length=150, null=True, verbose_name='Entity Name')),
                 ('hidden', models.BooleanField(default=False)),
                 ('fy_start_month', models.IntegerField(choices=[(1, 'January'), (2, 'February'), (3, 'March'), (4, 'April'), (5, 'May'), (6, 'June'), (7, 'July'), (8, 'August'), (9, 'September'), (10, 'October'), (11, 'November'), (12, 'December')], default=1, verbose_name='Fiscal Year Start')),
-                ('lft', models.PositiveIntegerField(editable=False)),
-                ('rght', models.PositiveIntegerField(editable=False)),
-                ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)),
-                ('level', models.PositiveIntegerField(editable=False)),
                 ('admin', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='admin_of', to=settings.AUTH_USER_MODEL, verbose_name='Admin')),
                 ('managers', models.ManyToManyField(related_name='managed_by', through='django_ledger.EntityManagementModel', to=settings.AUTH_USER_MODEL, verbose_name='Managers')),
-                ('parent', mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='django_ledger.entitymodel', verbose_name='Parent Entity')),
+                ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children_set', to='django_ledger.entitymodel')),
             ],
             options={
                 'verbose_name': 'Entity',
@@ -147,9 +141,6 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
             bases=(models.Model, django_ledger.io.io_mixin.IOMixIn, django_ledger.models.entity.EntityReportManager),
-            managers=[
-                ('_tree_manager', django.db.models.manager.Manager()),
-            ],
         ),
         migrations.CreateModel(
             name='EntityUnitModel',
@@ -161,22 +152,15 @@ class Migration(migrations.Migration):
                 ('slug', models.SlugField()),
                 ('active', models.BooleanField(default=True, verbose_name='Is Active')),
                 ('hidden', models.BooleanField(default=False, verbose_name='Is Hidden')),
-                ('lft', models.PositiveIntegerField(editable=False)),
-                ('rght', models.PositiveIntegerField(editable=False)),
-                ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)),
-                ('level', models.PositiveIntegerField(editable=False)),
                 ('entity', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='django_ledger.entitymodel', verbose_name='Unit Entity')),
-                ('parent', mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='django_ledger.entityunitmodel', verbose_name='Parent Unit')),
+                ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children_set', to='django_ledger.entityunitmodel')),
             ],
             options={
                 'verbose_name': 'Entity Unit Model',
                 'ordering': ['-created'],
                 'abstract': False,
             },
             bases=(django_ledger.io.io_mixin.IOMixIn, models.Model),
-            managers=[
-                ('_tree_manager', django.db.models.manager.Manager()),
-            ],
         ),
         migrations.CreateModel(
             name='ImportJobModel',
@@ -263,6 +247,7 @@ class Migration(migrations.Migration):
                 ('entity_unit', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='django_ledger.entityunitmodel', verbose_name='Associated Entity Unit')),
                 ('invoice_model', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='django_ledger.invoicemodel', verbose_name='Invoice Model')),
                 ('item_model', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='django_ledger.itemmodel', verbose_name='Item Model')),
+                ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children_set', to='django_ledger.itemthroughmodel')),
             ],
             options={
                 'abstract': False,
@@ -280,10 +265,6 @@ class Migration(migrations.Migration):
                 ('origin', models.CharField(blank=True, max_length=30, null=True, verbose_name='Origin')),
                 ('posted', models.BooleanField(default=False, verbose_name='Posted')),
                 ('locked', models.BooleanField(default=False, verbose_name='Locked')),
-                ('lft', models.PositiveIntegerField(editable=False)),
-                ('rght', models.PositiveIntegerField(editable=False)),
-                ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)),
-                ('level', models.PositiveIntegerField(editable=False)),
                 ('entity_unit', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='django_ledger.entityunitmodel', verbose_name='Associated Entity Unit')),
             ],
             options={
@@ -292,6 +273,9 @@ class Migration(migrations.Migration):
                 'ordering': ['-created'],
                 'abstract': False,
             },
+            managers=[
+                ('on_coa', django.db.models.manager.Manager()),
+            ],
         ),
         migrations.CreateModel(
             name='VendorModel',
@@ -428,7 +412,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='itemthroughmodel',
             name='po_model',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='django_ledger.purchaseordermodel', verbose_name='Purchase Order Model'),
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='django_ledger.purchaseordermodel', verbose_name='Purchase Order Model'),
         ),
         migrations.AddField(
             model_name='itemmodel',
@@ -553,7 +537,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='accountmodel',
             name='parent',
-            field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='django_ledger.accountmodel', verbose_name='Parent'),
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children_set', to='django_ledger.accountmodel'),
         ),
         migrations.AddIndex(
             model_name='vendormodel',

django_ledger/migrations/0001_initial.py

@@ -12,10 +12,9 @@
 from django.db import models
 from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
-from mptt.models import MPTTModel, TreeForeignKey
 
 from django_ledger.io.roles import ACCOUNT_ROLES, BS_ROLES, GROUP_INVOICE, GROUP_BILL
-from django_ledger.models.mixins import CreateUpdateMixIn
+from django_ledger.models.mixins import CreateUpdateMixIn, NodeTreeMixIn
 
 DEBIT = 'debit'
 CREDIT = 'credit'
@@ -69,7 +68,7 @@ def for_bill(self, user_model, entity_slug: str, coa_slug: str = None):
         return qs.filter(role__in=GROUP_BILL)
 
 
-class AccountModelAbstract(MPTTModel, CreateUpdateMixIn):
+class AccountModelAbstract(NodeTreeMixIn, CreateUpdateMixIn):
     """
     Djetler's Base Account Model Abstract
     """
@@ -83,13 +82,6 @@ class AccountModelAbstract(MPTTModel, CreateUpdateMixIn):
     name = models.CharField(max_length=100, verbose_name=_('Account Name'))
     role = models.CharField(max_length=25, choices=ACCOUNT_ROLES, verbose_name=_('Account Role'))
     balance_type = models.CharField(max_length=6, choices=BALANCE_TYPE, verbose_name=_('Account Balance Type'))
-    parent = TreeForeignKey('self',
-                            null=True,
-                            blank=True,
-                            related_name='children',
-                            verbose_name=_('Parent'),
-                            db_index=True,
-                            on_delete=models.CASCADE)
     locked = models.BooleanField(default=False, verbose_name=_('Locked'))
     active = models.BooleanField(default=False, verbose_name=_('Active'))
     coa = models.ForeignKey('django_ledger.ChartOfAccountModel',
@@ -114,9 +106,6 @@ class Meta:
             models.Index(fields=['role', 'balance_type', 'active']),
         ]
 
-    class MPTTMeta:
-        order_insertion_by = ['name']
-
     def __str__(self):
         return '{x1} - {x5}: {x2} ({x3}/{x4})'.format(x1=self.role_bs.upper(),
                                                       x2=self.name,

django_ledger/migrations/0002_alter_itemthroughmodel_po_model.py

@@ -20,11 +20,10 @@
 from django.urls import reverse
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
-from mptt.models import MPTTModel, TreeForeignKey
 
 from django_ledger.io import IOMixIn
 from django_ledger.models.coa import ChartOfAccountModel
-from django_ledger.models.mixins import CreateUpdateMixIn, SlugNameMixIn, ContactInfoMixIn
+from django_ledger.models.mixins import CreateUpdateMixIn, SlugNameMixIn, ContactInfoMixIn, NodeTreeMixIn
 
 UserModel = get_user_model()
 
@@ -94,7 +93,7 @@ def for_user(self, user_model):
         )
 
 
-class EntityModelAbstract(MPTTModel,
+class EntityModelAbstract(NodeTreeMixIn,
                           SlugNameMixIn,
                           CreateUpdateMixIn,
                           ContactInfoMixIn,
@@ -115,17 +114,12 @@ class EntityModelAbstract(MPTTModel,
         (12, _('December')),
     ]
 
-    parent = TreeForeignKey('self',
-                            null=True,
-                            blank=True,
-                            related_name='children',
-                            verbose_name=_('Parent Entity'),
-                            on_delete=models.CASCADE)
-
     uuid = models.UUIDField(default=uuid4, editable=False, primary_key=True)
     name = models.CharField(max_length=150, verbose_name=_('Entity Name'), null=True, blank=True)
-    admin = models.ForeignKey(UserModel, on_delete=models.CASCADE,
-                              related_name='admin_of', verbose_name=_('Admin'))
+    admin = models.ForeignKey(UserModel,
+                              on_delete=models.CASCADE,
+                              related_name='admin_of',
+                              verbose_name=_('Admin'))
     managers = models.ManyToManyField(UserModel, through='EntityManagementModel',
                                       related_name='managed_by', verbose_name=_('Managers'))
 
@@ -143,9 +137,6 @@ class Meta:
             models.Index(fields=['parent'])
         ]
 
-    class MPTTMeta:
-        order_insertion_by = ['created']
-
     def __str__(self):
         return self.name
 

django_ledger/models/accounts.py

@@ -15,7 +15,7 @@
 from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 
-from django_ledger.models.mixins import CreateUpdateMixIn
+from django_ledger.models.mixins import CreateUpdateMixIn, NodeTreeMixIn
 from django_ledger.settings import DJANGO_LEDGER_CURRENCY_SYMBOL as currency_symbol
 
 ITEM_LIST_RANDOM_SLUG_SUFFIX = ascii_lowercase + digits
@@ -279,7 +279,7 @@ def for_po(self, entity_slug, user_model, po_pk):
         return qs.filter(po_model__uuid__exact=po_pk)
 
 
-class ItemThroughModelAbstract(CreateUpdateMixIn):
+class ItemThroughModelAbstract(NodeTreeMixIn, CreateUpdateMixIn):
     STATUS_NOT_ORDERED = 'not_ordered'
     STATUS_ORDERED = 'ordered'
     STATUS_IN_TRANSIT = 'in_transit'