Merge branch 'development' of https://github.com/MNPC-IR/Rasaddam_Backend into development

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 = data.get('rancher_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,
             '',
         ]