From 7f1844aa6ba9e80fe7c79dffc4ba830c5066b3c5 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Sun, 2 Jan 2022 13:38:40 +0200
Subject: [PATCH] BIG-231 Transactions number on drawer title.

---
 .../Drawers/BillDrawer/BillDrawerProvider.js  |   4 +-
 .../CreditNoteDetailDrawerProvider.js         |   4 +-
 .../EstimateDetailDrawerProvider.js           |   4 +-
 src/containers/Drawers/ExpenseDrawer/index.js |   2 +-
 .../ManualJournalDrawerProvider.js            |   2 +-
 .../PaymentMadeDetailProvider.js              |   6 +-
 .../PaymentReceiveDetailProvider.js           |   4 +-
 .../ReceiptDetailDrawerProvider.js            |   4 +-
 .../VendorCreditNoteFormHeaderFields.js       |   1 +
 .../PaymentReceiveHeaderFields.js             |   1 +
 src/lang/ar/index.json                        | 168 +++++++++---------
 src/lang/en/index.json                        | 125 ++++++-------
 12 files changed, 171 insertions(+), 154 deletions(-)

diff --git a/src/containers/Drawers/BillDrawer/BillDrawerProvider.js b/src/containers/Drawers/BillDrawer/BillDrawerProvider.js
index 25d181e45..338a11157 100644
--- a/src/containers/Drawers/BillDrawer/BillDrawerProvider.js
+++ b/src/containers/Drawers/BillDrawer/BillDrawerProvider.js
@@ -33,7 +33,9 @@ function BillDrawerProvider({ billId, ...props }) {
     <DrawerLoading loading={loading}>
       <DrawerHeaderContent
         name="bill-drawer"
-        title={intl.get('bill.details.drawer.title')}
+        title={intl.get('bill.drawer.title', {
+          number: bill.bill_number ? `(${bill.bill_number})` : null,
+        })}
       />
       <BillDrawerContext.Provider value={provider} {...props} />
     </DrawerLoading>
diff --git a/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailDrawerProvider.js b/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailDrawerProvider.js
index e96a82bdd..1dbf5030b 100644
--- a/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailDrawerProvider.js
+++ b/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailDrawerProvider.js
@@ -67,8 +67,8 @@ function CreditNoteDetailDrawerProvider({ creditNoteId, ...props }) {
     >
       <DrawerHeaderContent
         name="credit-note-detail-drawer"
-        title={intl.get('credit_note.drawer_credit_note_detail', {
-          creditNumber: creditNote.credit_note_number,
+        title={intl.get('credit_note.drawer.title', {
+          number: creditNote.credit_note_number,
         })}
       />
       <CreditNoteDetailDrawerContext.Provider value={provider} {...props} />
diff --git a/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailDrawerProvider.js b/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailDrawerProvider.js
index bf11ea143..3fb3f62fa 100644
--- a/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailDrawerProvider.js
+++ b/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailDrawerProvider.js
@@ -24,7 +24,9 @@ function EstimateDetailDrawerProvider({ estimateId, ...props }) {
     <DrawerLoading loading={isEstimateLoading}>
       <DrawerHeaderContent
         name="estimate-detail-drawer"
-        title={intl.get('estimate_details')}
+        title={intl.get('estimate.drawer.title', {
+          number: estimate.estimate_number,
+        })}
       />
       <EstimateDetailDrawerContext.Provider value={provider} {...props} />
     </DrawerLoading>
diff --git a/src/containers/Drawers/ExpenseDrawer/index.js b/src/containers/Drawers/ExpenseDrawer/index.js
index 1764da1fa..cb3c56f66 100644
--- a/src/containers/Drawers/ExpenseDrawer/index.js
+++ b/src/containers/Drawers/ExpenseDrawer/index.js
@@ -22,7 +22,7 @@ function ExpenseDrawer({
     <Drawer
       isOpen={isOpen}
       name={name}
-      title={intl.get('expense')}
+      title={intl.get('expense.drawer.title')}
       size={'65%'}
       style={{ minWidth: '700px', maxWidth: '900px' }}
     >
diff --git a/src/containers/Drawers/ManualJournalDrawer/ManualJournalDrawerProvider.js b/src/containers/Drawers/ManualJournalDrawer/ManualJournalDrawerProvider.js
index 0d007e7fb..77ac64aff 100644
--- a/src/containers/Drawers/ManualJournalDrawer/ManualJournalDrawerProvider.js
+++ b/src/containers/Drawers/ManualJournalDrawer/ManualJournalDrawerProvider.js
@@ -31,7 +31,7 @@ function ManualJournalDrawerProvider({ manualJournalId, ...props }) {
     <DrawerLoading loading={isJournalLoading}>
       <DrawerHeaderContent
         name={'journal-drawer'}
-        title={intl.get('manual_journal_number', {
+        title={intl.get('manual_journal.drawer.title', {
           number: manualJournal?.journal_number,
         })}
       />
diff --git a/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailProvider.js b/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailProvider.js
index 27fa2a5f0..6cccd96c0 100644
--- a/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailProvider.js
+++ b/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailProvider.js
@@ -33,7 +33,11 @@ function PaymentMadeDetailProvider({ paymentMadeId, ...props }) {
     <DrawerLoading loading={loading}>
       <DrawerHeaderContent
         name="payment-made-detail-drawer"
-        title={intl.get('payment_made_details')}
+        title={intl.get('payment_made.drawer.title', {
+          number: paymentMade.payment_number
+            ? `(${paymentMade.payment_number})`
+            : '',
+        })}
       />
       <PaymentMadeDetailContext.Provider value={provider} {...props} />
     </DrawerLoading>
diff --git a/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailProvider.js b/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailProvider.js
index 04bb1902b..65aac0d3d 100644
--- a/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailProvider.js
+++ b/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailProvider.js
@@ -29,7 +29,9 @@ function PaymentReceiveDetailProvider({ paymentReceiveId, ...props }) {
     <DrawerLoading loading={isPaymentLoading}>
       <DrawerHeaderContent
         name="payment-receive-detail-drawer"
-        title={intl.get('payment_receive_details')}
+        title={intl.get('payment_receive.drawer.title', {
+          number: paymentReceive.payment_receive_no,
+        })}
       />
       <PaymentReceiveDetailContext.Provider value={provider} {...props} />
     </DrawerLoading>
diff --git a/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailDrawerProvider.js b/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailDrawerProvider.js
index 252f0904b..7578db3f4 100644
--- a/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailDrawerProvider.js
+++ b/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailDrawerProvider.js
@@ -28,7 +28,9 @@ function ReceiptDetailDrawerProvider({ receiptId, ...props }) {
     <DrawerLoading loading={isReceiptLoading}>
       <DrawerHeaderContent
         name="receipt-detail-drawer"
-        title={intl.get('receipt_details')}
+        title={intl.get('receipt.drawer.title', {
+          number: receipt.receipt_number,
+        })}
       />
       <ReceiptDetailDrawerContext.Provider value={provider} {...props} />
     </DrawerLoading>
diff --git a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.js b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.js
index e17da3e28..c97bfb1bb 100644
--- a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.js
+++ b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.js
@@ -139,6 +139,7 @@ function VendorCreditNoteFormHeaderFields({
           <FormGroup
             label={<T id={'credit_note.label_credit_note'} />}
             inline={true}
+            labelInfo={<FieldRequiredHint />}
             className={('form-group--vendor_credit_number', CLASSES.FILL)}
             intent={inputIntent({ error, touched })}
             helperText={<ErrorMessage name="vendor_credit_number" />}
diff --git a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveHeaderFields.js b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveHeaderFields.js
index 743e97d32..b990c3438 100644
--- a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveHeaderFields.js
+++ b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveHeaderFields.js
@@ -224,6 +224,7 @@ function PaymentReceiveHeaderFields({
           <FormGroup
             label={<T id={'payment_receive_no'} />}
             inline={true}
+            labelInfo={<FieldRequiredHint />}
             className={('form-group--payment_receive_no', CLASSES.FILL)}
             intent={inputIntent({ error, touched })}
             helperText={<ErrorMessage name="payment_receive_no" />}
diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json
index a2e774069..4e8bc38c5 100644
--- a/src/lang/ar/index.json
+++ b/src/lang/ar/index.json
@@ -1145,7 +1145,6 @@
   "Getting started": "Getting started",
   "Congratulations": "Congratulations",
   "payment_has_been_done_successfully": "Payment has been done successfully.",
-  "manual_journal_number": "تفاصيل قيد يدوي ({number})",
   "conditions_and_terms": "Conditions and terms",
   "allocate_landed_coast": "تحميل تكلفة اضافية",
   "transaction_date": "تاريخ المعاملة",
@@ -1247,7 +1246,7 @@
   "bill.details.subtotal": "المجموع",
   "bill.details.payment_amount": "مبلغ المدفوع",
   "bill.details.due_amount": "مبلغ المستحق",
-  "bill.details.drawer.title": "تفاصيل فاتورة الشراء",
+  "bill.drawer.title": "تفاصيل فاتورة الشراء {number}",
   "invoice.details.created_at": "أنشئت في",
   "invoice.details.total": "إجمالي",
   "invoice.details.subtotal": "المجموع",
@@ -1491,29 +1490,29 @@
   "sms_notification.payment_details.type": "شكر علي عملية الدفع",
   "sms_notification.receipt_details.type": "تفاصيل إيصال البيع",
   "personal": "المحمول",
-  "list.create":"إضافة {value}",
-  "roles.label":"دور المستخدمين",
-  "roles.column.name":"اسم الدور",
-  "roles.column.description":"الوصف",
-  "roles.edit_roles":" تعديل دور المستخدم",
-  "roles.delete_roles":"حذف دور المستخدم",
-  "roles.label.role_name":"اسم الدور",
-  "roles.error.role_is_predefined":"دور المستخدم معرَّف مسبقًا ، ولا يمكنك حذف دور المستخدمين المحددة مسبقًا ",
-  "roles.error.you_cannot_change_your_own_role":"لا يمكنك تغيير دور المستخدم الخاص بك.",
-  "roles.label.role_name_":"اسم دور المستخدم ",
-  "roles.permission_schema.success_message":"تم اضافة دور المستخدم بنجاح.",
-  "roles.permission_schema.upload_message":"تم تحديث دور المستخدم بنجاح.",
-  "roles.permission_schema.delete.alert_message":"تم حذف دور المستخدم بنجاح. ",
-  "roles.permission_schema.once_delete_this_role_you_will_able_to_restore_it":"بمجرد حذف دور المستخدم ، لن تتمكن من استعادته لاحقًا. هل أنت متأكد أنك تريد حذف هذا الدور؟",
-  "users.column.role_name":"دور المستخدم",
-  "roles.error.you_cannot_edit_predefined_roles":"لا يمكنك تعديل أدوار المستخدم المحددة مسبقا.",
-  "roles.error.you_cannot_delete_predefined_roles":"لا يمكنك حذف أدوار المستخدم المحددة مسبقا",
-  "roles.error.you_cannot_delete_role_that_associated_to_users":"لا يمكن حذف دور المستخدم لأنه لديه مستخدمين مرتبطة به.",
-  "payment_transactions":"معاملات الدفع",
+  "list.create": "إضافة {value}",
+  "roles.label": "دور المستخدمين",
+  "roles.column.name": "اسم الدور",
+  "roles.column.description": "الوصف",
+  "roles.edit_roles": " تعديل دور المستخدم",
+  "roles.delete_roles": "حذف دور المستخدم",
+  "roles.label.role_name": "اسم الدور",
+  "roles.error.role_is_predefined": "دور المستخدم معرَّف مسبقًا ، ولا يمكنك حذف دور المستخدمين المحددة مسبقًا ",
+  "roles.error.you_cannot_change_your_own_role": "لا يمكنك تغيير دور المستخدم الخاص بك.",
+  "roles.label.role_name_": "اسم دور المستخدم ",
+  "roles.permission_schema.success_message": "تم اضافة دور المستخدم بنجاح.",
+  "roles.permission_schema.upload_message": "تم تحديث دور المستخدم بنجاح.",
+  "roles.permission_schema.delete.alert_message": "تم حذف دور المستخدم بنجاح. ",
+  "roles.permission_schema.once_delete_this_role_you_will_able_to_restore_it": "بمجرد حذف دور المستخدم ، لن تتمكن من استعادته لاحقًا. هل أنت متأكد أنك تريد حذف هذا الدور؟",
+  "users.column.role_name": "دور المستخدم",
+  "roles.error.you_cannot_edit_predefined_roles": "لا يمكنك تعديل أدوار المستخدم المحددة مسبقا.",
+  "roles.error.you_cannot_delete_predefined_roles": "لا يمكنك حذف أدوار المستخدم المحددة مسبقا",
+  "roles.error.you_cannot_delete_role_that_associated_to_users": "لا يمكن حذف دور المستخدم لأنه لديه مستخدمين مرتبطة به.",
+  "payment_transactions": "معاملات الدفع",
   "sidebar_credit_note": "إشعارات الدائن",
   "credit_note.label_create_note_list": "قائمة إشعارات الدائن",
   "credit_note.label.new_credit_note": "إشعار دائن جديد",
-  "credit_note.label.edit_credit_note": "تعديل إشعار دائن ",  
+  "credit_note.label.edit_credit_note": "تعديل إشعار دائن ",
   "credit_note.label_credit_note": " رقم إشعار الدائن",
   "credit_note.action.refund_credit_note": " استرجاع الأموال",
   "credit_note.action.reconcile_with_invoices": "تسوية فواتير المبيعات ",
@@ -1530,14 +1529,13 @@
   "credit_note.label_customer_note": "ملاحظة الزبون",
   "credit_note.once_delete_this_credit_note": " بمجرد حذف إشعار الدائن ، لن تتمكن من استعادته لاحقًا. هل أنت متأكد أنك تريد حذف هذا إشعار",
   "credit_note.alert.delete_message": "تم حذف إشعار الدائن بنجاح",
-  "credit_note.label":"إشعارات الدائن",
+  "credit_note.label": "إشعارات الدائن",
   "credit_note.success_message": "تم إنشاء إشعار الدائن بنجاح.",
   "credit_note.edit_success_message": "تم تعديل إشعار الدائن  بنجاح.",
   "credit_note_number_settings": "إعدادات رقم إشعار الدائن",
   "credit_note.auto_increment.auto": "يتم تعيين أرقام إشعارات الدائن على وضع الزيادة التلقائي. هل أنت متأكد من تغيير هذا الإعداد؟",
   "credit_note.auto_increment.manually": "يتم تعيين أرقام إشعارات الدائن على وضع الزيادة التلقائي. هل أنت متأكد من تغيير هذا الإعداد؟",
   "setting_your_auto_generated_credit_note_number": "تعيين رقم إشعار الدائن الذي تم إنشاؤه تلقائيًا",
-  "credit_note.drawer_credit_note_detail": "تفاصيل إشعار الدائن ({creditNumber})",
   "credit_note.drawer.label_credit_note_no": "رقم الإشعار",
   "credit_note.drawer.label_credit_note_date": "تاريخ الإشعار",
   "credit_note.drawer.label_credits_remaining": "الرصيد المتبقي ",
@@ -1557,20 +1555,20 @@
   "vendor_credits.status_closed": "مغلقة",
   "vendor_credits.action.edit_vendor_credit": "تعديل إشعار مدين",
   "vendor_credits.action.refund_vendor_credit": "استرجاع الأموال",
-  "vendor_credits.action.delete_vendor_credit": "حذف إشعار المدين" ,
+  "vendor_credits.action.delete_vendor_credit": "حذف إشعار المدين",
   "vendor_credits.action.mark_as_open": "وضع علامة مفتوح",
   "vendor_credits.action.reconcile_with_bills": "تسوية فواتير الشراء ",
   "vendor_credits.success_message": "تم إنشاء إشعار المدين بنجاح.",
   "vendor_credits.edit_success_message": "تم تعديل إشعار المدين  بنجاح.",
   "vendor_credits.alert.delete_message": "تم حذف إشعار المدين بنجاح",
   "vendor_credits.note.once_delete_this_vendor_credit_note": " بمجرد حذف إشعار المدين ، لن تتمكن من استعادته لاحقًا. هل أنت متأكد أنك تريد حذف هذا إشعار ",
-  "vendor_credits.empty_status.title": "خفض أرصدة الموردين عن طريق إنشاء إشعار مدين" ,
-  "vendor_credits.empty_status.description": "إشعار المدين هو المستند الذي يرسل إلى المورد و يجعله مديناً للمنشأة ، فهو إثبات من قبل المنشأة أن لها حق يجب أخذه من المورد." ,
+  "vendor_credits.empty_status.title": "خفض أرصدة الموردين عن طريق إنشاء إشعار مدين",
+  "vendor_credits.empty_status.description": "إشعار المدين هو المستند الذي يرسل إلى المورد و يجعله مديناً للمنشأة ، فهو إثبات من قبل المنشأة أن لها حق يجب أخذه من المورد.",
   "vendor_credit_number_settings": "إعدادات رقم إشعار المدين",
   "vendor_credit.auto_increment.auto": "يتم تعيين أرقام إشعارات المدين على وضع الزيادة التلقائي. هل أنت متأكد من تغيير هذا الإعداد؟",
   "vendor_credit.auto_increment.manually": "يتم تعيين أرقام إشعارات المدين على وضع الزيادة التلقائي. هل أنت متأكد من تغيير هذا الإعداد؟",
   "setting_your_auto_generated_vendor_credit_number": "تعيين رقم إشعار المدين الذي تم إنشاؤه تلقائيًا",
-  "vendor_credit.label":"إشعارات المدين",
+  "vendor_credit.label": "إشعارات المدين",
   "vendor_credit.drawer_vendor_credit_detail": "تفاصيل إشعار المدين  ({vendorNumber})",
   "vendor_credit.drawer.label_vendor_credit_no": "رقم الإشعار",
   "vendor_credit.drawer.label_vendor_credit_date": "تاريخ الإشعار",
@@ -1667,10 +1665,10 @@
   "transactions_locking.callout.lock_individual.desc": "يمكنك قفل أو إلغاء قفل المعاملات لكل وحدة على حدا بدلاً من قفل المعاملات لجميع المعاملات مرة واحدة.",
   "transactions_locking.callout.lock_all_at_once.desc": "يمكن قفل او إلغاء قفل المعاملات لكل الوحدات مرة واحدة بدلاً من قفلها لكل وحدة بشكل جزئي.",
   "transactions_locking.long_description": "يمكنك قفل المعاملات المالية حتى لا يتمكن المستخدمون من تعديل أو حذف أو إضافة معاملات جديدة خلال الفترة الماضية ، ولكن لا يزال لدي المستخدمين إمكانية إضافة عمليات مالية فواتير الشراء أو البيع كمسودة  لن يؤثر إضافتها على نتائج التقارير المالية. عادةً ما يحدد تاريخ القفل بعد ما يتم من تدقيق من المعاملات في نهاية الشهر أو السنة.",
-  "transactions_locking.you_should_unlock_all_transactions_at_once_before":".يجب عليك إلغاء قفل جميع المعاملات مرة واحدة ، بدلاً من قفل المعاملات كل وحدة جزئيًا",
- "transactions_locking.lock_individual_modules":"قفل الوحدات بشكل منفرد ",
+  "transactions_locking.you_should_unlock_all_transactions_at_once_before": ".يجب عليك إلغاء قفل جميع المعاملات مرة واحدة ، بدلاً من قفل المعاملات كل وحدة جزئيًا",
+  "transactions_locking.lock_individual_modules": "قفل الوحدات بشكل منفرد ",
   "invoice_transactions.column.withdrawal_account": "حساب السحب",
-  "invoice_transactions.action.delete_transaction": "حذف المعاملة ",  
+  "invoice_transactions.action.delete_transaction": "حذف المعاملة ",
   "invoice_transactions.action.edit_transaction": " تعديل المعاملة",
   "bill_transactions.column.deposit_account": "حساب إيداع",
   "transactions_locking.lock_item.no_lock": "لا توجد معاملات مقفلة في هذه الوحدة.",
@@ -1678,13 +1676,13 @@
   "transactions": "معاملات ",
   "item.drawer_transactions_by": " عرض معاملات:",
   "item.drawer_quantity_sold": "الكمية المباعة",
-  "journal_entries.amount_displayed_base_currency":"يتم عرض المبلغ بالعملة الأساسية الخاصة بك ",
-  "inventory_adjustment.column.product":"المنتج",
-  "invoice.convert_to_credit_note":"تحويل إلى إشعار دائن",
-  "bill.convert_to_credit_note":"تحويل إلى إشعار مدين",
-  "bill.allocate_landed_coast":"تحميل تكلفة اضافية",
-  "overdue":"متأخرّة",
-  "invite_user.label.role_name":"دور المستخدم",
+  "journal_entries.amount_displayed_base_currency": "يتم عرض المبلغ بالعملة الأساسية الخاصة بك ",
+  "inventory_adjustment.column.product": "المنتج",
+  "invoice.convert_to_credit_note": "تحويل إلى إشعار دائن",
+  "bill.convert_to_credit_note": "تحويل إلى إشعار مدين",
+  "bill.allocate_landed_coast": "تحميل تكلفة اضافية",
+  "overdue": "متأخرّة",
+  "invite_user.label.role_name": "دور المستخدم",
   "permissions.column.view": "عرض",
   "permissions.column.full_access": "تحكم كامل",
   "permissions.column.delete": "حذف",
@@ -1693,7 +1691,7 @@
   "permissions.column.written_off_invoice": "شطب  فاتورة",
   "permissions.column.refund_credit_note": "استرجاع الأموال",
   "permissions.column.refund_vendor_credit": "استرجاع الأموال",
-  "permissions.column.transactions_locking":"قفل المعاملات",
+  "permissions.column.transactions_locking": "قفل المعاملات",
   "permissions.items_inventory": "منتجات والمخزون",
   "permissions.inventory_adjustment": "تسويات المخزون",
   "permissions.items": "المنتجات",
@@ -1706,48 +1704,52 @@
   "permissions.sale_receipt": "الإيصالات",
   "permissions.credit_note": "إشعارات الدائن",
   "permissions.payment_receive": "سندات الزبائن",
-  "permissions.purchases":"المشتريات",
-  "permissions.bills":"فواتير الشراء",
-  "permissions.vendor_credits":"إشعارات المدين",
-  "permissions.payment_made":"سندات الموردين",
-  "permissions.financial_accounting":"الأمور المالية",
-  "permissions.manual_journals":"القيود اليدوية",
-  "permissions.chart_of_accounts":"شجرة الحسابات",
-  "permissions.expenses":"المصاريف",
-  "permissions.reports":"التقارير",
-  "permissions.financial_reports":"تقارير مالية",
-  "permissions.balance_sheet":"الميزانية العمومية",
-  "permissions.profit_loss_sheet":"قائمة الدخل",
-  "permissions.trial_balance_sheet":"ميزان المراجعة",
-  "permissions.cash_flow_sheet":"قائمة التدفقات النقدية",
-  "permissions.journal_sheet":"دفتر اليومية العامة",
-  "permissions.general_ledger":"دفتر الأستاذ العام",
-  "permissions.a_r_aging_summary_report":"ملخص اعمار الديون للذمم المدينة",
-  "permissions.a_p_aging_summary_report":"ملخص اعمار الديون للذمم الدائنة",
-  "permissions.purchases_by_items":"المشتريات حسب المنتجات",
-  "permissions.sales_by_items":"المبيعات حسب المنتجات",
-  "permissions.customers_transactions":"معاملات الزبائن",
-  "permissions.vendors_transactions":"معاملات الموردين",
-  "permissions.customers_summary_balance":"ملخص رصيد الزبائن",
-  "permissions.vendors_summary_balance":"ملخص رصيد الموردين",
-  "permissions.inventory_valuation_summary":"ملخص تقييم المخزون ",
-  "permissions.inventory_items_details":"تفاصيل منتج المخزون",
-  "permissions.cashflow_account_transactions":"معاملات حسابات التدفقات النقدية",
-  "permissions.more_permissions":"عرض المزيد ",
-
+  "permissions.purchases": "المشتريات",
+  "permissions.bills": "فواتير الشراء",
+  "permissions.vendor_credits": "إشعارات المدين",
+  "permissions.payment_made": "سندات الموردين",
+  "permissions.financial_accounting": "الأمور المالية",
+  "permissions.manual_journals": "القيود اليدوية",
+  "permissions.chart_of_accounts": "شجرة الحسابات",
+  "permissions.expenses": "المصاريف",
+  "permissions.reports": "التقارير",
+  "permissions.financial_reports": "تقارير مالية",
+  "permissions.balance_sheet": "الميزانية العمومية",
+  "permissions.profit_loss_sheet": "قائمة الدخل",
+  "permissions.trial_balance_sheet": "ميزان المراجعة",
+  "permissions.cash_flow_sheet": "قائمة التدفقات النقدية",
+  "permissions.journal_sheet": "دفتر اليومية العامة",
+  "permissions.general_ledger": "دفتر الأستاذ العام",
+  "permissions.a_r_aging_summary_report": "ملخص اعمار الديون للذمم المدينة",
+  "permissions.a_p_aging_summary_report": "ملخص اعمار الديون للذمم الدائنة",
+  "permissions.purchases_by_items": "المشتريات حسب المنتجات",
+  "permissions.sales_by_items": "المبيعات حسب المنتجات",
+  "permissions.customers_transactions": "معاملات الزبائن",
+  "permissions.vendors_transactions": "معاملات الموردين",
+  "permissions.customers_summary_balance": "ملخص رصيد الزبائن",
+  "permissions.vendors_summary_balance": "ملخص رصيد الموردين",
+  "permissions.inventory_valuation_summary": "ملخص تقييم المخزون ",
+  "permissions.inventory_items_details": "تفاصيل منتج المخزون",
+  "permissions.cashflow_account_transactions": "معاملات حسابات التدفقات النقدية",
+  "permissions.more_permissions": "عرض المزيد ",
   "estimate.status.expired": "منتهية الصلاحية",
-  "refund_credit.drawer.title":" تفاصيل استرجاع الأموال لإشعار الدائن ",
-  "refund_credit.drawer.label.amount":"القيمة",
-  "refund_credit.drawer.label.credit_note_no":"رقم الإشعار",
-  "refund_credit.drawer.label.withdrawal_account":"حساب السحب",
-  "refund_credit.drawer.label.reference_no":"رقم المرجع",
-  "refund_credit.drawer.label.description":"الوصف",
-  "refund_vendor_credit.drawer.title":" تفاصيل استرجاع الأموال لإشعار المدين ",
-  "refund_vendor_credit.drawer.label.amount":"القيمة",
-  "refund_vendor_credit.drawer.label.vendor_credit_no":"رقم الإشعار",
-  "refund_vendor_credit.drawer.label.deposit_account":"حساب إيداع",
-  "refund_vendor_credit.drawer.label.reference_no":"رقم المرجع",
-  "refund_vendor_credit.drawer.label.description":"الوصف"
-}
-
-
+  "refund_credit.drawer.title": " تفاصيل استرجاع الأموال لإشعار الدائن ",
+  "refund_credit.drawer.label.amount": "القيمة",
+  "refund_credit.drawer.label.credit_note_no": "رقم الإشعار",
+  "refund_credit.drawer.label.withdrawal_account": "حساب السحب",
+  "refund_credit.drawer.label.reference_no": "رقم المرجع",
+  "refund_credit.drawer.label.description": "الوصف",
+  "refund_vendor_credit.drawer.title": " تفاصيل استرجاع الأموال لإشعار المدين ",
+  "refund_vendor_credit.drawer.label.amount": "القيمة",
+  "refund_vendor_credit.drawer.label.vendor_credit_no": "رقم الإشعار",
+  "refund_vendor_credit.drawer.label.deposit_account": "حساب إيداع",
+  "refund_vendor_credit.drawer.label.reference_no": "رقم المرجع",
+  "refund_vendor_credit.drawer.label.description": "الوصف",
+  "estimate.drawer.title": "تفاصيل العرض ({number})",
+  "receipt.drawer.title": "تفاصيل الإيصال ({number})",
+  "credit_note.drawer.title": "تفاصيل إشعار الدائن ({number})",
+  "payment_receive.drawer.title": "تفاصيل سند الزبون ({number})",
+  "payment_made.drawer.title": "تفاصيل سند المورد {number}",
+  "manual_journal.drawer.title": "تفاصيل قيد يدوي ({number})",
+  "expense.drawer.title": " تفاصيل المصروف"
+}
\ No newline at end of file
diff --git a/src/lang/en/index.json b/src/lang/en/index.json
index dfd5d5ed9..8c54593f1 100644
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -519,7 +519,7 @@
   "delete_invoice": "Delete Invoice",
   "new_invoice": "New Invoice",
   "invoice_list": "Invoice List",
-  "invoice_reference_no":"Reference #",
+  "invoice_reference_no": "Reference #",
   "the_invoice_has_been_edited_successfully": "The invoice #{number} has been edited successfully.",
   "the_invoice_has_been_created_successfully": "The invoice #{number} has been created successfully.",
   "the_invoice_has_been_deleted_successfully": "The invoice has been deleted successfully.",
@@ -709,7 +709,7 @@
   "day_partially_paid": "Partially paid, {due} due.",
   "overdue_by": "Overdue by {overdue} day.",
   "paid": "Paid",
-  "due":"Due",
+  "due": "Due",
   "your_account_has_been_locked": "Your account has been locked due to repeated failed login attempts. Please wait a few minutes before trying again.",
   "the_invoice_has_been_delivered_successfully": "The invoice has been delivered successfully.",
   "are_sure_to_deliver_this_invoice": "Are you sure you want to deliver this invoice?",
@@ -759,7 +759,7 @@
   "inventory_adjustments": "Inventory adjustments",
   "make_adjustment": "Make an adjustment",
   "adjustment_type": "Adjustment type",
-  "mark_as_open":"Make as Open",
+  "mark_as_open": "Make as Open",
   "decrement": "Decrement",
   "new_quantity": "New quantity",
   "reason": "Reason",
@@ -1116,7 +1116,6 @@
   "Initializing": "Initializing",
   "Getting started": "Getting started",
   "Congratulations": "Congratulations",
-  "manual_journal_number": "Manual journal ({number})",
   "conditions_and_terms": "Conditions and terms",
   "allocate_landed_coast": "Allocate landed cost",
   "transaction_date": "Transaction date",
@@ -1221,7 +1220,7 @@
   "invoice.details.payment_amount": "Payment amount",
   "invoice.details.invoice_message": "Invoice Message",
   "invoice.details.invoice_no": "Invoice #",
-  "bill.details.drawer.title":"Bill details",
+  "bill.drawer.title": "Bill details {number}",
   "bill.details.reference": "Reference #",
   "bill.details.bill_number": "Bill #",
   "bill.details.created_at": "Created at",
@@ -1229,7 +1228,7 @@
   "bill.details.subtotal": "Subtotal",
   "bill.details.payment_amount": "Payment amount",
   "bill.details.due_amount": "Due amount",
-  "bill.drawer.bill_details":"Bill details ({billNumber})",
+  "bill.drawer.bill_details": "Bill details ({billNumber})",
   "expense.details.subtotal": "Subtotal",
   "expense.details.total": "Total",
   "manual_journal.details.subtotal": "Subtotal",
@@ -1519,12 +1518,11 @@
   "credit_note.alert.delete_message": "The credit note has been deleted successfully",
   "credit_note.success_message": "The credit note has been created successfully.",
   "credit_note.edit_success_message": "The credit note has been edited successfully.",
-  "credit_note.label":"Credit notes",
+  "credit_note.label": "Credit notes",
   "credit_note_number_settings": "Credit Note Number Settings",
   "credit_note.auto_increment.auto": "Your credit note numbers are set on auto-increment mode. Are you sure changing this setting?",
   "credit_note.auto_increment.manually": "Your credit note numbers are set on manual mode. Are you sure chaning this settings?",
   "setting_your_auto_generated_credit_note_number": "Setting your auto-generated credit note number",
-  "credit_note.drawer_credit_note_detail": "Credit Note details ({creditNumber})",
   "credit_note.drawer.label_credit_note_no": "Credit Note #",
   "credit_note.drawer.label_credit_note_date": "Credit Date",
   "credit_note.drawer.label_credits_remaining": "Credits Remaining",
@@ -1543,8 +1541,8 @@
   "vendor_credits.action.edit_vendor_credit": "Edit Vendor Credit",
   "vendor_credits.action.refund_vendor_credit": "Refund Vendor Credit",
   "vendor_credits.action.delete_vendor_credit": "Delete Vendor Credit",
-  "vendor_credits.empty_status.title":"Reduce vendors balance by create vendor credit",
-  "vendor_credits.empty_status.description":"Vendor credit is the commercial document that is sent to the vendor and makes him owe to our organization. It is proof by the facility that it has a right to be taken from the vendor.",
+  "vendor_credits.empty_status.title": "Reduce vendors balance by create vendor credit",
+  "vendor_credits.empty_status.description": "Vendor credit is the commercial document that is sent to the vendor and makes him owe to our organization. It is proof by the facility that it has a right to be taken from the vendor.",
   "vendor_credits.action.mark_as_open": "Make as Open",
   "vendor_credits.action.reconcile_with_bills": "Reconcile with Bills",
   "vendor_credits.success_message": "The vendor credit has been created successfully",
@@ -1555,7 +1553,7 @@
   "vendor_credit.auto_increment.auto": "Your vendor credit  numbers are set on auto-increment mode. Are you sure changing this setting?",
   "vendor_credit.auto_increment.manually": "Your vendor credit  numbers are set on manual mode. Are you sure chaning this settings?",
   "setting_your_auto_generated_vendor_credit_number": "Setting your auto-generated vendor credit number",
-  "vendor_credit.label":"Vendor credits",
+  "vendor_credit.label": "Vendor credits",
   "vendor_credit.drawer_vendor_credit_detail": "Vendor Credit details",
   "vendor_credit.drawer.label_vendor_credit_no": "Vendor Credit #",
   "vendor_credit.drawer.label_vendor_credit_date": "Vendor Credit Date",
@@ -1588,7 +1586,6 @@
   "refund_vendor_credit.column.withdrawal_account": "Withdrawal account",
   "refund_vendor_credit_transactions.alert.delete_message": "The vendor credit refund has been deleted successfully.",
   "refund_vendor_credit_transactions.once_your_delete_this_refund_vendor_credit": "Once your delete this refund vendor credit note, you won't be able to restore it later, Are your sure you want to delete this transaction?",
-  
   "credit_note_opened.alert.success_message": "The credit note has been opened successfully",
   "credit_note_opened.are_sure_to_open_this_credit": "Are you sure you want to open this credit note?",
   "vendor_credit_opened.alert.success_message": "The  vendor credit has been opened successfully",
@@ -1653,8 +1650,8 @@
   "transactions_locking.callout.lock_individual.desc": "You have the ability to lock transactions of all modules at once instead of locking transactions each module​​ partially.",
   "transactions_locking.callout.lock_all_at_once.desc": "You have the ability to lock or unlock transactions of each module individually instead of locking all transactions at once.",
   "transactions_locking.long_description": "Transactions locking has the ability to lock all organization transactions so users can’t edit, delete or create new transactions during the past period, but still have the ability to create draft invoices or bills and that won’t affect financial reports. typically set a lock date when your financial records are being prepared for the year.",
-  "transactions_locking.you_should_unlock_all_transactions_at_once_before":"You should unlock all transactions at once before, than lock transactions partially on each module.",
- "transactions_locking.lock_individual_modules":"Lock Individual Modules",
+  "transactions_locking.you_should_unlock_all_transactions_at_once_before": "You should unlock all transactions at once before, than lock transactions partially on each module.",
+  "transactions_locking.lock_individual_modules": "Lock Individual Modules",
   "payment_transactions": "Payment transactions",
   "invoice_transactions.column.withdrawal_account": "Deposit account",
   "invoice_transactions.action.delete_transaction": "Delete Transaction",
@@ -1666,21 +1663,21 @@
   "item.drawer_transactions_by": "Transactions by:",
   "item.drawer_quantity_sold": "Quantity Sold",
   "role_name": "Role name",
-  "journal_entries.amount_displayed_base_currency":"Amount is displayed in your base currency",
-  "inventory_adjustment.column.product":"Product",
-  "invoice.convert_to_credit_note":"Convert to Credit Note",
-  "bill.convert_to_credit_note":"Convert to Vendor Credit",
-  "bill.allocate_landed_coast":"Allocate Landed Cost",
-  "overdue":"Overdue",
+  "journal_entries.amount_displayed_base_currency": "Amount is displayed in your base currency",
+  "inventory_adjustment.column.product": "Product",
+  "invoice.convert_to_credit_note": "Convert to Credit Note",
+  "bill.convert_to_credit_note": "Convert to Vendor Credit",
+  "bill.allocate_landed_coast": "Allocate Landed Cost",
+  "overdue": "Overdue",
   "permissions.column.view": "View",
   "permissions.column.full_access": "Full Access",
   "permissions.column.delete": "Delete",
   "permissions.column.edit": "Edit",
   "permissions.column.create": "Create",
-  "permissions.column.written_off_invoice":"Written-off invoice",
-  "permissions.column.refund_credit_note":"Refund credit note",
-  "permissions.column.refund_vendor_credit":"Refund vendor credit",
-  "permissions.column.transactions_locking":"Transactions locking",
+  "permissions.column.written_off_invoice": "Written-off invoice",
+  "permissions.column.refund_credit_note": "Refund credit note",
+  "permissions.column.refund_vendor_credit": "Refund vendor credit",
+  "permissions.column.transactions_locking": "Transactions locking",
   "permissions.items_inventory": "Items & Inventory",
   "permissions.inventory_adjustment": "Inventory Adjustment",
   "permissions.items": "Items",
@@ -1693,42 +1690,46 @@
   "permissions.sale_receipt": "Sale Receipt",
   "permissions.credit_note": "Credit note",
   "permissions.payment_receive": "Payment Receive",
-  "permissions.purchases":"Purchases",
-  "permissions.bills":"Bills",
-  "permissions.vendor_credit":"Vendor Credits",
-  "permissions.payment_made":"Payment Made",
-  "permissions.financial_accounting":"Financial Accounting",
-  "permissions.manual_journals":"Manual Journals",
-  "permissions.chart_of_accounts":"Chart of Accounts",
-  "permissions.expenses":"Expenses",
-  "permissions.reports":"Financial Reports",
-  "permissions.financial_reports":"Financial reprots",
-  "permissions.balance_sheet":"Balance sheet",
-  "permissions.profit_loss_sheet":"Profit & Loss sheet",
-  "permissions.trial_balance_sheet":"Trial Balance sheet",
-  "permissions.cash_flow_sheet":"Cash flow sheet",
-  "permissions.journal_sheet":"Journal sheet",
-  "permissions.general_ledger":"General ledger",
-  "permissions.a_r_aging_summary_report":"A/R Aging Summary report",
-  "permissions.a_p_aging_summary_report":"A/P Aging Summary report",
-  "permissions.purchases_by_items":"Purchases by items",
-  "permissions.sales_by_items":"Sales by items",
-  "permissions.customers_transactions":"Customers transactions",
-  "permissions.vendors_transactions":"Vendors transactions",
-  "permissions.customers_summary_balance":"Customers summary balance",
-  "permissions.vendors_summary_balance":"Vendors summary balance",
-  "permissions.inventory_valuation_summary":"Inventory valuation summary",
-  "permissions.inventory_items_details":"Inventory valuation summary",
-  "permissions.cashflow_account_transactions":"Cashflow account transactions",
-  "permissions.more_permissions":"More Permissions",
-
+  "permissions.purchases": "Purchases",
+  "permissions.bills": "Bills",
+  "permissions.vendor_credit": "Vendor Credits",
+  "permissions.payment_made": "Payment Made",
+  "permissions.financial_accounting": "Financial Accounting",
+  "permissions.manual_journals": "Manual Journals",
+  "permissions.chart_of_accounts": "Chart of Accounts",
+  "permissions.expenses": "Expenses",
+  "permissions.reports": "Financial Reports",
+  "permissions.financial_reports": "Financial reprots",
+  "permissions.balance_sheet": "Balance sheet",
+  "permissions.profit_loss_sheet": "Profit & Loss sheet",
+  "permissions.trial_balance_sheet": "Trial Balance sheet",
+  "permissions.cash_flow_sheet": "Cash flow sheet",
+  "permissions.journal_sheet": "Journal sheet",
+  "permissions.general_ledger": "General ledger",
+  "permissions.a_r_aging_summary_report": "A/R Aging Summary report",
+  "permissions.a_p_aging_summary_report": "A/P Aging Summary report",
+  "permissions.purchases_by_items": "Purchases by items",
+  "permissions.sales_by_items": "Sales by items",
+  "permissions.customers_transactions": "Customers transactions",
+  "permissions.vendors_transactions": "Vendors transactions",
+  "permissions.customers_summary_balance": "Customers summary balance",
+  "permissions.vendors_summary_balance": "Vendors summary balance",
+  "permissions.inventory_valuation_summary": "Inventory valuation summary",
+  "permissions.inventory_items_details": "Inventory valuation summary",
+  "permissions.cashflow_account_transactions": "Cashflow account transactions",
+  "permissions.more_permissions": "More Permissions",
   "estimate.status.expired": "Expired",
-  "refund_credit.drawer.title":"Refund credit note",
-  "refund_credit.drawer.label.amount":"Amount",
-  "refund_credit.drawer.label.credit_note_no":"Credit note number",
-  "refund_credit.drawer.label.withdrawal_account":"Withdrawal account",
-  "refund_credit.drawer.label.reference_no":"Reference number",
-  "refund_credit.drawer.label.description":"Description"
-
-}
-
+  "refund_credit.drawer.title": "Refund credit note",
+  "refund_credit.drawer.label.amount": "Amount",
+  "refund_credit.drawer.label.credit_note_no": "Credit note number",
+  "refund_credit.drawer.label.withdrawal_account": "Withdrawal account",
+  "refund_credit.drawer.label.reference_no": "Reference number",
+  "refund_credit.drawer.label.description": "Description",
+  "estimate.drawer.title": "Estimate details ({number})",
+  "receipt.drawer.title": "Receipt details ({number})",
+  "credit_note.drawer.title": "Credit Note details ({number})",
+  "payment_receive.drawer.title": "Payment receive details ({number})",
+  "payment_made.drawer.title": "Payment made details {number}",
+  "manual_journal.drawer.title": "Manual journal details ({number})",
+  "expense.drawer.title": "Expense details"
+}
\ No newline at end of file