Merge pull request #353 from ANasouf/BIG-112-Customer-emails-addresses-gets-the-.-removed-when-a-new-one-is-added

fix: gmail email addresses dots gets removed

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
+## [0.14.0] - 30-01-2024
+
+* feat: purchases by items exporting by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/327
+* fix: expense amounts should not be rounded by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/339
+* feat: get latest exchange rate from third party services by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/340
+* fix(webapp): inconsistency in currency of universal search items by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/335
+* hotfix: editing sales and expense transactions don't reflect GL entries by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/342
+
 ## [0.13.3] - 22-01-2024
 
 * hotfix(server): Unhandled thrown errors of services by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/329

packages/server/src/api/controllers/Contacts/Contacts.ts

@@ -26,27 +26,27 @@ export default class ContactsController extends BaseController {
       [...this.autocompleteQuerySchema],
       this.validationResult,
       this.asyncMiddleware(this.autocompleteContacts.bind(this)),
-      this.dynamicListService.handlerErrorsToResponse
+      this.dynamicListService.handlerErrorsToResponse,
     );
     router.get(
       '/:id',
       [param('id').exists().isNumeric().toInt()],
       this.validationResult,
-      this.asyncMiddleware(this.getContact.bind(this))
+      this.asyncMiddleware(this.getContact.bind(this)),
     );
     router.post(
       '/:id/inactivate',
       [param('id').exists().isNumeric().toInt()],
       this.validationResult,
       this.asyncMiddleware(this.inactivateContact.bind(this)),
-      this.handlerServiceErrors
+      this.handlerServiceErrors,
     );
     router.post(
       '/:id/activate',
       [param('id').exists().isNumeric().toInt()],
       this.validationResult,
       this.asyncMiddleware(this.activateContact.bind(this)),
-      this.handlerServiceErrors
+      this.handlerServiceErrors,
     );
     return router;
   }
