Compare commits

...

3 Commits

Author SHA1 Message Date
Ahmed Bouhuolia
278c8a01c5 Merge remote-tracking branch 'refs/remotes/origin/develop' into develop 2023-07-18 20:03:31 +02:00
Ahmed Bouhuolia
f22dc9a18b fix(webapp): assign currency code of customer/vendor to the transaction form. 2023-07-18 20:02:45 +02:00
Ahmed Bouhuolia
b224a2c313 Merge pull request #196 from bigcapitalhq/fix-loading-status-on-financial-reports
fix(webapp): show loading message of cost computing job on financial reports
2023-07-17 01:51:02 +02:00
8 changed files with 8 additions and 9 deletions

View File

@@ -176,7 +176,7 @@ function BillFormVendorField() {
name={'vendor_id'} name={'vendor_id'}
items={vendors} items={vendors}
placeholder={<T id={'select_vender_account'} />} placeholder={<T id={'select_vender_account'} />}
onItemChange={(contact) => { onItemSelect={(contact) => {
setFieldValue('vendor_id', contact.id); setFieldValue('vendor_id', contact.id);
setFieldValue('currency_code', contact?.currency_code); setFieldValue('currency_code', contact?.currency_code);
}} }}

View File

@@ -85,7 +85,6 @@ function VendorCreditNoteFormHeaderFields({
name={'exchange_rate'} name={'exchange_rate'}
formGroupProps={{ label: ' ', inline: true }} formGroupProps={{ label: ' ', inline: true }}
/> />
{/* ------- Vendor Credit date ------- */} {/* ------- Vendor Credit date ------- */}
<FastField name={'vendor_credit_date'}> <FastField name={'vendor_credit_date'}>
{({ form, field: { value }, meta: { error, touched } }) => ( {({ form, field: { value }, meta: { error, touched } }) => (
@@ -194,7 +193,7 @@ function VendorCreditFormVendorSelect() {
name={'vendor_id'} name={'vendor_id'}
items={vendors} items={vendors}
placeholder={<T id={'select_vender_account'} />} placeholder={<T id={'select_vender_account'} />}
onItemChange={(contact) => { onItemSelect={(contact) => {
setFieldValue('vendor_id', contact.id); setFieldValue('vendor_id', contact.id);
setFieldValue('currency_code', contact?.currency_code); setFieldValue('currency_code', contact?.currency_code);
}} }}

View File

@@ -248,7 +248,7 @@ function PaymentFormVendorSelect() {
name={'vendor_id'} name={'vendor_id'}
items={vendors} items={vendors}
placeholder={<T id={'select_vender_account'} />} placeholder={<T id={'select_vender_account'} />}
onItemChange={(contact) => { onItemSelect={(contact) => {
setFieldValue('vendor_id', contact.id); setFieldValue('vendor_id', contact.id);
setFieldValue('currency_code', contact?.currency_code); setFieldValue('currency_code', contact?.currency_code);
setPaymentVendorId(contact.id); setPaymentVendorId(contact.id);

View File

@@ -110,7 +110,7 @@ function CreditNoteCustomersSelect() {
name={'customer_id'} name={'customer_id'}
items={customers} items={customers}
placeholder={<T id={'select_customer_account'} />} placeholder={<T id={'select_customer_account'} />}
onItemChange={(customer) => { onItemSelect={(customer) => {
setFieldValue('customer_id', customer.id); setFieldValue('customer_id', customer.id);
setFieldValue('currency_code', customer?.currency_code); setFieldValue('currency_code', customer?.currency_code);
}} }}

View File

@@ -165,7 +165,7 @@ function EstimateFormCustomerSelect() {
name={'customer_id'} name={'customer_id'}
items={customers} items={customers}
placeholder={<T id={'select_customer_account'} />} placeholder={<T id={'select_customer_account'} />}
onItemChange={(customer) => { onItemSelect={(customer) => {
setFieldValue('customer_id', customer.id); setFieldValue('customer_id', customer.id);
setFieldValue('currency_code', customer?.currency_code); setFieldValue('currency_code', customer?.currency_code);
}} }}

View File

@@ -178,7 +178,7 @@ function InvoiceFormCustomerSelect() {
name={'customer_id'} name={'customer_id'}
items={customers} items={customers}
placeholder={<T id={'select_customer_account'} />} placeholder={<T id={'select_customer_account'} />}
onItemChange={(customer) => { onItemSelect={(customer) => {
setFieldValue('customer_id', customer.id); setFieldValue('customer_id', customer.id);
setFieldValue('currency_code', customer?.currency_code); setFieldValue('currency_code', customer?.currency_code);
}} }}

View File

@@ -263,7 +263,7 @@ function PaymentReceiveCustomerSelect() {
name={'customer_id'} name={'customer_id'}
items={customers} items={customers}
placeholder={<T id={'select_customer_account'} />} placeholder={<T id={'select_customer_account'} />}
onItemChange={(customer) => { onItemSelect={(customer) => {
setFieldValue('customer_id', customer.id); setFieldValue('customer_id', customer.id);
setFieldValue('full_amount', ''); setFieldValue('full_amount', '');
setFieldValue('currency_code', customer?.currency_code); setFieldValue('currency_code', customer?.currency_code);

View File

@@ -162,7 +162,7 @@ function ReceiptFormCustomerSelect() {
name={'customer_id'} name={'customer_id'}
items={customers} items={customers}
placeholder={<T id={'select_customer_account'} />} placeholder={<T id={'select_customer_account'} />}
onItemChange={(customer) => { onItemSelect={(customer) => {
setFieldValue('customer_id', customer.id); setFieldValue('customer_id', customer.id);
setFieldValue('currency_code', customer?.currency_code); setFieldValue('currency_code', customer?.currency_code);
}} }}