From f4f54801db43572ecef4c21f49f431ae68d46b40 Mon Sep 17 00:00:00 2001
From: behruz-dev <xoliqberdiyevbehruz12@gmail.com>
Date: Mon, 29 Sep 2025 15:31:06 +0500
Subject: [PATCH] add: add new field for expence income, and add to filter new
 fields

---
 core/apps/finance/filters/expence.py          |  3 ++-
 core/apps/finance/filters/income.py           |  3 ++-
 ..._alter_expence_audit_alter_income_audit.py | 23 +++++++++++++++++++
 core/apps/finance/models/expence.py           |  5 +++-
 core/apps/finance/models/income.py            |  5 +++-
 5 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 core/apps/finance/migrations/0031_alter_expence_audit_alter_income_audit.py

diff --git a/core/apps/finance/filters/expence.py b/core/apps/finance/filters/expence.py
index 5c68f99..f4d8412 100644
--- a/core/apps/finance/filters/expence.py
+++ b/core/apps/finance/filters/expence.py
@@ -13,7 +13,8 @@ class ExpenceFilter(django_filters.FilterSet):
     class Meta:
         model = Expence
         fields = [
-            'payment_type', 'project_folder', 'project', 'user', 'expence_type', 'cash_transaction', 'date'
+            'payment_type', 'project_folder', 'project', 'user', 'expence_type', 'cash_transaction', 'date',
+            'audit', 'counterparty'
         ]
     
     def filter_by_created_at(self, queryset, name, value):
diff --git a/core/apps/finance/filters/income.py b/core/apps/finance/filters/income.py
index 6adf4ce..0184ed2 100644
--- a/core/apps/finance/filters/income.py
+++ b/core/apps/finance/filters/income.py
@@ -13,7 +13,8 @@ class IncomeFilter(django_filters.FilterSet):
     class Meta:
         model = Income
         fields = [
-            'payment_type', 'project_folder', 'project', 'user', 'type_income', 'date', 'cash_transaction'
+            'payment_type', 'project_folder', 'project', 'user', 'type_income', 'date', 'cash_transaction',
+            'audit', 'counterparty'
         ]
 
     def filter_by_created_at(self, queryset, name, value):
diff --git a/core/apps/finance/migrations/0031_alter_expence_audit_alter_income_audit.py b/core/apps/finance/migrations/0031_alter_expence_audit_alter_income_audit.py
new file mode 100644
index 0000000..46a9a53
--- /dev/null
+++ b/core/apps/finance/migrations/0031_alter_expence_audit_alter_income_audit.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.2.4 on 2025-09-29 15:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0030_incomechat_incomemessage'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='expence',
+            name='audit',
+            field=models.CharField(blank=True, choices=[('CHECKED', 'tekshirildi'), ('PROCESS', 'jarayonda')], max_length=20, null=True),
+        ),
+        migrations.AlterField(
+            model_name='income',
+            name='audit',
+            field=models.CharField(blank=True, choices=[('CHECKED', 'tekshirildi'), ('PROCESS', 'jarayonda')], max_length=20, null=True),
+        ),
+    ]
diff --git a/core/apps/finance/models/expence.py b/core/apps/finance/models/expence.py
index ecf3ec8..c12c4e1 100644
--- a/core/apps/finance/models/expence.py
+++ b/core/apps/finance/models/expence.py
@@ -38,7 +38,10 @@ class Expence(BaseModel):
     )
     date = models.DateField(null=True, blank=True)
     comment = models.TextField(null=True, blank=True)
-    audit = models.CharField(max_length=200, null=True, blank=True)
+    audit = models.CharField(
+        max_length=20, choices=[('CHECKED', 'tekshirildi'),('PROCESS', 'jarayonda')],
+        null=True, blank=True
+    )
     file = models.FileField(null=True, blank=True, upload_to='finance/expence/files/')
     status = models.CharField(max_length=20, choices=STATUS, default='PENDING', null=True, blank=True)
     is_deleted = models.BooleanField(default=False)
diff --git a/core/apps/finance/models/income.py b/core/apps/finance/models/income.py
index d1902a9..970baa2 100644
--- a/core/apps/finance/models/income.py
+++ b/core/apps/finance/models/income.py
@@ -31,7 +31,10 @@ class Income(BaseModel):
     date = models.DateField(null=True, blank=True)
     comment = models.TextField(null=True, blank=True)
     file = models.FileField(upload_to='finance/income/file/', null=True, blank=True)
-    audit = models.CharField(max_length=200, null=True, blank=True)
+    audit = models.CharField(
+        max_length=20, choices=[('CHECKED', 'tekshirildi'),('PROCESS', 'jarayonda')],
+        null=True, blank=True
+    )    
     is_deleted = models.BooleanField(default=False)
 
     def __str__(self):