diff --git a/src/controllers/00-stats-controller.ts b/src/controllers/00-stats-controller.ts
index b4aef31..95484a4 100644
--- a/src/controllers/00-stats-controller.ts
+++ b/src/controllers/00-stats-controller.ts
@@ -631,6 +631,7 @@ export class StatsController extends Controller {
                   createdAt: { gte: v, lte: date.endOf("month").toDate() },
                   invoice: {
                     quotation: {
+                      quotationStatus: { notIn: [QuotationStatus.Canceled] },
                       registeredBranch: { OR: permissionCondCompany(req.user) },
                     },
                   },
diff --git a/src/controllers/06-request-list-controller.ts b/src/controllers/06-request-list-controller.ts
index a01f465..764fbc7 100644
--- a/src/controllers/06-request-list-controller.ts
+++ b/src/controllers/06-request-list-controller.ts
@@ -456,13 +456,19 @@ export class RequestDataActionController extends Controller {
             data: { quotationStatus: QuotationStatus.Canceled, urgent: false },
           })
           .then(async (res) => {
-            await tx.notification.createMany({
-              data: res.map((v) => ({
-                title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
-                detail: "รหัส / code : " + v.code + " Canceled",
-                receiverId: v.createdByUserId,
-              })),
-            });
+            await Promise.all(
+              res.map((v) =>
+                tx.notification.create({
+                  data: {
+                    title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
+                    detail: "รหัส / code : " + v.code + " Canceled",
+                    receiverId: v.createdByUserId,
+                    registeredBranchId: v.registeredBranchId,
+                    groupReceiver: { create: { name: "document_checker" } },
+                  },
+                }),
+              ),
+            );
           }),
         tx.taskOrder
           .updateManyAndReturn({
@@ -481,6 +487,7 @@ export class RequestDataActionController extends Controller {
                     title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
                     detail: "รหัส / code : " + v.code + " Canceled",
                     receiverId: v.createdByUserId,
+                    registeredBranchId: v.registeredBranchId,
                     groupReceiver: { create: { name: "document_checker" } },
                   },
                 }),
@@ -662,13 +669,19 @@ export class RequestDataActionController extends Controller {
               data: { quotationStatus: QuotationStatus.Canceled, urgent: false },
             })
             .then(async (res) => {
-              await tx.notification.createMany({
-                data: res.map((v) => ({
-                  title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
-                  detail: "รหัส / code : " + v.code + " Canceled",
-                  receiverId: v.createdByUserId,
-                })),
-              });
+              await Promise.all(
+                res.map((v) =>
+                  tx.notification.create({
+                    data: {
+                      title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
+                      detail: "รหัส / code : " + v.code + " Canceled",
+                      receiverId: v.createdByUserId,
+                      registeredBranchId: v.registeredBranchId,
+                      groupReceiver: { create: { name: "document_checker" } },
+                    },
+                  }),
+                ),
+              );
             }),
           tx.taskOrder.updateMany({
             where: {
@@ -766,13 +779,19 @@ export class RequestDataActionController extends Controller {
           },
         })
         .then(async (res) => {
-          await tx.notification.createMany({
-            data: res.map((v) => ({
-              title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
-              detail: "รหัส / code : " + v.code + " Completed",
-              receiverId: v.createdByUserId,
-            })),
-          });
+          await Promise.all(
+            res.map((v) =>
+              tx.notification.create({
+                data: {
+                  title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
+                  detail: "รหัส / code : " + v.code + " Completed",
+                  receiverId: v.createdByUserId,
+                  registeredBranchId: v.registeredBranchId,
+                  groupReceiver: { create: { name: "document_checker" } },
+                },
+              }),
+            ),
+          );
 
           const token = await this.#getLineToken();
           if (!token) return;
@@ -1178,13 +1197,19 @@ export class RequestListController extends Controller {
                 data: { quotationStatus: QuotationStatus.Canceled, urgent: false },
               })
               .then(async (res) => {
-                await tx.notification.createMany({
-                  data: res.map((v) => ({
-                    title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
-                    detail: "รหัส / code : " + v.code + " Canceled",
-                    receiverId: v.createdByUserId,
-                  })),
-                });
+                await Promise.all(
+                  res.map((v) =>
+                    tx.notification.create({
+                      data: {
+                        title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
+                        detail: "รหัส / code : " + v.code + " Canceled",
+                        receiverId: v.createdByUserId,
+                        registeredBranchId: v.registeredBranchId,
+                        groupReceiver: { create: { name: "document_checker" } },
+                      },
+                    }),
+                  ),
+                );
               }),
             tx.taskOrder.updateMany({
               where: {
@@ -1292,13 +1317,19 @@ export class RequestListController extends Controller {
           },
         })
         .then(async (res) => {
-          await tx.notification.createMany({
-            data: res.map((v) => ({
-              title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
-              detail: "รหัส / code : " + v.code + " Completed",
-              receiverId: v.createdByUserId,
-            })),
-          });
+          await Promise.all(
+            res.map((v) =>
+              tx.notification.create({
+                data: {
+                  title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
+                  detail: "รหัส / code : " + v.code + " Completed",
+                  receiverId: v.createdByUserId,
+                  registeredBranchId: v.registeredBranchId,
+                  groupReceiver: { create: { name: "document_checker" } },
+                },
+              }),
+            ),
+          );
           const token = await this.#getLineToken();
           if (!token) return;
 
diff --git a/src/controllers/07-task-controller.ts b/src/controllers/07-task-controller.ts
index ba2f656..ad97be0 100644
--- a/src/controllers/07-task-controller.ts
+++ b/src/controllers/07-task-controller.ts
@@ -407,6 +407,7 @@ export class TaskController extends Controller {
             data: {
               title: "ใบสั่งงานใหม่ / New Task Order",
               detail: "รหัส / code : " + v.code,
+              registeredBranchId: v.registeredBranchId,
               groupReceiver: { create: { name: "document_checker" } },
             },
           });
@@ -554,6 +555,7 @@ export class TaskController extends Controller {
               title: "มีการส่งงาน / Task Submitted",
               detail: "รหัสใบสั่งงาน / Order : " + record.code,
               receiverId: record.createdByUserId,
+              registeredBranchId: record.registeredBranchId,
               groupReceiver: { create: { name: "document_checker" } },
             },
           });
@@ -749,6 +751,7 @@ export class TaskActionController extends Controller {
           title: "มีการส่งงาน / Task Submitted",
           detail: "รหัสใบสั่งงาน / Order : " + record.code,
           receiverId: record.createdByUserId,
+          registeredBranchId: record.registeredBranchId,
           groupReceiver: { create: { name: "document_checker" } },
         },
       }),
