Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PSP-8047 : FT-REG: Disposition Files - Net proceeds before & After SP… #3859

Merged
merged 2 commits into from
Mar 13, 2024
Merged

PSP-8047 : FT-REG: Disposition Files - Net proceeds before & After SP… #3859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1eb7e53
PSP-8047 : FT-REG: Disposition Files - Net proceeds before & After SP…
Mar 11, 2024
23dfc1c
Merge branch 'dev' into psp-8047
Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/frontend/src/features/mapSideBar/disposition/tabs/offersAndSale/OffersAndSaleView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ const OffersAndSaleView: React.FunctionComponent<IOffersAndSaleViewProps> = ({
<SectionField
label="Net proceeds before SPP cost ($)"
labelWidth="6"
tooltip="Net Proceeds before Surplus Property Program (SPP) Cost = Final Sales price, less Commissions, and Net Book Value."
tooltip="Net Proceeds before Surplus Property Program (SPP) Cost = Final Sales price, less Commissions, GST Total Cost of Sales, and Net Book Value."
valueTestId="disposition-sale.netProceedsBeforeSppAmount"
>
{formatMoney(calculateNetProceedsBeforeSppAmount(dispositionSale))}
Expand All @@ -310,7 +310,7 @@ const OffersAndSaleView: React.FunctionComponent<IOffersAndSaleViewProps> = ({
<SectionField
label="Net proceeds after SPP cost ($)"
labelWidth="6"
tooltip="Net Proceeds after SPP Cost = Final Sales price, less Commissions, Net Book Value, Total Cost of Sales, and SPP Amount."
tooltip="Net Proceeds after SPP Cost = Final Sales price, less Commissions, GST, Net Book Value, Total Cost of Sales, and SPP Amount."
valueTestId="disposition-sale.netProceedsAfterSppAmount"
>
{formatMoney(calculateNetProceedsAfterSppAmount(dispositionSale))}
Expand Down
4 changes: 2 additions & 2 deletions ...es/mapSideBar/disposition/tabs/offersAndSale/dispositionSale/form/DispositionSaleForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ const DispositionSaleForm: React.FunctionComponent<
label="Net proceeds before SPP cost ($)"
labelWidth="5"
contentWidth="5"
tooltip="Net Proceeds before Surplus Property Program (SPP) Cost = Final Sales price, less Commissions, and Net Book Value."
tooltip="Net Proceeds before Surplus Property Program (SPP) Cost = Final Sales price, less Commissions, GST Total Cost of Sales, and Net Book Value."
>
<FastCurrencyInput
formikProps={formikProps}
Expand All @@ -212,7 +212,7 @@ const DispositionSaleForm: React.FunctionComponent<
label="Net proceeds after SPP cost ($)"
labelWidth="5"
contentWidth="5"
tooltip="Net Proceeds after SPP Cost = Final Sales price, less Commissions, Net Book Value, Total Cost of Sales, and SPP Amount."
tooltip="Net Proceeds after SPP Cost = Final Sales price, less Commissions, GST, Net Book Value, Total Cost of Sales, and SPP Amount."
>
<FastCurrencyInput
formikProps={formikProps}
Expand Down
Loading