From e302f5abbf12a581751587c3ac62f817f683f4ee Mon Sep 17 00:00:00 2001
From: CameronEYDS <53542131+cameron-eyds@users.noreply.github.com>
Date: Mon, 23 Oct 2023 10:30:55 -0700
Subject: [PATCH 1/4] Reset Exemption Validations for Staff (#1592)

---
 ppr-ui/package-lock.json                          |  4 ++--
 ppr-ui/package.json                               |  2 +-
 ppr-ui/src/composables/exemption/useExemptions.ts | 11 ++++++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ppr-ui/package-lock.json b/ppr-ui/package-lock.json
index af8c47768..78ede419c 100644
--- a/ppr-ui/package-lock.json
+++ b/ppr-ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ppr-ui",
-  "version": "2.1.18",
+  "version": "2.1.19",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ppr-ui",
-      "version": "2.1.18",
+      "version": "2.1.19",
       "dependencies": {
         "@bcrs-shared-components/corp-type-module": "^1.0.7",
         "@bcrs-shared-components/enums": "^1.0.19",
diff --git a/ppr-ui/package.json b/ppr-ui/package.json
index f486fc907..51856f351 100644
--- a/ppr-ui/package.json
+++ b/ppr-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ppr-ui",
-  "version": "2.1.18",
+  "version": "2.1.19",
   "private": true,
   "appName": "Assets UI",
   "sbcName": "SBC Common Components",
diff --git a/ppr-ui/src/composables/exemption/useExemptions.ts b/ppr-ui/src/composables/exemption/useExemptions.ts
index 403765991..fd95b4419 100644
--- a/ppr-ui/src/composables/exemption/useExemptions.ts
+++ b/ppr-ui/src/composables/exemption/useExemptions.ts
@@ -16,7 +16,12 @@ import { APIMhrDescriptionTypes, MhApiStatusTypes, RouteNames, UnitNoteDocTypes
 export const useExemptions = () => {
   const { goToRoute } = useNavigation()
   const { setMhrExemption, setMhrExemptionNote, setMhrExemptionValidation, setMhrExemptionValue } = useStore()
-  const { getMhrExemption, isRoleStaffReg, isRoleQualifiedSupplier } = storeToRefs(useStore())
+  const {
+    getMhrExemption,
+    getMhrExemptionValidation,
+    isRoleStaffReg,
+    isRoleQualifiedSupplier
+  } = storeToRefs(useStore())
 
   /** Returns true when staff or qualified supplier and the feature flag is enabled **/
   const isExemptionEnabled: ComputedRef<boolean> = computed((): boolean => {
@@ -92,6 +97,10 @@ export const useExemptions = () => {
       updateValidation('documentId', true)
       updateValidation('submittingParty', true)
       updateValidation('staffPayment', true)
+    } else {
+      const validationState = getMhrExemptionValidation.value
+      // eslint-disable-next-line no-return-assign
+      Object.keys(validationState).forEach(flag => validationState[flag] = false)
     }
   }
 

From bcbae33138eb4d2953ee494246d2602a12a76915 Mon Sep 17 00:00:00 2001
From: Dima K <dima1086@hotmail.com>
Date: Mon, 23 Oct 2023 14:01:36 -0400
Subject: [PATCH 2/4] Exempt state for MHR Information (#1591)

* Updates for exempt state of Mhr Info
* Add unit tests for exempt Mhr Info
* Updates for Non-Res Exemption
---
 .../unitNotes/UnitNoteContentInfo.vue         | 13 +++--
 .../components/unitNotes/UnitNotePanel.vue    |  2 +-
 .../components/unitNotes/UnitNotePanels.vue   | 24 +++++++--
 .../composables/exemption/useExemptions.ts    | 25 ++++++---
 ppr-ui/src/enums/registrationTypes.ts         |  3 +-
 .../resources/exemptions/componentContent.ts  |  2 +-
 ppr-ui/src/resources/unitNotes.ts             | 11 ++++
 .../views/mhrInformation/MhrInformation.vue   | 21 ++++++--
 ppr-ui/tests/unit/MhrInformation.spec.ts      | 28 +++++++++-
 ppr-ui/tests/unit/Tombstone.spec.ts           | 12 ++---
 ppr-ui/tests/unit/TombstoneDischarge.spec.ts  | 21 +++++++-
 ppr-ui/tests/unit/UnitNotePanels.spec.ts      | 51 ++++++++++++++++++-
 .../unit/test-data/mock-registration-new.ts   | 14 ++++-
 .../tests/unit/test-data/mock-unit-notes.ts   | 13 +++++
 14 files changed, 205 insertions(+), 35 deletions(-)

diff --git a/ppr-ui/src/components/unitNotes/UnitNoteContentInfo.vue b/ppr-ui/src/components/unitNotes/UnitNoteContentInfo.vue
index 4a1428c0c..dce20d643 100644
--- a/ppr-ui/src/components/unitNotes/UnitNoteContentInfo.vue
+++ b/ppr-ui/src/components/unitNotes/UnitNoteContentInfo.vue
@@ -2,7 +2,7 @@
   <!-- Note Information-->
   <div>
     <v-row
-      v-if="note.effectiveDateTime && hasEffectiveDateInPanel(note)"
+      v-if="note.effectiveDateTime && hasEffectiveDateInPanel(note) && !isExemptionNoteType"
       no-gutters
       class="mt-7"
       data-test-id="effective-date-info"
@@ -42,7 +42,7 @@
       </v-col>
     </v-row>
 
-    <v-row no-gutters class="mt-6 mb-7">
+    <v-row no-gutters class="mt-6" :class="{ 'mb-6': !isExemptionNoteType }" data-test-id="remarks-info">
       <v-col cols="3">
         <h3 class="fs-14">Remarks</h3>
       </v-col>
@@ -61,12 +61,12 @@
     </v-row>
 
     <v-divider
-      v-if="note.effectiveDateTime || note.expiryDateTime || note.remarks"
+      v-if="!isExemptionNoteType && (note.effectiveDateTime || note.expiryDateTime || note.remarks)"
       class="ml-0 my-4"
     />
 
     <!-- Person Giving Notice or Collector Table -->
-    <v-row no-gutters class="mt-7">
+    <v-row v-if="!isExemptionNoteType" no-gutters class="mt-7" data-test-id="person-giving-notice-info">
       <v-col cols="3">
         <h3 class="fs-14">{{ contactInfoTitle }}</h3>
       </v-col>
@@ -174,7 +174,10 @@ export default defineComponent({
         props.note.documentType === UnitNoteDocTypes.NOTICE_OF_TAX_SALE
           ? collectorInformationContent.title
           : personGivingNoticeContent.title
-      )
+      ),
+      isExemptionNoteType: computed((): boolean =>
+        [UnitNoteDocTypes.RESIDENTIAL_EXEMPTION_ORDER, UnitNoteDocTypes.NON_RESIDENTIAL_EXEMPTION]
+          .includes(props.note.documentType))
     })
 
     const getNoticePartyIcon = (givingNoticeParty: PartyIF): string => {
diff --git a/ppr-ui/src/components/unitNotes/UnitNotePanel.vue b/ppr-ui/src/components/unitNotes/UnitNotePanel.vue
index ed2596b02..206375748 100644
--- a/ppr-ui/src/components/unitNotes/UnitNotePanel.vue
+++ b/ppr-ui/src/components/unitNotes/UnitNotePanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-expansion-panel class="unit-note-panel pb-4 px-1">
+  <v-expansion-panel class="unit-note-panel pb-3 px-1">
     <v-expansion-panel-header disable-icon-rotate :disabled="disabled">
       <UnitNoteHeaderInfo :note="note"/>
       <!-- Custom Panel Actions -->
diff --git a/ppr-ui/src/components/unitNotes/UnitNotePanels.vue b/ppr-ui/src/components/unitNotes/UnitNotePanels.vue
index baa831cae..752a6067e 100644
--- a/ppr-ui/src/components/unitNotes/UnitNotePanels.vue
+++ b/ppr-ui/src/components/unitNotes/UnitNotePanels.vue
@@ -30,9 +30,9 @@
             </template>
 
             <!-- Drop down list -->
-            <v-list width="350" height="305">
+            <v-list width="350" class="add-unit-note-item-list">
               <v-list-item
-                v-for="item in UnitNotesDropdown"
+                v-for="item in addUnitNoteDropdown"
                 :key="item"
                 class="unit-note-list-item"
                 @click="initUnitNote(item)"
@@ -77,10 +77,14 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, toRefs, watch } from 'vue-demi'
+import { computed, defineComponent, reactive, toRefs, watch } from 'vue-demi'
 import { RouteNames, UnitNoteDocTypes } from '@/enums'
 import { useStore } from '@/store/store'
-import { UnitNotesInfo, UnitNotesDropdown } from '@/resources'
+import { UnitNotesInfo,
+  UnitNotesDropdown,
+  ResidentialExemptionStaffDropDown,
+  ResidentialExemptionQSDropDown }
+  from '@/resources'
 import { UnitNoteIF } from '@/interfaces/unit-note-interfaces'
 import UnitNotePanel from './UnitNotePanel.vue'
 import { useMhrUnitNotePanel, useNavigation } from '@/composables'
@@ -98,12 +102,17 @@ export default defineComponent({
     disabled: {
       type: Boolean,
       default: false
+    },
+    hasActiveExemption: {
+      type: Boolean,
+      default: false
     }
   },
   setup (props) {
     const { goToRoute } = useNavigation()
 
     const {
+      isRoleStaffReg,
       setMhrUnitNoteType
     } = useStore()
 
@@ -113,7 +122,11 @@ export default defineComponent({
 
     const localState = reactive({
       activePanels: [],
-      panelUnitNotes: createPanelUnitNotes(props.unitNotes)
+      panelUnitNotes: createPanelUnitNotes(props.unitNotes),
+      addUnitNoteDropdown: computed((): UnitNoteDocTypes[] => {
+        const dropdown = isRoleStaffReg ? ResidentialExemptionStaffDropDown : ResidentialExemptionQSDropDown
+        return props.hasActiveExemption ? dropdown : UnitNotesDropdown
+      })
     })
 
     const initUnitNote = (noteType: UnitNoteDocTypes): void => {
@@ -129,6 +142,7 @@ export default defineComponent({
       initUnitNote,
       UnitNotesInfo,
       UnitNotesDropdown,
+      ResidentialExemptionStaffDropDown,
       ...toRefs(localState)
     }
   }
diff --git a/ppr-ui/src/composables/exemption/useExemptions.ts b/ppr-ui/src/composables/exemption/useExemptions.ts
index fd95b4419..87f111e48 100644
--- a/ppr-ui/src/composables/exemption/useExemptions.ts
+++ b/ppr-ui/src/composables/exemption/useExemptions.ts
@@ -10,8 +10,8 @@ import {
   hasTruthyValue,
   parseAccountToSubmittingParty
 } from '@/utils'
-import { ExemptionIF, MhRegistrationSummaryIF } from '@/interfaces'
-import { APIMhrDescriptionTypes, MhApiStatusTypes, RouteNames, UnitNoteDocTypes } from '@/enums'
+import { ExemptionIF, MhRegistrationSummaryIF, UnitNoteIF } from '@/interfaces'
+import { APIMhrDescriptionTypes, MhApiStatusTypes, RouteNames, UnitNoteDocTypes, UnitNoteStatusTypes } from '@/enums'
 
 export const useExemptions = () => {
   const { goToRoute } = useNavigation()
@@ -20,7 +20,8 @@ export const useExemptions = () => {
     getMhrExemption,
     getMhrExemptionValidation,
     isRoleStaffReg,
-    isRoleQualifiedSupplier
+    isRoleQualifiedSupplier,
+    getMhrUnitNotes
   } = storeToRefs(useStore())
 
   /** Returns true when staff or qualified supplier and the feature flag is enabled **/
@@ -104,20 +105,32 @@ export const useExemptions = () => {
     }
   }
 
-  /** Check is MHR Registration has filed Residential Exemption **/
+  /** Check if MHR Registration has filed Residential Exemption **/
   const hasChildResExemption = (mhrRegSummary: MhRegistrationSummaryIF): boolean => {
     return mhrRegSummary.changes?.filter(
       reg =>
-        reg.registrationDescription === APIMhrDescriptionTypes.RESIDENTIAL_EXEMPTION &&
+        [APIMhrDescriptionTypes.RESIDENTIAL_EXEMPTION.toString(),
+          APIMhrDescriptionTypes.NON_RESIDENTIAL_EXEMPTION.toString()].includes(reg.registrationDescription) &&
         (reg.statusType === MhApiStatusTypes.EXEMPT || reg.statusType === MhApiStatusTypes.ACTIVE)
     ).length > 0
   }
 
+  /* Get active Residential Exemption from unit notes */
+  const getActiveExemption = () => {
+    // there should be only one active residential exemption
+    return getMhrUnitNotes.value.find((unitNote: UnitNoteIF) =>
+      [UnitNoteDocTypes.RESIDENTIAL_EXEMPTION_ORDER, UnitNoteDocTypes.NON_RESIDENTIAL_EXEMPTION]
+        .includes(unitNote.documentType) &&
+      unitNote.status === UnitNoteStatusTypes.ACTIVE
+    )
+  }
+
   return {
     isExemptionEnabled,
     goToExemptions,
     updateValidation,
     buildExemptionPayload,
-    hasChildResExemption
+    hasChildResExemption,
+    getActiveExemption
   }
 }
diff --git a/ppr-ui/src/enums/registrationTypes.ts b/ppr-ui/src/enums/registrationTypes.ts
index 3e89a9c6d..74b624de0 100644
--- a/ppr-ui/src/enums/registrationTypes.ts
+++ b/ppr-ui/src/enums/registrationTypes.ts
@@ -174,7 +174,8 @@ export enum APIMhrDescriptionTypes {
   TRANSFER_EXECUTOR_PROBATE_WILL = 'TRANSFER TO EXECUTOR \u2013 GRANT OF PROBATE WITH WILL',
   TRANSFER_EXECUTOR_UNDER_25_WILL = 'TRANSFER TO EXECUTOR \u2013 ESTATE UNDER $25,000 WITH WILL',
   TRANSFER_ADMINISTRATOR = 'TRANSFER TO ADMINISTRATOR \u2013 GRANT OF ADMINISTRATION',
-  RESIDENTIAL_EXEMPTION = 'RESIDENTIAL EXEMPTION'
+  RESIDENTIAL_EXEMPTION = 'RESIDENTIAL EXEMPTION',
+  NON_RESIDENTIAL_EXEMPTION = 'NON-RESIDENTIAL EXEMPTION'
 }
 
 export enum UIMhrDescriptionTypes {
diff --git a/ppr-ui/src/resources/exemptions/componentContent.ts b/ppr-ui/src/resources/exemptions/componentContent.ts
index e4f724e38..6c76320fb 100644
--- a/ppr-ui/src/resources/exemptions/componentContent.ts
+++ b/ppr-ui/src/resources/exemptions/componentContent.ts
@@ -1,4 +1,4 @@
-import { ContactInformationContentIF, ContentIF, RequirementsConfigIF } from '@/interfaces'
+import { ContentIF, RequirementsConfigIF } from '@/interfaces'
 
 export const exDocIdContent: ContentIF = {
   title: 'Document ID',
diff --git a/ppr-ui/src/resources/unitNotes.ts b/ppr-ui/src/resources/unitNotes.ts
index 4605d3647..b332b471d 100644
--- a/ppr-ui/src/resources/unitNotes.ts
+++ b/ppr-ui/src/resources/unitNotes.ts
@@ -26,6 +26,17 @@ export const NoticeOfTaxSaleDropDown: Array<UnitNoteDocTypes> = [
   UnitNoteDocTypes.NOTICE_OF_REDEMPTION
 ]
 
+// Dropdown items for Staff when Mhr has Residential Exemption note
+export const ResidentialExemptionStaffDropDown: Array<UnitNoteDocTypes> = [
+  UnitNoteDocTypes.PUBLIC_NOTE,
+  UnitNoteDocTypes.CONFIDENTIAL_NOTE
+]
+
+// Dropdown items for QS when Mhr has Residential Exemption note
+export const ResidentialExemptionQSDropDown: Array<UnitNoteDocTypes> = [
+  UnitNoteDocTypes.PUBLIC_NOTE
+]
+
 export const UnitNotesInfo: Record<UnitNoteDocTypes, UnitNoteInfoIF> = {
   [UnitNoteDocTypes.NOTICE_OF_CAUTION]: {
     header: 'Notice of Caution',
diff --git a/ppr-ui/src/views/mhrInformation/MhrInformation.vue b/ppr-ui/src/views/mhrInformation/MhrInformation.vue
index f2f7ab97e..ff38005ea 100644
--- a/ppr-ui/src/views/mhrInformation/MhrInformation.vue
+++ b/ppr-ui/src/views/mhrInformation/MhrInformation.vue
@@ -36,8 +36,9 @@
                     This is the current information for this registration as of
                     <span class="font-weight-bold">{{ asOfDateTime }}</span>.
                   </p>
-                  <p>Ensure ALL of the information below is correct before making any changes to this
-                    registration. Necessary fees will be applied as updates are made.
+                  <p v-if="!hasActiveExemption" data-test-id="correct-into-desc">
+                    Ensure ALL of the information below is correct before making any changes to this registration.
+                    Necessary fees will be applied as updates are made.
                   </p>
 
                   <!-- Unit Note Info -->
@@ -51,11 +52,12 @@
                     </span>
 
                     <!-- Has Alert Message (Notice of Tax Sale, and others) -->
-                    <template v-if="hasAlertMsg">
+                    <template v-if="hasAlertMsg || hasActiveExemption">
                       <CautionBox
                         class="mt-9"
                         :setMsg="alertMsg"
                         setAlert
+                        data-test-id="mhr-alert-msg"
                       >
                         <template #prependSLot>
                           <v-icon color="error" class="alert-icon mt-1 mr-2">mdi-alert</v-icon>
@@ -239,7 +241,7 @@
                       <img class="home-owners-icon mb-1 ml-1" src="@/assets/svgs/homeownersicon_reviewscreen.svg"/>
                       <span class="font-weight-bold pl-2">Home Owners</span>
                     </v-col>
-                    <v-col v-if="enableHomeOwnerChanges" cols="3" class="text-right">
+                    <v-col v-if="enableHomeOwnerChanges && !hasActiveExemption" cols="3" class="text-right">
                       <v-btn
                         text
                         id="home-owners-change-btn"
@@ -310,6 +312,7 @@
                     id="unit-note-component"
                     :unitNotes="getMhrUnitNotes"
                     :disabled="!enableHomeOwnerChanges || showTransferType"
+                    :hasActiveExemption="hasActiveExemption"
                 />
 
                 <v-spacer class="py-10 my-10"></v-spacer>
@@ -363,6 +366,7 @@ import {
 } from '@/components/common'
 import {
   useAuth,
+  useExemptions,
   useHomeOwners,
   useInputRules,
   useMhrInformation,
@@ -510,6 +514,8 @@ export default defineComponent({
       isTransferToExecutorUnder25Will
     } = useTransferOwners()
 
+    const { getActiveExemption } = useExemptions()
+
     // Refs
     const homeOwnersComponentRef = ref(null) as Component
     const transferDetailsComponent = ref(null) as Component
@@ -535,6 +541,7 @@ export default defineComponent({
       showCancelDialog: false,
       showCancelChangeDialog: false,
       showStartTransferRequiredDialog: false,
+      hasActiveExemption: computed((): boolean => !!getActiveExemption()),
       transferRequiredDialogOptions: computed((): DialogOptionsIF => {
         transferRequiredDialog.text =
           transferRequiredDialog.text.replace('mhr_number', getMhrInformation.value.mhrNumber)
@@ -585,6 +592,12 @@ export default defineComponent({
       }),
       hasAlertMsg: false,
       alertMsg: computed((): string => {
+        // msg when MHR has a Residential Exemption
+        if (localState.hasActiveExemption) {
+          return isRoleStaffReg.value
+            ? `This manufactured home is exempt as of ${pacificDate(getActiveExemption().createDateTime)} and changes can no longer be made to this home unless it is restored. See Unit Notes for further information.` // eslint-disable-line max-len
+            : `This manufactured home has been exempt as of ${pacificDate(getActiveExemption().createDateTime)} and changes can no longer be made to this home unless it is restored.  If you require further information please contact BC Registries staff. ` // eslint-disable-line max-len
+        }
         // not all MHR Info will have the frozenDocumentType
         if (!getMhrInformation.value?.frozenDocumentType && !localState.hasAlertMsg) return
         // display alert message based o the locker document type
diff --git a/ppr-ui/tests/unit/MhrInformation.spec.ts b/ppr-ui/tests/unit/MhrInformation.spec.ts
index 339897647..79feb0b25 100644
--- a/ppr-ui/tests/unit/MhrInformation.spec.ts
+++ b/ppr-ui/tests/unit/MhrInformation.spec.ts
@@ -41,7 +41,9 @@ import {
   mockedUnitNotes5,
   mockedPerson2,
   mockedExecutor,
-  mockedAdministrator
+  mockedAdministrator,
+  mockedResidentialExemptionOrder,
+  mockedUnitNotes3
 } from './test-data'
 import {
   CertifyIF,
@@ -1040,4 +1042,28 @@ describe('Mhr Information', () => {
     expect(CautionBoxComponent.find('.v-icon').classes('alert-icon')).toBeTruthy()
     expect(CautionBoxComponent.text()).toContain(UnitNotesInfo[UnitNoteDocTypes.NOTICE_OF_TAX_SALE].header)
   })
+
+  it('should have read only view for exempt MHR (Residential Exemption filed)', async () => {
+    wrapper = createComponent()
+
+    // add unit notes with Residential Exemption
+    await store.setMhrUnitNotes([mockedResidentialExemptionOrder, ...mockedUnitNotes3])
+    await store.setAuthRoles([AuthRoles.PPR_STAFF])
+    wrapper.vm.dataLoaded = true
+    await nextTick()
+
+    expect(wrapper.find(getTestId('correct-into-desc')).exists()).toBeFalsy()
+    expect(wrapper.find(getTestId('mhr-alert-msg')).exists()).toBeTruthy()
+    // message for Staff should contain unique text
+    expect(wrapper.find(getTestId('mhr-alert-msg')).text()).toContain('See Unit Notes for further information')
+    expect(wrapper.find(HomeOwners).find('#home-owners-change-btn').exists()).toBeFalsy()
+
+    // setup Qualified Supplier as Manufacturer
+    await store.setAuthRoles([AuthRoles.MHR_TRANSFER_SALE])
+    await store.setUserProductSubscriptionsCodes([ProductCode.MANUFACTURER])
+    await nextTick()
+
+    // message for QS should contain unique text
+    expect(wrapper.find(getTestId('mhr-alert-msg')).text()).toContain('contact BC Registries staff')
+  })
 })
diff --git a/ppr-ui/tests/unit/Tombstone.spec.ts b/ppr-ui/tests/unit/Tombstone.spec.ts
index fc2c7d231..9e6000616 100644
--- a/ppr-ui/tests/unit/Tombstone.spec.ts
+++ b/ppr-ui/tests/unit/Tombstone.spec.ts
@@ -15,7 +15,7 @@ import { AccountInformationIF, FinancingStatementIF, UserInfoIF } from '@/interf
 import { mockedFinancingStatementComplete, mockedSelectSecurityAgreement } from './test-data'
 import mockRouter from './MockRouter'
 import { AuthRoles, ProductCode, RouteNames } from '@/enums'
-import { convertDate, pacificDate } from '@/utils'
+import { pacificDate } from '@/utils'
 
 Vue.use(Vuetify)
 
@@ -150,7 +150,7 @@ describe('Tombstone component', () => {
     expect(extraInfo.length).toBe(0)
   })
 
-  it('renders Tombstone component peoperly for Search', async () => {
+  it('renders Tombstone component properly for Search', async () => {
     wrapper = createComponent(RouteNames.SEARCH)
     await nextTick()
 
@@ -168,7 +168,7 @@ describe('Tombstone component', () => {
     expect(extraInfo.length).toBe(0)
   })
 
-  it('renders Tombstone component peoperly for New Registration: length-trust', async () => {
+  it('renders Tombstone component properly for New Registration: length-trust', async () => {
     wrapper = createComponent(RouteNames.LENGTH_TRUST)
     await nextTick()
 
@@ -186,7 +186,7 @@ describe('Tombstone component', () => {
     expect(extraInfo.length).toBe(0)
   })
 
-  it('renders Tombstone component peoperly for New Registration: parties/debtors', async () => {
+  it('renders Tombstone component properly for New Registration: parties/debtors', async () => {
     wrapper = createComponent(RouteNames.ADD_SECUREDPARTIES_AND_DEBTORS)
     await nextTick()
 
@@ -204,7 +204,7 @@ describe('Tombstone component', () => {
     expect(extraInfo.length).toBe(0)
   })
 
-  it('renders Tombstone component peoperly for New Registration: collateral', async () => {
+  it('renders Tombstone component properly for New Registration: collateral', async () => {
     wrapper = createComponent(RouteNames.ADD_COLLATERAL)
     await nextTick()
 
@@ -222,7 +222,7 @@ describe('Tombstone component', () => {
     expect(extraInfo.length).toBe(0)
   })
 
-  it('renders Tombstone component peoperly for New Registration: review/confirm', async () => {
+  it('renders Tombstone component properly for New Registration: review/confirm', async () => {
     wrapper = createComponent(RouteNames.REVIEW_CONFIRM)
     await nextTick()
 
diff --git a/ppr-ui/tests/unit/TombstoneDischarge.spec.ts b/ppr-ui/tests/unit/TombstoneDischarge.spec.ts
index 1f73ddf28..c4e5ae56f 100644
--- a/ppr-ui/tests/unit/TombstoneDischarge.spec.ts
+++ b/ppr-ui/tests/unit/TombstoneDischarge.spec.ts
@@ -1,5 +1,5 @@
 // Libraries
-import Vue, { nextTick } from 'vue'
+import Vue from 'vue'
 import Vuetify from 'vuetify'
 import VueRouter from 'vue-router'
 import { createPinia, setActivePinia } from 'pinia'
@@ -12,7 +12,12 @@ import { TombstoneDischarge } from '@/components/tombstone'
 
 // Other
 import { FinancingStatementIF } from '@/interfaces'
-import { mockedFinancingStatementComplete, mockedMhrInformation, mockedSelectSecurityAgreement } from './test-data'
+import {
+  mockedFinancingStatementComplete,
+  mockedMhrInformation,
+  mockedMhrInformationExempt,
+  mockedSelectSecurityAgreement
+} from './test-data'
 import mockRouter from './MockRouter'
 import { RouteNames } from '@/enums'
 import { pacificDate } from '@/utils'
@@ -191,4 +196,16 @@ describe('TombstoneDischarge component - MHR', () => {
     expect(extraInfo.at(0).text()).toContain('Registration Status:')
     expect(extraInfo.at(0).text()).toContain('Cancelled')
   })
+
+  it('should render Tombstone component for Exempt MHR (Residential Exemption unit note)', async () => {
+    await store.setMhrInformation(mockedMhrInformationExempt)
+    wrapper = createComponent(RouteNames.MHR_INFORMATION)
+    const tombstoneDischarge = wrapper.findComponent(TombstoneDischarge)
+    tombstoneDischarge.vm.isMhrInformation = true
+    await Vue.nextTick()
+
+    expect(tombstoneDischarge.find(tombstoneHeader).text())
+      .toContain('Manufactured Home Registration Number ' + mockedMhrInformationExempt.mhrNumber)
+    expect(tombstoneDischarge.find(tombstoneInfo).text()).toContain(mockedMhrInformationExempt.statusType)
+  })
 })
diff --git a/ppr-ui/tests/unit/UnitNotePanels.spec.ts b/ppr-ui/tests/unit/UnitNotePanels.spec.ts
index f58bbc0bc..a46921530 100644
--- a/ppr-ui/tests/unit/UnitNotePanels.spec.ts
+++ b/ppr-ui/tests/unit/UnitNotePanels.spec.ts
@@ -4,10 +4,11 @@ import { createPinia, setActivePinia } from 'pinia'
 import { useStore } from '../../src/store/store'
 import { mount, createLocalVue, Wrapper } from '@vue/test-utils'
 import { UnitNoteContentInfo, UnitNoteHeaderInfo, UnitNotePanel, UnitNotePanels } from '../../src/components/unitNotes'
-import { UnitNoteDocTypes, UnitNoteStatusTypes } from '../../src/enums'
+import { AuthRoles, ProductCode, UnitNoteDocTypes, UnitNoteStatusTypes } from '../../src/enums'
 import {
   mockedCancelledTaxSaleNote,
   mockedNoticeOfRedemption,
+  mockedResidentialExemptionOrder,
   mockedUnitNotes,
   mockedUnitNotes2,
   mockedUnitNotes3,
@@ -17,7 +18,7 @@ import {
 } from './test-data'
 import { BaseAddress } from '@/composables/address'
 import { pacificDate, shortPacificDate } from '@/utils'
-import { UnitNotesInfo, cancelledWithRedemptionNote } from '@/resources/unitNotes'
+import { ResidentialExemptionQSDropDown, ResidentialExemptionStaffDropDown, UnitNotesInfo, cancelledWithRedemptionNote } from '@/resources/unitNotes'
 import { CancelUnitNoteIF, UnitNoteIF, UnitNotePanelIF } from '@/interfaces'
 import { getTestId } from './utils'
 import { useMhrUnitNote } from '@/composables'
@@ -471,4 +472,50 @@ describe('UnitNotePanels', () => {
       `${UnitNotesInfo[UnitNoteDocTypes.NOTICE_OF_TAX_SALE].header} ${cancelledWithRedemptionNote}`
     )
   })
+
+  it('should show correct view for Staff and QS for Residential Exemption note', async () => {
+    const mixedNotes: UnitNoteIF[] =
+    [...mockedUnitNotes4, mockedResidentialExemptionOrder]
+
+    let wrapper = createComponent(mixedNotes)
+    wrapper.setProps({ hasActiveExemption: true })
+
+    // set Qualified Supplier role
+    await store.setAuthRoles([AuthRoles.MHR_TRANSFER_SALE])
+    await store.setUserProductSubscriptionsCodes([ProductCode.MANUFACTURER])
+
+    wrapper.find('#open-unit-notes-btn').trigger('click')
+    await nextTick()
+
+    // check dropdown for Qualified Supplier
+    expect(wrapper.vm.addUnitNoteDropdown).toBe(ResidentialExemptionQSDropDown)
+
+    // set Staff role
+    await store.setAuthRoles([AuthRoles.STAFF, AuthRoles.PPR_STAFF])
+
+    wrapper = createComponent(mixedNotes)
+    wrapper.setProps({ hasActiveExemption: true })
+
+    wrapper.find('#open-unit-notes-btn').trigger('click')
+    await nextTick()
+    await nextTick()
+
+    // check dropdown for Staff
+    expect(wrapper.vm.addUnitNoteDropdown).toBe(ResidentialExemptionStaffDropDown)
+
+    const resExemptionPanel = wrapper.findAllComponents(UnitNotePanel).at(1)
+    expect(resExemptionPanel.find('h3').text()).toBe(UnitNotesInfo[UnitNoteDocTypes.RESIDENTIAL_EXEMPTION_ORDER].header)
+
+    // expand Res Exemption panel
+    resExemptionPanel.find('.unit-note-menu-btn').trigger('click')
+    await nextTick()
+    await nextTick()
+
+    const resExemptionContentInfo = resExemptionPanel.findComponent(UnitNoteContentInfo)
+
+    // check visible and hidden sections of the panel info
+    expect(resExemptionContentInfo.find(getTestId('effective-date-info')).exists()).toBe(false)
+    expect(resExemptionContentInfo.find(getTestId('remarks-info')).exists()).toBe(true)
+    expect(resExemptionContentInfo.find(getTestId('person-giving-notice-info')).exists()).toBe(false)
+  })
 })
diff --git a/ppr-ui/tests/unit/test-data/mock-registration-new.ts b/ppr-ui/tests/unit/test-data/mock-registration-new.ts
index f495232fc..ceb043320 100644
--- a/ppr-ui/tests/unit/test-data/mock-registration-new.ts
+++ b/ppr-ui/tests/unit/test-data/mock-registration-new.ts
@@ -1,4 +1,4 @@
-import { APIRegistrationTypes, DraftTypes, UIRegistrationTypes, APIVehicleTypes, ActionTypes } from '@/enums'
+import { APIRegistrationTypes, DraftTypes, APIVehicleTypes, ActionTypes, MhApiStatusTypes } from '@/enums'
 import {
   RegistrationTypesMiscellaneousCC,
   RegistrationTypesStandard,
@@ -448,3 +448,15 @@ export const mockedMhrInformation: MhRegistrationSummaryIF = {
   submittingParty: 'ABC SUBMITTING COMPANY',
   username: 'BUSINESS REGISTRY TEST 1'
 }
+
+export const mockedMhrInformationExempt: MhRegistrationSummaryIF = {
+  clientReferenceId: 'UT-MHREG-SOLE',
+  createDateTime: '2023-10-15T09:18:13-07:00',
+  mhrNumber: '150575',
+  ownerNames: 'MARY-ANNE BICKNELL',
+  path: '/mhr/api/v1/registrations/150575',
+  registrationDescription: 'MANUFACTURED HOME REGISTRATION',
+  statusType: MhApiStatusTypes.EXEMPT.toLocaleLowerCase(),
+  submittingParty: 'ABC SUBMITTING COMPANY',
+  username: 'BUSINESS REGISTRY TEST 1'
+}
diff --git a/ppr-ui/tests/unit/test-data/mock-unit-notes.ts b/ppr-ui/tests/unit/test-data/mock-unit-notes.ts
index 7b0ffb3c3..2b399fdb0 100644
--- a/ppr-ui/tests/unit/test-data/mock-unit-notes.ts
+++ b/ppr-ui/tests/unit/test-data/mock-unit-notes.ts
@@ -444,3 +444,16 @@ export const mockedNoticeOfRedemption: CancelUnitNoteIF = {
   status: UnitNoteStatusTypes.ACTIVE,
   destroyed: false
 }
+
+// Residential Exemption - EXRS type
+export const mockedResidentialExemptionOrder: UnitNoteIF = {
+  documentType: UnitNoteDocTypes.RESIDENTIAL_EXEMPTION_ORDER,
+  documentId: '12345678',
+  documentRegistrationNumber: '5544332',
+  documentDescription: UnitNotesInfo[UnitNoteDocTypes.RESIDENTIAL_EXEMPTION_ORDER].header,
+  createDateTime: '2023-08-20T09:00:00Z',
+  effectiveDateTime: '2023-08-20T09:00:00Z',
+  remarks: 'Residential Exemption remarks',
+  status: UnitNoteStatusTypes.ACTIVE,
+  destroyed: false
+}

From 749d65a8d6cf2ba110a4ebc6d590a0448696fb26 Mon Sep 17 00:00:00 2001
From: CameronEYDS <53542131+cameron-eyds@users.noreply.github.com>
Date: Tue, 24 Oct 2023 09:09:00 -0700
Subject: [PATCH 3/4] Updated Exemption Initialization (#1597)

---
 .../composables/exemption/useExemptions.ts    | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/ppr-ui/src/composables/exemption/useExemptions.ts b/ppr-ui/src/composables/exemption/useExemptions.ts
index 87f111e48..a350a0dc2 100644
--- a/ppr-ui/src/composables/exemption/useExemptions.ts
+++ b/ppr-ui/src/composables/exemption/useExemptions.ts
@@ -90,18 +90,28 @@ export const useExemptions = () => {
     })
     setMhrExemptionNote({ key: 'documentType', value: exemptionType })
 
-    if (isRoleQualifiedSupplier.value) {
-      const account = await getAccountInfoFromAuth()
-      setMhrExemptionValue({ key: 'submittingParty', value: parseAccountToSubmittingParty(account) })
+    // Initialize role specific values
+    switch (true) {
+      case isRoleQualifiedSupplier.value:
+        const account = await getAccountInfoFromAuth()
+        setMhrExemptionValue({ key: 'submittingParty', value: parseAccountToSubmittingParty(account) })
 
-      // Reset Validations here for qs specific requirements
-      updateValidation('documentId', true)
-      updateValidation('submittingParty', true)
-      updateValidation('staffPayment', true)
-    } else {
-      const validationState = getMhrExemptionValidation.value
-      // eslint-disable-next-line no-return-assign
-      Object.keys(validationState).forEach(flag => validationState[flag] = false)
+        // Reset Validations here for qs specific requirements
+        updateValidation('documentId', true)
+        updateValidation('submittingParty', true)
+        updateValidation('staffPayment', true)
+        break
+      case isRoleStaffReg.value:
+        const validationState = getMhrExemptionValidation.value
+        // eslint-disable-next-line no-return-assign
+        Object.keys(validationState).forEach(flag => validationState[flag] = false)
+
+        // Staff specific flags
+        updateValidation('remarks', true)
+        updateValidation('attention', true)
+        updateValidation('folio', true)
+        break
+      default:
     }
   }
 

From d09bc0760a2d8a14dfb565da1632cb7d3a5f3422 Mon Sep 17 00:00:00 2001
From: Doug Lovett <doug@diamante.ca>
Date: Tue, 24 Oct 2023 09:29:25 -0700
Subject: [PATCH 4/4] Allow NCON, NCAN, NRED in exempt state. (#1596)

* Allow NCON, NCAN, NRED in exempt state.

Signed-off-by: Doug Lovett <doug@diamante.ca>

* 18290 bug fix transfer from SOLE to JOINT tenancy type of NA.

Signed-off-by: Doug Lovett <doug@diamante.ca>

---------

Signed-off-by: Doug Lovett <doug@diamante.ca>
---
 .../src/mhr_api/models/registration_utils.py  |   4 +-
 mhr_api/src/mhr_api/utils/admin_validator.py  |   7 +-
 .../mhr_api/utils/registration_validator.py   |   2 +-
 mhr_api/src/mhr_api/utils/validator_utils.py  |   5 +-
 .../mhr_api/utils/validator_utils_legacy.py   |   5 +-
 mhr_api/test_data/db2_data_files/test0006.sql |  71 +++++++++
 .../postgres_data_files/test0008.sql          | 135 ++++++++++++++++++
 .../tests/unit/utils/test_admin_validator.py  |   4 +-
 .../tests/unit/utils/test_note_validator.py   |   1 +
 .../unit/utils/test_transfer_validator.py     |   2 +-
 10 files changed, 226 insertions(+), 10 deletions(-)
 create mode 100644 mhr_api/test_data/db2_data_files/test0006.sql
 create mode 100644 mhr_api/test_data/postgres_data_files/test0008.sql

diff --git a/mhr_api/src/mhr_api/models/registration_utils.py b/mhr_api/src/mhr_api/models/registration_utils.py
index 0685a0f7c..fe72912d3 100644
--- a/mhr_api/src/mhr_api/models/registration_utils.py
+++ b/mhr_api/src/mhr_api/models/registration_utils.py
@@ -744,7 +744,9 @@ def __collapse_results(results):
         has_caution: bool = False
         changes = []
         for result in results:
-            if result['mhrNumber'] == reg['mhrNumber'] and result['registrationType'] != MhrRegistrationTypes.MHREG:
+            if result['mhrNumber'] == reg['mhrNumber'] and \
+                    result['registrationType'] not in (MhrRegistrationTypes.MHREG,
+                                                       MhrRegistrationTypes.MHREG_CONVERSION):
                 if result.get('expireDays') and result.get('expireDays') >= 0:
                     has_caution = True
                 changes.append(result)
diff --git a/mhr_api/src/mhr_api/utils/admin_validator.py b/mhr_api/src/mhr_api/utils/admin_validator.py
index 993cf42a7..15af5d162 100644
--- a/mhr_api/src/mhr_api/utils/admin_validator.py
+++ b/mhr_api/src/mhr_api/utils/admin_validator.py
@@ -18,7 +18,7 @@
 from flask import current_app
 
 from mhr_api.models import MhrRegistration, utils as model_utils, registration_utils as reg_utils
-from mhr_api.models.type_tables import MhrDocumentTypes, MhrNoteStatusTypes
+from mhr_api.models.type_tables import MhrDocumentTypes, MhrNoteStatusTypes, MhrRegistrationTypes
 from mhr_api.models.db2.mhomnote import FROM_LEGACY_STATUS
 from mhr_api.models.db2.utils import FROM_LEGACY_DOC_TYPE
 from mhr_api.utils import validator_utils
@@ -55,7 +55,10 @@ def validate_admin_reg(registration: MhrRegistration, json_data) -> str:
         doc_type: str = json_data.get('documentType', '')
         if not doc_type and json_data.get('note') and json_data['note'].get('documentType'):
             doc_type = json_data['note'].get('documentType')
-        error_msg += validator_utils.validate_registration_state(registration, True, doc_type)
+        error_msg += validator_utils.validate_registration_state(registration,
+                                                                 True,
+                                                                 MhrRegistrationTypes.REG_STAFF_ADMIN,
+                                                                 doc_type)
         error_msg += validate_giving_notice(json_data, doc_type)
         if doc_type and doc_type == MhrDocumentTypes.NRED:
             error_msg += validate_nred(registration, json_data)
diff --git a/mhr_api/src/mhr_api/utils/registration_validator.py b/mhr_api/src/mhr_api/utils/registration_validator.py
index 51df7f24f..686c03fd7 100644
--- a/mhr_api/src/mhr_api/utils/registration_validator.py
+++ b/mhr_api/src/mhr_api/utils/registration_validator.py
@@ -507,7 +507,7 @@ def validate_owner_groups(groups,
             error_msg += validate_owner(owner)
     if so_count > 1 or (so_count == 1 and len(groups) > 1):
         error_msg += ADD_SOLE_OWNER_INVALID
-    if not new and active_count == 1 and tenancy_type in (MhrTenancyTypes.COMMON, MhrTenancyTypes.NA):
+    if not new and active_count == 1 and tenancy_type == MhrTenancyTypes.COMMON:
         error_msg += GROUP_COMMON_INVALID
     return error_msg
 
diff --git a/mhr_api/src/mhr_api/utils/validator_utils.py b/mhr_api/src/mhr_api/utils/validator_utils.py
index 2e09f70b0..a7e414e45 100644
--- a/mhr_api/src/mhr_api/utils/validator_utils.py
+++ b/mhr_api/src/mhr_api/utils/validator_utils.py
@@ -132,7 +132,7 @@ def validate_registration_state(registration: MhrRegistration, staff: bool, reg_
         return error_msg
     if is_legacy():
         return validator_utils_legacy.validate_registration_state(registration, staff, reg_type, doc_type)
-    if reg_type and reg_type == MhrDocumentTypes.EXRE:
+    if doc_type and doc_type == MhrDocumentTypes.EXRE:
         return validate_registration_state_exre(registration)
     if reg_type and reg_type in (MhrRegistrationTypes.EXEMPTION_NON_RES, MhrRegistrationTypes.EXEMPTION_RES):
         return validate_registration_state_exemption(registration, reg_type, staff)
@@ -140,7 +140,8 @@ def validate_registration_state(registration: MhrRegistration, staff: bool, reg_
         if registration.status_type != MhrRegistrationStatusTypes.ACTIVE:
             if registration.status_type == MhrRegistrationStatusTypes.CANCELLED or \
                     doc_type is None or \
-                    doc_type != MhrDocumentTypes.NPUB:
+                    doc_type not in (MhrDocumentTypes.NPUB, MhrDocumentTypes.NCON,
+                                     MhrDocumentTypes.NCAN, MhrDocumentTypes.NRED):
                 error_msg += STATE_NOT_ALLOWED
         elif registration.change_registrations:
             last_reg: MhrRegistration = registration.change_registrations[-1]
diff --git a/mhr_api/src/mhr_api/utils/validator_utils_legacy.py b/mhr_api/src/mhr_api/utils/validator_utils_legacy.py
index 7c7b50410..247d80d56 100644
--- a/mhr_api/src/mhr_api/utils/validator_utils_legacy.py
+++ b/mhr_api/src/mhr_api/utils/validator_utils_legacy.py
@@ -43,14 +43,15 @@ def validate_registration_state(registration, staff: bool, reg_type: str, doc_ty
     if not registration or not registration.manuhome:
         return error_msg
     manuhome: Db2Manuhome = registration.manuhome
-    if reg_type and reg_type == MhrDocumentTypes.EXRE:
+    if doc_type and doc_type == MhrDocumentTypes.EXRE:
         return validate_registration_state_exre(manuhome)
     if reg_type and reg_type in (MhrRegistrationTypes.EXEMPTION_NON_RES, MhrRegistrationTypes.EXEMPTION_RES):
         return validate_registration_state_exemption(manuhome, reg_type, staff)
     if manuhome.mh_status != manuhome.StatusTypes.REGISTERED:
         if manuhome.mh_status == manuhome.StatusTypes.CANCELLED or \
                 doc_type is None or \
-                doc_type != MhrDocumentTypes.NPUB:
+                doc_type not in (MhrDocumentTypes.NPUB, MhrDocumentTypes.NCON,
+                                 MhrDocumentTypes.NCAN, MhrDocumentTypes.NRED):
             error_msg += STATE_NOT_ALLOWED
     elif manuhome.reg_documents:
         last_doc: Db2Document = manuhome.reg_documents[-1]
diff --git a/mhr_api/test_data/db2_data_files/test0006.sql b/mhr_api/test_data/db2_data_files/test0006.sql
new file mode 100644
index 000000000..776c27004
--- /dev/null
+++ b/mhr_api/test_data/db2_data_files/test0006.sql
@@ -0,0 +1,71 @@
+-- UT-0033 000932 MHREG EXEMPT with NCON, TAXN notes.
+INSERT INTO amhrtdb.manuhome(MANHOMID, MHREGNUM, MHSTATUS, REGDOCID, UPDATECT, UPDATEID, UPDATEDA, UPDATETI)
+     VALUES (200000047, '000932', 'E', 'UT000047', 1, 'PS12345 ', current date, current time)
+;
+INSERT INTO amhrtdb.document(DOCUMTID, MHREGNUM, DRAFDATE, REGIDATE, DOCUTYPE, DOCUREGI, OWNLAND, UPDATEID, PHONE, NAME, ADDRESS, AFFIRMBY, OLBCFOLI)
+     VALUES ('UT000047', '000932', current timestamp, current timestamp, '101 ', '90499047', 'N', 'PS12345 ', '6041234567', 
+             'SUBMITTING', 
+             '1234 TEST-0033                                                                  CITY                                    BC CA                            V8R 3A5', 
+             'TEST USER', 'UT-0033')
+;
+INSERT INTO amhrtdb.descript(MANHOMID, DESCRNID, STATUS, REGDOCID, CSANUMBR, CSASTAND, NUMBSECT, YEARMADE,
+                             SERNUMB1, LENGTH1, LENGIN1, WIDTH1, WIDIN1,
+                             MANUNAME, MAKEMODL, REBUILTR, OTHERREM, ENGIDATE)
+     VALUES (200000047, 1, 'A', 'UT000047', '77777', '1234', 1, '2000', '888888', 60, 10, 14, 11,
+             'MANUFACTURER', 'make model', 'rebuilt', 'other', TO_DATE('0001-01-01', 'YYYY-MM-DD'))
+;
+INSERT INTO amhrtdb.location(MANHOMID, LOCATNID, STATUS, REGDOCID, STNUMBER, STNAME, TOWNCITY, PROVINCE, MAHPNAME,
+                             MAHPPAD, PIDNUMB, TAXCERT, TAXDATE, MHDEALER, ADDDESC)
+     VALUES (200000047, 1, 'A', 'UT000047', '1234', 'TEST-0033', 'CITY', 'BC', '', '', '005509807', 'N',
+             TO_DATE('0001-01-01', 'YYYY-MM-DD'), '', 'additional')
+;
+INSERT INTO amhrtdb.owngroup(MANHOMID, OWNGRPID, COPGRPID, GRPSEQNO, STATUS, REGDOCID, TENYTYPE, INTEREST, INTNUMER, TENYSPEC)
+     VALUES (200000047, 1, 0, 1, '3', 'UT000047', 'SO', '', 0, 'Y')
+;
+INSERT INTO amhrtdb.owner(MANHOMID, OWNGRPID, OWNERID, OWNSEQNO, VERIFIED, OWNRTYPE, COMPNAME, OWNRFONE, OWNRPOCO, OWNRNAME, OWNRSUFF, OWNRADDR)
+     VALUES (200000047, 1, 1, 1, ' ', 'B', 'TESTEXRSACTIVE', '6041234567', 'V8R 3A5', 'TTEST EXRS ACTIVE', '',
+             '1234 TEST-0033                          CITY                                    BC CA')
+;
+INSERT INTO amhrtdb.cmpserno(MANHOMID, CMPSERID, SERIALNO)
+     VALUES (200000047, 1, (SELECT serialno FROM amhrtdb.cmpserno WHERE manhomid = 40865 AND CMPSERID = 1))
+;
+-- UT-0033 000932 NCON note registration
+INSERT INTO amhrtdb.document(DOCUMTID, MHREGNUM, DRAFDATE, REGIDATE, DOCUTYPE, DOCUREGI, OWNLAND, UPDATEID, PHONE, NAME, ADDRESS, AFFIRMBY, OLBCFOLI)
+     VALUES ('UT000048', '000932', current timestamp, current timestamp, 'NCON', '90499048', 'N', 'PS12345 ', '6041234567', 
+             'SUBMITTING', 
+             '1234 TEST-0033                                                                  CITY                                    BC CA                            V8R 3A5', 
+             'TEST USER', 'UT-0033')
+;
+INSERT INTO amhrtdb.mhomnote(MANHOMID, MHNOTEID, MHNOTENO, REGDOCID, CANDOCID, DOCUTYPE, STATUS, DESTROYD, EXPIRYDA, PHONE, NAME, ADDRESS, REMARKS)
+     VALUES (200000047, 1, 1, 'UT000048', '', 'NCON', 'A', '', TO_DATE('0001-01-01', 'YYYY-MM-DD'), '6041234567', 
+             'PERSON GIVING NOTICE', 
+             '1234 TEST-0033                                                                  CITY                                    BC CA                            V8R 3A5', 
+             'NCON NOTE REMARKS')
+;
+-- UT-0033 000932 TAXN note registration
+INSERT INTO amhrtdb.document(DOCUMTID, MHREGNUM, DRAFDATE, REGIDATE, DOCUTYPE, DOCUREGI, OWNLAND, UPDATEID, PHONE, NAME, ADDRESS, AFFIRMBY, OLBCFOLI)
+     VALUES ('UT000049', '000932', current timestamp, current timestamp, 'TAXN', '90499049', 'N', 'PS12345 ', '6041234567', 
+             'SUBMITTING', 
+             '1234 TEST-0033                                                                  CITY                                    BC CA                            V8R 3A5', 
+             'TEST USER', 'UT-0033')
+;
+INSERT INTO amhrtdb.mhomnote(MANHOMID, MHNOTEID, MHNOTENO, REGDOCID, CANDOCID, DOCUTYPE, STATUS, DESTROYD, EXPIRYDA, PHONE, NAME, ADDRESS, REMARKS)
+     VALUES (200000047, 2, 2, 'UT000049', '', 'TAXN', 'A', '', TO_DATE('0001-01-01', 'YYYY-MM-DD'), '6041234567', 
+             'PERSON GIVING NOTICE', 
+             '1234 TEST-0033                                                                  CITY                                    BC CA                            V8R 3A5', 
+             'TAXN NOTE REMARKS')
+;
+-- UT-0033 000932 EXRS registration
+INSERT INTO amhrtdb.document(DOCUMTID, MHREGNUM, DRAFDATE, REGIDATE, DOCUTYPE, DOCUREGI, OWNLAND, UPDATEID, PHONE, NAME, ADDRESS, AFFIRMBY, OLBCFOLI)
+     VALUES ('UT000050', '000932', current timestamp, current timestamp, 'EXRS', '90499050', 'N', 'PS12345 ', '6041234567', 
+             'SUBMITTING', 
+             '1234 TEST-0033                                                                  CITY                                    BC CA                            V8R 3A5', 
+             'TEST USER', 'UT-0033')
+;
+INSERT INTO amhrtdb.mhomnote(MANHOMID, MHNOTEID, MHNOTENO, REGDOCID, CANDOCID, DOCUTYPE, STATUS, DESTROYD, EXPIRYDA, PHONE, NAME, ADDRESS, REMARKS)
+     VALUES (200000047, 3, 3, 'UT000050', '', 'EXRS', 'A', '', TO_DATE('0001-01-01', 'YYYY-MM-DD'), '6041234567', 
+             'PERSON GIVING NOTICE', 
+             '1234 TEST-0033                                                                  CITY                                    BC CA                            V8R 3A5', 
+             'RESIDENTIAL REMARKS')
+;
+
diff --git a/mhr_api/test_data/postgres_data_files/test0008.sql b/mhr_api/test_data/postgres_data_files/test0008.sql
new file mode 100644
index 000000000..18be4d859
--- /dev/null
+++ b/mhr_api/test_data/postgres_data_files/test0008.sql
@@ -0,0 +1,135 @@
+-- UT-0033 000932 MHREG EXEMPT with NCON, TAXN notes.
+INSERT INTO mhr_registrations (id, mhr_number, account_id, registration_type, registration_ts, status_type, draft_id, 
+                               pay_invoice_id, pay_path, user_id, client_reference_id)
+     VALUES (200000047, '000932', 'PS12345', 'MHREG', now() at time zone 'UTC', 'EXEMPT', 200000001, null, null, 'TESTUSER', 'UT-0033')
+;
+INSERT INTO addresses(id, street, street_additional, city, region, postal_code, country)
+  VALUES(190000128, '1234 TEST-0033', NULL, 'CITY', 'BC', 'V8R 3A5', 'CA')
+;
+INSERT INTO mhr_parties(id, party_type, status_type, registration_id, change_registration_id, first_name, middle_name, 
+                        last_name, business_name, compressed_name, address_id, email_address, phone_number, phone_extension, 
+                        owner_group_id)
+    VALUES(200000108, 'SUBMITTING', 'ACTIVE', 200000047, 200000047, null, null, null, 'SUBMITTING',
+           mhr_name_compressed_key('SUBMITTING'), 190000128, 'test@gmail.com', '6041234567', null, null)
+;
+INSERT INTO addresses(id, street, street_additional, city, region, postal_code, country)
+  VALUES(190000129, '1234 TEST-0033', NULL, 'CITY', 'BC', 'V8R 3A5', 'CA')
+;
+INSERT INTO mhr_locations(id, location_type, status_type, registration_id, change_registration_id, address_id, ltsa_description, 
+                        additional_description, dealer_name, exception_plan, leave_province, tax_certification, tax_certification_date, 
+                        park_name, park_pad, pid_number, lot, parcel, block, district_lot, part_of, section,
+                        township, range, meridian, land_district, plan)
+    VALUES(200000047, 'OTHER', 'ACTIVE', 200000047, 200000047, 190000129,
+           'LOT 24 DISTRICT LOT 497 KAMLOOPS DIVISION YALE DISTRICT PLAN 25437',
+           'additional', NULL, NULL, 'N', 'Y', now() at time zone 'UTC', NULL, NULL, '005509807', NULL, NULL,
+           NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) 
+;
+INSERT INTO mhr_descriptions(id, status_type, registration_id, csa_number, csa_standard, number_of_sections, 
+                          square_feet, year_made, circa, engineer_date, engineer_name, manufacturer_name,
+                          make, model, rebuilt_remarks, other_remarks, change_registration_id)
+    VALUES(200000047, 'ACTIVE', 200000047, '7777700000', '1234', 3, NULL, 2015, 'Y', now() at time zone 'UTC',
+           'engineer name', 'manufacturer', 'make', 'model', 'rebuilt', 'other', 200000047)
+;
+INSERT INTO mhr_sections(id, registration_id, status_type, compressed_key, serial_number, length_feet, length_inches,
+                               width_feet, width_inches, change_registration_id)
+    VALUES(200000044, 200000047, 'ACTIVE', mhr_serial_compressed_key('888888'), '888888', 60, 10, 14, 11,
+           200000047)
+;
+INSERT INTO mhr_documents(id, document_type, registration_id, document_id, document_registration_number, attention_reference, 
+                          declared_value, consideration_value, own_land, transfer_date, consent, owner_x_reference, change_registration_id)
+    VALUES(200000047, 'REG_101', 200000047, 'UT000047', '90499047', 'attn', NULL, NULL, 'Y', null, null, null, 200000047)
+;
+INSERT INTO mhr_owner_groups(id, sequence_number, registration_id, status_type, tenancy_type, interest,
+                             tenancy_specified, interest_numerator, interest_denominator, change_registration_id)
+    VALUES(200000042, 1, 200000047, 'ACTIVE', 'SOLE', NULL, 'Y', NULL, NULL, 200000047)
+;
+INSERT INTO addresses(id, street, street_additional, city, region, postal_code, country)
+  VALUES(190000130, '1234 TEST-0033', NULL, 'CITY', 'BC', 'V8R 3A5', 'CA')
+;
+INSERT INTO mhr_parties(id, party_type, status_type, registration_id, change_registration_id, first_name, middle_name, 
+                        last_name, business_name, compressed_name, address_id, email_address, phone_number, phone_extension, 
+                        owner_group_id)
+    VALUES(200000109, 'OWNER_BUS', 'ACTIVE', 200000047, 200000047, null, null, null, 'TEST EXRS ACTIVE', 
+           mhr_name_compressed_key('TEST EXRS ACTIVE'), 190000130, null, NULL, null, 200000042)
+;
+-- UT-0033 000932 NCON note registration
+INSERT INTO mhr_registrations (id, mhr_number, account_id, registration_type, registration_ts, status_type, draft_id, 
+                               pay_invoice_id, pay_path, user_id, client_reference_id)
+     VALUES (200000048, '000932', 'PS12345', 'REG_STAFF_ADMIN', now() at time zone 'UTC', 'ACTIVE', 200000001, null, null, 'TESTUSER', 'UT-0033')
+;
+INSERT INTO addresses(id, street, street_additional, city, region, postal_code, country)
+  VALUES(190000131, '1234 TEST-0033', NULL, 'CITY', 'BC', 'V8R 3A5', 'CA')
+;
+INSERT INTO mhr_parties(id, party_type, status_type, registration_id, change_registration_id, first_name, middle_name, 
+                        last_name, business_name, compressed_name, address_id, email_address, phone_number, phone_extension, 
+                        owner_group_id)
+    VALUES(200000110, 'SUBMITTING', 'ACTIVE', 200000048, 200000048, null, null, null, 'SUBMITTING',
+           mhr_name_compressed_key('SUBMITTING'), 190000131, 'test@gmail.com', '6041234567', null, null)
+;
+INSERT INTO mhr_parties(id, party_type, status_type, registration_id, change_registration_id, first_name, middle_name, 
+                        last_name, business_name, compressed_name, address_id, email_address, phone_number, phone_extension, 
+                        owner_group_id)
+    VALUES(200000111, 'CONTACT', 'ACTIVE', 200000048, 200000048, null, null, null, 'PERSON GIVING NOTICE',
+           mhr_name_compressed_key('PERSON GIVING NOTICE'), 190000131, 'test@gmail.com', '6041234567', null, null)
+;
+INSERT INTO mhr_documents(id, document_type, registration_id, document_id, document_registration_number, attention_reference, 
+                          declared_value, consideration_value, own_land, transfer_date, consent, owner_x_reference, change_registration_id)
+    VALUES(200000048, 'NCON', 200000048, 'UT000048', '90499048', 'attn', NULL, NULL, 'Y', null, null, null, 200000048)
+;
+INSERT INTO mhr_notes(id, document_type, registration_id, document_id, status_type, remarks, destroyed,
+                      change_registration_id, expiry_date, effective_ts)
+    VALUES(200000034, 'NCON', 200000048, 200000048, 'ACTIVE', 'NCON NOTE REMARKS', 'N', 200000048,
+           null, now() at time zone 'UTC')
+;
+-- UT-0033 000932 TAXN note registration
+INSERT INTO mhr_registrations (id, mhr_number, account_id, registration_type, registration_ts, status_type, draft_id, 
+                               pay_invoice_id, pay_path, user_id, client_reference_id)
+     VALUES (200000049, '000932', 'PS12345', 'REG_STAFF_ADMIN', now() at time zone 'UTC', 'ACTIVE', 200000001, null, null, 'TESTUSER', 'UT-0033')
+;
+INSERT INTO addresses(id, street, street_additional, city, region, postal_code, country)
+  VALUES(190000132, '1234 TEST-0033', NULL, 'CITY', 'BC', 'V8R 3A5', 'CA')
+;
+INSERT INTO mhr_parties(id, party_type, status_type, registration_id, change_registration_id, first_name, middle_name, 
+                        last_name, business_name, compressed_name, address_id, email_address, phone_number, phone_extension, 
+                        owner_group_id)
+    VALUES(200000112, 'SUBMITTING', 'ACTIVE', 200000049, 200000049, null, null, null, 'SUBMITTING',
+           mhr_name_compressed_key('SUBMITTING'), 190000132, 'test@gmail.com', '6041234567', null, null)
+;
+INSERT INTO mhr_parties(id, party_type, status_type, registration_id, change_registration_id, first_name, middle_name, 
+                        last_name, business_name, compressed_name, address_id, email_address, phone_number, phone_extension, 
+                        owner_group_id)
+    VALUES(200000113, 'CONTACT', 'ACTIVE', 200000049, 200000049, null, null, null, 'PERSON GIVING NOTICE',
+           mhr_name_compressed_key('PERSON GIVING NOTICE'), 190000132, 'test@gmail.com', '6041234567', null, null)
+;
+INSERT INTO mhr_documents(id, document_type, registration_id, document_id, document_registration_number, attention_reference, 
+                          declared_value, consideration_value, own_land, transfer_date, consent, owner_x_reference, change_registration_id)
+    VALUES(200000049, 'TAXN', 200000049, 'UT000049', '90499049', 'attn', NULL, NULL, 'Y', null, null, null, 200000049)
+;
+INSERT INTO mhr_notes(id, document_type, registration_id, document_id, status_type, remarks, destroyed,
+                      change_registration_id, expiry_date, effective_ts)
+    VALUES(200000035, 'TAXN', 200000049, 200000049, 'ACTIVE', 'TAXN NOTE REMARKS', 'N', 200000049,
+           null, now() at time zone 'UTC')
+;
+-- UT-0033 000932 residential exemption registration
+INSERT INTO mhr_registrations (id, mhr_number, account_id, registration_type, registration_ts, status_type, draft_id, 
+                               pay_invoice_id, pay_path, user_id, client_reference_id)
+     VALUES (200000050, '000932', 'PS12345', 'EXEMPTION_RES', now() at time zone 'UTC', 'ACTIVE', 200000001, null, null, 'TESTUSER', 'UT-0033')
+;
+INSERT INTO addresses(id, street, street_additional, city, region, postal_code, country)
+  VALUES(190000133, '1234 TEST-0033', NULL, 'CITY', 'BC', 'V8R 3A5', 'CA')
+;
+INSERT INTO mhr_parties(id, party_type, status_type, registration_id, change_registration_id, first_name, middle_name, 
+                        last_name, business_name, compressed_name, address_id, email_address, phone_number, phone_extension, 
+                        owner_group_id)
+    VALUES(200000114, 'SUBMITTING', 'ACTIVE', 200000050, 200000050, null, null, null, 'SUBMITTING',
+           mhr_name_compressed_key('SUBMITTING'), 190000133, 'test@gmail.com', '6041234567', null, null)
+;
+INSERT INTO mhr_documents(id, document_type, registration_id, document_id, document_registration_number, attention_reference, 
+                          declared_value, consideration_value, own_land, transfer_date, consent, owner_x_reference, change_registration_id)
+    VALUES(200000050, 'EXRS', 200000050, 'UT000050', '90499050', 'attn', NULL, NULL, 'Y', null, null, null, 200000050)
+;
+INSERT INTO mhr_notes(id, document_type, registration_id, document_id, status_type, remarks, destroyed,
+                      change_registration_id, expiry_date, effective_ts)
+    VALUES(200000036, 'EXRS', 200000050, 200000050, 'ACTIVE', 'RESIDENTIAL REMARKS', 'N', 200000050,
+           null, now() at time zone 'UTC')
+;
diff --git a/mhr_api/tests/unit/utils/test_admin_validator.py b/mhr_api/tests/unit/utils/test_admin_validator.py
index 15f8a84b6..6bd8ca8d8 100644
--- a/mhr_api/tests/unit/utils/test_admin_validator.py
+++ b/mhr_api/tests/unit/utils/test_admin_validator.py
@@ -92,7 +92,7 @@
     ('Invalid missing submitting party', False, 'NRED', DOC_ID_VALID, '000914', 'PS12345',
      validator_utils.SUBMITTING_REQUIRED),
     ('Invalid FROZEN', False, 'NRED', DOC_ID_VALID, '000917', 'PS12345', validator_utils.STATE_NOT_ALLOWED),
-    ('Invalid EXEMPT', False, 'NRED', DOC_ID_VALID, '000912', 'PS12345', validator_utils.STATE_NOT_ALLOWED),
+    ('Invalid EXEMPT', False, 'REST', DOC_ID_VALID, '000912', 'PS12345', validator_utils.STATE_NOT_ALLOWED),
     ('Invalid CANCELLED', False, 'NRED', DOC_ID_VALID, '000913', 'PS12345', validator_utils.STATE_NOT_ALLOWED),
     ('Invalid missing doc id', False, 'NRED', None, '000914', 'PS12345', validator.DOC_ID_REQUIRED),
     ('Invalid doc id checksum', False, 'NRED', DOC_ID_INVALID_CHECKSUM, '000914', 'PS12345',
@@ -104,6 +104,7 @@
 # test data pattern is ({description}, {valid}, {update_doc_id}, {mhr_num}, {account}, {message_content})
 TEST_NOTE_DATA_NRED = [
     ('Valid TAXN', True, 'UT000020', '000914', 'PS12345', None),
+    ('Valid TAXN EXEMPT', True, 'UT000049', '000932', 'PS12345', None),
     ('Invalid no doc id', False, None, '000914', 'PS12345', validator.UPDATE_DOCUMENT_ID_REQUIRED),
     ('Invalid status', False, 'UT000014', '000910', 'PS12345', validator.UPDATE_DOCUMENT_ID_STATUS),
     ('Invalid doc type REST', False, 'UT000022', '000915', 'PS12345', validator.NRED_INVALID_TYPE)
@@ -128,6 +129,7 @@
 # test data pattern is ({description}, {valid}, {update_doc_id}, {mhr_num}, {account}, {message_content})
 TEST_NOTE_DATA_NCAN = [
     ('Valid REST', True, 'UT000022', '000915', 'PS12345', None),
+    ('Valid NCON EXEMPT', True, 'UT000048', '000932', 'PS12345', None),
     ('Invalid no doc id', False, None, '000915', 'PS12345', validator.NCAN_DOCUMENT_ID_REQUIRED),
     ('Invalid status', False, 'UT000011', '000909', 'PS12345', validator.NCAN_DOCUMENT_ID_STATUS),
     ('Invalid doc type TAXN', False, 'UT000020', '000914', 'PS12345', validator.NCAN_NOT_ALLOWED)
diff --git a/mhr_api/tests/unit/utils/test_note_validator.py b/mhr_api/tests/unit/utils/test_note_validator.py
index 92a1c31cd..ab2bac5d6 100644
--- a/mhr_api/tests/unit/utils/test_note_validator.py
+++ b/mhr_api/tests/unit/utils/test_note_validator.py
@@ -139,6 +139,7 @@
 TEST_NOTE_DATA_STATE = [
     ('Valid', True, 'CAUC', '000916', 'PS12345', None),
     ('Valid exempt NPUB', True, 'NPUB', '000912', 'PS12345', None),
+    ('Valid exempt NCON', True, 'NCON', '000912', 'PS12345', None),
     ('Invalid exempt not NPUB', False, 'CAU', '000912', 'PS12345', validator_utils.STATE_NOT_ALLOWED),
     ('Invalid cancelled', False, 'CAU', '000913', 'PS12345', validator_utils.STATE_NOT_ALLOWED)
  ]
diff --git a/mhr_api/tests/unit/utils/test_transfer_validator.py b/mhr_api/tests/unit/utils/test_transfer_validator.py
index f73e930d4..18f5f6f88 100644
--- a/mhr_api/tests/unit/utils/test_transfer_validator.py
+++ b/mhr_api/tests/unit/utils/test_transfer_validator.py
@@ -241,7 +241,7 @@
     ('Valid unchanged exec', True, True, 'COMMON', '000924', TRANS_TC_5, None),
     ('Valid split exec', True, True, 'COMMON', '000924', TRANS_TC_6, None),
     ('Invalid add TC type', False, True, 'COMMON', '000900', TRANS_TC_3, validator.GROUP_COMMON_INVALID),
-    ('Invalid add NA type', False, True, 'NA', '000900', TRANS_TC_3, validator.GROUP_COMMON_INVALID),
+    ('Invalid add NA type', False, True, 'NA', '000900', TRANS_TC_3, validator.TENANCY_TYPE_NA_INVALID),
     ('Invalid add exec', False, True, 'COMMON', '000924', TRANS_TC_5, validator.TRANSFER_PARTY_TYPE_INVALID)
 ]
 # testdata pattern is ({desc}, {valid}, {doc_type}, {reg_type}, {message content})