django-ledger 0.6.4__py3-none-any.whl → 0.7.0__py3-none-any.whl

django_ledger/__init__.py

@@ -1,15 +1,12 @@
 """
 Django Ledger created by Miguel Sanda <msanda@arrobalytics.com>.
 Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
-
-Contributions to this module:
-    * Miguel Sanda <msanda@arrobalytics.com>
 """
 
 default_app_config = 'django_ledger.apps.DjangoLedgerConfig'
 
 """Django Ledger"""
-__version__ = '0.6.4'
+__version__ = '0.7.0'
 __license__ = 'GPLv3 License'
 
 __author__ = 'Miguel Sanda'

django_ledger/contrib/django_ledger_graphene/accounts/schema.py

@@ -25,7 +25,7 @@ class Accountlist_Query(graphene.ObjectType):
     def resolve_all_accounts(self, info, slug_name, **kwargs):
         if info.context.user.is_authenticated:
             return AccountModel.objects.for_entity(
-            entity_slug=slug_name,
+            entity_model=slug_name,
             user_model=info.context.user,
         ).select_related('parent').order_by('code')
         else:

django_ledger/forms/account.py

@@ -1,47 +1,49 @@
+"""
+Django Ledger created by Miguel Sanda <msanda@arrobalytics.com>.
+Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
+
+Contributions to this module:
+    * Miguel Sanda <msanda@arrobalytics.com>
+"""
+from random import randint
 from typing import Optional
 
-from django.forms import TextInput, Select, ModelForm, ChoiceField, ValidationError, CheckboxInput
+from django.forms import TextInput, Select, ModelForm, ChoiceField, ValidationError, CheckboxInput, HiddenInput
 from django.utils.translation import gettext_lazy as _
 from treebeard.forms import MoveNodeForm
 
 from django_ledger.io import ACCOUNT_CHOICES_NO_ROOT
+from django_ledger.models import ChartOfAccountModel, EntityModel
 from django_ledger.models.accounts import AccountModel
 from django_ledger.settings import DJANGO_LEDGER_FORM_INPUT_CLASSES
 
-"""
-The account Model has the below forms: All these form have Account Model as their base.
-
-CreateForm
-CreateChildForm
-Update Form
-"""
-
 
 class AccountModelCreateForm(ModelForm):
     """
-    AccountModelCreateForm
-    ======================
-
     A form for creating and managing account models within the system.
 
     Attributes
     ----------
-    ENTITY : Model
+    ENTITY_MODEL : Model
         The entity model being used in the form.
     COA_MODEL : Model
         The Chart of Account Model being used in the form.
-    USER_MODEL : Model
-        The user model being used in the form.
-
     """
 
-    def __init__(self, entity_model, coa_model, user_model, *args, **kwargs):
-        self.ENTITY = entity_model
-        self.COA_MODEL = coa_model
-        self.USER_MODEL = user_model
+    FORM_ID_SEP = '___'
+
+    def __init__(self, coa_model: ChartOfAccountModel, *args, **kwargs):
+        self.COA_MODEL: ChartOfAccountModel = coa_model
         super().__init__(*args, **kwargs)
         self.fields['role'].choices = ACCOUNT_CHOICES_NO_ROOT
         self.fields['code'].required = False
+        self.fields['coa_model'].disabled = True
+        self.fields['coa_model'].required = False
+
+        self.form_id: str = self.get_form_id()
+
+    def get_form_id(self) -> str:
+        return f'account-model-create-form-{self.COA_MODEL.slug}{self.FORM_ID_SEP}{randint(100000, 999999)}'
 
     def clean_role_default(self):
         role_default = self.cleaned_data['role_default']
@@ -49,12 +51,8 @@ class AccountModelCreateForm(ModelForm):
             return None
         return role_default
 
-    def clean_code(self):
-        code = self.cleaned_data['code']
-        is_code_valid = not self.COA_MODEL.accountmodel_set.filter(code=code).exists()
-        if not is_code_valid:
-            raise ValidationError(message=_('Code {} already exists for CoA {}').format(code, self.COA_MODEL.slug))
-        return code
+    def clean_coa_model(self):
+        return self.COA_MODEL
 
     class Meta:
         model = AccountModel
@@ -65,7 +63,8 @@ class AccountModelCreateForm(ModelForm):
             'role_default',
             'balance_type',
             'active',
