admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed job costing bugs. BOD-247

Browse Source
This commit is contained in:
Patrick Fic
2020-08-11 13:26:53 -07:00
parent 1715c08296
commit 1e3bf19cd3
12 changed files with 134 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx
View File

@@ -127,6 +127,10 @@ function InvoiceEnterModalContainer({
if (enterAgain) form.submit();
}, [enterAgain, form]);
useEffect(() => {
if (invoiceEnterModal.visible) form.resetFields();
}, [invoiceEnterModal.visible, form]);
return (
<Modal
title={t("invoices.labels.new")}
@@ -165,6 +169,7 @@ function InvoiceEnterModalContainer({
setEnterAgain(false);
}}
initialValues={{
...invoiceEnterModal.context.invoice,
jobid:
(invoiceEnterModal.context.job &&
invoiceEnterModal.context.job.id) ||
@@ -172,7 +177,6 @@ function InvoiceEnterModalContainer({
federal_tax_rate: bodyshop.invoice_tax_rates.federal_tax_rate || 0,
state_tax_rate: bodyshop.invoice_tax_rates.state_tax_rate || 0,
local_tax_rate: bodyshop.invoice_tax_rates.local_tax_rate || 0,
...invoiceEnterModal.context.invoice,
}}
>
<InvoiceFormContainer form={form} />