add: add kreditor and debitor

core/apps/counterparty/migrations/0005_counterparty_debit_counterparty_kredit.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.4 on 2025-09-09 15:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('counterparty', '0004_counterparty_status'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='counterparty',
+            name='debit',
+            field=models.BigIntegerField(blank=True, default=0, null=True),
+        ),
+        migrations.AddField(
+            model_name='counterparty',
+            name='kredit',
+            field=models.BigIntegerField(blank=True, default=0, null=True),
+        ),
+    ]

core/apps/counterparty/migrations/0006_rename_debit_counterparty_debit_usd_and_more.py

@@ -0,0 +1,43 @@
+# Generated by Django 5.2.4 on 2025-09-09 16:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('counterparty', '0005_counterparty_debit_counterparty_kredit'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='counterparty',
+            old_name='debit',
+            new_name='debit_usd',
+        ),
+        migrations.RenameField(
+            model_name='counterparty',
+            old_name='kredit',
+            new_name='debit_uzs',
+        ),
+        migrations.AddField(
+            model_name='counterparty',
+            name='kredit_usd',
+            field=models.BigIntegerField(blank=True, default=0, null=True),
+        ),
+        migrations.AddField(
+            model_name='counterparty',
+            name='kredit_uzs',
+            field=models.BigIntegerField(blank=True, default=0, null=True),
+        ),
+        migrations.AddField(
+            model_name='counterparty',
+            name='total_debit',
+            field=models.BigIntegerField(blank=True, default=0, null=True),
+        ),
+        migrations.AddField(
+            model_name='counterparty',
+            name='total_kredit',
+            field=models.BigIntegerField(blank=True, default=0, null=True),
+        ),
+    ]

core/apps/counterparty/models/conterparty.py

@@ -49,6 +49,13 @@ class Counterparty(BaseModel):
     comment = models.TextField(null=True, blank=True)
     is_archived = models.BooleanField(default=False)
 
+    debit_usd = models.BigIntegerField(default=0, null=True, blank=True)
+    debit_uzs = models.BigIntegerField(default=0, null=True, blank=True)
+    total_debit = models.BigIntegerField(default=0, null=True, blank=True)
+    kredit_usd = models.BigIntegerField(default=0, null=True, blank=True)
+    kredit_uzs = models.BigIntegerField(default=0, null=True, blank=True)
+    total_kredit = models.BigIntegerField(default=0, null=True, blank=True)
+
     def __str__(self):
         return self.name
     

core/apps/counterparty/serializers/counterparty.py

@@ -12,6 +12,7 @@ class CounterpartyListSerializer(serializers.ModelSerializer):
         fields = [
             'id', 'inn', 'name', 'phone', 'type', 'folder', 'type', 'region', 'district',
             'balance', 'balance_currency', 'balance_date', 'comment', 'is_archived',
+            'kredit_usd', 'kredit_uzs', 'total_kredit', 'debit_usd', 'debit_uzs', 'total_debit',
         ]
     
 

core/apps/counterparty/views/counterparty.py

@@ -13,7 +13,7 @@ from core.apps.counterparty.filters.counterparty import CounterpartyFilter
 
 class CounterpartyListApiView(generics.ListAPIView):
     serializer_class = serializers.CounterpartyListSerializer
-    queryset = Counterparty.objects.exclude(is_archived=True).exclude(folder__isnull=True)
+    queryset = Counterparty.objects.exclude(is_archived=True).exclude(folder__isnull=False)
     pagination_class = [HasRolePermission]
     required_permissions = []
     pagination_class = CustomPageNumberPagination
@@ -91,7 +91,7 @@ class FolderCounterpartyListApiView(generics.GenericAPIView):
 
     def get(self, reuqest, folder_id):
         folder = get_object_or_404(CounterpartyFolder, id=folder_id)
-        queryset = self.queryset.filter(fodler=folder).exclude(folder__isnull=False)
+        queryset = self.queryset.filter(fodler=folder).exclude(folder__isnull=True)
         page = self.paginate_queryset(queryset)
         if page is not None:
             serializer = self.serializer_class(page, many=True)