-            'active'
+            'active',
+            'coa_model'
         ]
         widgets = {
             'code': TextInput(attrs={
@@ -83,6 +82,7 @@ class AccountModelCreateForm(ModelForm):
             'balance_type': Select(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
             }),
+            'coa_model': HiddenInput()
         }
 
 
@@ -101,22 +101,22 @@ class AccountModelUpdateForm(MoveNodeForm):
     """
 
     _position = ChoiceField(required=True,
-                            label=_("Position"),
+                            label=_('Position'),
                             widget=Select(attrs={
                                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
                             }))
     _ref_node_id = ChoiceField(required=False,
-                               label=_("Relative to"),
+                               label=_('Relative to'),
                                widget=Select(attrs={
                                    'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
                                }))
 
-    def __init__(self, entity_model, coa_model, user_model, *args, **kwargs):
-        self.ENTITY = entity_model
-        self.COA_MODEL = coa_model
-        self.USER_MODEL = user_model
+
+    def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        # self.fields['_ref_node_id'].choices = self.mk_dropdown_tree_choices()
+        self.fields['role'].disabled = True
+        self.fields['coa_model'].disabled = True
+
 
     @classmethod
     def mk_dropdown_tree(cls, model, for_node: Optional[AccountModel] = None):
@@ -125,15 +125,18 @@ class AccountModelUpdateForm(MoveNodeForm):
         if not for_node:
             raise ValidationError(message='Must provide for_node argument.')
 
-        options = list()
         qs = for_node.get_account_move_choice_queryset()
 
-        # for node in qs:
-        #     cls.add_subtree(for_node, node, options)
         return [
             (i.uuid, f'{"-" * (i.depth - 1)} {i}') for i in qs
         ]
 
+    def clean_role(self):
+        return self.instance.role
+
+    def coa_model(self):
+        return self.instance.coa_model
+
     def clean_role_default(self):
         role_default = self.cleaned_data['role_default']
         if not role_default:
@@ -142,8 +145,10 @@ class AccountModelUpdateForm(MoveNodeForm):
 
     class Meta:
         model = AccountModel
-        exclude = ('depth', 'numchild', 'path', 'balance_type', 'role')
+        exclude = ('depth', 'numchild', 'path', 'balance_type')
         widgets = {
+            'role': HiddenInput(),
+            'coa_model': HiddenInput(),
             'parent': Select(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
             }),

django_ledger/forms/bank_account.py

@@ -13,9 +13,10 @@ class BankAccountCreateForm(ModelForm):
         super().__init__(*args, **kwargs)
         self.ENTITY_SLUG = entity_slug
         self.USER_MODEL = user_model
-        account_qs = AccountModel.objects.for_entity_available(
+        account_qs = AccountModel.objects.for_entity(
             user_model=self.USER_MODEL,
-            entity_slug=self.ENTITY_SLUG).filter(
+            entity_model=self.ENTITY_SLUG
+        ).available().filter(
             role__exact=ASSET_CA_CASH)
         self.fields['cash_account'].queryset = account_qs
 

django_ledger/forms/bill.py

@@ -6,25 +6,20 @@ from django.utils.translation import gettext_lazy as _
 
 from django_ledger.io.roles import ASSET_CA_CASH, ASSET_CA_PREPAID, LIABILITY_CL_ACC_PAYABLE
 from django_ledger.models import (ItemModel, AccountModel, BillModel, ItemTransactionModel,
-                                  VendorModel, EntityUnitModel)
+                                  VendorModel, EntityUnitModel, EntityModel)
 from django_ledger.settings import DJANGO_LEDGER_FORM_INPUT_CLASSES
 
 
 class BillModelCreateForm(ModelForm):
-    def __init__(self, *args, entity_slug, user_model, **kwargs):
+    def __init__(self, *args, entity_model: EntityModel, **kwargs):
         super().__init__(*args, **kwargs)
-        self.ENTITY_SLUG = entity_slug
-        self.USER_MODEL = user_model
-        self.BILL_MODEL: BillModel = self.instance
+        self.ENTITY_MODEL = entity_model
         self.get_vendor_queryset()
         self.get_accounts_queryset()
 
     def get_vendor_queryset(self):
         if 'vendor' in self.fields:
-            vendor_qs = VendorModel.objects.for_entity(
-                user_model=self.USER_MODEL,
-                entity_slug=self.ENTITY_SLUG
-            )
+            vendor_qs = self.ENTITY_MODEL.vendormodel_set.active()
             self.fields['vendor'].queryset = vendor_qs
 
     def get_accounts_queryset(self):
@@ -34,14 +29,7 @@ class BillModelCreateForm(ModelForm):
             'prepaid_account' in self.fields,
             'unearned_account' in self.fields,
         ]):
-            account_qs = AccountModel.objects.for_bill(
-                user_model=self.USER_MODEL,
-                entity_slug=self.ENTITY_SLUG
-            )
-
-            # forcing evaluation of qs to cache results for fields... (avoids multiple database queries)
-            len(account_qs)
-
+            account_qs = self.ENTITY_MODEL.default_coa.accountmodel_set.all().for_bill()
             self.fields['cash_account'].queryset = account_qs.filter(role__exact=ASSET_CA_CASH)
             self.fields['prepaid_account'].queryset = account_qs.filter(role__exact=ASSET_CA_PREPAID)
             self.fields['unearned_account'].queryset = account_qs.filter(role__exact=LIABILITY_CL_ACC_PAYABLE)
@@ -107,11 +95,11 @@ class BaseBillModelUpdateForm(BillModelCreateForm):
 
     def __init__(self,
                  *args,
-                 entity_slug,
+                 entity_model,
                  user_model,
                  **kwargs):
-        super().__init__(entity_slug=entity_slug, user_model=user_model, *args, **kwargs)
-        self.ENTITY_SLUG = entity_slug
+        super().__init__(entity_model=entity_model, *args, **kwargs)
+        self.ENTITY_MODEL = entity_model
         self.USER_MODEL = user_model
         self.BILL_MODEL: BillModel = self.instance
 
@@ -120,7 +108,7 @@ class BaseBillModelUpdateForm(BillModelCreateForm):
             self.BILL_MODEL.update_state()
             self.instance.migrate_state(
                 user_model=self.USER_MODEL,
-                entity_slug=self.ENTITY_SLUG,
+                entity_slug=self.ENTITY_MODEL.slug,
                 raise_exception=False
             )
         super().save(commit=commit)
@@ -226,6 +214,10 @@ class BillModelConfigureForm(BaseBillModelUpdateForm):
 
 class BillItemTransactionForm(ModelForm):
 
+    # def __init__(self, entity_unit_qs, *args, **kwargs):
+    #     super().__init__(self, *args, **kwargs)
+    #     self.fields['entity_unit'].queryset = entity_unit_qs
+
     def clean(self):
         cleaned_data = super(BillItemTransactionForm, self).clean()
         itemtxs_model: ItemTransactionModel = self.instance
@@ -262,28 +254,24 @@ class BillItemTransactionForm(ModelForm):
 class BaseBillItemTransactionFormset(BaseModelFormSet):
 
     def __init__(self, *args,
-                 entity_slug,
+                 entity_model: EntityModel,
                  bill_model: BillModel,
-                 user_model,
                  **kwargs):
         super().__init__(*args, **kwargs)
-        self.USER_MODEL = user_model
         self.BILL_MODEL = bill_model
-        self.ENTITY_SLUG = entity_slug
-
-        items_qs = ItemModel.objects.for_bill(
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
-        )
+        self.ENTITY_MODEL = entity_model
+        self.queryset = self.BILL_MODEL.itemtransactionmodel_set.select_related(
+            'item_model',
+            'po_model',
+            'bill_model'
+        ).order_by('-total_amount')
 
-        unit_qs = EntityUnitModel.objects.for_entity(
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
-        )
+        self.items_qs = self.ENTITY_MODEL.itemmodel_set.bills()
+        self.entity_unit_qs = self.ENTITY_MODEL.entityunitmodel_set.all()
 
         for form in self.forms:
-            form.fields['item_model'].queryset = items_qs
-            form.fields['entity_unit'].queryset = unit_qs
+            form.fields['item_model'].queryset = self.items_qs
+            form.fields['entity_unit'].queryset = self.entity_unit_qs
 
             if not self.BILL_MODEL.can_edit_items():
                 form.fields['item_model'].disabled = True

django_ledger/forms/customer.py

@@ -37,7 +37,7 @@ class CustomerModelForm(ModelForm):
             'hidden'
         ]
         help_texts = {
-            'sales_tax_rate': _('Example: 3.50% should be entered as 0.0035')
+            'sales_tax_rate': _('Example: 3.50% should be entered as 0.035')
         }
         widgets = {
             'customer_name': TextInput(attrs={

django_ledger/forms/data_import.py

@@ -130,10 +130,10 @@ class BaseStagedTransactionModelFormSet(BaseModelFormSet):
         self.IMPORT_DISABLED = not exclude_account
         self.CASH_ACCOUNT = exclude_account
 
-        account_model_qs = AccountModel.objects.for_entity_available(
+        account_model_qs = AccountModel.objects.for_entity(
             user_model=self.USER_MODEL,
-            entity_slug=self.ENTITY_SLUG
-        ).order_by('role', 'name')
+            entity_model=self.ENTITY_SLUG
+        ).available().order_by('role', 'name')
 
         unit_model_qs = EntityUnitModel.objects.for_entity(
             user_model=self.USER_MODEL,

django_ledger/forms/estimate.py

@@ -27,7 +27,7 @@ class EstimateModelCreateForm(forms.ModelForm):
         return CustomerModel.objects.for_entity(
             entity_slug=self.ENTITY_SLUG,
             user_model=self.USER_MODEL
-        )
+        ).active()
 
     class Meta:
         model = EstimateModel

django_ledger/forms/invoice.py

@@ -31,7 +31,7 @@ class InvoiceModelCreateForEstimateForm(ModelForm):
             customer_qs = CustomerModel.objects.for_entity(
                 user_model=self.USER_MODEL,
                 entity_slug=self.ENTITY_SLUG
-            )
+            ).active()
             self.fields['customer'].queryset = customer_qs
 
     def get_accounts_queryset(self):
@@ -41,13 +41,11 @@ class InvoiceModelCreateForEstimateForm(ModelForm):
             'prepaid_account' in self.fields,
             'unearned_account' in self.fields,
         ]):
-            account_qs = AccountModel.objects.for_invoice(
-                user_model=self.USER_MODEL,
-                entity_slug=self.ENTITY_SLUG
-            )
 
-            # forcing evaluation of qs to cache results for fields... (avoids multiple database queries)
-            len(account_qs)
+            account_qs = AccountModel.objects.for_entity(
+                user_model=self.USER_MODEL,
+                entity_model=self.ENTITY_SLUG
+            ).for_invoice()
 
             self.fields['cash_account'].queryset = account_qs.filter(role__exact=ASSET_CA_CASH)
             self.fields['prepaid_account'].queryset = account_qs.filter(role__exact=ASSET_CA_RECEIVABLES)

django_ledger/forms/item.py

@@ -46,10 +46,12 @@ class ProductCreateForm(ModelForm):
         self.USER_MODEL = user_model
         super().__init__(*args, **kwargs)
 
-        accounts_qs = AccountModel.objects.with_roles(
-            roles=self.PRODUCT_OR_SERVICE_ROLES,
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL).active()
+        accounts_qs = AccountModel.objects.for_entity(
+            entity_model=self.ENTITY_SLUG,
+            user_model=self.USER_MODEL
+        ).with_roles(
+            roles=self.PRODUCT_OR_SERVICE_ROLES
+        ).active()
 
         # caches the QS for filtering...
         len(accounts_qs)
@@ -139,10 +141,12 @@ class ServiceCreateForm(ModelForm):
         self.USER_MODEL = user_model
         super().__init__(*args, **kwargs)
 
-        accounts_qs = AccountModel.objects.with_roles(
+        accounts_qs = AccountModel.objects.for_entity(
+            entity_model=self.ENTITY_SLUG,
+            user_model=self.USER_MODEL
+        ).with_roles(
             roles=self.SERVICE_ROLES,
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL).active()
+        ).active()
 
         # caches the QS for filtering...
         len(accounts_qs)
@@ -224,10 +228,12 @@ class ExpenseItemCreateForm(ModelForm):
         self.USER_MODEL = user_model
         super().__init__(*args, **kwargs)
 
-        accounts_qs = AccountModel.objects.with_roles(
-            roles=GROUP_EXPENSES,
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL).active()
+        accounts_qs = AccountModel.objects.for_entity(
+            entity_model=self.ENTITY_SLUG,
+            user_model=self.USER_MODEL
+        ).with_roles(
+            roles=GROUP_EXPENSES
+        ).active()
 
         self.fields['expense_account'].queryset = accounts_qs.filter(role__in=GROUP_EXPENSES)
 
@@ -295,6 +301,7 @@ class ExpenseItemUpdateForm(ExpenseItemCreateForm):
             'sku',
             'default_amount',
             'expense_account',
+            'is_active'
         ]
 
 
@@ -306,10 +313,12 @@ class InventoryItemCreateForm(ModelForm):
         self.USER_MODEL = user_model
         super().__init__(*args, **kwargs)
 
-        accounts_qs = AccountModel.objects.with_roles(
-            roles=[ASSET_CA_INVENTORY],
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL).active()
+        accounts_qs = AccountModel.objects.for_entity(
+            entity_model=self.ENTITY_SLUG,
+            user_model=self.USER_MODEL
+        ).with_roles(
+            roles=[ASSET_CA_INVENTORY]
+        ).active()
         self.fields['inventory_account'].queryset = accounts_qs
 
         if 'uom' in self.fields:

django_ledger/forms/transactions.py

@@ -51,10 +51,10 @@ class TransactionModelFormSet(BaseModelFormSet):
         self.LEDGER_PK = ledger_pk
         self.ENTITY_SLUG = entity_slug
 
-        account_qs = AccountModel.objects.for_entity_available(
+        account_qs = AccountModel.objects.for_entity(
             user_model=self.USER_MODEL,
-            entity_slug=self.ENTITY_SLUG
-        ).order_by('code')
+            entity_model=self.ENTITY_SLUG
+        ).available().order_by('code')
 
         for form in self.forms:
             form.fields['account'].queryset = account_qs

django_ledger/io/io_core.py

@@ -549,7 +549,7 @@ class IODatabaseMixIn:
                       force_queryset_sorting: bool = False,
                       **kwargs) -> IOResult:
         """
-        Performs the appropriate transaction post-processing after DB aggregation..
+        Performs the appropriate transaction post-processing after DB aggregation.
 
 
         Parameters
@@ -757,7 +757,6 @@ class IODatabaseMixIn:
                 by_unit=by_unit
             )
 
