Merge branch 'master' of https://github.com/abouolia/Bigcapital

client/src/containers/Sales/Invoice/InvoiceForm.js

@@ -98,7 +98,6 @@ function InvoiceForm({
       .required()
       .label(formatMessage({ id: 'due_date_' })),
     invoice_no: Yup.string()
-      .required()
       .label(formatMessage({ id: 'invoice_no_' })),
     reference_no: Yup.string().min(1).max(255),
     status: Yup.string().required(),

client/src/containers/Sales/Invoice/InvoiceFormHeader.js

@@ -149,7 +149,6 @@ function InvoiceFormHeader({
           label={<T id={'invoice_no'} />}
           inline={true}
           className={classNames('form-group--invoice-no', CLASSES.FILL)}
-          labelInfo={<FieldRequiredHint />}
           intent={errors.invoice_no && touched.invoice_no && Intent.DANGER}
           helperText={
             <ErrorMessage name="invoice_no" {...{ errors, touched }} />

client/src/containers/Sales/Invoice/withInvoices.js

@@ -4,9 +4,7 @@ import {
   getInvoiceCurrentPageFactory,
   getInvoicePaginationMetaFactory,
   getInvoiceTableQueryFactory,
-  getCustomerReceivableInvoicesFactory,
-  getPaymentReceivableInvoicesFactory,
-  getPaymentReceiveReceivableInvoicesFactory
+  getCustomerReceivableInvoicesEntriesFactory
 } from 'store/Invoice/invoices.selector';
 
 export default (mapState) => {
@@ -15,10 +13,7 @@ export default (mapState) => {
   const getInvoicesPaginationMeta = getInvoicePaginationMetaFactory();
   const getInvoiceTableQuery = getInvoiceTableQueryFactory();
 
-  // const getPaymentReceivableInvoices = getPaymentReceivableInvoicesFactory();
-  // const getCustomerReceivableInvoices = getCustomerReceivableInvoicesFactory();
-  
-  const getPaymentReceiveReceivableInvoices = getPaymentReceiveReceivableInvoicesFactory();
+  const getCustomerReceivableInvoicesEntries = getCustomerReceivableInvoicesEntriesFactory();
 
   const mapStateToProps = (state, props) => {
     const query = getInvoiceTableQuery(state, props);
@@ -30,8 +25,7 @@ export default (mapState) => {
       invoicesTableQuery: query,
       invoicesPageination: getInvoicesPaginationMeta(state, props, query),
       invoicesLoading: state.salesInvoices.loading,
-
-      paymentReceiveReceivableInvoices: getPaymentReceiveReceivableInvoices(state, props),
+      customerInvoiceEntries: getCustomerReceivableInvoicesEntries(state, props),
     };
     return mapState ? mapState(mapped, state, props) : mapped;
   };