@@ -805,6 +808,7 @@ export class TaskActionController extends Controller {
                 title: "ใบงานเสร็จสิ้น / Task Complete",
                 detail: "รหัสใบสั่งงาน / Order : " + record.code,
                 receiverId: record.createdByUserId,
+                registeredBranchId: record.registeredBranchId,
                 groupReceiver: { create: { name: "document_checker" } },
               },
             });
@@ -918,6 +922,7 @@ export class TaskActionController extends Controller {
           include: {
             quotation: {
               select: {
+                registeredBranchId: true,
                 createdByUserId: true,
               },
             },
@@ -932,6 +937,7 @@ export class TaskActionController extends Controller {
                   title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
                   detail: "รหัส / code : " + v.code + " Completed",
                   receiverId: v.quotation.createdByUserId,
+                  registeredBranchId: v.quotation.registeredBranchId,
                   groupReceiver: { create: { name: "document_checker" } },
                 },
               }),
@@ -984,6 +990,7 @@ export class TaskActionController extends Controller {
                   title: "สถานะใบเสนอราคาเปลี่ยนแปลง / Quotation Status Updated",
                   detail: "รหัส / code : " + v.code + " Completed",
                   receiverId: v.createdByUserId,
+                  registeredBranchId: v.registeredBranchId,
                   groupReceiver: { create: { name: "document_checker" } },
                 },
               }),
@@ -1232,6 +1239,7 @@ export class UserTaskController extends Controller {
                 title: "สถานะใบส่งงานมีการเปลี่ยนแปลง / Order Status Changed",
                 detail: "รหัสใบสั่งงาน / Order : " + v.code + " InProgress",
                 receiverId: v.createdByUserId,
+                registeredBranchId: v.registeredBranchId,
                 groupReceiver: { create: { name: "document_checker" } },
               },
             });
@@ -1240,6 +1248,7 @@ export class UserTaskController extends Controller {
                 title: "มีการรับงาน / Task Accepted",
                 detail: "รหัสใบสั่งงาน / Order : " + v.code,
                 receiverId: v.createdByUserId,
+                registeredBranchId: v.registeredBranchId,
                 groupReceiver: { create: { name: "document_checker" } },
               },
             });