-            # idea: change digest() name to something else? maybe aggregate, calculate?...
             io_state = roles_mgr.digest()
 
         if any([
@@ -938,6 +937,7 @@ class IOReportMixIn:
             balance_sheet_statement=True,
             txs_queryset=txs_queryset,
             as_io_digest=True,
+            signs=True,
             **kwargs
         )
 
@@ -991,6 +991,7 @@ class IOReportMixIn:
             income_statement=True,
             txs_queryset=txs_queryset,
             as_io_digest=True,
+            sings=True,
             **kwargs
         )
 
@@ -1046,6 +1047,7 @@ class IOReportMixIn:
             cash_flow_statement=True,
             txs_queryset=txs_queryset,
             as_io_digest=True,
+            signs=True,
             **kwargs
         )
 

django_ledger/io/io_middleware.py

@@ -451,11 +451,16 @@ class CashFlowStatementIOMiddleware:
             bal for act, bal in self.IO_DATA[self.CFS_DIGEST_KEY]['net_cash_by_activity'].items()
         ])
 
+    def net_income(self):
+        group_balances = self.IO_DATA[AccountGroupIOMiddleware.GROUP_BALANCE_KEY]
+        self.IO_DATA[self.CFS_DIGEST_KEY]['net_income'] = group_balances['GROUP_CFS_NET_INCOME']
+
     def digest(self):
         self.IO_DATA[self.CFS_DIGEST_KEY] = dict()
         self.check_io_digest()
         self.operating()
         self.financing()
         self.investing()
+        self.net_income()
         self.net_cash()
         return self.IO_DATA

django_ledger/migrations/0017_alter_accountmodel_unique_together_and_more.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.1.1 on 2024-10-09 19:40
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_ledger', '0016_remove_accountmodel_django_ledg_coa_mod_e19964_idx_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='accountmodel',
+            unique_together=set(),
+        ),
+        migrations.AlterField(
+            model_name='accountmodel',
+            name='coa_model',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='django_ledger.chartofaccountmodel', verbose_name='Chart of Accounts'),
+        ),
+        migrations.AddConstraint(
+            model_name='accountmodel',
+            constraint=models.UniqueConstraint(fields=('coa_model', 'code'), name='unique_code_for_coa_model', violation_error_message='Account codes must be unique for each Chart of Accounts Model.'),
+        ),
+        migrations.AddConstraint(
+            model_name='accountmodel',
+            constraint=models.UniqueConstraint(fields=('coa_model', 'role', 'role_default'), name='only_one_account_assigned_as_default_for_role', violation_error_message='Only one default account for role permitted.'),
+        ),
+    ]