From fae6fea2fa7f65aa2ff09da475d4c3257e8143cc Mon Sep 17 00:00:00 2001
From: 7nimor <7nimor@gmail.com>
Date: Sun, 14 Dec 2025 14:06:49 +0330
Subject: [PATCH 1/2] update excel

---
 apps/warehouse/services/excel/excel_processing.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/warehouse/services/excel/excel_processing.py b/apps/warehouse/services/excel/excel_processing.py
index c2d735d..01e9e29 100644
--- a/apps/warehouse/services/excel/excel_processing.py
+++ b/apps/warehouse/services/excel/excel_processing.py
@@ -249,6 +249,7 @@ class WareHouseExcelViewSet(viewsets.ModelViewSet, ExcelDynamicSearchMixin):
             "ردیف",
             "تعاونی دامدار",
             "کد ملی دامدار",
+            "نام و نام خانوادگی دامدار",
             "تاریخ",
             "محصولات",
             "شناسه تراکنش",
@@ -308,6 +309,7 @@ class WareHouseExcelViewSet(viewsets.ModelViewSet, ExcelDynamicSearchMixin):
 
                 rancher_data = data.get('rancher')
                 national_code = rancher_data.get('national_code', '-') if rancher_data else '-'
+                rancher_name = rancher_data.get('fullname', '-') if rancher_data else '-'
 
                 seller_org = data.get('seller_organization')
                 org_name = seller_org.get('name', '-') if seller_org else '-'
@@ -329,6 +331,7 @@ class WareHouseExcelViewSet(viewsets.ModelViewSet, ExcelDynamicSearchMixin):
                     m,
                     org_name,
                     national_code,
+                    rancher_name,
                     str(shamsi_date(convert_str_to_date(data['transaction_date']), in_value=True)) if data.get(
                         'transaction_date') else '',
                     products_str,
@@ -364,6 +367,7 @@ class WareHouseExcelViewSet(viewsets.ModelViewSet, ExcelDynamicSearchMixin):
             '',
             '',
             '',
+            '',
             total_price,
             '',
         ]

From 99382817c1933cf8dcfbb4b61299a798d7991c70 Mon Sep 17 00:00:00 2001
From: 7nimor <7nimor@gmail.com>
Date: Sun, 14 Dec 2025 14:11:53 +0330
Subject: [PATCH 2/2] update excel

---
 apps/warehouse/services/excel/excel_processing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/warehouse/services/excel/excel_processing.py b/apps/warehouse/services/excel/excel_processing.py
index 01e9e29..89e591c 100644
--- a/apps/warehouse/services/excel/excel_processing.py
+++ b/apps/warehouse/services/excel/excel_processing.py
@@ -309,7 +309,7 @@ class WareHouseExcelViewSet(viewsets.ModelViewSet, ExcelDynamicSearchMixin):
 
                 rancher_data = data.get('rancher')
                 national_code = rancher_data.get('national_code', '-') if rancher_data else '-'
-                rancher_name = rancher_data.get('fullname', '-') if rancher_data else '-'
+                rancher_name = data.get('rancher_fullname', '-') if rancher_data else '-'
 
                 seller_org = data.get('seller_organization')
                 org_name = seller_org.get('name', '-') if seller_org else '-'