Skip to content

Commit ad8a001

Browse files
elarrobaelarroba
committed
Development pre-migration new laptop
1 parent 77d4893 commit ad8a001

File tree

4 files changed

+49
-46
lines changed

4 files changed

+49
-46
lines changed

‎dev_env/settings.py

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -177,24 +177,25 @@
177177
# DJANGO_LEDGER_STAGED_TRANSACTION_MODEL = getattr(settings, 'DJANGO_LEDGER_STAGED_TRANSACTION_MODEL', 'django_ledger.StagedTransactionModel')
178178
# DJANGO_LEDGER_IMPORT_JOB_MODEL = getattr(settings, 'DJANGO_LEDGER_IMPORT_JOB_MODEL', 'django_ledger.ImportJobModel')
179179

180-
DJANGO_LEDGER_ACCOUNT_MODEL = 'django_ledger.AccountModel'
181-
DJANGO_LEDGER_CHART_OF_ACCOUNTS_MODEL = 'django_ledger.ChartOfAccountModel'
182-
DJANGO_LEDGER_TRANSACTION_MODEL = 'django_ledger.TransactionModel'
183-
DJANGO_LEDGER_JOURNAL_ENTRY_MODEL = 'django_ledger.JournalEntryModel'
184-
DJANGO_LEDGER_LEDGER_MODEL = 'django_ledger.LedgerModel'
185-
DJANGO_LEDGER_ENTITY_MODEL = 'django_ledger.EntityModel'
186-
DJANGO_LEDGER_ENTITY_STATE_MODEL = 'django_ledger.EntityStateModel'
187-
DJANGO_LEDGER_ENTITY_UNIT_MODEL = 'django_ledger.EntityUnitModel'
188-
DJANGO_LEDGER_ESTIMATE_MODEL = 'django_ledger.EstimateModel'
189-
DJANGO_LEDGER_BILL_MODEL = 'django_ledger.BillModel'
190-
DJANGO_LEDGER_INVOICE_MODEL = 'django_ledger.InvoiceModel'
191-
DJANGO_LEDGER_PURCHASE_ORDER_MODEL = 'django_ledger.PurchaseOrderModel'
192-
DJANGO_LEDGER_CUSTOMER_MODEL = 'django_ledger.CustomerModel'
193-
DJANGO_LEDGER_VENDOR_MODEL = 'django_ledger.VendorModel'
194-
DJANGO_LEDGER_BANK_ACCOUNT_MODEL = 'django_ledger.BankAccountModel'
195-
DJANGO_LEDGER_CLOSING_ENTRY_MODEL = 'django_ledger.ClosingEntryModel'
196-
DJANGO_LEDGER_UNIT_OF_MEASURE_MODEL = 'django_ledger.UnitOfMeasureModel'
197-
DJANGO_LEDGER_ITEM_TRANSACTION_MODEL = 'django_ledger.ItemTransactionModel'
198-
DJANGO_LEDGER_ITEM_MODEL = 'django_ledger.ItemModel'
199-
DJANGO_LEDGER_STAGED_TRANSACTION_MODEL = 'django_ledger.StagedTransactionModel'
200-
DJANGO_LEDGER_IMPORT_JOB_MODEL = 'django_ledger.ImportJobModel'
180+
# DJANGO_LEDGER_ACCOUNT_MODEL = 'django_ledger.AccountModel'
181+
# DJANGO_LEDGER_CHART_OF_ACCOUNTS_MODEL = 'django_ledger.ChartOfAccountModel'
182+
# DJANGO_LEDGER_TRANSACTION_MODEL = 'django_ledger.TransactionModel'
183+
# DJANGO_LEDGER_JOURNAL_ENTRY_MODEL = 'django_ledger.JournalEntryModel'
184+
# DJANGO_LEDGER_LEDGER_MODEL = 'django_ledger.LedgerModel'
185+
# DJANGO_LEDGER_ENTITY_MODEL = 'django_ledger.EntityModel'
186+
# DJANGO_LEDGER_ENTITY_STATE_MODEL = 'django_ledger.EntityStateModel'
187+
# DJANGO_LEDGER_ENTITY_UNIT_MODEL = 'django_ledger.EntityUnitModel'
188+
# DJANGO_LEDGER_ESTIMATE_MODEL = 'django_ledger.EstimateModel'
189+
# DJANGO_LEDGER_BILL_MODEL = 'django_ledger.BillModel'
190+
# DJANGO_LEDGER_INVOICE_MODEL = 'django_ledger.InvoiceModel'
191+
# DJANGO_LEDGER_PURCHASE_ORDER_MODEL = 'django_ledger.PurchaseOrderModel'
192+
# DJANGO_LEDGER_CUSTOMER_MODEL = 'django_ledger.CustomerModel'
193+
# DJANGO_LEDGER_VENDOR_MODEL = 'django_ledger.VendorModel'
194+
# DJANGO_LEDGER_BANK_ACCOUNT_MODEL = 'django_ledger.BankAccountModel'
195+
# DJANGO_LEDGER_CLOSING_ENTRY_MODEL = 'django_ledger.ClosingEntryModel'
196+
# DJANGO_LEDGER_CLOSING_ENTRY_TRANSACTION_MODEL = 'django_ledger.ClosingEntryTransactionModel'
197+
# DJANGO_LEDGER_UNIT_OF_MEASURE_MODEL = 'django_ledger.UnitOfMeasureModel'
198+
# DJANGO_LEDGER_ITEM_TRANSACTION_MODEL = 'django_ledger.ItemTransactionModel'
199+
# DJANGO_LEDGER_ITEM_MODEL = 'django_ledger.ItemModel'
200+
# DJANGO_LEDGER_STAGED_TRANSACTION_MODEL = 'django_ledger.StagedTransactionModel'
201+
# DJANGO_LEDGER_IMPORT_JOB_MODEL = 'django_ledger.ImportJobModel'

