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', {
-          creditNumber: creditNote.credit_note_number,
+        title={intl.get('credit_note.drawer.title', {
+          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" />}