diff --git a/src/controllers/05-quotation-controller.ts b/src/controllers/05-quotation-controller.ts
index 29face5..e13d4b6 100644
--- a/src/controllers/05-quotation-controller.ts
+++ b/src/controllers/05-quotation-controller.ts
@@ -525,24 +525,22 @@ export class QuotationController extends Controller {
         const p = product.find((p) => p.id === v.productId)!;
 
         const vatIncluded = body.agentPrice ? p.agentPriceVatIncluded : p.vatIncluded;
+        const vatCalc = body.agentPrice ? p.agentPriceCalcVat : p.calcVat;
 
         const originalPrice = body.agentPrice ? p.agentPrice : p.price;
-        const finalPriceWithVat = precisionRound(
-          originalPrice + (vatIncluded ? 0 : originalPrice * VAT_DEFAULT),
-        );
 
-        const price = finalPriceWithVat;
-        const pricePerUnit = price / (1 + VAT_DEFAULT);
-        const vat = (body.agentPrice ? p.agentPriceCalcVat : p.calcVat)
-          ? (pricePerUnit * v.amount - (v.discount || 0)) * VAT_DEFAULT
-          : 0;
+        const price = vatIncluded ? originalPrice / (1 + VAT_DEFAULT) : originalPrice;
+        const priceWithVat = precisionRound(price * (1 + VAT_DEFAULT));
+
+        const finalPrice = (vatCalc ? price : priceWithVat) * v.amount - (v.discount ?? 0);
+        const vat = vatCalc ? finalPrice - finalPrice / (1 + VAT_DEFAULT) : 0;
 
         return {
           order: i + 1,
           productId: v.productId,
           workId: v.workId,
           serviceId: v.serviceId,
-          pricePerUnit,
+          pricePerUnit: vatCalc ? priceWithVat / (1 + VAT_DEFAULT) : price,
           amount: v.amount,
           discount: v.discount || 0,
           installmentNo: v.installmentNo,
@@ -813,24 +811,22 @@ export class QuotationController extends Controller {
         const p = product.find((p) => p.id === v.productId)!;
 
         const vatIncluded = record.agentPrice ? p.agentPriceVatIncluded : p.vatIncluded;
+        const vatCalc = record.agentPrice ? p.agentPriceCalcVat : p.calcVat;
 
         const originalPrice = record.agentPrice ? p.agentPrice : p.price;
-        const finalPriceWithVat = precisionRound(
-          originalPrice + (vatIncluded ? 0 : originalPrice * VAT_DEFAULT),
-        );
 
-        const price = finalPriceWithVat;
-        const pricePerUnit = price / (1 + VAT_DEFAULT);
-        const vat = (record.agentPrice ? p.agentPriceCalcVat : p.calcVat)
-          ? (pricePerUnit * v.amount - (v.discount || 0)) * VAT_DEFAULT
-          : 0;
+        const price = vatIncluded ? originalPrice / (1 + VAT_DEFAULT) : originalPrice;
+        const priceWithVat = precisionRound(price * (1 + VAT_DEFAULT));
+
+        const finalPrice = (vatCalc ? price : priceWithVat) * v.amount - (v.discount ?? 0);
+        const vat = vatCalc ? finalPrice - finalPrice / (1 + VAT_DEFAULT) : 0;
 
         return {
           order: i + 1,
           productId: v.productId,
           workId: v.workId,
           serviceId: v.serviceId,
-          pricePerUnit,
+          pricePerUnit: vatCalc ? priceWithVat / (1 + VAT_DEFAULT) : price,
           amount: v.amount,
           discount: v.discount || 0,
           installmentNo: v.installmentNo,
diff --git a/src/controllers/09-debit-note-controller.ts b/src/controllers/09-debit-note-controller.ts
index 5fcdee9..3ca3346 100644
--- a/src/controllers/09-debit-note-controller.ts
+++ b/src/controllers/09-debit-note-controller.ts
@@ -430,20 +430,24 @@ export class DebitNoteController extends Controller {
 
       const list = body.productServiceList.map((v, i) => {
         const p = product.find((p) => p.id === v.productId)!;
-        const price = body.agentPrice ? p.agentPrice : p.price;
-        const pricePerUnit = p.vatIncluded ? price / (1 + VAT_DEFAULT) : price;
-        const vat = p.calcVat
-          ? (pricePerUnit * (v.discount ? v.amount : 1) - (v.discount || 0)) *
-            VAT_DEFAULT *
-            (!v.discount ? v.amount : 1)
-          : 0;
+
+        const vatIncluded = body.agentPrice ? p.agentPriceVatIncluded : p.vatIncluded;
+        const vatCalc = body.agentPrice ? p.agentPriceCalcVat : p.calcVat;
+
+        const originalPrice = body.agentPrice ? p.agentPrice : p.price;
+
+        const price = vatIncluded ? originalPrice / (1 + VAT_DEFAULT) : originalPrice;
+        const priceWithVat = precisionRound(price * (1 + VAT_DEFAULT));
+
+        const finalPrice = (vatCalc ? price : priceWithVat) * v.amount - (v.discount ?? 0);
+        const vat = vatCalc ? finalPrice - finalPrice / (1 + VAT_DEFAULT) : 0;
 
         return {
           order: i + 1,
           productId: v.productId,
           workId: v.workId,
           serviceId: v.serviceId,
-          pricePerUnit,
+          pricePerUnit: vatCalc ? priceWithVat / (1 + VAT_DEFAULT) : price,
           amount: v.amount,
           discount: v.discount || 0,
           installmentNo: v.installmentNo,
@@ -673,20 +677,24 @@ export class DebitNoteController extends Controller {
       }
       const list = body.productServiceList.map((v, i) => {
         const p = product.find((p) => p.id === v.productId)!;
-        const price = body.agentPrice ? p.agentPrice : p.price;
-        const pricePerUnit = p.vatIncluded ? price / (1 + VAT_DEFAULT) : price;
-        const vat = p.calcVat
-          ? (pricePerUnit * (v.discount ? v.amount : 1) - (v.discount || 0)) *
-            VAT_DEFAULT *
-            (!v.discount ? v.amount : 1)
-          : 0;
+
+        const vatIncluded = record.agentPrice ? p.agentPriceVatIncluded : p.vatIncluded;
+        const vatCalc = record.agentPrice ? p.agentPriceCalcVat : p.calcVat;
+
+        const originalPrice = record.agentPrice ? p.agentPrice : p.price;
+
+        const price = vatIncluded ? originalPrice / (1 + VAT_DEFAULT) : originalPrice;
+        const priceWithVat = precisionRound(price * (1 + VAT_DEFAULT));
+
+        const finalPrice = (vatCalc ? price : priceWithVat) * v.amount - (v.discount ?? 0);
+        const vat = vatCalc ? finalPrice - finalPrice / (1 + VAT_DEFAULT) : 0;
 
         return {
           order: i + 1,
           productId: v.productId,
           workId: v.workId,
           serviceId: v.serviceId,
-          pricePerUnit,
+          pricePerUnit: vatCalc ? priceWithVat / (1 + VAT_DEFAULT) : price,
           amount: v.amount,
           discount: v.discount || 0,
           installmentNo: v.installmentNo,
diff --git a/src/services/flowaccount.ts b/src/services/flowaccount.ts
index 730482d..5757e34 100644
--- a/src/services/flowaccount.ts
+++ b/src/services/flowaccount.ts
@@ -1,6 +1,7 @@
 import prisma from "../db";
 import config from "../config.json";
 import { CustomerType, PayCondition } from "@prisma/client";
+import { convertTemplate } from "../utils/string-template";
 
 if (!process.env.FLOW_ACCOUNT_URL) throw new Error("Require FLOW_ACCOUNT_URL");
 if (!process.env.FLOW_ACCOUNT_CLIENT_ID) throw new Error("Require FLOW_ACCOUNT_CLIENT_ID");
@@ -182,17 +183,14 @@ const flowAccountAPI = {
       data.paymentDate = `${year}-${String(month).padStart(2, "0")}-${String(date).padStart(2, "0")}`;
     } */
 
-    const res = await fetch(
-      api + "/upgrade/receipts/inline" + (withPayment ? "/with-payment" : ""),
-      {
-        method: "POST",
-        headers: {
-          ["Content-Type"]: `application/json`,
-          ["Authorization"]: `Bearer ${token}`,
-        },
-        body: JSON.stringify({ ...data, referenceDocument: [] }),
+    const res = await fetch(api + "/tax-invoices/inline" + (withPayment ? "/with-payment" : ""), {
+      method: "POST",
+      headers: {
+        ["Content-Type"]: `application/json`,
+        ["Authorization"]: `Bearer ${token}`,
       },
-    );
+      body: JSON.stringify({ ...data, referenceDocument: [] }),
+    });
 
     return {
       ok: res.ok,
@@ -232,6 +230,28 @@ const flowAccount = {
         installments: true,
         quotation: {
           include: {
+            paySplit: {
+              select: {
+                amount: true,
+                no: true,
+              },
+            },
+            worker: {
+              select: {
+                employee: {
+                  select: {
+                    namePrefix: true,
+                    firstNameEN: true,
+                    lastNameEN: true,
+                    employeePassport: {
+                      select: { number: true },
+                      orderBy: { expireDate: "desc" },
+                      take: 1,
+                    },
+                  },
+                },
+              },
+            },
             registeredBranch: {
               include: {
                 province: true,
@@ -305,6 +325,7 @@ const flowAccount = {
       isVat: true,
 
       useReceiptDeduction: false,
+      useInlineVat: true,
 
       discounPercentage: 0,
       discountAmount: quotation.totalDiscount,
@@ -325,7 +346,29 @@ const flowAccount = {
         quotation.payCondition === "BillSplitCustom" || quotation.payCondition === "SplitCustom"
           ? data.installments.reduce((a, c) => a + c.amount, 0)
           : quotation.finalPrice,
-
+      remark: quotation.remark
+        ? convertTemplate(quotation.remark, {
+            "quotation-payment": {
+              paymentType: quotation.payCondition,
+              amount: quotation.finalPrice,
+              installments: quotation.paySplit.map((v) => ({ no: v.no, amount: v.amount })),
+            },
+            "quotation-labor": {
+              name: quotation.worker.map((v) =>
+                (
+                  (v.employee.employeePassport.at(0)?.number
+                    ? v.employee.employeePassport.at(0)?.number + "_"
+                    : "") +
+                  v.employee.namePrefix +
+                  "." +
+                  v.employee.firstNameEN +
+                  " " +
+                  v.employee.lastNameEN
+                ).toUpperCase(),
+              ),
+            },
+          })
+        : null,
       items: product.map((v) => ({
         type: ProductAndServiceType.ProductNonInv,
         name: v.product.name,