npm - taxtank-core - Versions diffs - 1.0.67 → 1.0.68 - Mend

taxtank-core 1.0.67 → 1.0.68

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/fesm2022/taxtank-core.mjs +1585 -1640
package/fesm2022/taxtank-core.mjs.map +1 -1
package/package.json +1 -1
package/src/lib/db/Models/depreciation/depreciation.d.ts +2 -0

package/fesm2022/taxtank-core.mjs CHANGED Viewed

@@ -2731,627 +2731,692 @@ function enumToList(data) {
 var ChartAccountsValues = [
 	{
 		id: 1,
-		chartAccounts: {
+		chart_accounts: {
 			id: 24
 		},
-		financialYear: 2017,
-		startDate: null,
-		endDate: null,
+		financial_year: 2017,
+		start_date: null,
+		end_date: null,
 		value: 0.66,
-		unitOfMeasure: "kilometres",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 2,
-		chartAccounts: {
+		chart_accounts: {
 			id: 24
 		},
-		financialYear: 2018,
-		startDate: null,
-		endDate: null,
+		financial_year: 2018,
+		start_date: null,
+		end_date: null,
 		value: 0.66,
-		unitOfMeasure: "kilometres",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 3,
-		chartAccounts: {
+		chart_accounts: {
 			id: 24
 		},
-		financialYear: 2019,
-		startDate: null,
-		endDate: null,
+		financial_year: 2019,
+		start_date: null,
+		end_date: null,
 		value: 0.68,
-		unitOfMeasure: "kilometres",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 4,
-		chartAccounts: {
+		chart_accounts: {
 			id: 24
 		},
-		financialYear: 2020,
-		startDate: null,
-		endDate: null,
+		financial_year: 2020,
+		start_date: null,
+		end_date: null,
 		value: 0.68,
-		unitOfMeasure: "kilometres",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 14,
-		chartAccounts: {
+		chart_accounts: {
 			id: 87
 		},
-		financialYear: 2018,
-		startDate: null,
-		endDate: null,
+		financial_year: 2018,
+		start_date: null,
+		end_date: null,
 		value: 0.45,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 15,
-		chartAccounts: {
+		chart_accounts: {
 			id: 87
 		},
-		financialYear: 2019,
-		startDate: null,
-		endDate: null,
+		financial_year: 2019,
+		start_date: null,
+		end_date: null,
 		value: 0.52,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 16,
-		chartAccounts: {
+		chart_accounts: {
 			id: 87
 		},
-		financialYear: 2020,
-		startDate: null,
-		endDate: null,
+		financial_year: 2020,
+		start_date: null,
+		end_date: null,
 		value: 0.52,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 17,
-		chartAccounts: {
+		chart_accounts: {
 			id: 103
 		},
-		financialYear: 2017,
-		startDate: null,
-		endDate: null,
+		financial_year: 2017,
+		start_date: null,
+		end_date: null,
 		value: 0.45,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 18,
-		chartAccounts: {
+		chart_accounts: {
 			id: 103
 		},
-		financialYear: 2018,
-		startDate: null,
-		endDate: null,
+		financial_year: 2018,
+		start_date: null,
+		end_date: null,
 		value: 0.45,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 19,
-		chartAccounts: {
+		chart_accounts: {
 			id: 103
 		},
-		financialYear: 2019,
-		startDate: null,
-		endDate: null,
+		financial_year: 2019,
+		start_date: null,
+		end_date: null,
 		value: 0.52,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 20,
-		chartAccounts: {
+		chart_accounts: {
 			id: 103
 		},
-		financialYear: 2020,
-		startDate: null,
-		endDate: null,
+		financial_year: 2020,
+		start_date: null,
+		end_date: null,
 		value: 0.52,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 21,
-		chartAccounts: {
+		chart_accounts: {
 			id: 288
 		},
-		financialYear: 2017,
-		startDate: null,
-		endDate: null,
+		financial_year: 2017,
+		start_date: null,
+		end_date: null,
 		value: 0.45,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 22,
-		chartAccounts: {
+		chart_accounts: {
 			id: 288
 		},
-		financialYear: 2018,
-		startDate: null,
-		endDate: null,
+		financial_year: 2018,
+		start_date: null,
+		end_date: null,
 		value: 0.45,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 23,
-		chartAccounts: {
+		chart_accounts: {
 			id: 288
 		},
-		financialYear: 2019,
-		startDate: null,
-		endDate: null,
+		financial_year: 2019,
+		start_date: null,
+		end_date: null,
 		value: 0.52,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 24,
-		chartAccounts: {
+		chart_accounts: {
 			id: 288
 		},
-		financialYear: 2020,
-		startDate: null,
-		endDate: null,
+		financial_year: 2020,
+		start_date: null,
+		end_date: null,
 		value: 0.52,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 25,
-		chartAccounts: {
+		chart_accounts: {
 			id: 24
 		},
-		financialYear: 2021,
-		startDate: null,
-		endDate: null,
+		financial_year: 2021,
+		start_date: null,
+		end_date: null,
 		value: 0.72,
-		unitOfMeasure: "kilometres",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 28,
-		chartAccounts: {
+		chart_accounts: {
 			id: 87
 		},
-		financialYear: 2021,
-		startDate: null,
-		endDate: null,
+		financial_year: 2021,
+		start_date: null,
+		end_date: null,
 		value: 0.52,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 29,
-		chartAccounts: {
+		chart_accounts: {
 			id: 103
 		},
-		financialYear: 2021,
-		startDate: null,
-		endDate: null,
+		financial_year: 2021,
+		start_date: null,
+		end_date: null,
 		value: 0.52,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 30,
-		chartAccounts: {
+		chart_accounts: {
 			id: 288
 		},
-		financialYear: 2021,
-		startDate: null,
-		endDate: null,
+		financial_year: 2021,
+		start_date: null,
+		end_date: null,
 		value: 0.52,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 31,
-		chartAccounts: {
+		chart_accounts: {
 			id: 24
 		},
-		financialYear: 2022,
-		startDate: null,
-		endDate: null,
+		financial_year: 2022,
+		start_date: null,
+		end_date: null,
 		value: 0.72,
-		unitOfMeasure: "kilometres",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 32,
-		chartAccounts: {
+		chart_accounts: {
 			id: 87
 		},
-		financialYear: 2022,
-		startDate: null,
-		endDate: null,
+		financial_year: 2022,
+		start_date: null,
+		end_date: null,
 		value: 0.52,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 33,
-		chartAccounts: {
+		chart_accounts: {
 			id: 103
 		},
-		financialYear: 2022,
-		startDate: null,
-		endDate: null,
+		financial_year: 2022,
+		start_date: null,
+		end_date: null,
 		value: 0.52,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 34,
-		chartAccounts: {
+		chart_accounts: {
 			id: 288
 		},
-		financialYear: 2022,
-		startDate: null,
-		endDate: null,
+		financial_year: 2022,
+		start_date: null,
+		end_date: null,
 		value: 0.52,
-		unitOfMeasure: "hours",
-		createdAt: "2020-05-23 00:00:00",
-		updatedAt: "2020-05-23 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2020-05-23 00:00:00",
+		updated_at: "2020-05-23 00:00:00"
 	},
 	{
 		id: 35,
-		chartAccounts: {
+		chart_accounts: {
 			id: 683
 		},
-		financialYear: 2017,
-		startDate: null,
-		endDate: null,
+		financial_year: 2017,
+		start_date: null,
+		end_date: null,
 		value: 0.66,
-		unitOfMeasure: "kilometres",
-		createdAt: "2022-03-08 00:00:00",
-		updatedAt: "2022-03-08 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2022-03-08 00:00:00",
+		updated_at: "2022-03-08 00:00:00"
 	},
 	{
 		id: 36,
-		chartAccounts: {
+		chart_accounts: {
 			id: 683
 		},
-		financialYear: 2018,
-		startDate: null,
-		endDate: null,
+		financial_year: 2018,
+		start_date: null,
+		end_date: null,
 		value: 0.66,
-		unitOfMeasure: "kilometres",
-		createdAt: "2022-03-08 00:00:00",
-		updatedAt: "2022-03-08 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2022-03-08 00:00:00",
+		updated_at: "2022-03-08 00:00:00"
 	},
 	{
 		id: 37,
-		chartAccounts: {
+		chart_accounts: {
 			id: 683
 		},
-		financialYear: 2019,
-		startDate: null,
-		endDate: null,
+		financial_year: 2019,
+		start_date: null,
+		end_date: null,
 		value: 0.68,
-		unitOfMeasure: "kilometres",
-		createdAt: "2022-03-08 00:00:00",
-		updatedAt: "2022-03-08 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2022-03-08 00:00:00",
+		updated_at: "2022-03-08 00:00:00"
 	},
 	{
 		id: 38,
-		chartAccounts: {
+		chart_accounts: {
 			id: 683
 		},
-		financialYear: 2020,
-		startDate: null,
-		endDate: null,
+		financial_year: 2020,
+		start_date: null,
+		end_date: null,
 		value: 0.68,
-		unitOfMeasure: "kilometres",
-		createdAt: "2022-03-08 00:00:00",
-		updatedAt: "2022-03-08 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2022-03-08 00:00:00",
+		updated_at: "2022-03-08 00:00:00"
 	},
 	{
 		id: 39,
-		chartAccounts: {
+		chart_accounts: {
 			id: 683
 		},
-		financialYear: 2021,
-		startDate: null,
-		endDate: null,
+		financial_year: 2021,
+		start_date: null,
+		end_date: null,
 		value: 0.72,
-		unitOfMeasure: "kilometres",
-		createdAt: "2022-03-08 00:00:00",
-		updatedAt: "2022-03-08 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2022-03-08 00:00:00",
+		updated_at: "2022-03-08 00:00:00"
 	},
 	{
 		id: 40,
-		chartAccounts: {
+		chart_accounts: {
 			id: 683
 		},
-		financialYear: 2022,
-		startDate: null,
-		endDate: null,
+		financial_year: 2022,
+		start_date: null,
+		end_date: null,
 		value: 0.72,
-		unitOfMeasure: "kilometres",
-		createdAt: "2022-03-08 00:00:00",
-		updatedAt: "2022-03-08 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2022-03-08 00:00:00",
+		updated_at: "2022-03-08 00:00:00"
 	},
 	{
 		id: 41,
-		chartAccounts: {
+		chart_accounts: {
 			id: 24
 		},
-		financialYear: 2023,
-		startDate: null,
-		endDate: null,
+		financial_year: 2023,
+		start_date: null,
+		end_date: null,
 		value: 0.78,
-		unitOfMeasure: "kilometres",
-		createdAt: "2022-06-29 00:00:00",
-		updatedAt: "2022-06-29 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2022-06-29 00:00:00",
+		updated_at: "2022-06-29 00:00:00"
 	},
 	{
 		id: 42,
-		chartAccounts: {
+		chart_accounts: {
 			id: 87
 		},
-		financialYear: 2023,
-		startDate: null,
-		endDate: null,
+		financial_year: 2023,
+		start_date: null,
+		end_date: null,
 		value: 0.67,
-		unitOfMeasure: "hours",
-		createdAt: "2022-06-29 00:00:00",
-		updatedAt: "2022-06-29 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2022-06-29 00:00:00",
+		updated_at: "2022-06-29 00:00:00"
 	},
 	{
 		id: 43,
-		chartAccounts: {
+		chart_accounts: {
 			id: 103
 		},
-		financialYear: 2023,
-		startDate: null,
-		endDate: null,
+		financial_year: 2023,
+		start_date: null,
+		end_date: null,
 		value: 0.67,
-		unitOfMeasure: "hours",
-		createdAt: "2022-06-29 00:00:00",
-		updatedAt: "2022-06-29 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2022-06-29 00:00:00",
+		updated_at: "2022-06-29 00:00:00"
 	},
 	{
 		id: 45,
-		chartAccounts: {
+		chart_accounts: {
 			id: 683
 		},
-		financialYear: 2023,
-		startDate: null,
-		endDate: null,
+		financial_year: 2023,
+		start_date: null,
+		end_date: null,
 		value: 0.78,
-		unitOfMeasure: "kilometres",
-		createdAt: "2022-06-29 00:00:00",
-		updatedAt: "2022-06-29 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2022-06-29 00:00:00",
+		updated_at: "2022-06-29 00:00:00"
 	},
 	{
 		id: 46,
-		chartAccounts: {
+		chart_accounts: {
 			id: 24
 		},
-		financialYear: 2024,
-		startDate: null,
-		endDate: null,
+		financial_year: 2024,
+		start_date: null,
+		end_date: null,
 		value: 0.85,
-		unitOfMeasure: "kilometres",
-		createdAt: "2023-07-01 00:00:00",
-		updatedAt: "2023-07-01 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2023-07-01 00:00:00",
+		updated_at: "2023-07-01 00:00:00"
 	},
 	{
 		id: 47,
-		chartAccounts: {
+		chart_accounts: {
 			id: 87
 		},
-		financialYear: 2024,
-		startDate: null,
-		endDate: null,
+		financial_year: 2024,
+		start_date: null,
+		end_date: null,
 		value: 0.67,
-		unitOfMeasure: "hours",
-		createdAt: "2023-07-01 00:00:00",
-		updatedAt: "2023-07-01 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2023-07-01 00:00:00",
+		updated_at: "2023-07-01 00:00:00"
 	},
 	{
 		id: 48,
-		chartAccounts: {
+		chart_accounts: {
 			id: 103
 		},
-		financialYear: 2024,
-		startDate: null,
-		endDate: null,
+		financial_year: 2024,
+		start_date: null,
+		end_date: null,
 		value: 0.67,
-		unitOfMeasure: "hours",
-		createdAt: "2023-07-01 00:00:00",
-		updatedAt: "2023-07-01 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2023-07-01 00:00:00",
+		updated_at: "2023-07-01 00:00:00"
 	},
 	{
 		id: 49,
-		chartAccounts: {
+		chart_accounts: {
 			id: 683
 		},
-		financialYear: 2024,
-		startDate: null,
-		endDate: null,
+		financial_year: 2024,
+		start_date: null,
+		end_date: null,
 		value: 0.85,
-		unitOfMeasure: "kilometres",
-		createdAt: "2023-07-01 00:00:00",
-		updatedAt: "2023-07-01 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2023-07-01 00:00:00",
+		updated_at: "2023-07-01 00:00:00"
 	},
 	{
 		id: 50,
-		chartAccounts: {
+		chart_accounts: {
 			id: 888
 		},
-		financialYear: 2023,
-		startDate: null,
-		endDate: null,
+		financial_year: 2023,
+		start_date: null,
+		end_date: null,
 		value: 0.67,
-		unitOfMeasure: "hours",
-		createdAt: "2024-01-29 15:15:00",
-		updatedAt: "2024-01-29 15:15:00"
+		unit_of_measure: "hours",
+		created_at: "2024-01-29 15:15:00",
+		updated_at: "2024-01-29 15:15:00"
 	},
 	{
 		id: 51,
-		chartAccounts: {
+		chart_accounts: {
 			id: 888
 		},
-		financialYear: 2024,
-		startDate: null,
-		endDate: null,
+		financial_year: 2024,
+		start_date: null,
+		end_date: null,
 		value: 0.67,
-		unitOfMeasure: "hours",
-		createdAt: "2024-01-29 15:15:00",
-		updatedAt: "2024-01-29 15:15:00"
+		unit_of_measure: "hours",
+		created_at: "2024-01-29 15:15:00",
+		updated_at: "2024-01-29 15:15:00"
 	},
 	{
 		id: 52,
-		chartAccounts: {
+		chart_accounts: {
 			id: 888
 		},
-		financialYear: 2021,
-		startDate: null,
-		endDate: null,
+		financial_year: 2021,
+		start_date: null,
+		end_date: null,
 		value: 0.52,
-		unitOfMeasure: "hours",
-		createdAt: "2024-01-30 15:15:00",
-		updatedAt: "2024-01-30 15:15:00"
+		unit_of_measure: "hours",
+		created_at: "2024-01-30 15:15:00",
+		updated_at: "2024-01-30 15:15:00"
 	},
 	{
 		id: 53,
-		chartAccounts: {
+		chart_accounts: {
 			id: 888
 		},
-		financialYear: 2022,
-		startDate: null,
-		endDate: null,
+		financial_year: 2022,
+		start_date: null,
+		end_date: null,
 		value: 0.52,
-		unitOfMeasure: "hours",
-		createdAt: "2024-01-30 15:15:00",
-		updatedAt: "2024-01-30 15:15:00"
+		unit_of_measure: "hours",
+		created_at: "2024-01-30 15:15:00",
+		updated_at: "2024-01-30 15:15:00"
 	},
 	{
 		id: 54,
-		chartAccounts: {
+		chart_accounts: {
 			id: 888
 		},
-		financialYear: 2023,
-		startDate: null,
-		endDate: null,
+		financial_year: 2023,
+		start_date: null,
+		end_date: null,
 		value: 0.67,
-		unitOfMeasure: "hours",
-		createdAt: "2024-02-01 15:15:00",
-		updatedAt: "2024-02-01 15:15:00"
+		unit_of_measure: "hours",
+		created_at: "2024-02-01 15:15:00",
+		updated_at: "2024-02-01 15:15:00"
 	},
 	{
 		id: 55,
-		chartAccounts: {
+		chart_accounts: {
 			id: 888
 		},
-		financialYear: 2024,
-		startDate: null,
-		endDate: null,
+		financial_year: 2024,
+		start_date: null,
+		end_date: null,
 		value: 0.67,
-		unitOfMeasure: "hours",
-		createdAt: "2024-02-01 15:15:00",
-		updatedAt: "2024-02-01 15:15:00"
+		unit_of_measure: "hours",
+		created_at: "2024-02-01 15:15:00",
+		updated_at: "2024-02-01 15:15:00"
 	},
 	{
 		id: 56,
-		chartAccounts: {
+		chart_accounts: {
 			id: 24
 		},
-		financialYear: 2025,
-		startDate: null,
-		endDate: null,
+		financial_year: 2025,
+		start_date: null,
+		end_date: null,
 		value: 0.88,
-		unitOfMeasure: "kilometres",
-		createdAt: "2024-06-25 00:00:00",
-		updatedAt: "2024-06-25 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2024-06-25 00:00:00",
+		updated_at: "2024-06-25 00:00:00"
 	},
 	{
 		id: 57,
-		chartAccounts: {
+		chart_accounts: {
 			id: 87
 		},
-		financialYear: 2025,
-		startDate: null,
-		endDate: null,
+		financial_year: 2025,
+		start_date: null,
+		end_date: null,
 		value: 0.7,
-		unitOfMeasure: "hours",
-		createdAt: "2024-06-25 00:00:00",
-		updatedAt: "2024-06-25 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2024-06-25 00:00:00",
+		updated_at: "2024-06-25 00:00:00"
 	},
 	{
 		id: 58,
-		chartAccounts: {
+		chart_accounts: {
 			id: 103
 		},
-		financialYear: 2025,
-		startDate: null,
-		endDate: null,
+		financial_year: 2025,
+		start_date: null,
+		end_date: null,
 		value: 0.7,
-		unitOfMeasure: "hours",
-		createdAt: "2024-06-25 00:00:00",
-		updatedAt: "2024-06-25 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2024-06-25 00:00:00",
+		updated_at: "2024-06-25 00:00:00"
 	},
 	{
 		id: 59,
-		chartAccounts: {
+		chart_accounts: {
 			id: 683
 		},
-		financialYear: 2025,
-		startDate: null,
-		endDate: null,
+		financial_year: 2025,
+		start_date: null,
+		end_date: null,
 		value: 0.88,
-		unitOfMeasure: "kilometres",
-		createdAt: "2024-06-25 00:00:00",
-		updatedAt: "2024-06-25 00:00:00"
+		unit_of_measure: "kilometres",
+		created_at: "2024-06-25 00:00:00",
+		updated_at: "2024-06-25 00:00:00"
 	},
 	{
 		id: 60,
-		chartAccounts: {
+		chart_accounts: {
 			id: 888
 		},
-		financialYear: 2025,
-		startDate: null,
-		endDate: null,
+		financial_year: 2025,
+		start_date: null,
+		end_date: null,
 		value: 0.7,
-		unitOfMeasure: "hours",
-		createdAt: "2024-06-25 00:00:00",
-		updatedAt: "2024-06-25 00:00:00"
+		unit_of_measure: "hours",
+		created_at: "2024-06-25 00:00:00",
+		updated_at: "2024-06-25 00:00:00"
+	},
+	{
+		id: 61,
+		chart_accounts: {
+			id: 24
+		},
+		financial_year: 2026,
+		start_date: null,
+		end_date: null,
+		value: 0.88,
+		unit_of_measure: "kilometres",
+		created_at: "2025-06-27 00:00:00",
+		updated_at: "2025-06-27 00:00:00"
+	},
+	{
+		id: 62,
+		chart_accounts: {
+			id: 87
+		},
+		financial_year: 2026,
+		start_date: null,
+		end_date: null,
+		value: 0.7,
+		unit_of_measure: "hours",
+		created_at: "2025-06-27 00:00:00",
+		updated_at: "2025-06-27 00:00:00"
+	},
+	{
+		id: 63,
+		chart_accounts: {
+			id: 103
+		},
+		financial_year: 2026,
+		start_date: null,
+		end_date: null,
+		value: 0.7,
+		unit_of_measure: "hours",
+		created_at: "2025-06-27 00:00:00",
+		updated_at: "2025-06-27 00:00:00"
+	},
+	{
+		id: 64,
+		chart_accounts: {
+			id: 683
+		},
+		financial_year: 2026,
+		start_date: null,
+		end_date: null,
+		value: 0.88,
+		unit_of_measure: "kilometres",
+		created_at: "2025-06-27 00:00:00",
+		updated_at: "2025-06-27 00:00:00"
+	},
+	{
+		id: 65,
+		chart_accounts: {
+			id: 888
+		},
+		financial_year: 2026,
+		start_date: null,
+		end_date: null,
+		value: 0.7,
+		unit_of_measure: "hours",
+		created_at: "2025-06-27 00:00:00",
+		updated_at: "2025-06-27 00:00:00"
 	}
 ];
@@ -11968,7 +12033,6 @@ let RestService$1 = class RestService extends DataService {
             return;
         }
         this.sseService.on(this.mercureTopic).pipe(map((response) => {
-            console.log(response);
             let model = this.createModelInstance(response);
             let method;
             if (model.id) {
@@ -11981,7 +12045,6 @@ let RestService$1 = class RestService extends DataService {
             }
             return { method, model };
         })).subscribe((change) => {
-            console.log(change);
             this.handleResponse([change.model], change.method);
         });
     }
@@ -17324,2075 +17387,1959 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.2", ngImpor
 var TaxReturnItems = [
 	{
 		id: 1,
-		taxReturnCategory: {
-			id: 1
-		},
-		code: 1,
-		subCode: "C",
-		taxReturnCode: null,
+		tax_return_category_id: 1,
+		code: "1",
+		sub_code: "C",
+		tax_return_code: null,
 		name: "Salary or wages",
 		seq: 10,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 2,
-		taxReturnCategory: {
-			id: 30
-		},
-		code: 2,
-		subCode: "K",
-		taxReturnCode: null,
+		tax_return_category_id: 30,
+		code: "2",
+		sub_code: "K",
+		tax_return_code: null,
 		name: "Allowances, earnings, tips, directors fees",
 		seq: 20,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 3,
-		taxReturnCategory: {
-			id: 31
-		},
-		code: 3,
-		subCode: "R",
-		taxReturnCode: null,
+		tax_return_category_id: 31,
+		code: "3",
+		sub_code: "R",
+		tax_return_code: null,
 		name: "Employer lump sum payments",
 		seq: 30,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 4,
-		taxReturnCategory: {
-			id: 32
-		},
-		code: 4,
-		subCode: "I",
-		taxReturnCode: null,
+		tax_return_category_id: 32,
+		code: "4",
+		sub_code: "I",
+		tax_return_code: null,
 		name: "Employment termination payments",
 		seq: 40,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 5,
-		taxReturnCategory: {
-			id: 2
-		},
-		code: 5,
-		subCode: "A",
-		taxReturnCode: null,
+		tax_return_category_id: 2,
+		code: "5",
+		sub_code: "A",
+		tax_return_code: null,
 		name: "Australian Government allowances and payments",
 		seq: 50,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 6,
-		taxReturnCategory: {
-			id: 33
-		},
-		code: 6,
-		subCode: "B",
-		taxReturnCode: null,
+		tax_return_category_id: 33,
+		code: "6",
+		sub_code: "B",
+		tax_return_code: null,
 		name: "Australian Government pensions and allowances",
 		seq: 60,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 7,
-		taxReturnCategory: {
-			id: 3
-		},
-		code: 7,
-		subCode: null,
-		taxReturnCode: null,
+		tax_return_category_id: 3,
+		code: "7",
+		sub_code: null,
+		tax_return_code: null,
 		name: "Australian annuities and superannuation income streams",
 		seq: 70,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 8,
-		taxReturnCategory: {
-			id: 34
-		},
-		code: 8,
-		subCode: null,
-		taxReturnCode: null,
+		tax_return_category_id: 34,
+		code: "8",
+		sub_code: null,
+		tax_return_code: null,
 		name: "Australian superannuation lump sum payments",
 		seq: 80,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 9,
-		taxReturnCategory: {
-			id: 4
-		},
-		code: 9,
-		subCode: "O",
-		taxReturnCode: null,
+		tax_return_category_id: 4,
+		code: "9",
+		sub_code: "O",
+		tax_return_code: null,
 		name: "Attributed personal services income",
 		seq: 90,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 10,
-		taxReturnCategory: {
-			id: 5
-		},
-		code: 10,
-		subCode: "L",
-		taxReturnCode: null,
+		tax_return_category_id: 5,
+		code: "10",
+		sub_code: "L",
+		tax_return_code: null,
 		name: "Gross interest",
 		seq: 100,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 11,
-		taxReturnCategory: {
-			id: 6
-		},
-		code: 11,
-		subCode: null,
-		taxReturnCode: null,
+		tax_return_category_id: 6,
+		code: "11",
+		sub_code: null,
+		tax_return_code: null,
 		name: "Dividends",
 		seq: 110,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 12,
-		taxReturnCategory: {
-			id: 35
-		},
-		code: 12,
-		subCode: null,
-		taxReturnCode: null,
+		tax_return_category_id: 35,
+		code: "12",
+		sub_code: null,
+		tax_return_code: null,
 		name: "Employee share schemes",
 		seq: 120,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
-	},
-	{
-		id: 13,
-		taxReturnCategory: {
-			id: 13
-		},
-		code: 13,
-		subCode: null,
-		taxReturnCode: null,
-		name: "Partnerships and trusts",
-		seq: 130,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 14,
-		taxReturnCategory: {
-			id: 14
-		},
-		code: 14,
-		subCode: "N",
-		taxReturnCode: null,
+		tax_return_category_id: 14,
+		code: "14",
+		sub_code: "N",
+		tax_return_code: null,
 		name: "Personal services income (PSI) - ABN not quoted",
 		seq: 140,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
-	},
-	{
-		id: 15,
-		taxReturnCategory: {
-			id: 38
-		},
-		code: 15,
-		subCode: null,
-		taxReturnCode: null,
-		name: "Net income or loss from business",
-		seq: 150,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
-	},
-	{
-		id: 16,
-		taxReturnCategory: {
-			id: 16
-		},
-		code: 16,
-		subCode: null,
-		taxReturnCode: null,
-		name: "Deferred non-commercial business losses",
-		seq: 160,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 17,
-		taxReturnCategory: {
-			id: 17
-		},
-		code: 17,
-		subCode: null,
-		taxReturnCode: null,
+		tax_return_category_id: 17,
+		code: "17",
+		sub_code: null,
+		tax_return_code: null,
 		name: "Net farm management deposits or repayments",
 		seq: 170,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 18,
-		taxReturnCategory: {
-			id: 15
-		},
-		code: 18,
-		subCode: null,
-		taxReturnCode: null,
+		tax_return_category_id: 15,
+		code: "18",
+		sub_code: null,
+		tax_return_code: null,
 		name: "Capital gains",
 		seq: 180,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 19,
-		taxReturnCategory: {
-			id: 17
-		},
-		code: 19,
-		subCode: null,
-		taxReturnCode: null,
+		tax_return_category_id: 17,
+		code: "19",
+		sub_code: null,
+		tax_return_code: null,
 		name: "Foreign entities",
 		seq: 190,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
-	},
-	{
-		id: 20,
-		taxReturnCategory: {
-			id: 16
-		},
-		code: 20,
-		subCode: null,
-		taxReturnCode: null,
-		name: "Foreign source income and foreign assets or property",
-		seq: 200,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 21,
-		taxReturnCategory: {
-			id: 12
-		},
-		code: 21,
-		subCode: "T",
-		taxReturnCode: "U",
+		tax_return_category_id: 12,
+		code: "21",
+		sub_code: "T",
+		tax_return_code: "U",
 		name: "Travel Expenses",
 		seq: 210,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 22,
-		taxReturnCategory: {
-			id: 8
-		},
-		code: 21,
-		subCode: "A",
-		taxReturnCode: "P",
+		tax_return_category_id: 8,
+		code: "21",
+		sub_code: "A",
+		tax_return_code: "P",
 		name: "Rental Income",
 		seq: 220,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 23,
-		taxReturnCategory: {
-			id: 8
-		},
-		code: 21,
-		subCode: "B",
-		taxReturnCode: "P",
+		tax_return_category_id: 8,
+		code: "21",
+		sub_code: "B",
+		tax_return_code: "P",
 		name: "Other rental Income",
 		seq: 230,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 24,
-		taxReturnCategory: {
-			id: 9
-		},
-		code: 21,
-		subCode: "L",
-		taxReturnCode: "Q",
+		tax_return_category_id: 9,
+		code: "21",
+		sub_code: "L",
+		tax_return_code: "Q",
 		name: "Interest on loan(s)",
 		seq: 240,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 25,
-		taxReturnCategory: {
-			id: 10
-		},
-		code: 21,
-		subCode: "R",
-		taxReturnCode: "F",
+		tax_return_category_id: 10,
+		code: "21",
+		sub_code: "R",
+		tax_return_code: "F",
 		name: "Capital Works - Depreciation",
 		seq: 250,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 26,
-		taxReturnCategory: {
-			id: 12
-		},
-		code: 21,
-		subCode: "D",
-		taxReturnCode: "U",
+		tax_return_category_id: 12,
+		code: "21",
+		sub_code: "D",
+		tax_return_code: "U",
 		name: "Advertising for tenants",
 		seq: 260,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 27,
-		taxReturnCategory: {
-			id: 12
-		},
-		code: 21,
-		subCode: "E",
-		taxReturnCode: "U",
+		tax_return_category_id: 12,
+		code: "21",
+		sub_code: "E",
+		tax_return_code: "U",
 		name: "Body Corporate Fees",
 		seq: 270,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 28,
-		taxReturnCategory: {
-			id: 29
-		},
-		code: 21,
-		subCode: "F",
-		taxReturnCode: "U",
+		tax_return_category_id: 29,
+		code: "21",
+		sub_code: "F",
+		tax_return_code: "U",
 		name: "Borrowing Expenses",
 		seq: 280,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 29,
-		taxReturnCategory: {
-			id: 12
-		},
-		code: 21,
-		subCode: "G",
-		taxReturnCode: "U",
+		tax_return_category_id: 12,
+		code: "21",
+		sub_code: "G",
+		tax_return_code: "U",
 		name: "Cleaning",
 		seq: 290,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 30,
-		taxReturnCategory: {
-			id: 12
-		},
-		code: 21,
-		subCode: "H",
-		taxReturnCode: "U",
+		tax_return_category_id: 12,
+		code: "21",
+		sub_code: "H",
+		tax_return_code: "U",
 		name: "Council Rates",
 		seq: 300,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 31,
-		taxReturnCategory: {
-			id: 12
-		},
-		code: 21,
-		subCode: "J",
-		taxReturnCode: "U",
+		tax_return_category_id: 12,
+		code: "21",
+		sub_code: "J",
+		tax_return_code: "U",
 		name: "Gardening / Lawn Mowing",
 		seq: 310,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 32,
-		taxReturnCategory: {
-			id: 11
-		},
-		code: 21,
-		subCode: "I",
-		taxReturnCode: "U",
+		tax_return_category_id: 11,
+		code: "21",
+		sub_code: "I",
+		tax_return_code: "U",
 		name: "Plant & Equipment - Depreciation & Low Value Pool",
 		seq: 320,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 33,
-		taxReturnCategory: {
-			id: 12
-		},
-		code: 21,
-		subCode: "K",
-		taxReturnCode: "U",
+		tax_return_category_id: 12,
+		code: "21",
+		sub_code: "K",
+		tax_return_code: "U",
 		name: "Insurance",
 		seq: 330,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 34,
-		taxReturnCategory: {
-			id: 12
-		},
-		code: 21,
-		subCode: "M",
-		taxReturnCode: "U",
+		tax_return_category_id: 12,
+		code: "21",
+		sub_code: "M",
+		tax_return_code: "U",
 		name: "Land Tax",
 		seq: 340,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 35,
-		taxReturnCategory: {
-			id: 12
-		},
-		code: 21,
-		subCode: "N",
-		taxReturnCode: "U",
+		tax_return_category_id: 12,
+		code: "21",
+		sub_code: "N",
+		tax_return_code: "U",
 		name: "Legal Fees",
 		seq: 350,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 36,
-		taxReturnCategory: {
-			id: 12
-		},
-		code: 21,
-		subCode: "O",
-		taxReturnCode: "U",
+		tax_return_category_id: 12,
+		code: "21",
+		sub_code: "O",
+		tax_return_code: "U",
 		name: "Pest Control",
 		seq: 360,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 37,
-		taxReturnCategory: {
-			id: 12
-		},
-		code: 21,
-		subCode: "P",
-		taxReturnCode: "U",
+		tax_return_category_id: 12,
+		code: "21",
+		sub_code: "P",
+		tax_return_code: "U",
 		name: "Property Management Fees",
 		seq: 370,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 38,
-		taxReturnCategory: {
-			id: 12
-		},
-		code: 21,
-		subCode: "Q",
-		taxReturnCode: "U",
+		tax_return_category_id: 12,
+		code: "21",
+		sub_code: "Q",
+		tax_return_code: "U",
 		name: "Repairs & Maintenance",
 		seq: 380,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 39,
-		taxReturnCategory: {
-			id: 12
-		},
-		code: 21,
-		subCode: "S",
-		taxReturnCode: "U",
+		tax_return_category_id: 12,
+		code: "21",
+		sub_code: "S",
+		tax_return_code: "U",
 		name: "Stationery / Phone / Postage",
 		seq: 390,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 40,
-		taxReturnCategory: {
-			id: 12
-		},
-		code: 21,
-		subCode: "U",
-		taxReturnCode: "U",
+		tax_return_category_id: 12,
+		code: "21",
+		sub_code: "U",
+		tax_return_code: "U",
 		name: "Water Charges",
 		seq: 400,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 41,
-		taxReturnCategory: {
-			id: 12
-		},
-		code: 21,
-		subCode: "V",
-		taxReturnCode: "U",
+		tax_return_category_id: 12,
+		code: "21",
+		sub_code: "V",
+		tax_return_code: "U",
 		name: "Sundry Rental Expenses",
 		seq: 410,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 42,
-		taxReturnCategory: {
-			id: 17
-		},
-		code: 22,
-		subCode: "W",
-		taxReturnCode: null,
+		tax_return_category_id: 17,
+		code: "22",
+		sub_code: "W",
+		tax_return_code: null,
 		name: "Bonuses from life insurance companies and friendly societies",
 		seq: 420,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 43,
-		taxReturnCategory: {
-			id: 39
-		},
-		code: 23,
-		subCode: null,
-		taxReturnCode: null,
+		tax_return_category_id: 39,
+		code: "23",
+		sub_code: null,
+		tax_return_code: null,
 		name: "Forestry managed investment scheme income",
 		seq: 430,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 44,
-		taxReturnCategory: {
-			id: 40
-		},
-		code: 24,
-		subCode: null,
-		taxReturnCode: null,
+		tax_return_category_id: 40,
+		code: "24",
+		sub_code: null,
+		tax_return_code: null,
 		name: "Other income",
 		seq: 440,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 45,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 65,
 		code: "D1",
-		subCode: null,
-		taxReturnCode: null,
+		sub_code: null,
+		tax_return_code: null,
 		name: "Work-related car expenses",
 		seq: 450,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 46,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 65,
 		code: "D1",
-		subCode: "Claim S",
-		taxReturnCode: null,
+		sub_code: "Claim S",
+		tax_return_code: null,
 		name: "Klm's travelled for work",
 		seq: 460,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 47,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 65,
 		code: "D1",
-		subCode: "Claim B",
-		taxReturnCode: null,
+		sub_code: "Claim B",
+		tax_return_code: null,
 		name: "Depreciation - Vehicles",
 		seq: 470,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 48,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 66,
 		code: "D2",
-		subCode: null,
-		taxReturnCode: null,
+		sub_code: null,
+		tax_return_code: null,
 		name: "Work-related travel expenses",
 		seq: 480,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 49,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 66,
 		code: "D2",
-		subCode: "A",
-		taxReturnCode: null,
+		sub_code: "A",
+		tax_return_code: null,
 		name: "Award Transport",
 		seq: 490,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 50,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 66,
 		code: "D2",
-		subCode: "D",
-		taxReturnCode: null,
+		sub_code: "D",
+		tax_return_code: null,
 		name: "Domestic Transport",
 		seq: 500,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 51,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 66,
 		code: "D2",
-		subCode: "T",
-		taxReturnCode: null,
+		sub_code: "T",
+		tax_return_code: null,
 		name: "Tolls",
 		seq: 510,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 52,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 66,
 		code: "D2",
-		subCode: "P",
-		taxReturnCode: null,
+		sub_code: "P",
+		tax_return_code: null,
 		name: "Parking",
 		seq: 520,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 53,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 66,
 		code: "D2",
-		subCode: "V",
-		taxReturnCode: null,
+		sub_code: "V",
+		tax_return_code: null,
 		name: "Hire Vehicle Expenses",
 		seq: 530,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 54,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 66,
 		code: "D2",
-		subCode: "O",
-		taxReturnCode: null,
+		sub_code: "O",
+		tax_return_code: null,
 		name: "Travel Expenses - Other",
 		seq: 540,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 55,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 67,
 		code: "D3",
-		subCode: null,
-		taxReturnCode: null,
+		sub_code: null,
+		tax_return_code: null,
 		name: "Work-related clothing expenses",
 		seq: 550,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 56,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 67,
 		code: "D3",
-		subCode: "C",
-		taxReturnCode: null,
+		sub_code: "C",
+		tax_return_code: null,
 		name: "Compulsory Work Uniform",
 		seq: 560,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 57,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 67,
 		code: "D3",
-		subCode: "P",
-		taxReturnCode: null,
+		sub_code: "P",
+		tax_return_code: null,
 		name: "Hi Vis Workwear",
 		seq: 570,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 58,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 67,
 		code: "D3",
-		subCode: "S",
-		taxReturnCode: null,
+		sub_code: "S",
+		tax_return_code: null,
 		name: "Occupational Specific Clothing",
 		seq: 580,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 59,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 68,
 		code: "D4",
-		subCode: null,
-		taxReturnCode: null,
+		sub_code: null,
+		tax_return_code: null,
 		name: "Work-related self-education expenses",
 		seq: 590,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 60,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 68,
 		code: "D4",
-		subCode: "A",
-		taxReturnCode: null,
+		sub_code: "A",
+		tax_return_code: null,
 		name: "Course Fees",
 		seq: 600,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 61,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: null,
-		taxReturnCode: null,
+		sub_code: null,
+		tax_return_code: null,
 		name: "Other work-related expenses",
 		seq: 610,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 62,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: "A",
-		taxReturnCode: null,
+		sub_code: "A",
+		tax_return_code: null,
 		name: "Mobile Phone",
 		seq: 620,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 63,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: "B",
-		taxReturnCode: null,
+		sub_code: "B",
+		tax_return_code: null,
 		name: "Books, Journals",
 		seq: 630,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 64,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: "E",
-		taxReturnCode: null,
+		sub_code: "E",
+		tax_return_code: null,
 		name: "Internet",
 		seq: 640,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 65,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: "F",
-		taxReturnCode: null,
+		sub_code: "F",
+		tax_return_code: null,
 		name: "Financial Institutions Duty (FID)",
 		seq: 650,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 66,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: "G",
-		taxReturnCode: null,
+		sub_code: "G",
+		tax_return_code: null,
 		name: "Subscriptions",
 		seq: 660,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 67,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: "H",
-		taxReturnCode: null,
+		sub_code: "H",
+		tax_return_code: null,
 		name: "Home Office - Running",
 		seq: 670,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 68,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: "I",
-		taxReturnCode: null,
+		sub_code: "I",
+		tax_return_code: null,
 		name: "Work-related depreciation",
 		seq: 680,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 70,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: "J",
-		taxReturnCode: null,
+		sub_code: "J",
+		tax_return_code: null,
 		name: "Home Office - Occupancy",
 		seq: 700,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 71,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: "M",
-		taxReturnCode: null,
+		sub_code: "M",
+		tax_return_code: null,
 		name: "Award Overtime Meal Allowance Expense",
 		seq: 710,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 72,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: "N",
-		taxReturnCode: null,
+		sub_code: "N",
+		tax_return_code: null,
 		name: "Newspaper",
 		seq: 720,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 73,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: "P",
-		taxReturnCode: null,
+		sub_code: "P",
+		tax_return_code: null,
 		name: "Printing, Postage & Stationery",
 		seq: 730,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 74,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: "S",
-		taxReturnCode: null,
+		sub_code: "S",
+		tax_return_code: null,
 		name: "Seminars, workshops and courses",
 		seq: 740,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 75,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: "T",
-		taxReturnCode: null,
+		sub_code: "T",
+		tax_return_code: null,
 		name: "Telephone",
 		seq: 750,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 76,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: "U",
-		taxReturnCode: null,
+		sub_code: "U",
+		tax_return_code: null,
 		name: "Union Fees",
 		seq: 760,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 77,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 69,
 		code: "D5",
-		subCode: "O",
-		taxReturnCode: null,
+		sub_code: "O",
+		tax_return_code: null,
 		name: "Other work-related expenses",
 		seq: 770,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 78,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 70,
 		code: "D6",
-		subCode: null,
-		taxReturnCode: null,
+		sub_code: null,
+		tax_return_code: null,
 		name: "Low-value pool deduction",
 		seq: 780,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 79,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 71,
 		code: "D7",
-		subCode: null,
-		taxReturnCode: null,
+		sub_code: null,
+		tax_return_code: null,
 		name: "Interest Deductions",
 		seq: 790,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 80,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 71,
 		code: "D7",
-		subCode: "BL",
-		taxReturnCode: null,
+		sub_code: "BL",
+		tax_return_code: null,
 		name: "Interest Deductions - Linked Bonded & Notes",
 		seq: 800,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 81,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 71,
 		code: "D7",
-		subCode: "BO",
-		taxReturnCode: null,
+		sub_code: "BO",
+		tax_return_code: null,
 		name: "Interest Deductions - Bonds Other",
 		seq: 810,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 82,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 71,
 		code: "D7",
-		subCode: "CN",
-		taxReturnCode: null,
+		sub_code: "CN",
+		tax_return_code: null,
 		name: "Interest Deductions - Convertible Notes",
 		seq: 820,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 83,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 71,
 		code: "D7",
-		subCode: "CP",
-		taxReturnCode: null,
+		sub_code: "CP",
+		tax_return_code: null,
 		name: "Interest Deductions - Convertible Preference Shares",
 		seq: 830,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 84,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 71,
 		code: "D7",
-		subCode: "IR",
-		taxReturnCode: null,
+		sub_code: "IR",
+		tax_return_code: null,
 		name: "Interest Deductions - Instalment Receipts",
 		seq: 840,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 85,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 71,
 		code: "D7",
-		subCode: "MA",
-		taxReturnCode: null,
+		sub_code: "MA",
+		tax_return_code: null,
 		name: "Interest Deductions - Allocated Pensions & Annuities",
 		seq: 850,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 86,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 71,
 		code: "D7",
-		subCode: "MF",
-		taxReturnCode: null,
+		sub_code: "MF",
+		tax_return_code: null,
 		name: "Interest Deductions - Friendly Society",
 		seq: 860,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 87,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 72,
 		code: "D8",
-		subCode: null,
-		taxReturnCode: null,
+		sub_code: null,
+		tax_return_code: null,
 		name: "Dividend Deductions",
 		seq: 870,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 88,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 72,
 		code: "D8",
-		subCode: "BL",
-		taxReturnCode: null,
+		sub_code: "BL",
+		tax_return_code: null,
 		name: "Dividend Deductions - Linked Bonded & Notes",
 		seq: 880,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 89,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 72,
 		code: "D8",
-		subCode: "BO",
-		taxReturnCode: null,
+		sub_code: "BO",
+		tax_return_code: null,
 		name: "Dividend Deductions - Bonds Other",
 		seq: 890,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 90,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 72,
 		code: "D8",
-		subCode: "CN",
-		taxReturnCode: null,
+		sub_code: "CN",
+		tax_return_code: null,
 		name: "Dividend Deductions - Convertible Notes",
 		seq: 900,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 91,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 72,
 		code: "D8",
-		subCode: "CP",
-		taxReturnCode: null,
+		sub_code: "CP",
+		tax_return_code: null,
 		name: "Dividend Deductions - Convertible Preference Share",
 		seq: 910,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 92,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 72,
 		code: "D8",
-		subCode: "MA",
-		taxReturnCode: null,
+		sub_code: "MA",
+		tax_return_code: null,
 		name: "Dividend Deductions - Allocated Pensions & Annuities",
 		seq: 920,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 93,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 72,
 		code: "D8",
-		subCode: "MF",
-		taxReturnCode: null,
+		sub_code: "MF",
+		tax_return_code: null,
 		name: "Dividend Deductions - Friendly Society",
 		seq: 930,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 94,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 73,
 		code: "D9",
-		subCode: "J",
-		taxReturnCode: null,
+		sub_code: "J",
+		tax_return_code: null,
 		name: "Gifts or donations",
 		seq: 940,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 95,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 74,
 		code: "D10",
-		subCode: null,
-		taxReturnCode: null,
+		sub_code: null,
+		tax_return_code: null,
 		name: "Cost of managing tax affairs",
 		seq: 950,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 96,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 74,
 		code: "D10",
-		subCode: "N",
-		taxReturnCode: null,
+		sub_code: "N",
+		tax_return_code: null,
 		name: "Interest Charged by ATO",
 		seq: 960,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 97,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 74,
 		code: "D10",
-		subCode: "L",
-		taxReturnCode: null,
+		sub_code: "L",
+		tax_return_code: null,
 		name: "Litigation Costs",
 		seq: 970,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 98,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 74,
 		code: "D10",
-		subCode: "M",
-		taxReturnCode: null,
+		sub_code: "M",
+		tax_return_code: null,
 		name: "Accounting Fees",
 		seq: 980,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 99,
-		taxReturnCategory: {
-			id: 7
-		},
+		tax_return_category_id: 75,
 		code: "D11",
-		subCode: null,
-		taxReturnCode: null,
+		sub_code: null,
+		tax_return_code: null,
 		name: "Deductible amount of undeducted purchase price of a foreign pension or annuity",
 		seq: 990,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 100,
-		taxReturnCategory: {
-			id: 18
-		},
+		tax_return_category_id: 81,
 		code: "D12",
-		subCode: null,
-		taxReturnCode: null,
+		sub_code: null,
+		tax_return_code: null,
 		name: "Personal superannuation contributions",
 		seq: 1000,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 101,
-		taxReturnCategory: {
-			id: 18
-		},
+		tax_return_category_id: 81,
 		code: "D12",
-		subCode: "H",
-		taxReturnCode: null,
+		sub_code: "H",
+		tax_return_code: null,
 		name: "Personal Super Contributions (Non-Deductible)",
 		seq: 1010,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 102,
-		taxReturnCategory: {
-			id: 18
-		},
+		tax_return_category_id: 82,
 		code: "D13",
-		subCode: null,
-		taxReturnCode: null,
+		sub_code: null,
+		tax_return_code: null,
 		name: "Deduction for project pool",
 		seq: 1020,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 103,
-		taxReturnCategory: {
-			id: 18
-		},
+		tax_return_category_id: 83,
 		code: "D14",
-		subCode: "A",
-		taxReturnCode: null,
+		sub_code: "A",
+		tax_return_code: null,
 		name: "Forestry managed investment scheme deduction",
 		seq: 1030,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 104,
-		taxReturnCategory: {
-			id: 18
-		},
+		tax_return_category_id: 76,
 		code: "D15",
-		subCode: "O",
-		taxReturnCode: null,
+		sub_code: "O",
+		tax_return_code: null,
 		name: "Non capital losses on disposal of assets",
 		seq: 1040,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 105,
-		taxReturnCategory: {
-			id: 18
-		},
+		tax_return_category_id: 76,
 		code: "D15",
-		subCode: "P",
-		taxReturnCode: null,
+		sub_code: "P",
+		tax_return_code: null,
 		name: "Income Protection Insurance",
 		seq: 1050,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
-	},
-	{
-		id: 133,
-		taxReturnCategory: {
-			id: 18
-		},
-		code: "D16",
-		subCode: null,
-		taxReturnCode: null,
-		name: "Private income and expenses",
-		seq: 1330,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 134,
-		taxReturnCategory: {
-			id: 31
-		},
-		code: 3,
-		subCode: "H",
-		taxReturnCode: null,
+		tax_return_category_id: 31,
+		code: "3",
+		sub_code: "H",
+		tax_return_code: null,
 		name: "Lump Sum B",
 		seq: 35,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 135,
-		taxReturnCategory: {
-			id: 40
-		},
-		code: 24,
-		subCode: "E",
-		taxReturnCode: null,
+		tax_return_category_id: 40,
+		code: "24",
+		sub_code: "E",
+		tax_return_code: null,
 		name: "Tax Withheld Lump Sum payments in arrears",
 		seq: 441,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 136,
-		taxReturnCategory: {
-			id: 40
-		},
-		code: 24,
-		subCode: "Y",
-		taxReturnCode: null,
+		tax_return_category_id: 40,
+		code: "24",
+		sub_code: "Y",
+		tax_return_code: null,
 		name: "Other Income - Category 1",
 		seq: 442,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 137,
-		taxReturnCategory: {
-			id: 40
-		},
-		code: 24,
-		subCode: "V",
-		taxReturnCode: null,
-		name: "Other Income - Ctaegory 4",
+		tax_return_category_id: 78,
+		code: "24",
+		sub_code: "V",
+		tax_return_code: null,
+		name: "Other Income - Category 4",
 		seq: 443,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 138,
-		taxReturnCategory: {
-			id: 40
-		},
-		code: 24,
-		subCode: "Z",
-		taxReturnCode: null,
+		tax_return_category_id: 40,
+		code: "24",
+		sub_code: "Z",
+		tax_return_code: null,
 		name: "Taxable Professional Income",
 		seq: 444,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 139,
-		taxReturnCategory: {
-			id: 40
-		},
-		code: 24,
-		subCode: "X",
-		taxReturnCode: null,
+		tax_return_category_id: 40,
+		code: "24",
+		sub_code: "X",
+		tax_return_code: null,
 		name: "Other Income - Category 2 - ATO Interest",
 		seq: 445,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 140,
-		taxReturnCategory: {
-			id: 6
-		},
-		code: 11,
-		subCode: null,
-		taxReturnCode: null,
+		tax_return_category_id: 6,
+		code: "11",
+		sub_code: null,
+		tax_return_code: null,
 		name: "Dividends",
 		seq: 111,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 144,
-		taxReturnCategory: {
-			id: 3
-		},
-		code: 7,
-		subCode: "J",
-		taxReturnCode: null,
+		tax_return_category_id: 3,
+		code: "7",
+		sub_code: "J",
+		tax_return_code: null,
 		name: "Superannuation income streams - Taxed Element",
 		seq: 71,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 145,
-		taxReturnCategory: {
-			id: 3
-		},
-		code: 7,
-		subCode: "N",
-		taxReturnCode: null,
+		tax_return_category_id: 3,
+		code: "7",
+		sub_code: "N",
+		tax_return_code: null,
 		name: "Superannuation income streams - Untaxed Element",
 		seq: 72,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 146,
-		taxReturnCategory: {
-			id: 3
-		},
-		code: 7,
-		subCode: "M",
-		taxReturnCode: null,
+		tax_return_category_id: 3,
+		code: "7",
+		sub_code: "M",
+		tax_return_code: null,
 		name: "Assessable Amount From Capped Benefit",
 		seq: 73,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 147,
-		taxReturnCategory: {
-			id: 3
-		},
-		code: 7,
-		subCode: "Y",
-		taxReturnCode: null,
+		tax_return_category_id: 3,
+		code: "7",
+		sub_code: "Y",
+		tax_return_code: null,
 		name: "Lump Sum in Arrears - Taxed Element",
 		seq: 74,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 148,
-		taxReturnCategory: {
-			id: 3
-		},
-		code: 7,
-		subCode: "Z",
-		taxReturnCode: null,
+		tax_return_category_id: 3,
+		code: "7",
+		sub_code: "Z",
+		tax_return_code: null,
 		name: "Lump Sum in Arrears - Untaxed Element",
 		seq: 75,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 149,
-		taxReturnCategory: {
-			id: 34
-		},
-		code: 8,
-		subCode: "Q",
-		taxReturnCode: null,
+		tax_return_category_id: 34,
+		code: "8",
+		sub_code: "Q",
+		tax_return_code: null,
 		name: "Superannuation Lump Sum Payments - Taxed Element",
 		seq: 81,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 150,
-		taxReturnCategory: {
-			id: 34
-		},
-		code: 8,
-		subCode: "P",
-		taxReturnCode: null,
+		tax_return_category_id: 34,
+		code: "8",
+		sub_code: "P",
+		tax_return_code: null,
 		name: "Superannuation Lump Sum Payments - Untaxed Element",
 		seq: 82,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 151,
-		taxReturnCategory: {
-			id: 35
-		},
-		code: 12,
-		subCode: "D",
-		taxReturnCode: null,
+		tax_return_category_id: 35,
+		code: "12",
+		sub_code: "D",
+		tax_return_code: null,
 		name: "Discount From Taxed Upfront Schemes - Eligible for reduction",
 		seq: 121,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 152,
-		taxReturnCategory: {
-			id: 35
-		},
-		code: 12,
-		subCode: "E",
-		taxReturnCode: null,
+		tax_return_category_id: 35,
+		code: "12",
+		sub_code: "E",
+		tax_return_code: null,
 		name: "Discount From Taxed Upfront Schemes - Not Eligible for reduction",
 		seq: 122,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 153,
-		taxReturnCategory: {
-			id: 35
-		},
-		code: 12,
-		subCode: "F",
-		taxReturnCode: null,
+		tax_return_category_id: 35,
+		code: "12",
+		sub_code: "F",
+		tax_return_code: null,
 		name: "Discount From Deferral Schemes",
 		seq: 123,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 154,
-		taxReturnCategory: {
-			id: 36
-		},
-		code: 13,
-		subCode: "O",
-		taxReturnCode: null,
+		tax_return_category_id: 36,
+		code: "13",
+		sub_code: "O",
+		tax_return_code: null,
 		name: "Partnership Income",
 		seq: 131,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 155,
-		taxReturnCategory: {
-			id: 37
-		},
-		code: 13,
-		subCode: "U",
-		taxReturnCode: null,
+		tax_return_category_id: 37,
+		code: "13",
+		sub_code: "U",
+		tax_return_code: null,
 		name: "Trust Income",
 		seq: 132,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 156,
-		taxReturnCategory: {
-			id: 36
-		},
-		code: 13,
-		subCode: "B",
-		taxReturnCode: null,
+		tax_return_category_id: 36,
+		code: "13",
+		sub_code: "B",
+		tax_return_code: null,
 		name: "Partnership Expenses",
 		seq: 133,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 157,
-		taxReturnCategory: {
-			id: 37
-		},
-		code: 13,
-		subCode: "Y",
-		taxReturnCode: null,
+		tax_return_category_id: 37,
+		code: "13",
+		sub_code: "Y",
+		tax_return_code: null,
 		name: "Trust Expenses",
 		seq: 134,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 158,
-		taxReturnCategory: {
-			id: 14
-		},
-		code: 14,
-		subCode: "O",
-		taxReturnCode: null,
+		tax_return_category_id: 14,
+		code: "14",
+		sub_code: "O",
+		tax_return_code: null,
 		name: "Personal services income (PSI) - labour hire or other",
 		seq: 141,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 159,
-		taxReturnCategory: {
-			id: 14
-		},
-		code: 14,
-		subCode: "V",
-		taxReturnCode: null,
+		tax_return_category_id: 14,
+		code: "14",
+		sub_code: "V",
+		tax_return_code: null,
 		name: "Personal services income (PSI) - voluntary agreement",
 		seq: 148,
-		isOtherIncome: 1,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 1,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 160,
-		taxReturnCategory: {
-			id: 18
-		},
+		tax_return_category_id: 84,
 		code: "D15",
-		subCode: "D",
-		taxReturnCode: null,
+		sub_code: "D",
+		tax_return_code: null,
 		name: "Foreign exchange losses",
 		seq: 1055,
-		isOtherIncome: 0,
-		createdAt: "2020-06-01 00:00:00",
-		updatedAt: "2020-06-01 00:00:00"
+		is_other_income: 0,
+		created_at: "2020-06-01 00:00:00",
+		updated_at: "2020-06-01 00:00:00"
 	},
 	{
 		id: 161,
-		taxReturnCategory: {
-			id: 42
-		},
-		code: 15,
-		subCode: "D",
-		taxReturnCode: null,
+		tax_return_category_id: 42,
+		code: "15",
+		sub_code: "D",
+		tax_return_code: null,
 		name: "Gross payments - no ABN given",
 		seq: 1500,
-		isOtherIncome: 0,
-		createdAt: "2022-07-29 00:00:00",
-		updatedAt: "2022-07-29 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-07-29 00:00:00",
+		updated_at: "2022-07-29 00:00:00"
 	},
 	{
 		id: 162,
-		taxReturnCategory: {
-			id: 43
-		},
-		code: 15,
-		subCode: "F",
-		taxReturnCode: null,
+		tax_return_category_id: 43,
+		code: "15",
+		sub_code: "F",
+		tax_return_code: null,
 		name: "Gross payments - Voluntary agreement",
 		seq: 1510,
-		isOtherIncome: 0,
-		createdAt: "2022-07-29 00:00:00",
-		updatedAt: "2022-07-29 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-07-29 00:00:00",
+		updated_at: "2022-07-29 00:00:00"
 	},
 	{
 		id: 163,
-		taxReturnCategory: {
-			id: 50
-		},
-		code: 15,
-		subCode: "G",
-		taxReturnCode: null,
+		tax_return_category_id: 50,
+		code: "15",
+		sub_code: "G",
+		tax_return_code: null,
 		name: "Superannuation expenses",
 		seq: 1520,
-		isOtherIncome: 0,
-		createdAt: "2022-07-29 00:00:00",
-		updatedAt: "2022-07-29 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-07-29 00:00:00",
+		updated_at: "2022-07-29 00:00:00"
 	},
 	{
 		id: 164,
-		taxReturnCategory: {
-			id: 45
-		},
-		code: 15,
-		subCode: "H",
-		taxReturnCode: null,
+		tax_return_category_id: 45,
+		code: "15",
+		sub_code: "H",
+		tax_return_code: null,
 		name: "Assessable Government Payments",
 		seq: 1530,
-		isOtherIncome: 0,
-		createdAt: "2022-07-29 00:00:00",
-		updatedAt: "2022-07-29 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-07-29 00:00:00",
+		updated_at: "2022-07-29 00:00:00"
 	},
 	{
 		id: 165,
-		taxReturnCategory: {
-			id: 51
-		},
-		code: 15,
-		subCode: "I",
-		taxReturnCode: null,
+		tax_return_category_id: 51,
+		code: "15",
+		sub_code: "I",
+		tax_return_code: null,
 		name: "Bad debts",
 		seq: 1540,
-		isOtherIncome: 0,
-		createdAt: "2022-07-29 00:00:00",
-		updatedAt: "2022-07-29 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-07-29 00:00:00",
+		updated_at: "2022-07-29 00:00:00"
 	},
 	{
 		id: 166,
-		taxReturnCategory: {
-			id: 46
-		},
-		code: 15,
-		subCode: "U",
-		taxReturnCode: null,
+		tax_return_category_id: 46,
+		code: "15",
+		sub_code: "U",
+		tax_return_code: null,
 		name: "Other Business Income",
 		seq: 1550,
-		isOtherIncome: 0,
-		createdAt: "2022-07-29 00:00:00",
-		updatedAt: "2022-07-29 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-07-29 00:00:00",
+		updated_at: "2022-07-29 00:00:00"
 	},
 	{
 		id: 167,
-		taxReturnCategory: {
-			id: 53
-		},
-		code: 15,
-		subCode: "K",
-		taxReturnCode: null,
+		tax_return_category_id: 53,
+		code: "15",
+		sub_code: "K",
+		tax_return_code: null,
 		name: "Rent expenses",
 		seq: 1560,
-		isOtherIncome: 0,
-		createdAt: "2022-07-29 00:00:00",
-		updatedAt: "2022-07-29 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-07-29 00:00:00",
+		updated_at: "2022-07-29 00:00:00"
 	},
 	{
 		id: 168,
-		taxReturnCategory: {
-			id: 48
-		},
-		code: 15,
-		subCode: "L",
-		taxReturnCode: null,
+		tax_return_category_id: 48,
+		code: "15",
+		sub_code: "L",
+		tax_return_code: null,
 		name: "Purchases and other costs",
 		seq: 1570,
-		isOtherIncome: 0,
-		createdAt: "2022-07-29 00:00:00",
-		updatedAt: "2022-07-29 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-07-29 00:00:00",
+		updated_at: "2022-07-29 00:00:00"
 	},
 	{
 		id: 169,
-		taxReturnCategory: {
-			id: 56
-		},
-		code: 15,
-		subCode: "M",
-		taxReturnCode: null,
+		tax_return_category_id: 56,
+		code: "15",
+		sub_code: "M",
+		tax_return_code: null,
 		name: "Depreciation expenses",
 		seq: 1580,
-		isOtherIncome: 0,
-		createdAt: "2022-07-29 00:00:00",
-		updatedAt: "2022-07-29 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-07-29 00:00:00",
+		updated_at: "2022-07-29 00:00:00"
 	},
 	{
 		id: 170,
-		taxReturnCategory: {
-			id: 57
-		},
-		code: 15,
-		subCode: "N",
-		taxReturnCode: null,
+		tax_return_category_id: 57,
+		code: "15",
+		sub_code: "N",
+		tax_return_code: null,
 		name: "Motor vehicle expenses",
 		seq: 1590,
-		isOtherIncome: 0,
-		createdAt: "2022-07-29 00:00:00",
-		updatedAt: "2022-07-29 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-07-29 00:00:00",
+		updated_at: "2022-07-29 00:00:00"
 	},
 	{
 		id: 171,
-		taxReturnCategory: {
-			id: 44
-		},
-		code: 15,
-		subCode: "O",
-		taxReturnCode: null,
+		tax_return_category_id: 44,
+		code: "15",
+		sub_code: "O",
+		tax_return_code: null,
 		name: "Gross payments - Labour hire or other",
 		seq: 1600,
-		isOtherIncome: 0,
-		createdAt: "2022-07-29 00:00:00",
-		updatedAt: "2022-07-29 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-07-29 00:00:00",
+		updated_at: "2022-07-29 00:00:00"
 	},
 	{
 		id: 172,
-		taxReturnCategory: {
-			id: 58
-		},
-		code: 15,
-		subCode: "P",
-		taxReturnCode: null,
+		tax_return_category_id: 58,
+		code: "15",
+		sub_code: "P",
+		tax_return_code: null,
 		name: "All other expenses",
 		seq: 1610,
-		isOtherIncome: 0,
-		createdAt: "2022-07-29 00:00:00",
-		updatedAt: "2022-07-29 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-07-29 00:00:00",
+		updated_at: "2022-07-29 00:00:00"
 	},
 	{
 		id: 173,
-		taxReturnCategory: {
-			id: 54
-		},
-		code: 15,
-		subCode: "Q",
-		taxReturnCode: null,
+		tax_return_category_id: 54,
+		code: "15",
+		sub_code: "Q",
+		tax_return_code: null,
 		name: "Interest expenses within Australia",
 		seq: 1620,
-		isOtherIncome: 0,
-		createdAt: "2022-07-29 00:00:00",
-		updatedAt: "2022-07-29 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-07-29 00:00:00",
+		updated_at: "2022-07-29 00:00:00"
 	},
 	{
 		id: 174,
-		taxReturnCategory: {
-			id: 55
-		},
-		code: 15,
-		subCode: "R",
-		taxReturnCode: null,
+		tax_return_category_id: 55,
+		code: "15",
+		sub_code: "R",
+		tax_return_code: null,
 		name: "Interest expenses overseas",
 		seq: 1630,
-		isOtherIncome: 0,
-		createdAt: "2022-07-29 00:00:00",
-		updatedAt: "2022-07-29 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-07-29 00:00:00",
+		updated_at: "2022-07-29 00:00:00"
 	},
 	{
 		id: 175,
-		taxReturnCategory: {
-			id: 49
-		},
-		code: 15,
-		subCode: "F",
-		taxReturnCode: null,
+		tax_return_category_id: 49,
+		code: "15",
+		sub_code: "F",
+		tax_return_code: null,
 		name: "Contractors, subcontractors & commission expenses",
 		seq: 1575,
-		isOtherIncome: 0,
-		createdAt: "2022-08-31 00:00:00",
-		updatedAt: "2022-08-31 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-08-31 00:00:00",
+		updated_at: "2022-08-31 00:00:00"
 	},
 	{
 		id: 176,
-		taxReturnCategory: {
-			id: 52
-		},
-		code: 15,
-		subCode: "J",
-		taxReturnCode: null,
+		tax_return_category_id: 52,
+		code: "15",
+		sub_code: "J",
+		tax_return_code: null,
 		name: "Lease expenses",
 		seq: 1545,
-		isOtherIncome: 0,
-		createdAt: "2022-08-31 00:00:00",
-		updatedAt: "2022-08-31 00:00:00"
+		is_other_income: 0,
+		created_at: "2022-08-31 00:00:00",
+		updated_at: "2022-08-31 00:00:00"
 	},
 	{
 		id: 177,
-		taxReturnCategory: {
-			id: 14
-		},
-		code: 14,
-		subCode: "J",
-		taxReturnCode: null,
+		tax_return_category_id: 14,
+		code: "14",
+		sub_code: "J",
+		tax_return_code: null,
 		name: "Personal services income (PSI) - Other",
 		seq: 142,
-		isOtherIncome: 1,
-		createdAt: "2022-10-15 00:00:00",
-		updatedAt: "2022-10-15 00:00:00"
+		is_other_income: 1,
+		created_at: "2022-10-15 00:00:00",
+		updated_at: "2022-10-15 00:00:00"
 	},
 	{
 		id: 178,
-		taxReturnCategory: {
-			id: 14
-		},
-		code: 14,
-		subCode: "K",
-		taxReturnCode: null,
+		tax_return_category_id: 14,
+		code: "14",
+		sub_code: "K",
+		tax_return_code: null,
 		name: "Personal services income (PSI) - Deductions Associates",
 		seq: 143,
-		isOtherIncome: 1,
-		createdAt: "2022-10-15 00:00:00",
-		updatedAt: "2022-10-15 00:00:00"
+		is_other_income: 1,
+		created_at: "2022-10-15 00:00:00",
+		updated_at: "2022-10-15 00:00:00"
 	},
 	{
 		id: 179,
-		taxReturnCategory: {
-			id: 14
-		},
-		code: 14,
-		subCode: "L",
-		taxReturnCode: null,
+		tax_return_category_id: 14,
+		code: "14",
+		sub_code: "L",
+		tax_return_code: null,
 		name: "Personal services income (PSI) - Deductions Other",
 		seq: 144,
-		isOtherIncome: 1,
-		createdAt: "2022-10-15 00:00:00",
-		updatedAt: "2022-10-15 00:00:00"
+		is_other_income: 1,
+		created_at: "2022-10-15 00:00:00",
+		updated_at: "2022-10-15 00:00:00"
+	},
+	{
+		id: 180,
+		tax_return_category_id: 77,
+		code: "10",
+		sub_code: "L",
+		tax_return_code: null,
+		name: "Gross Income",
+		seq: 100,
+		is_other_income: 1,
+		created_at: "2025-04-18 00:00:00",
+		updated_at: "2025-04-18 00:00:00"
+	},
+	{
+		id: 181,
+		tax_return_category_id: 79,
+		code: "13",
+		sub_code: "O",
+		tax_return_code: null,
+		name: "Partnership Income",
+		seq: 131,
+		is_other_income: 1,
+		created_at: "2025-04-18 00:00:00",
+		updated_at: "2025-04-18 00:00:00"
+	},
+	{
+		id: 182,
+		tax_return_category_id: 80,
+		code: "13",
+		sub_code: "U",
+		tax_return_code: null,
+		name: "Trust Income",
+		seq: 132,
+		is_other_income: 1,
+		created_at: "2025-04-18 00:00:00",
+		updated_at: "2025-04-18 00:00:00"
+	},
+	{
+		id: 183,
+		tax_return_category_id: 71,
+		code: "D7",
+		sub_code: "MI",
+		tax_return_code: null,
+		name: "Interest Deductions - Insurance Bonds",
+		seq: 861,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 184,
+		tax_return_category_id: 71,
+		code: "D7",
+		sub_code: "MS",
+		tax_return_code: null,
+		name: "Interest Deductions - Superannuation",
+		seq: 862,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 185,
+		tax_return_category_id: 71,
+		code: "D7",
+		sub_code: "MO",
+		tax_return_code: null,
+		name: "Interest Deductions - Managed Funds Other",
+		seq: 863,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 186,
+		tax_return_category_id: 71,
+		code: "D7",
+		sub_code: "RP",
+		tax_return_code: null,
+		name: "Interest Deductions - Loans to Related Parties",
+		seq: 864,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 187,
+		tax_return_category_id: 71,
+		code: "D7",
+		sub_code: "SM",
+		tax_return_code: null,
+		name: "Interest Deductions - Shares Margin lending",
+		seq: 865,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 188,
+		tax_return_category_id: 71,
+		code: "D7",
+		sub_code: "SO",
+		tax_return_code: null,
+		name: "Interest Deductions - Shares Other",
+		seq: 866,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 189,
+		tax_return_category_id: 71,
+		code: "D7",
+		sub_code: "SS",
+		tax_return_code: null,
+		name: "Interest Deductions - Stapled Securities",
+		seq: 867,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 190,
+		tax_return_category_id: 71,
+		code: "D7",
+		sub_code: "OT",
+		tax_return_code: null,
+		name: "Interest Deductions - Other",
+		seq: 868,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 191,
+		tax_return_category_id: 71,
+		code: "D8",
+		sub_code: "MI",
+		tax_return_code: null,
+		name: "Dividend Deductions - Insurance Bonds",
+		seq: 931,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 192,
+		tax_return_category_id: 71,
+		code: "D8",
+		sub_code: "MS",
+		tax_return_code: null,
+		name: "Dividend Deductions - Superannuation",
+		seq: 932,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 193,
+		tax_return_category_id: 71,
+		code: "D8",
+		sub_code: "MO",
+		tax_return_code: null,
+		name: "Dividend Deductions - Managed Funds Other",
+		seq: 933,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 194,
+		tax_return_category_id: 71,
+		code: "D8",
+		sub_code: "RP",
+		tax_return_code: null,
+		name: "Dividend Deductions - Loans to Related Parties",
+		seq: 934,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 195,
+		tax_return_category_id: 71,
+		code: "D8",
+		sub_code: "SM",
+		tax_return_code: null,
+		name: "Dividend Deductions - Shares Margin lending",
+		seq: 935,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 196,
+		tax_return_category_id: 71,
+		code: "D8",
+		sub_code: "SO",
+		tax_return_code: null,
+		name: "Dividend Deductions - Shares Other",
+		seq: 936,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 197,
+		tax_return_category_id: 71,
+		code: "D8",
+		sub_code: "SS",
+		tax_return_code: null,
+		name: "Dividend Deductions - Stapled Securities",
+		seq: 937,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 198,
+		tax_return_category_id: 71,
+		code: "D8",
+		sub_code: "OT",
+		tax_return_code: null,
+		name: "Dividend Deductions - Other",
+		seq: 938,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
+	},
+	{
+		id: 199,
+		tax_return_category_id: 84,
+		code: "D15",
+		sub_code: "D",
+		tax_return_code: null,
+		name: "Portfolio Admin Fees",
+		seq: 1056,
+		is_other_income: 0,
+		created_at: "2025-05-26 00:00:00",
+		updated_at: "2025-05-26 00:00:00"
 	}
 ];
@@ -23149,7 +23096,7 @@ function atLeastOneEnabledValidator(arrayName) {
  * Form for import multiple basiq bank accounts
  */
 class BankAccountsImportForm extends AbstractForm {
-    static { this.minDate = new FinancialYear(new Date().getFullYear() - 1).startDate; }
+    static { this.minDate = new FinancialYear(new FinancialYear().year - 1).startDate; }
     static { this.maxDate = new FinancialYear(new Date()).endDate; }
     constructor(bankAccounts) {
         super({
@@ -25339,10 +25286,8 @@ class HoldingTradeForm extends AbstractForm {
         this.controlsChanges(['quantity', 'price', 'fee']).subscribe(([quantity, price, fee]) => {
             this.purchaseValue = quantity * price + fee;
         });
-        this.controlsChanges(['category']).subscribe(() => {
-            if (!this.model.id) {
-                this.get('holdingType').reset();
-            }
+        this.get('category').valueChanges.subscribe(category => {
+            this.get('holdingType').reset();
         });
     }
     submit(data = {}, includeDisabledFields = false) {