diff --git a/hesabixCore/src/Controller/Plugins/TaxSettingsController.php b/hesabixCore/src/Controller/Plugins/TaxSettingsController.php
index 8e49d63..7a96ce3 100644
--- a/hesabixCore/src/Controller/Plugins/TaxSettingsController.php
+++ b/hesabixCore/src/Controller/Plugins/TaxSettingsController.php
@@ -1162,6 +1162,22 @@ class TaxSettingsController extends AbstractController
                 $totalTax += $item['tax'];
             }
 
+            $buyerNationalId = null;
+            $buyerEconomicCode = null;
+            
+            $buyerPerson = null;
+            foreach ($invoice->getHesabdariRows() as $row) {
+                if ($row->getPerson()) {
+                    $buyerPerson = $row->getPerson();
+                    break;
+                }
+            }
+            
+            if ($buyerPerson) {
+                $buyerNationalId = $buyerPerson->getShenasemeli();
+                $buyerEconomicCode = $buyerPerson->getCodeeghtesadi();
+            }
+
             $dateTime = new DateTime();
             $header = (new \SnappMarketPro\Moadian\Dto\InvoiceHeaderDto())
                 ->setTaxid($moadian->generateTaxId($dateTime, $internalId))
@@ -1174,8 +1190,8 @@ class TaxSettingsController extends AbstractController
                 ->setIns(1)
                 ->setTins($taxId)
                 ->setTob(1)
-                ->setBid(null)
-                ->setTinb(null)
+                ->setBid($buyerNationalId)
+                ->setTinb($buyerEconomicCode)
                 ->setSbc(null)
                 ->setBpc(null)
                 ->setBbc(null)