‎django_ledger/models/closing_entry.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from typing import Optional
1010
from uuid import uuid4, UUID
1111

12-
from django.conf import settings
1312
from django.core.exceptions import ValidationError
1413
from django.core.validators import MinValueValidator
1514
from django.db import models
@@ -24,7 +23,6 @@
2423
from django_ledger.models.mixins import CreateUpdateMixIn, MarkdownNotesMixIn
2524
from django_ledger.models.transactions import TransactionModel
2625
from django_ledger.models.utils import lazy_loader
27-
from django_ledger.settings import DJANGO_LEDGER_LEDGER_MODEL
2826

2927

3028
class ClosingEntryValidationError(ValidationError):
@@ -439,7 +437,6 @@ class Meta:
439437
name='unique_ce_opt_3'
440438
)
441439
]
442-
443440
indexes = [
444441
models.Index(fields=['closing_entry_model']),
445442
models.Index(fields=['account_model'])
@@ -476,6 +473,10 @@ class ClosingEntryTransactionModel(ClosingEntryTransactionModelAbstract):
476473
Base ClosingEntryModel Class
477474
"""
478475

476+
class Meta(ClosingEntryTransactionModelAbstract.Meta):
477+
abstract = False
478+
swappable = 'DJANGO_LEDGER_CLOSING_ENTRY_TRANSACTION_MODEL'
479+
479480

480481
def closingentrymodel_presave(instance: ClosingEntryModel, **kwargs):
481482
instance.create_entry_ledger(commit=False)

‎django_ledger/settings.py

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,28 @@
3030

3131

3232
## MODEL ABSTRACTS ##
33-
DJANGO_LEDGER_ACCOUNT_MODEL = getattr(settings, 'DJANGO_LEDGER_ACCOUNT_MODEL', 'django_ledger.AccountModel')
34-
DJANGO_LEDGER_CHART_OF_ACCOUNTS_MODEL = getattr(settings, 'DJANGO_LEDGER_ACCOUNT_MODEL', 'django_ledger.ChartOfAccountModel')
35-
DJANGO_LEDGER_TRANSACTION_MODEL = getattr(settings, 'DJANGO_LEDGER_TRANSACTION_MODEL', 'django_ledger.TransactionModel')
36-
DJANGO_LEDGER_JOURNAL_ENTRY_MODEL = getattr(settings, 'DJANGO_LEDGER_JOURNAL_ENTRY_MODEL', 'django_ledger.JournalEntryModel')
37-
DJANGO_LEDGER_LEDGER_MODEL = getattr(settings, 'DJANGO_LEDGER_LEDGER_MODEL', 'django_ledger.LedgerModel')
38-
DJANGO_LEDGER_ENTITY_MODEL = getattr(settings, 'DJANGO_LEDGER_ENTITY_MODEL', 'django_ledger.EntityModel')
39-
DJANGO_LEDGER_ENTITY_STATE_MODEL = getattr(settings, 'DJANGO_LEDGER_ENTITY_STATE_MODEL', 'django_ledger.EntityStateModel')
40-
DJANGO_LEDGER_ENTITY_UNIT_MODEL = getattr(settings, 'DJANGO_LEDGER_ENTITY_UNIT_MODEL', 'django_ledger.EntityUnitModel')
41-
DJANGO_LEDGER_ESTIMATE_MODEL = getattr(settings, 'DJANGO_LEDGER_ESTIMATE_MODEL', 'django_ledger.EstimateModel')
42-
DJANGO_LEDGER_BILL_MODEL = getattr(settings, 'DJANGO_LEDGER_BILL_MODEL', 'django_ledger.BillModel')
43-
DJANGO_LEDGER_INVOICE_MODEL = getattr(settings, 'DJANGO_LEDGER_INVOICE_MODEL', 'django_ledger.InvoiceModel')
44-
DJANGO_LEDGER_PURCHASE_ORDER_MODEL = getattr(settings, 'DJANGO_LEDGER_PURCHASE_ORDER_MODEL', 'django_ledger.PurchaseOrderModel')
45-
DJANGO_LEDGER_CUSTOMER_MODEL = getattr(settings, 'DJANGO_LEDGER_CUSTOMER_MODEL', 'django_ledger.CustomerModel')
46-
DJANGO_LEDGER_VENDOR_MODEL = getattr(settings, 'DJANGO_LEDGER_VENDOR_MODEL', 'django_ledger.VendorModel')
47-
DJANGO_LEDGER_BANK_ACCOUNT_MODEL = getattr(settings, 'DJANGO_LEDGER_BANK_ACCOUNT_MODEL', 'django_ledger.BankAccountModel')
48-
DJANGO_LEDGER_CLOSING_ENTRY_MODEL = getattr(settings, 'DJANGO_LEDGER_CLOSING_ENTRY_MODEL', 'django_ledger.ClosingEntryModel')
49-
DJANGO_LEDGER_UNIT_OF_MEASURE_MODEL = getattr(settings, 'DJANGO_LEDGER_UNIT_OF_MEASURE_MODEL', 'django_ledger.UnitOfMeasureModel')
50-
DJANGO_LEDGER_ITEM_TRANSACTION_MODEL = getattr(settings, 'DJANGO_LEDGER_ITEM_TRANSACTION_MODEL', 'django_ledger.ItemTransactionModel')
51-
DJANGO_LEDGER_ITEM_MODEL = getattr(settings, 'DJANGO_LEDGER_ITEM_MODEL', 'django_ledger.ItemModel')
52-
DJANGO_LEDGER_STAGED_TRANSACTION_MODEL = getattr(settings, 'DJANGO_LEDGER_STAGED_TRANSACTION_MODEL', 'django_ledger.StagedTransactionModel')
53-
DJANGO_LEDGER_IMPORT_JOB_MODEL = getattr(settings, 'DJANGO_LEDGER_IMPORT_JOB_MODEL', 'django_ledger.ImportJobModel')
33+
# DJANGO_LEDGER_ACCOUNT_MODEL = getattr(settings, 'DJANGO_LEDGER_ACCOUNT_MODEL', 'django_ledger.AccountModel')
34+
# DJANGO_LEDGER_CHART_OF_ACCOUNTS_MODEL = getattr(settings, 'DJANGO_LEDGER_ACCOUNT_MODEL', 'django_ledger.ChartOfAccountModel')
35+
# DJANGO_LEDGER_TRANSACTION_MODEL = getattr(settings, 'DJANGO_LEDGER_TRANSACTION_MODEL', 'django_ledger.TransactionModel')
36+
# DJANGO_LEDGER_JOURNAL_ENTRY_MODEL = getattr(settings, 'DJANGO_LEDGER_JOURNAL_ENTRY_MODEL', 'django_ledger.JournalEntryModel')
37+
# DJANGO_LEDGER_LEDGER_MODEL = getattr(settings, 'DJANGO_LEDGER_LEDGER_MODEL', 'django_ledger.LedgerModel')
38+
# DJANGO_LEDGER_ENTITY_MODEL = getattr(settings, 'DJANGO_LEDGER_ENTITY_MODEL', 'django_ledger.EntityModel')
39+
# DJANGO_LEDGER_ENTITY_STATE_MODEL = getattr(settings, 'DJANGO_LEDGER_ENTITY_STATE_MODEL', 'django_ledger.EntityStateModel')
40+
# DJANGO_LEDGER_ENTITY_UNIT_MODEL = getattr(settings, 'DJANGO_LEDGER_ENTITY_UNIT_MODEL', 'django_ledger.EntityUnitModel')
41+
# DJANGO_LEDGER_ESTIMATE_MODEL = getattr(settings, 'DJANGO_LEDGER_ESTIMATE_MODEL', 'django_ledger.EstimateModel')
42+
# DJANGO_LEDGER_BILL_MODEL = getattr(settings, 'DJANGO_LEDGER_BILL_MODEL', 'django_ledger.BillModel')
43+
# DJANGO_LEDGER_INVOICE_MODEL = getattr(settings, 'DJANGO_LEDGER_INVOICE_MODEL', 'django_ledger.InvoiceModel')
44+
# DJANGO_LEDGER_PURCHASE_ORDER_MODEL = getattr(settings, 'DJANGO_LEDGER_PURCHASE_ORDER_MODEL', 'django_ledger.PurchaseOrderModel')
45+
# DJANGO_LEDGER_CUSTOMER_MODEL = getattr(settings, 'DJANGO_LEDGER_CUSTOMER_MODEL', 'django_ledger.CustomerModel')
46+
# DJANGO_LEDGER_VENDOR_MODEL = getattr(settings, 'DJANGO_LEDGER_VENDOR_MODEL', 'django_ledger.VendorModel')
47+
# DJANGO_LEDGER_BANK_ACCOUNT_MODEL = getattr(settings, 'DJANGO_LEDGER_BANK_ACCOUNT_MODEL', 'django_ledger.BankAccountModel')
48+
# DJANGO_LEDGER_CLOSING_ENTRY_MODEL = getattr(settings, 'DJANGO_LEDGER_CLOSING_ENTRY_MODEL', 'django_ledger.ClosingEntryModel')
49+
# DJANGO_LEDGER_CLOSING_ENTRY_TRANSACTION_MODEL = getattr(settings, 'DJANGO_LEDGER_CLOSING_ENTRY_TRANSACTION_MODEL', 'django_ledger.ClosingEntryTransactionModel')
50+
# DJANGO_LEDGER_UNIT_OF_MEASURE_MODEL = getattr(settings, 'DJANGO_LEDGER_UNIT_OF_MEASURE_MODEL', 'django_ledger.UnitOfMeasureModel')
51+
# DJANGO_LEDGER_ITEM_TRANSACTION_MODEL = getattr(settings, 'DJANGO_LEDGER_ITEM_TRANSACTION_MODEL', 'django_ledger.ItemTransactionModel')
52+
# DJANGO_LEDGER_ITEM_MODEL = getattr(settings, 'DJANGO_LEDGER_ITEM_MODEL', 'django_ledger.ItemModel')
53+
# DJANGO_LEDGER_STAGED_TRANSACTION_MODEL = getattr(settings, 'DJANGO_LEDGER_STAGED_TRANSACTION_MODEL', 'django_ledger.StagedTransactionModel')
54+
# DJANGO_LEDGER_IMPORT_JOB_MODEL = getattr(settings, 'DJANGO_LEDGER_IMPORT_JOB_MODEL', 'django_ledger.ImportJobModel')
5455

5556
DJANGO_LEDGER_USE_CLOSING_ENTRIES = getattr(settings, 'DJANGO_LEDGER_USE_CLOSING_ENTRIES', True)
5657
DJANGO_LEDGER_DEFAULT_CLOSING_ENTRY_CACHE_TIMEOUT = getattr(settings,

‎django_ledger/urls/ledger.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
path('<slug:entity_slug>/list/year/<int:year>/',
1515
views.LedgerModelYearListView.as_view(),
1616
name='ledger-list-year'),
17-
path('<slug:entity_slug>/list/month/<int:year>/<int:month>',
17+
path('<slug:entity_slug>/list/month/<int:year>/<int:month>/',
1818
views.LedgerModelMonthListView.as_view(),
1919
name='ledger-list-month'),
2020
path('<slug:entity_slug>/create/',

0 commit comments

Comments
 (0)