django-ledger 0.7.1__py3-none-any.whl → 0.7.2__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.2'
 __license__ = 'GPLv3 License'
 
 __author__ = 'Miguel Sanda'

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()

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/templates/django_ledger/data_import/tags/data_import_job_list_table.html

@@ -9,6 +9,7 @@
             <th>Description</th>
             <th>Bank Account</th>
             <th>Created</th>
+            <th>Completed</th>
             <th>Actions</th>
         </tr>
         </thead>
@@ -19,6 +20,13 @@
                 <td>{{ job.description }}</td>
                 <td>{{ job.bank_account_model }}</td>
                 <td>{{ job.created }}</td>
+                <td class="has-text-centered">
+                    {% if job.is_complete %}
+                        <span class="icon has-text-success">{% icon 'ant-design:check-circle-filled' 24 %}</span>
+                    {% else %}
+                        <span class="icon is-small has-text-danger">{% icon 'maki:roadblock-11' 24 %}</span>
+                    {% endif %}
+                </td>
                 <td>
                     <div class="dropdown is-right" id="customer-action-{{ job.uuid }}">
 

{django_ledger-0.7.1.dist-info → django_ledger-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-ledger
-Version: 0.7.1
+Version: 0.7.2
 Summary: Double entry accounting system built on the Django Web Framework.
 Author-email: Miguel Sanda <msanda@arrobalytics.com>
 Maintainer-email: Miguel Sanda <msanda@arrobalytics.com>

{django_ledger-0.7.1.dist-info → django_ledger-0.7.2.dist-info}/RECORD

@@ -48,7 +48,7 @@ assets/node_modules/node-gyp/gyp/tools/pretty_gyp.py,sha256=2ZCRPW-MZfK7gdnCIaqh
 assets/node_modules/node-gyp/gyp/tools/pretty_sln.py,sha256=b_Fxm-SXUCPL3Tix4EyNwZNmQ-zkeRIFFmuL0R5wFhw,5482
 assets/node_modules/node-gyp/gyp/tools/pretty_vcproj.py,sha256=AwQrxK1F-jhjsbbT35XQjrvWNbc3IBFaKXoJogqMh_o,10633
 assets/node_modules/node-gyp/test/fixtures/test-charmap.py,sha256=5raXzaQnO2eJnrlFtlDtWftryhZX7Fj0amFW3hdSnhE,547
-django_ledger/__init__.py,sha256=F00HXUYiLYru2tz50vigBnkAjc7Y_amyDn-nIpAtNDs,380
+django_ledger/__init__.py,sha256=CX_J_4RTT4BUlffHbyF7VMYkSXKUovsClUss_XdeLJY,380
 django_ledger/apps.py,sha256=H-zEWUjKGakgSDSZmLIoXChZ2h6e0dth0ZO5SpoT-8U,163
 django_ledger/exceptions.py,sha256=rML8sQQ0Hq-DYMLZ76dfw2RYSAsXWUoyHuyC_yP9o1o,491
 django_ledger/settings.py,sha256=LX2QVtwm4YwAJrfN1VplJlQ310-NeIg-wpRz5QdFJTk,8906
@@ -152,11 +152,11 @@ django_ledger/models/bill.py,sha256=nNjoZLHT5jqhDiBpCeFdJP59TKwLTBTlbZMg4lGqhPE,
 django_ledger/models/chart_of_accounts.py,sha256=YxTmqy3FrTmqUCub-18GTtTRDCqVpWTzC_FmDPTlVJ4,30227
 django_ledger/models/closing_entry.py,sha256=MKCy-q0LJUL2LP3g3y-OwP0SdcJAPssXwhLCKgp1nM0,17912
 django_ledger/models/coa_default.py,sha256=CK4vOZ73QePciZUL93wigDXpxKamdXAKBaQR7r-G7tk,27482
-django_ledger/models/customer.py,sha256=jhNQzBJXU6tawEpGWlXyg-hdRjlZIg8oIpUldf-nKiM,11778
-django_ledger/models/data_import.py,sha256=O7zH9O4mVtuWBUJw_V0NB2ygXgQ7lKM6yxRdzATng24,19675
+django_ledger/models/customer.py,sha256=EeynuiYFx7ME7iCtUzvaURUnY4yRqKA-9hrSiv6Bs0Y,11806
+django_ledger/models/data_import.py,sha256=lAWoEw9Bh-0R1no4HjHaO6c8Fps2bn3qtEaAAFt894M,20414
 django_ledger/models/entity.py,sha256=XXvpD-AMcNQP6k6JlHy9dAHUfIQQesvaRol9sJCBais,123770
 django_ledger/models/estimate.py,sha256=EPkGMJwn3bkyYYeVHOfyLeWqtlJIyjF8fUc36dLz_18,58107
-django_ledger/models/invoice.py,sha256=rrQBn0tXkLRw2RD74Hv-gj3t97ePAyHxGJHIrkxnQc8,62840
+django_ledger/models/invoice.py,sha256=bbFq1vEQRJ3NcScutOM1LB3Vg0XELxK856Ned_u3NfI,62867
 django_ledger/models/items.py,sha256=-l_ibAiJTu4dO7TZUdGD4sq524Ew8oIwhq_hiHVUDeY,55251
 django_ledger/models/journal_entry.py,sha256=KlATZhW7lT4L5hy0GRQMdkrqcgaiGVREwQU7kEO09sI,54293
 django_ledger/models/ledger.py,sha256=68OHNANMK050_7s5NEj-n2FBY8JUnBaVsHDm2LItrMs,25034
@@ -289,7 +289,7 @@ django_ledger/templates/django_ledger/data_import/data_import_job_txs.html,sha25
 django_ledger/templates/django_ledger/data_import/import_job_create.html,sha256=d3cr04L6I8E4XFBfjSCSC4Z-_OxUOa_6b5Idp6XSWvg,2873
 django_ledger/templates/django_ledger/data_import/import_job_delete.html,sha256=qgobtrI-WNYFqhn8de05mcD-FQ0UGSLT6ZoaBlblXAU,944
 django_ledger/templates/django_ledger/data_import/import_job_update.html,sha256=ZDy391RSOXUq3keUs48QrVrI_ZicdNvDeLT_JacH17M,887
-django_ledger/templates/django_ledger/data_import/tags/data_import_job_list_table.html,sha256=JrKMiM63kY_xtpnNwHpFAovTMW5cX3_YJA9Hty0KxR0,2488
+django_ledger/templates/django_ledger/data_import/tags/data_import_job_list_table.html,sha256=y_U1xixMC9YPR4aq6F_cNpyb-dZ5qcVh9D6HSN9Xpps,2919
 django_ledger/templates/django_ledger/data_import/tags/data_import_job_txs_imported.html,sha256=e8dLP-VEPSh901KmpBSIZ635cPMM67okWzilbNpGNh4,1298
 django_ledger/templates/django_ledger/data_import/tags/data_import_job_txs_table.html,sha256=f-RJr7uw4v_s3XqMA9T7n0JDeIL0s-xdbdLmM1grvCk,3835
 django_ledger/templates/django_ledger/entity/entitiy_list.html,sha256=onM9uaWTm2oQ00OPIH5ki2FEfgjx7_EIOT8akuAhQM4,1507
@@ -457,9 +457,9 @@ django_ledger/views/purchase_order.py,sha256=CyftKrQWV1SBz7W0CvZOfZ81OPEiBHPD7b9
 django_ledger/views/transactions.py,sha256=3ijtJzdLPFkqG7OYpe-7N4QVjCyR2yl5ht_9RyfquBA,212
 django_ledger/views/unit.py,sha256=MF9tEeWCOt5XrtK-UFmHFisyBM-h3WzgL6v8IX2Ynbk,10446
 django_ledger/views/vendor.py,sha256=qlkd3gsjZ6RYuPrRYDVZp-Im65calM9ed3KxsaT4cxw,3467
-django_ledger-0.7.1.dist-info/AUTHORS.md,sha256=ShPwf-qniJkbjRzX5_lqhmgoLMEYMSHSwKPXHZtWmyk,824
-django_ledger-0.7.1.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-django_ledger-0.7.1.dist-info/METADATA,sha256=4f7K_hEZLKSR3V6tyn2jLM5zOqMxLNtX1eMOwww3YOU,8607
-django_ledger-0.7.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-django_ledger-0.7.1.dist-info/top_level.txt,sha256=fmHWehb2HfoDncQ3eQtYzeYc-gJMywf6q_ZpKBjwzoQ,38
-django_ledger-0.7.1.dist-info/RECORD,,
+django_ledger-0.7.2.dist-info/AUTHORS.md,sha256=ShPwf-qniJkbjRzX5_lqhmgoLMEYMSHSwKPXHZtWmyk,824
+django_ledger-0.7.2.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+django_ledger-0.7.2.dist-info/METADATA,sha256=XZ4MPmKkapPS3_Bjm64jcJOrHqRFFe6q652qqTtIa7g,8607
+django_ledger-0.7.2.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+django_ledger-0.7.2.dist-info/top_level.txt,sha256=fmHWehb2HfoDncQ3eQtYzeYc-gJMywf6q_ZpKBjwzoQ,38
+django_ledger-0.7.2.dist-info/RECORD,,