diff --git a/hesabixCore/src/Controller/Plugins/TaxSettingsController.php b/hesabixCore/src/Controller/Plugins/TaxSettingsController.php
index 1454a01..cf38540 100644
--- a/hesabixCore/src/Controller/Plugins/TaxSettingsController.php
+++ b/hesabixCore/src/Controller/Plugins/TaxSettingsController.php
@@ -1198,12 +1198,18 @@ class TaxSettingsController extends AbstractController
                 $personType = 2;
             }
 
+            $InvoiceType = 2;
+
+            if ($buyerNationalId && $buyerEconomicCode) {
+                $InvoiceType = 1;
+            }
+
             $dateTime = new DateTime();
             $header = (new \SnappMarketPro\Moadian\Dto\InvoiceHeaderDto())
                 ->setTaxid($moadian->generateTaxId($dateTime, $internalId))
                 ->setIndati2m($dateTime->getTimestamp() * 1000)
                 ->setIndatim($dateTime->getTimestamp() * 1000)
-                ->setInty(2)
+                ->setInty($InvoiceType)
                 ->setInno($moadian->normalizeInvoiceNumber($internalId))
                 ->setIrtaxid(null)
                 ->setInp(1)
@@ -1227,7 +1233,7 @@ class TaxSettingsController extends AbstractController
                 ->setTvam($totalTax)
                 ->setTodam($data['shippingCost'])
                 ->setTbill($data['finalTotal'])
-                ->setSetm(null)
+                ->setSetm(1)
                 ->setCap(null)
                 ->setInsp(null)
                 ->setTvop(null)
diff --git a/webUI/src/views/acc/plugins/tax/invoices/list.vue b/webUI/src/views/acc/plugins/tax/invoices/list.vue
index 823116b..d19944d 100644
--- a/webUI/src/views/acc/plugins/tax/invoices/list.vue
+++ b/webUI/src/views/acc/plugins/tax/invoices/list.vue
@@ -589,7 +589,7 @@ export default {
                 if (response.data.success) {
                     Swal.fire({
                         title: 'ارسال موفق',
-                        text: 'فاکتور بدون اطلاعات خریدار به سامانه مودیان مالیاتی ارسال شد',
+                        text: 'فاکتور به سامانه مودیان مالیاتی ارسال شد',
                         icon: 'success',
                         confirmButtonText: 'باشه'
                     });