diff --git a/src/components/ExchangeRate/ExchangeRateInput.js b/src/components/ExchangeRate/ExchangeRateInput.js
index 925e1be10..ec1209d6d 100644
--- a/src/components/ExchangeRate/ExchangeRateInput.js
+++ b/src/components/ExchangeRate/ExchangeRateInput.js
@@ -22,7 +22,7 @@ export function ExchangeRateInputGroup({
1 {fromCurrency} =
}
onContactSelected={(contact) => {
form.setFieldValue('vendor_id', contact.id);
- form.setFieldValue('exchange_rate', '');
form.setFieldValue('currency_code', contact?.currency_code);
setSelectVendor(contact);
}}
diff --git a/src/containers/Purchases/Bills/BillForm/utils.js b/src/containers/Purchases/Bills/BillForm/utils.js
index 325fd6c4e..619cdd5fe 100644
--- 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,
};
};
diff --git a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteForm.js b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteForm.js
index 8c5bc8e20..18da5cc0e 100644
--- 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],
diff --git a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.js b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.js
index 5d3ae714f..bfe2477e6 100644
--- a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.js
+++ b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.js
@@ -107,7 +107,6 @@ function VendorCreditNoteFormHeaderFields({
defaultSelectText={}
onContactSelected={(contact) => {
form.setFieldValue('vendor_id', contact.id);
- form.setFieldValue('exchange_rate', '');
form.setFieldValue('currency_code', contact?.currency_code);
setSelectVendor(contact);
}}
diff --git a/src/containers/Purchases/CreditNotes/CreditNoteForm/utils.js b/src/containers/Purchases/CreditNotes/CreditNoteForm/utils.js
index 7eb2cd097..4144f0ab1 100644
--- 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)],
};
diff --git a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js
index 729895e08..b190805c3 100644
--- 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={}
onContactSelected={(contact) => {
form.setFieldValue('vendor_id', contact.id);
- form.setFieldValue('exchange_rate', '');
form.setFieldValue('currency_code', contact?.currency_code);
setPaymentVendorId(contact.id);
setSelectVendor(contact);
diff --git a/src/containers/Purchases/PaymentMades/PaymentForm/utils.js b/src/containers/Purchases/PaymentMades/PaymentForm/utils.js
index 2544b3574..b93e3404e 100644
--- 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: [],
};
diff --git a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteForm.js b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteForm.js
index e3297d3ef..4103fe284 100644
--- 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 && {
diff --git a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormHeaderFields.js b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormHeaderFields.js
index fc4fd95bd..a118abfb7 100644
--- a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormHeaderFields.js
+++ b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormHeaderFields.js
@@ -107,7 +107,6 @@ function CreditNoteFormHeaderFields({
defaultSelectText={}
onContactSelected={(customer) => {
form.setFieldValue('customer_id', customer.id);
- form.setFieldValue('exchange_rate', '');
form.setFieldValue('currency_code', customer?.currency_code);
setSelectCustomer(customer);
}}
diff --git a/src/containers/Sales/CreditNotes/CreditNoteForm/utils.js b/src/containers/Sales/CreditNotes/CreditNoteForm/utils.js
index 384428860..0f026d47e 100644
--- 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)],
};
diff --git a/src/containers/Sales/Estimates/EstimateForm/EstimateForm.js b/src/containers/Sales/Estimates/EstimateForm/EstimateForm.js
index 832d4fab6..0a987e0f6 100644
--- 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 && {
diff --git a/src/containers/Sales/Estimates/EstimateForm/EstimateFormHeaderFields.js b/src/containers/Sales/Estimates/EstimateForm/EstimateFormHeaderFields.js
index f2adc28bd..1609b015e 100644
--- a/src/containers/Sales/Estimates/EstimateForm/EstimateFormHeaderFields.js
+++ b/src/containers/Sales/Estimates/EstimateForm/EstimateFormHeaderFields.js
@@ -99,7 +99,6 @@ function EstimateFormHeader({
defaultSelectText={}
onContactSelected={(customer) => {
form.setFieldValue('customer_id', customer.id);
- form.setFieldValue('exchange_rate', '');
form.setFieldValue('currency_code', customer?.currency_code);
setSelectCustomer(customer);
}}
diff --git a/src/containers/Sales/Estimates/EstimateForm/utils.js b/src/containers/Sales/Estimates/EstimateForm/utils.js
index 2245064a6..a37039139 100644
--- 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)],
};
diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js
index b83f15072..047f0f553 100644
--- 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 && {
diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js
index 0268caf3c..280152a78 100644
--- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js
+++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js
@@ -115,7 +115,6 @@ function InvoiceFormHeaderFields({
defaultSelectText={}
onContactSelected={(customer) => {
form.setFieldValue('customer_id', customer.id);
- form.setFieldValue('exchange_rate', '');
form.setFieldValue('currency_code', customer?.currency_code);
setSelectCustomer(customer);
}}
diff --git a/src/containers/Sales/Invoices/InvoiceForm/utils.js b/src/containers/Sales/Invoices/InvoiceForm/utils.js
index 4ac16610d..0392aa068 100644
--- 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)],
diff --git a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveHeaderFields.js b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveHeaderFields.js
index 63ce759eb..f4bc370c9 100644
--- 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);
}}
diff --git a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/utils.js b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/utils.js
index c1c715af2..9191e9f58 100644
--- 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: [],
};
diff --git a/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.js b/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.js
index 79310e87f..129b6cec3 100644
--- 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 && {
diff --git a/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormHeaderFields.js b/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormHeaderFields.js
index 8d5f1dde8..f2953aa6c 100644
--- a/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormHeaderFields.js
+++ b/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormHeaderFields.js
@@ -107,7 +107,6 @@ function ReceiptFormHeader({
defaultSelectText={}
onContactSelected={(customer) => {
form.setFieldValue('customer_id', customer.id);
- form.setFieldValue('exchange_rate', '');
form.setFieldValue('currency_code', customer?.currency_code);
setSelectCustomer(customer);
}}
diff --git a/src/containers/Sales/Receipts/ReceiptForm/utils.js b/src/containers/Sales/Receipts/ReceiptForm/utils.js
index 7ad3b69de..937d9d596 100644
--- 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)],
};