feat(Sales & Purchases ): add currency code in edit mode.

2026-02-18 13:50:31 +00:00 · 2022-03-01 15:57:47 +02:00
parent 151e72a76d
commit 0923c69c16
23 changed files with 21 additions and 22 deletions
--- a/src/components/ExchangeRate/ExchangeRateInput.js
+++ b/src/components/ExchangeRate/ExchangeRateInput.js
@@ -22,7 +22,7 @@ export function ExchangeRateInputGroup({
          <ExchangeFlagIcon countryCode={fromCountryCode} /> 1 {fromCurrency} =
        </ExchangeRatePrepend>
        <ExchangeRateField
-          allowDecimals={false}
+          allowDecimals={true}
          allowNegativeValue={true}
          {...inputGroupProps}
          name={name}
--- a/src/containers/Purchases/Bills/BillForm/BillForm.js
+++ b/src/containers/Purchases/Bills/BillForm/BillForm.js
@@ -46,7 +46,6 @@ function BillForm({
      ...(!isEmpty(bill)
        ? {
            ...transformToEditForm(bill),
-            currency_code: base_currency,
          }
        : {
            ...defaultBill,
--- a/src/containers/Purchases/Bills/BillForm/BillFormHeaderFields.js
+++ b/src/containers/Purchases/Bills/BillForm/BillFormHeaderFields.js
@@ -69,7 +69,6 @@ function BillFormHeader() {
                defaultSelectText={<T id={'select_vender_account'} />}
                onContactSelected={(contact) => {
                  form.setFieldValue('vendor_id', contact.id);
-                  form.setFieldValue('exchange_rate', '');
                  form.setFieldValue('currency_code', contact?.currency_code);
                  setSelectVendor(contact);
                }}
--- a/src/containers/Purchases/Bills/BillForm/utils.js
+++ b/src/containers/Purchases/Bills/BillForm/utils.js
@@ -44,7 +44,8 @@ export const defaultBill = {
  open: '',
  branch_id: '',
  warehouse_id: '',
-  exchange_rate: '',
+  exchange_rate: 1,
+  currency_code: '',
  entries: [...repeatValue(defaultBillEntry, MIN_LINES_NUMBER)],
 };

@@ -107,6 +108,7 @@ export const transformFormValuesToRequest = (values) => {
    ...values,
    entries: transformEntriesToSubmit(entries),
    open: false,
+    exchange_rate: 1,
  };
 };

--- a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteForm.js
+++ b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteForm.js
@@ -75,6 +75,7 @@ function VendorCreditNoteForm({
              vendor_credit_number: vendorCreditNumber,
            }),
            ...newVendorCredit,
+            currency_code: base_currency,
          }),
    }),
    [vendorCredit, base_currency],
--- a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.js
+++ b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.js
@@ -107,7 +107,6 @@ function VendorCreditNoteFormHeaderFields({
                defaultSelectText={<T id={'select_vender_account'} />}
                onContactSelected={(contact) => {
                  form.setFieldValue('vendor_id', contact.id);
-                  form.setFieldValue('exchange_rate', '');
                  form.setFieldValue('currency_code', contact?.currency_code);
                  setSelectVendor(contact);
                }}
--- a/src/containers/Purchases/CreditNotes/CreditNoteForm/utils.js
+++ b/src/containers/Purchases/CreditNotes/CreditNoteForm/utils.js
@@ -41,7 +41,8 @@ export const defaultVendorsCreditNote = {
  note: '',
  branch_id: '',
  warehouse_id: '',
-  exchange_rate: '',
+  exchange_rate: 1,
+  currency_code: '',
  entries: [...repeatValue(defaultCreditNoteEntry, MIN_LINES_NUMBER)],
 };

--- a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js
+++ b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js
@@ -110,7 +110,6 @@ function PaymentMadeFormHeaderFields({ organization: { base_currency } }) {
                defaultSelectText={<T id={'select_vender_account'} />}
                onContactSelected={(contact) => {
                  form.setFieldValue('vendor_id', contact.id);
-                  form.setFieldValue('exchange_rate', '');
                  form.setFieldValue('currency_code', contact?.currency_code);
                  setPaymentVendorId(contact.id);
                  setSelectVendor(contact);
--- a/src/containers/Purchases/PaymentMades/PaymentForm/utils.js
+++ b/src/containers/Purchases/PaymentMades/PaymentForm/utils.js
@@ -35,7 +35,7 @@ export const defaultPaymentMade = {
  statement: '',
  currency_code: '',
  branch_id: '',
-  exchange_rate: '',
+  exchange_rate: 1,
  entries: [],
 };

--- a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteForm.js
+++ b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteForm.js
@@ -69,7 +69,7 @@ function CreditNoteForm({
  const initialValues = React.useMemo(
    () => ({
      ...(!isEmpty(creditNote)
-        ? { ...transformToEditForm(creditNote), currency_code: base_currency }
+        ? { ...transformToEditForm(creditNote) }
        : {
            ...defaultCreditNote,
            ...(creditAutoIncrement && {
--- a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormHeaderFields.js
+++ b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormHeaderFields.js
@@ -107,7 +107,6 @@ function CreditNoteFormHeaderFields({
                defaultSelectText={<T id={'select_customer_account'} />}
                onContactSelected={(customer) => {
                  form.setFieldValue('customer_id', customer.id);
-                  form.setFieldValue('exchange_rate', '');
                  form.setFieldValue('currency_code', customer?.currency_code);
                  setSelectCustomer(customer);
                }}
--- a/src/containers/Sales/CreditNotes/CreditNoteForm/utils.js
+++ b/src/containers/Sales/CreditNotes/CreditNoteForm/utils.js
@@ -43,7 +43,8 @@ export const defaultCreditNote = {
  terms_conditions: '',
  branch_id: '',
  warehouse_id: '',
-  exchange_rate: '',
+  exchange_rate: 1,
+  currency_code: '',
  entries: [...repeatValue(defaultCreditNoteEntry, MIN_LINES_NUMBER)],
 };

--- a/src/containers/Sales/Estimates/EstimateForm/EstimateForm.js
+++ b/src/containers/Sales/Estimates/EstimateForm/EstimateForm.js
@@ -62,7 +62,7 @@ function EstimateForm({
  const initialValues = useMemo(
    () => ({
      ...(!isEmpty(estimate)
-        ? { ...transformToEditForm(estimate), currency_code: base_currency }
+        ? { ...transformToEditForm(estimate) }
        : {
            ...defaultEstimate,
            ...(estimateIncrementMode && {
--- a/src/containers/Sales/Estimates/EstimateForm/EstimateFormHeaderFields.js
+++ b/src/containers/Sales/Estimates/EstimateForm/EstimateFormHeaderFields.js
@@ -99,7 +99,6 @@ function EstimateFormHeader({
                defaultSelectText={<T id={'select_customer_account'} />}
                onContactSelected={(customer) => {
                  form.setFieldValue('customer_id', customer.id);
-                  form.setFieldValue('exchange_rate', '');
                  form.setFieldValue('currency_code', customer?.currency_code);
                  setSelectCustomer(customer);
                }}
--- a/src/containers/Sales/Estimates/EstimateForm/utils.js
+++ b/src/containers/Sales/Estimates/EstimateForm/utils.js
@@ -39,7 +39,8 @@ export const defaultEstimate = {
  terms_conditions: '',
  branch_id: '',
  warehouse_id: '',
-  exchange_rate: '',
+  exchange_rate: 1,
+  currency_code: '',
  entries: [...repeatValue(defaultEstimateEntry, MIN_LINES_NUMBER)],
 };

--- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js
+++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js
@@ -67,7 +67,7 @@ function InvoiceForm({
  const initialValues = useMemo(
    () => ({
      ...(!isEmpty(invoice)
-        ? { ...transformToEditForm(invoice), currency_code: base_currency }
+        ? { ...transformToEditForm(invoice) }
        : {
            ...defaultInvoice,
            ...(invoiceIncrementMode && {
--- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js
+++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js
@@ -115,7 +115,6 @@ function InvoiceFormHeaderFields({
                defaultSelectText={<T id={'select_customer_account'} />}
                onContactSelected={(customer) => {
                  form.setFieldValue('customer_id', customer.id);
-                  form.setFieldValue('exchange_rate', '');
                  form.setFieldValue('currency_code', customer?.currency_code);
                  setSelectCustomer(customer);
                }}
--- a/src/containers/Sales/Invoices/InvoiceForm/utils.js
+++ b/src/containers/Sales/Invoices/InvoiceForm/utils.js
@@ -44,7 +44,8 @@ export const defaultInvoice = {
  reference_no: '',
  invoice_message: '',
  terms_conditions: '',
-  exchange_rate: '',
+  exchange_rate: 1,
+  currency_code: '',
  branch_id: '',
  warehouse_id: '',
  entries: [...repeatValue(defaultInvoiceEntry, MIN_LINES_NUMBER)],
--- a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveHeaderFields.js
+++ b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveHeaderFields.js
@@ -153,7 +153,6 @@ function PaymentReceiveHeaderFields({
                onContactSelected={(customer) => {
                  form.setFieldValue('customer_id', customer.id);
                  form.setFieldValue('full_amount', '');
-                  form.setFieldValue('exchange_rate', '');
                  form.setFieldValue('currency_code', customer?.currency_code);
                  setSelectCustomer(customer);
                }}
--- a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/utils.js
+++ b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/utils.js
@@ -34,7 +34,7 @@ export const defaultPaymentReceive = {
  full_amount: '',
  currency_code: '',
  branch_id: '',
-  exchange_rate:'',
+  exchange_rate: 1,
  entries: [],
 };

--- a/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.js
+++ b/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.js
@@ -67,7 +67,7 @@ function ReceiptForm({
  const initialValues = useMemo(
    () => ({
      ...(!isEmpty(receipt)
-        ? { ...transformToEditForm(receipt), currency_code: base_currency }
+        ? { ...transformToEditForm(receipt) }
        : {
            ...defaultReceipt,
            ...(receiptAutoIncrement && {
--- a/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormHeaderFields.js
+++ b/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormHeaderFields.js
@@ -107,7 +107,6 @@ function ReceiptFormHeader({
                defaultSelectText={<T id={'select_customer_account'} />}
                onContactSelected={(customer) => {
                  form.setFieldValue('customer_id', customer.id);
-                  form.setFieldValue('exchange_rate', '');
                  form.setFieldValue('currency_code', customer?.currency_code);
                  setSelectCustomer(customer);
                }}
--- a/src/containers/Sales/Receipts/ReceiptForm/utils.js
+++ b/src/containers/Sales/Receipts/ReceiptForm/utils.js
@@ -39,7 +39,8 @@ export const defaultReceipt = {
  closed: '',
  branch_id: '',
  warehouse_id: '',
-  exchange_rate: '',
+  exchange_rate: 1,
+  currency_code: '',
  entries: [...repeatValue(defaultReceiptEntry, MIN_LINES_NUMBER)],
 };