django-ledger 0.7.1__py3-none-any.whl → 0.7.3__py3-none-any.whl

django_ledger/__init__.py

@@ -6,7 +6,7 @@ Copyright© EDMA Group Inc licensed under the GPLv3 Agreement.
 default_app_config = 'django_ledger.apps.DjangoLedgerConfig'
 
 """Django Ledger"""
-__version__ = '0.7.1'
+__version__ = '0.7.3'
 __license__ = 'GPLv3 License'
 
 __author__ = 'Miguel Sanda'

django_ledger/forms/account.py

@@ -145,13 +145,16 @@ class AccountModelUpdateForm(MoveNodeForm):
 
     class Meta:
         model = AccountModel
-        exclude = ('depth', 'numchild', 'path', 'balance_type')
+        exclude = ('depth', 'numchild', 'path')
         widgets = {
             'role': HiddenInput(),
             'coa_model': HiddenInput(),
             'parent': Select(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
             }),
+            'balance_type': Select(attrs={
+                'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
+            }),
             'code': TextInput(attrs={
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES
             }),

django_ledger/io/io_core.py

@@ -499,10 +499,11 @@ class IODatabaseMixIn:
         VALUES = [
             'account__uuid',
             'account__balance_type',
-            'tx_type',
             'account__code',
             'account__name',
             'account__role',
+            'account__coa_model__slug',
+            'tx_type',
         ]
 
         ANNOTATE = {'balance': Sum('amount')}
@@ -663,6 +664,7 @@ class IODatabaseMixIn:
         gl = list(g)
         return {
             'account_uuid': k[0],
+            'coa_slug': gl[0]['account__coa_model__slug'],
             'unit_uuid': k[1],
             'unit_name': gl[0].get('journal_entry__entity_unit__name'),
             'activity': gl[0].get('journal_entry__activity'),

django_ledger/models/customer.py

@@ -330,6 +330,6 @@ class CustomerModel(CustomerModelAbstract):
     Base Customer Model Implementation
     """
 
-    class Meta:
+    class Meta(CustomerModelAbstract.Meta):
         swappable = 'DJANGO_LEDGER_CUSTOMER_MODEL'
         abstract = False

django_ledger/models/data_import.py

@@ -32,7 +32,25 @@ class ImportJobModelManager(Manager):
 
     def get_queryset(self):
         qs = super().get_queryset()
-        return qs.select_related(
+        return qs.annotate(
+            txs_count=Count('stagedtransactionmodel',
+                            filter=Q(stagedtransactionmodel__parent__isnull=False)),
+            txs_mapped_count=Count(
+                'stagedtransactionmodel__account_model_id',
+                filter=Q(stagedtransactionmodel__parent__isnull=False) | Q(
+                    stagedtransactionmodel__parent__parent__isnull=False)
+
+            ),
+        ).annotate(
+            txs_pending=F('txs_count') - F('txs_mapped_count')
+        ).annotate(
+            is_complete=Case(
+                When(txs_count__exact=0, then=False),
+                When(txs_pending__exact=0, then=True),
+                default=False,
+                output_field=BooleanField()
+            ),
+        ).select_related(
             'bank_account_model',
             'bank_account_model__cash_account',
             'ledger_model'
@@ -101,7 +119,7 @@ class ImportJobModelAbstract(CreateUpdateMixIn):
         return _(f'Are you sure you want to delete Import Job {self.description}?')
 
 
-class StagedTransactionModelQuerySet(models.QuerySet):
+class StagedTransactionModelQuerySet(QuerySet):
 
     def is_pending(self):
         return self.filter(transaction_model__isnull=True)
@@ -116,7 +134,7 @@ class StagedTransactionModelQuerySet(models.QuerySet):
         return self.filter(ready_to_import=True)
 
 
-class StagedTransactionModelManager(models.Manager):
+class StagedTransactionModelManager(Manager):
 
     def get_queryset(self):
         qs = super().get_queryset()
@@ -138,6 +156,7 @@ class StagedTransactionModelManager(models.Manager):
                 When(parent_id__isnull=False, then=F('parent_id'))
             ),
         ).annotate(
+            entity_unit=F('transaction_model__journal_entry__entity_unit__name'),
             ready_to_import=Case(
                 # is mapped singleton...
                 When(

django_ledger/models/invoice.py

@@ -1819,7 +1819,7 @@ class InvoiceModel(InvoiceModelAbstract):
     Base Invoice Model from Abstract.
     """
 
-    class Meta:
+    class Meta(InvoiceModelAbstract.Meta):
         swappable = 'DJANGO_LEDGER_INVOICE_MODEL'
         abstract = False
 

django_ledger/models/mixins.py

@@ -898,11 +898,11 @@ class AccrualMixIn(models.Model):
             ]):
                 raise ValidationError('Must provide all accounts Cash, Prepaid, UnEarned.')
 
-        if self.accrue:
-            if self.is_approved():
-                self.progress = Decimal.from_float(1.00)
-            else:
-                self.progress = Decimal.from_float(0.00)
+        # if self.accrue:
+        #     if self.is_approved():
+        #         self.progress = Decimal.from_float(1.00)
+        #     else:
+        #         self.progress = Decimal.from_float(0.00)
 
         if self.amount_paid > self.amount_due:
             raise ValidationError(f'Amount paid {self.amount_paid} cannot exceed amount due {self.amount_due}')