@@ -77,7 +77,7 @@ export default class ContactsController extends BaseController {
     try {
       const contact = await this.contactsService.getContact(
         tenantId,
-        contactId
+        contactId,
       );
       return res.status(200).send({
         customer: this.transfromToResponse(contact),
@@ -105,7 +105,7 @@ export default class ContactsController extends BaseController {
     try {
       const contacts = await this.contactsService.autocompleteContacts(
         tenantId,
-        filter
+        filter,
       );
       return res.status(200).send({ contacts });
     } catch (error) {
@@ -153,7 +153,6 @@ export default class ContactsController extends BaseController {
       check('email')
         .optional({ nullable: true })
         .isString()
-        .normalizeEmail()
         .isEmail()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('website')
@@ -380,7 +379,7 @@ export default class ContactsController extends BaseController {
     error: Error,
     req: Request,
     res: Response,
-    next: NextFunction
+    next: NextFunction,
   ) {
     if (error instanceof ServiceError) {
       if (error.errorType === 'contact_not_found') {

packages/server/src/api/controllers/Purchases/Bills.ts

@@ -560,6 +560,16 @@ export default class BillsController extends BaseController {
           errors: [{ type: 'ITEM_ENTRY_TAX_RATE_ID_NOT_FOUND', code: 1900 }],
         });
       }
+      if (error.errorType === 'BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT') {
+        return res.boom.badRequest(null, {
+          errors: [
+            {
+              type: 'BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT',
+              code: 2000,
+            },
+          ],
+        });
+      }
     }
     next(error);
   }

packages/server/src/services/CreditNotes/CreditNoteTransformer.ts

@@ -14,6 +14,7 @@ export class CreditNoteTransformer extends Transformer {
       'formattedCreditNoteDate',
       'formattedAmount',
       'formattedCreditsUsed',
+      'formattedSubtotal',
       'entries',
     ];
   };
@@ -60,6 +61,15 @@ export class CreditNoteTransformer extends Transformer {
     });
   };
 
+  /**
+   * Retrieves the formatted subtotal.
+   * @param {ICreditNote} credit
+   * @returns {string}
+   */
+  protected formattedSubtotal = (credit): string => {
+    return formatNumber(credit.amount, { money: false });
+  };
+
   /**
    * Retrieves the entries of the credit note.
    * @param {ICreditNote} credit

packages/server/src/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheet.ts

@@ -252,10 +252,6 @@ export default class TrialBalanceSheet extends FinancialSheet {
    * @return {ITrialBalanceSheetData}
    */
   public reportData(): ITrialBalanceSheetData {
-    // Don't return noting if the journal has no transactions.
-    if (this.repository.totalAccountsLedger.isEmpty()) {
-      return null;
-    }
     // Retrieve accounts nodes.
     const accounts = this.accountsSection(this.repository.accounts);
 

packages/server/src/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetTable.ts

@@ -123,7 +123,7 @@ export class TrialBalanceSheetTable extends R.compose(
    */
   public tableRows = (): ITableRow[] => {
     return R.compose(
-      R.append(this.totalTableRow()),
+      R.unless(R.isEmpty, R.append(this.totalTableRow())),
       R.concat(this.accountsTableRows())
     )([]);
   };

packages/server/src/services/Purchases/BillPayments/BillPaymentValidators.ts

@@ -10,7 +10,6 @@ import {
 import TenancyService from '@/services/Tenancy/TenancyService';
 import { ServiceError } from '@/exceptions';
 import { ACCOUNT_TYPE } from '@/data/AccountTypes';
-import { BillPayment } from '@/models';
 import { ERRORS } from './constants';
 
 @Service()
@@ -18,19 +17,6 @@ export class BillPaymentValidators {
   @Inject()
   private tenancy: TenancyService;
 
-  /**
-   * Validates the payment existance.
-   * @param {BillPayment | undefined | null} payment
-   * @throws {ServiceError(ERRORS.PAYMENT_MADE_NOT_FOUND)}
-   */
-  public async validateBillPaymentExistance(
-    payment: BillPayment | undefined | null
-  ) {
-    if (!payment) {
-      throw new ServiceError(ERRORS.PAYMENT_MADE_NOT_FOUND);
-    }
-  }
-
   /**
    * Validates the bill payment existance.
    * @param {Request} req

packages/server/src/services/Purchases/BillPayments/DeleteBillPayment.ts

@@ -1,6 +1,5 @@
 import { Knex } from 'knex';
 import UnitOfWork from '@/services/UnitOfWork';
-import { BillPaymentValidators } from './BillPaymentValidators';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { Inject, Service } from 'typedi';
@@ -21,9 +20,6 @@ export class DeleteBillPayment {
   @Inject()
   private uow: UnitOfWork;
 
-  @Inject()
-  private validators: BillPaymentValidators;
-
   /**
    * Deletes the bill payment and associated transactions.
    * @param  {number} tenantId - Tenant id.
@@ -36,10 +32,8 @@ export class DeleteBillPayment {
     // Retrieve the bill payment or throw not found service error.
     const oldBillPayment = await BillPayment.query()
       .withGraphFetched('entries')
-      .findById(billPaymentId);
+      .findById(billPaymentId)
-
+      .throwIfNotFound();
-    // Validates the bill payment existance.
-    this.validators.validateBillPaymentExistance(oldBillPayment);
 
     // Deletes the bill transactions with associated transactions under
     // unit-of-work envirement.

packages/server/src/services/Purchases/BillPayments/EditBillPayment.ts

@@ -57,12 +57,12 @@ export class EditBillPayment {
 
     const tenantMeta = await TenantMetadata.query().findOne({ tenantId });
 
-    const oldBillPayment = await BillPayment.query().findById(billPaymentId);
+    const oldBillPayment = await BillPayment.query()
+      .findById(billPaymentId)
+      .withGraphFetched('entries')
+      .throwIfNotFound();
 
-    // Validates the bill payment existance.
+    // Retrieves the bill payment vendor or throw not found error.
-    this.validators.validateBillPaymentExistance(oldBillPayment);
-
-    //
     const vendor = await Contact.query()
       .modify('vendor')
       .findById(billPaymentDTO.vendorId)
@@ -126,7 +126,7 @@ export class EditBillPayment {
         trx,
       } as IBillPaymentEditingPayload);
 
-      // Deletes the bill payment transaction graph from the storage.
+      // Edits the bill payment transaction graph on the storage.
       const billPayment = await BillPayment.query(trx).upsertGraphAndFetch({
         id: billPaymentId,
         ...billPaymentObj,

packages/server/src/services/Purchases/BillPayments/GetBillPayment.ts

@@ -1,12 +1,8 @@
 import { IBillPayment } from '@/interfaces';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { Inject, Service } from 'typedi';
-import { ERRORS } from './constants';
-import { ServiceError } from '@/exceptions';
 import { BillPaymentTransformer } from './BillPaymentTransformer';
 import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
-import { BillsValidators } from '../Bills/BillsValidators';
-import { BillPaymentValidators } from './BillPaymentValidators';
 
 @Service()
 export class GetBillPayment {
@@ -16,9 +12,6 @@ export class GetBillPayment {
   @Inject()
   private transformer: TransformerInjectable;
 
-  @Inject()
-  private validators: BillPaymentValidators;
-
   /**
    * Retrieve bill payment.
    * @param {number} tenantId
@@ -37,10 +30,8 @@ export class GetBillPayment {
       .withGraphFetched('paymentAccount')
       .withGraphFetched('transactions')
       .withGraphFetched('branch')
-      .findById(billPyamentId);
+      .findById(billPyamentId)
-
+      .throwIfNotFound();
-    // Validates the bill payment existance.
-    this.validators.validateBillPaymentExistance(billPayment);
 
     return this.transformer.transform(
       tenantId,

packages/server/src/services/Purchases/BillPayments/GetPaymentBills.ts

@@ -18,10 +18,9 @@ export class GetPaymentBills {
   public async getPaymentBills(tenantId: number, billPaymentId: number) {
     const { Bill, BillPayment } = this.tenancy.models(tenantId);
 
-    const billPayment = await BillPayment.query().findById(billPaymentId);
+    const billPayment = await BillPayment.query()
-
+      .findById(billPaymentId)
-    // Validates the bill payment existance.
+      .throwIfNotFound();
-    this.validators.validateBillPaymentExistance(billPayment);
 
     const paymentBillsIds = billPayment.entries.map((entry) => entry.id);
 

packages/server/src/services/Purchases/Bills/BillsValidators.ts

@@ -21,6 +21,20 @@ export class BillsValidators {
     }
   }
 
+  /**
+   * Validates the bill amount is bigger than paid amount.
+   * @param {number} billAmount 
+   * @param {number} paidAmount 
+   */
+  public validateBillAmountBiggerPaidAmount(
+    billAmount: number,
+    paidAmount: number,
+  ) {
+    if (billAmount < paidAmount) {
+      throw new ServiceError(ERRORS.BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT);
+    }
+  }
+
   /**
    * Validates the bill number existance.
    */

packages/server/src/services/Purchases/Bills/EditBill.ts

@@ -103,6 +103,7 @@ export class EditBill {
       tenantId,
       billDTO.entries
     );
+    
     // Transforms the bill DTO to model object.
     const billObj = await this.transformerDTO.billDTOToModel(
       tenantId,
@@ -111,6 +112,11 @@ export class EditBill {
       authorizedUser,
       oldBill
     );
+    // Validate bill total amount should be bigger than paid amount.
+    this.validators.validateBillAmountBiggerPaidAmount(
+      billObj.amount,
+      oldBill.paymentAmount
+    );
     // Validate landed cost entries that have allocated cost could not be deleted.
     await this.entriesService.validateLandedCostEntriesNotDeleted(
       oldBill.entries,

packages/server/src/services/Purchases/Bills/constants.ts

@@ -18,6 +18,7 @@ export const ERRORS = {
   LANDED_COST_ENTRIES_SHOULD_BE_INVENTORY_ITEMS:
     'LANDED_COST_ENTRIES_SHOULD_BE_INVENTORY_ITEMS',
   BILL_HAS_APPLIED_TO_VENDOR_CREDIT: 'BILL_HAS_APPLIED_TO_VENDOR_CREDIT',
+  BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT: 'BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT',
 };
 
 export const DEFAULT_VIEW_COLUMNS = [];

packages/server/src/services/Purchases/VendorCredits/VendorCreditTransformer.ts

@@ -11,6 +11,7 @@ export class VendorCreditTransformer extends Transformer {
   public includeAttributes = (): string[] => {
     return [
       'formattedAmount',
+      'formattedSubtotal',
       'formattedVendorCreditDate',
       'formattedCreditsRemaining',
       'entries',
@@ -37,6 +38,15 @@ export class VendorCreditTransformer extends Transformer {
     });
   };
 
+  /**
+   * Retrieves the vendor credit formatted subtotal.
+   * @param {IVendorCredit} vendorCredit
+   * @returns {string}
+   */
+  protected formattedSubtotal = (vendorCredit): string => {
+    return formatNumber(vendorCredit.amount, { money: false });
+  };
+
   /**
    * Retrieve formatted credits remaining.
    * @param {IVendorCredit} credit

packages/server/src/services/Sales/Estimates/SaleEstimateTransformer.ts

@@ -10,6 +10,7 @@ export class SaleEstimateTransfromer extends Transformer {
    */
   public includeAttributes = (): string[] => {
     return [
+      'formattedSubtotal',
       'formattedAmount',
       'formattedEstimateDate',
       'formattedExpirationDate',
@@ -76,6 +77,15 @@ export class SaleEstimateTransfromer extends Transformer {
     });
   };
 
+  /**
+   * Retrieves the formatted invoice subtotal.
+   * @param {ISaleEstimate} estimate
+   * @returns {string}
+   */
+  protected formattedSubtotal = (estimate: ISaleEstimate): string => {
+    return formatNumber(estimate.amount, { money: false });
+  };
+
   /**
    * Retrieves the entries of the sale estimate.
    * @param {ISaleEstimate} estimate

packages/server/src/services/Sales/Invoices/ItemEntryTransformer.ts

@@ -8,7 +8,16 @@ export class ItemEntryTransformer extends Transformer {
    * @returns {Array}
    */
   public includeAttributes = (): string[] => {
-    return ['rateFormatted', 'totalFormatted'];
+    return ['quantityFormatted', 'rateFormatted', 'totalFormatted'];
+  };
+
+  /**
+   * Retrieves the formatted quantitty of item entry.
+   * @param {IItemEntry} entry
+   * @returns {string}
+   */
+  protected quantityFormatted = (entry: IItemEntry): string => {
+    return formatNumber(entry.quantity, { money: false });
   };
 
   /**

packages/server/src/services/Sales/PaymentReceives/EditPaymentReceive.ts

@@ -61,7 +61,8 @@ export class EditPaymentReceive {
     // Validate the payment receive existance.
     const oldPaymentReceive = await PaymentReceive.query()
       .withGraphFetched('entries')
-      .findById(paymentReceiveId);
+      .findById(paymentReceiveId)
+      .throwIfNotFound();
 
     // Validates the payment existance.
     this.validators.validatePaymentExistance(oldPaymentReceive);

packages/server/src/services/Sales/PaymentReceives/PaymentReceiveTransformer.ts

@@ -10,6 +10,7 @@ export class PaymentReceiveTransfromer extends Transformer {
    */
   public includeAttributes = (): string[] => {
     return [
+      'subtotalFormatted',
       'formattedPaymentDate',
       'formattedAmount',
       'formattedExchangeRate',
@@ -26,6 +27,18 @@ export class PaymentReceiveTransfromer extends Transformer {
     return this.formatDate(payment.paymentDate);
   };
 
+  /**
+   * Retrieve the formatted payment subtotal.
+   * @param {IPaymentReceive} payment 
+   * @returns {string}
+   */
+  protected subtotalFormatted = (payment: IPaymentReceive): string => {
+    return formatNumber(payment.amount, {
+      currencyCode: payment.currencyCode,
+      money: false,
+    });
+  };
+
   /**
    * Retrieve formatted payment amount.
    * @param {ISaleInvoice} invoice

packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts

@@ -12,6 +12,7 @@ export class SaleReceiptTransformer extends Transformer {
    */
   public includeAttributes = (): string[] => {
     return [
+      'formattedSubtotal',
       'formattedAmount',
       'formattedReceiptDate',
       'formattedClosedAtDate',
@@ -37,6 +38,15 @@ export class SaleReceiptTransformer extends Transformer {
     return this.formatDate(receipt.closedAt);
   };
 
+  /**
+   * Retrieves the estimate formatted subtotal.
+   * @param {ISaleReceipt} receipt
+   * @returns {string}
+   */
+  protected formattedSubtotal = (receipt: ISaleReceipt): string => {
+    return formatNumber(receipt.amount, { money: false });
+  };
+
   /**
    * Retrieve formatted invoice amount.
    * @param {ISaleReceipt} estimate

packages/webapp/src/components/Details/index.tsx

@@ -66,7 +66,7 @@ export function DetailItem({ label, children, name, align, className }) {
       >
         {label}
       </div>
-      <div class="detail-item__content">{children}</div>
+      <div>{children}</div>
     </div>
   );
 }

packages/webapp/src/constants/errors.tsx

@@ -9,6 +9,8 @@ export const ERROR = {
   SALE_INVOICE_NO_NOT_UNIQUE: 'SALE_INVOICE_NO_NOT_UNIQUE',
   SALE_ESTIMATE_IS_ALREADY_CONVERTED_TO_INVOICE:
     'SALE_ESTIMATE_IS_ALREADY_CONVERTED_TO_INVOICE',
+  INVOICE_AMOUNT_SMALLER_THAN_PAYMENT_AMOUNT:
+    'INVOICE_AMOUNT_SMALLER_THAN_PAYMENT_AMOUNT',
 
   // Sales Receipts
   SALE_RECEIPT_NUMBER_NOT_UNIQUE: 'SALE_RECEIPT_NUMBER_NOT_UNIQUE',
@@ -17,6 +19,6 @@ export const ERROR = {
   // Bills
   BILL_NUMBER_EXISTS: 'BILL.NUMBER.EXISTS',
   SALE_INVOICE_NO_IS_REQUIRED: 'SALE_INVOICE_NO_IS_REQUIRED',
-  ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED:"ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED",
+  ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED:
-
+    'ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED',
 };

packages/webapp/src/containers/Authentication/Login.tsx

@@ -70,7 +70,7 @@ function LoginFooterLinks() {
     <AuthFooterLinks>
       {!signupDisabled && (
         <AuthFooterLink>
-          Don't have an account? <Link to={'/auth/register'}>Sign up</Link>
+          <T id={'dont_have_an_account'} /> <Link to={'/auth/register'}><T id={'sign_up'} /></Link>
         </AuthFooterLink>
       )}
       <AuthFooterLink>

packages/webapp/src/containers/Authentication/Register.tsx

@@ -87,7 +87,7 @@ function RegisterFooterLinks() {
   return (
     <AuthFooterLinks>
       <AuthFooterLink>
-        Return to <Link to={'/auth/login'}>Sign In</Link>
+        <T id={'return_to'} /> <Link to={'/auth/login'}><T id={'sign_in'} /></Link>
       </AuthFooterLink>
 
       <AuthFooterLink>

packages/webapp/src/containers/Authentication/ResetPassword.tsx

@@ -5,7 +5,7 @@ import { Formik } from 'formik';
 import { Intent, Position } from '@blueprintjs/core';
 import { Link, useParams, useHistory } from 'react-router-dom';
 
-import { AppToaster } from '@/components';
+import { AppToaster, FormattedMessage as T } from '@/components';
 import { useAuthResetPassword } from '@/hooks/query';
 import AuthInsider from '@/containers/Authentication/AuthInsider';
 
@@ -86,11 +86,11 @@ function ResetPasswordFooterLinks() {
     <AuthFooterLinks>
       {!signupDisabled && (
         <AuthFooterLink>
-          Don't have an account? <Link to={'/auth/register'}>Sign up</Link>
+          <T id={'dont_have_an_account'} /> <Link to={'/auth/register'}><T id={'sign_up'} /></Link>
         </AuthFooterLink>
       )}
       <AuthFooterLink>
-        Return to <Link to={'/auth/login'}>Sign In</Link>
+        <T id={'return_to'} /> <Link to={'/auth/login'}><T id={'sign_in'} /></Link>
       </AuthFooterLink>
     </AuthFooterLinks>
   );

packages/webapp/src/containers/Authentication/SendResetPassword.tsx

@@ -5,7 +5,7 @@ import { Formik } from 'formik';
 import { Link, useHistory } from 'react-router-dom';
 import { Intent } from '@blueprintjs/core';
 
-import { AppToaster } from '@/components';
+import { AppToaster, FormattedMessage as T } from '@/components';
 import { useAuthSendResetPassword } from '@/hooks/query';
 
 import SendResetPasswordForm from './SendResetPasswordForm';
@@ -82,11 +82,11 @@ function SendResetPasswordFooterLinks() {
     <AuthFooterLinks>
       {!signupDisabled && (
         <AuthFooterLink>
-          Don't have an account? <Link to={'/auth/register'}>Sign up</Link>
+          <T id={'dont_have_an_account'} /> <Link to={'/auth/register'}><T id={'sign_up'} /></Link>
         </AuthFooterLink>
       )}
       <AuthFooterLink>
-        Return to <Link to={'/auth/login'}>Sign In</Link>
+        <T id={'return_to'} /> <Link to={'/auth/login'}><T id={'sign_in'} /></Link>
       </AuthFooterLink>
     </AuthFooterLinks>
   );

packages/webapp/src/containers/Authentication/SendResetPasswordForm.tsx

@@ -14,8 +14,7 @@ export default function SendResetPasswordForm({ isSubmitting }) {
   return (
     <Form>
       <TopParagraph>
-        Enter the email address associated with your account and we'll send you
+        <T id={'enter_the_email_address_associated_with_your_account'} />
-        a link to reset your password.
       </TopParagraph>
 
       <FFormGroup name={'crediential'} label={<T id={'email_address'} />}>
@@ -29,7 +28,7 @@ export default function SendResetPasswordForm({ isSubmitting }) {
         large={true}
         loading={isSubmitting}
       >
-        Reset Password
+        <T id={'reset_password'} />
       </AuthSubmitButton>
     </Form>
   );

packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailTableFooter.tsx

@@ -1,12 +1,9 @@
 // @ts-nocheck
-import React from 'react';
 import styled from 'styled-components';
-
 import {
   T,
   TotalLines,
   TotalLine,
-  FormatNumber,
   TotalLineBorderStyle,
   TotalLineTextStyle,
 } from '@/components';
@@ -23,7 +20,7 @@ export default function CreditNoteDetailTableFooter() {
       <CreditNoteTotalLines labelColWidth={'180px'} amountColWidth={'180px'}>
         <TotalLine
           title={<T id={'credit_note.drawer.label_subtotal'} />}
-          value={<FormatNumber value={creditNote.formatted_amount} />}
+          value={creditNote.formatted_subtotal}
         />
         <TotalLine
           title={<T id={'credit_note.drawer.label_total'} />}

packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailTableFooter.tsx

@@ -8,7 +8,6 @@ import {
   TotalLine,
   TotalLineBorderStyle,
   TotalLineTextStyle,
-  FormatNumber,
 } from '@/components';
 import { useEstimateDetailDrawerContext } from './EstimateDetailDrawerProvider';
 
@@ -23,7 +22,7 @@ export default function EstimateDetailTableFooter() {
       <EstimateTotalLines labelColWidth={'180px'} amountColWidth={'180px'}>
         <TotalLine
           title={<T id={'estimate.details.subtotal'} />}
-          value={<FormatNumber value={estimate.amount} />}
+          value={estimate.formatted_subtotal}
           borderStyle={TotalLineBorderStyle.SingleDark}
         />
         <TotalLine

packages/webapp/src/containers/Drawers/EstimateDetailDrawer/utils.tsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import intl from 'react-intl-universal';
 import { getColumnWidth } from '@/utils';
-import { FormatNumberCell, TextOverviewTooltipCell } from '@/components';
+import { TextOverviewTooltipCell } from '@/components';
 import { useEstimateDetailDrawerContext } from './EstimateDetailDrawerProvider';
 
 /**
@@ -35,9 +35,8 @@ export const useEstimateReadonlyEntriesColumns = () => {
       },
       {
         Header: intl.get('quantity'),
-        accessor: 'quantity',
+        accessor: 'quantity_formatted',
-        Cell: FormatNumberCell,
+        width: getColumnWidth(entries, 'quantity_formatted', {
-        width: getColumnWidth(entries, 'quantity', {
           minWidth: 60,
           magicSpacing: 5,
         }),
@@ -59,7 +58,6 @@ export const useEstimateReadonlyEntriesColumns = () => {
       {
         Header: intl.get('amount'),
         accessor: 'total_formatted',
-        Cell: FormatNumberCell,
         width: getColumnWidth(entries, 'total_formatted', {
           minWidth: 60,
           magicSpacing: 5,

packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailTableFooter.tsx

@@ -3,10 +3,9 @@ import React from 'react';
 import styled from 'styled-components';
 
 import {
-  FormatNumber,
+  T,
   TotalLineTextStyle,
   TotalLineBorderStyle,
-  T,
   TotalLine,
   TotalLines,
 } from '@/components';
@@ -27,7 +26,7 @@ export default function PaymentReceiveDetailTableFooter() {
       >
         <TotalLine
           title={<T id={'payment_receive.details.subtotal'} />}
-          value={<FormatNumber value={paymentReceive.amount} />}
+          value={paymentReceive.subtotal_formatted}
         />
         <TotalLine
           title={<T id={'payment_receive.details.total'} />}

packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/utils.tsx

@@ -10,7 +10,7 @@ import {
   MenuItem,
   Menu,
 } from '@blueprintjs/core';
-import { Icon, FormatNumberCell } from '@/components';
+import { Icon } from '@/components';
 import { getColumnWidth } from '@/utils';
 import { usePaymentReceiveDetailContext } from './PaymentReceiveDetailProvider';
 
@@ -40,9 +40,8 @@ export const usePaymentReceiveEntriesColumns = () => {
       },
       {
         Header: intl.get('invoice_amount'),
-        accessor: 'invoice.balance',
+        accessor: 'invoice.total_formatted',
-        Cell: FormatNumberCell,
+        width: getColumnWidth(entries, 'invoice.total_formatted', {
-        width: getColumnWidth(entries, 'invoice.balance', {
           minWidth: 60,
           magicSpacing: 5,
         }),
@@ -51,10 +50,9 @@ export const usePaymentReceiveEntriesColumns = () => {
       },
       {
         Header: intl.get('amount_due'),
-        accessor: 'invoice.due_amount',
+        accessor: 'invoice.due_amount_formatted',
-        Cell: FormatNumberCell,
         align: 'right',
-        width: getColumnWidth(entries, 'invoice.due_amount', {
+        width: getColumnWidth(entries, 'invoice.due_amount_formatted', {
           minWidth: 60,
           magicSpacing: 5,
         }),

packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailTableFooter.tsx

@@ -23,7 +23,7 @@ export default function ReceiptDetailTableFooter() {
       <ReceiptTotalLines labelColWidth={'180px'} amountColWidth={'180px'}>
         <TotalLine
           title={<T id={'receipt.details.subtotal'} />}
-          value={receipt.formatted_amount}
+          value={receipt.formatted_subtotal}
         />
         <TotalLine
           title={<T id={'receipt.details.total'} />}

packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/JournalEntriesTransactions/components.tsx

@@ -13,7 +13,6 @@ export const useJournalEntriesTransactionsColumns = () => {
     () => [
       {
         Header: intl.get('date'),
-        accessor: 'date',
         accessor: 'formatted_date',
         Cell: FormatDateCell,
         width: 140,
@@ -34,15 +33,17 @@ export const useJournalEntriesTransactionsColumns = () => {
       },
       {
         Header: intl.get('credit'),
-        accessor: ({ credit }) => credit.formatted_amount,
+        accessor: 'credit.formatted_amount',
         width: 100,
         className: 'credit',
+        align: 'right',
       },
       {
         Header: intl.get('debit'),
-        accessor: ({ debit }) => debit.formatted_amount,
+        accessor: 'debit.formatted_amount',
         width: 100,
         className: 'debit',
+        align: 'right',
       },
     ],
     [],

packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailDrawerFooter.tsx

@@ -8,7 +8,6 @@ import {
   TotalLine,
   TotalLineBorderStyle,
   TotalLineTextStyle,
-  FormatNumber,
 } from '@/components';
 import { useVendorCreditDetailDrawerContext } from './VendorCreditDetailDrawerProvider';
 
@@ -23,7 +22,7 @@ export default function VendorCreditDetailDrawerFooter() {
       <VendorCreditTotalLines labelColWidth={'180px'} amountColWidth={'180px'}>
         <TotalLine
           title={<T id={'vendor_credit.drawer.label_subtotal'} />}
-          value={vendorCredit.formatted_amount}
+          value={vendorCredit.formatted_subtotal}
           borderStyle={TotalLineBorderStyle.SingleDark}
         />
         <TotalLine

packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/utils.tsx

@@ -49,9 +49,8 @@ export const useVendorCreditReadonlyEntriesTableColumns = () => {
       },
       {
         Header: intl.get('quantity'),
-        accessor: 'quantity',
+        accessor: 'quantity_formatted',
-        Cell: FormatNumberCell,
+        width: getColumnWidth(entries, 'quantity_formatted', {
-        width: getColumnWidth(entries, 'quantity', {
           minWidth: 60,
           magicSpacing: 5,
         }),

packages/webapp/src/containers/Purchases/Bills/BillForm/utils.tsx

@@ -67,6 +67,7 @@ export const ERRORS = {
   BILL_NUMBER_EXISTS: 'BILL.NUMBER.EXISTS',
   ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED:
     'ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED',
+  BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT: 'BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT',
 };
 /**
  * Transformes the bill to initial values of edit form.
@@ -200,6 +201,14 @@ export const handleErrors = (errors, { setErrors }) => {
       }),
     );
   }
+  if (
+    errors.some((e) => e.type === ERRORS.BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT)
+  ) {
+    AppToaster.show({
+      intent: Intent.DANGER,
+      message: intl.get('bill.total_smaller_than_paid_amount'),
+    });
+  }
 };
 
 export const useSetPrimaryBranchToForm = () => {

packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeEntriesTable.tsx

@@ -30,6 +30,7 @@ export default function PaymentMadeEntriesTable({
   // Formik context.
   const {
     values: { vendor_id },
+    errors,
   } = useFormikContext();
 
   // Handle update data.
@@ -63,7 +64,7 @@ export default function PaymentMadeEntriesTable({
         data={entries}
         spinnerProps={false}
         payload={{
-          errors: [],
+          errors: errors?.entries || [],
           updateData: handleUpdateData,
           currencyCode,
         }}

packages/webapp/src/containers/Sales/Invoices/InvoiceForm/utils.tsx

@@ -112,6 +112,16 @@ export const transformErrors = (errors, { setErrors }) => {
       intent: Intent.DANGER,
     });
   }
+  if (
+    errors.some(
+      ({ type }) => type === ERROR.INVOICE_AMOUNT_SMALLER_THAN_PAYMENT_AMOUNT,
+    )
+  ) {
+    AppToaster.show({
+      message: intl.get('sale_invoice.total_smaller_than_paid_amount'),
+      intent: Intent.DANGER,
+    });
+  }
   if (
     errors.some((error) => error.type === ERROR.SALE_INVOICE_NO_IS_REQUIRED)
   ) {

packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveItemsTable.tsx

@@ -28,6 +28,7 @@ export default function PaymentReceiveItemsTable({
   // Formik context.
   const {
     values: { customer_id },
+    errors,
   } = useFormikContext();
 
   // No results message.
@@ -58,7 +59,7 @@ export default function PaymentReceiveItemsTable({
         data={entries}
         spinnerProps={false}
         payload={{
-          errors: [],
+          errors: errors?.entries || [],
           updateData: handleUpdateData,
           currencyCode,
         }}

packages/webapp/src/lang/ar/index.json

@@ -20,6 +20,11 @@
   "log_in": "تسجيل الدخول",
   "forget_my_password": "نسيت كلمة المرور الخاصة بي",
   "keep_me_logged_in": "تذكرني",
+  "dont_have_an_account": "ليس لديك حساب؟",
+  "sign_up": "تسجيل",
+  "return_to": "عودة إلى",
+  "sign_in": "صفحة الدخول",
+  "enter_the_email_address_associated_with_your_account": "قم بادخال بريدك الإلكتروني المرتبط بالحساب وسوف نرسل لك رابط لاعادة تعيين كلمة المرور.",
   "create_an_account": "إنشاء حساب",
   "need_bigcapital_account": "تحتاج إلى حساب Bigcapital؟",
   "show": "عرض",

packages/webapp/src/lang/en/index.json

@@ -19,6 +19,11 @@
   "log_in": "Log in",
   "forget_my_password": "Forget my password",
   "keep_me_logged_in": "Keep me logged in",
+  "dont_have_an_account": "Don't have an account?",
+  "sign_up": "Sign up",
+  "return_to": "Return to",
+  "sign_in": "Sign In",
+  "enter_the_email_address_associated_with_your_account": "Enter the email address associated with your account and we'll send you a link to reset your password.",
   "create_an_account": "Create an account",
   "need_bigcapital_account": "Need a Bigcapital account ?",
   "show": "Show",
@@ -653,7 +658,9 @@
   "invoice_number_is_not_unqiue": "Invoice number is not unqiue",
   "sale_receipt_number_not_unique": "Receipt number is not unique",
   "sale_invoice_number_is_exists": "Sale invoice number is exists",
+  "sale_invoice.total_smaller_than_paid_amount": "The invoice total is smaller than the invoice paid amount.",
   "bill_number_exists": "Bill number exists",
+  "bill.total_smaller_than_paid_amount": "The bill total is smaller than the bill paid amount.",
   "ok": "Ok!",
   "quantity_cannot_be_zero_or_empty": "Quantity cannot be zero or empty.",
   "customer_email": "Customer email",