Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop

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>

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', {
+        title={intl.get('credit_note.drawer.title', {
-          creditNumber: creditNote.credit_note_number,
+          number: creditNote.credit_note_number,
         })}
       />
       <CreditNoteDetailDrawerContext.Provider value={provider} {...props} />

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>

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' }}
     >

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,
         })}
       />

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>

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>

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>

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" />}

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" />}

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": "المجموع",
@@ -1537,7 +1536,6 @@
   "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": "الرصيد المتبقي ",
@@ -1734,7 +1732,6 @@
   "permissions.inventory_items_details": "تفاصيل منتج المخزون",
   "permissions.cashflow_account_transactions": "معاملات حسابات التدفقات النقدية",
   "permissions.more_permissions": "عرض المزيد ",
-
   "estimate.status.expired": "منتهية الصلاحية",
   "refund_credit.drawer.title": " تفاصيل استرجاع الأموال لإشعار الدائن ",
   "refund_credit.drawer.label.amount": "القيمة",
@@ -1747,7 +1744,12 @@
   "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_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": " تفاصيل المصروف"
 }
-
-

src/lang/en/index.json

@@ -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",
@@ -1524,7 +1523,6 @@
   "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",
@@ -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",
@@ -1721,14 +1718,18 @@
   "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.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"
 }
-