From 5cd25cb76f075e5510b0c8eb8931608334c41448 Mon Sep 17 00:00:00 2001
From: RunasSudo <runassudo@yingtongli.me>
Date: Thu, 14 Aug 2025 21:54:09 +1000
Subject: [PATCH] Specify CGT cost base adjustment as signed numbers

---
 src/plugins/austax/CGTAdjustmentEditor.vue    | 19 +++++--------------
 src/plugins/austax/EditCGTAdjustmentView.vue  |  8 +++-----
 .../austax/MultiNewCGTAdjustmentView.vue      | 19 +++++--------------
 src/plugins/austax/NewCGTAdjustmentView.vue   |  5 ++---
 4 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/src/plugins/austax/CGTAdjustmentEditor.vue b/src/plugins/austax/CGTAdjustmentEditor.vue
index 46e668b..d7a523e 100644
--- a/src/plugins/austax/CGTAdjustmentEditor.vue
+++ b/src/plugins/austax/CGTAdjustmentEditor.vue
@@ -1,5 +1,5 @@
 <!--
-	DrCr: Web-based double-entry bookkeeping framework
+	DrCr: Double-entry bookkeeping framework
 	Copyright (C) 2022-2025  Lee Yingtong Li (RunasSudo)
 	
 	This program is free software: you can redistribute it and/or modify
@@ -46,13 +46,7 @@
 			<div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
 				<span class="text-gray-500">{{ db.metadata.reporting_commodity }}</span>
 			</div>
-			<input type="number" class="bordered-field pl-7 pr-16" step="0.01" v-model="adjustment.cost_adjustment_abs" placeholder="0.00">
-			<div class="absolute inset-y-0 right-0 flex items-center">
-				<select class="h-full border-0 bg-transparent py-0 pl-2 pr-8 text-gray-900 focus:ring-2 focus:ring-inset focus:ring-indigo-600" v-model="adjustment.sign">
-					<option value="dr">Dr</option>
-					<option value="cr">Cr</option>
-				</select>
-			</div>
+			<input type="number" class="bordered-field pl-7" step="0.01" v-model="adjustment.cost_adjustment" placeholder="0.00">
 		</div>
 	</div>
 	
@@ -90,8 +84,7 @@
 		acquisition_dt: string,
 		dt: string,
 		description: string,
-		sign: string,
-		cost_adjustment_abs: string,
+		cost_adjustment: string,
 	}
 	
 	const { adjustment } = defineProps<{ adjustment: EditingCGTAdjustment }>();
@@ -114,9 +107,9 @@
 			}
 		}
 		
-		let cost_adjustment_abs;
+		let cost_adjustment;
 		try {
-			cost_adjustment_abs = deserialiseAmount('' + adjustment.cost_adjustment_abs);
+			cost_adjustment = deserialiseAmount('' + adjustment.cost_adjustment).quantity;
 		} catch (err) {
 			if (err instanceof DeserialiseAmountError) {
 				error.value = err.message;
@@ -126,8 +119,6 @@
 			}
 		}
 		
-		const cost_adjustment = adjustment.sign === 'dr' ? cost_adjustment_abs.quantity : -cost_adjustment_abs.quantity;
-		
 		const session = await db.load();
 		
 		if (adjustment.id === null) {
diff --git a/src/plugins/austax/EditCGTAdjustmentView.vue b/src/plugins/austax/EditCGTAdjustmentView.vue
index 4f0fe75..5590fd0 100644
--- a/src/plugins/austax/EditCGTAdjustmentView.vue
+++ b/src/plugins/austax/EditCGTAdjustmentView.vue
@@ -1,5 +1,5 @@
 <!--
-	DrCr: Web-based double-entry bookkeeping framework
+	DrCr: Double-entry bookkeeping framework
 	Copyright (C) 2022-2025  Lee Yingtong Li (RunasSudo)
 	
 	This program is free software: you can redistribute it and/or modify
@@ -41,8 +41,7 @@
 		acquisition_dt: null!,
 		dt: null!,
 		description: null!,
-		sign: null!,
-		cost_adjustment_abs: null!,
+		cost_adjustment: null!,
 	} as EditingCGTAdjustment);
 	
 	async function load() {
@@ -60,8 +59,7 @@
 		rawAdjustment.asset = serialiseAmount(rawAdjustment.quantity, rawAdjustment.commodity);
 		rawAdjustment.acquisition_dt = dayjs(rawAdjustment.acquisition_dt).format('YYYY-MM-DD');
 		rawAdjustment.dt = dayjs(rawAdjustment.dt).format('YYYY-MM-DD');
-		rawAdjustment.sign = rawAdjustment.cost_adjustment >= 0 ? 'dr' : 'cr';
-		rawAdjustment.cost_adjustment_abs = serialiseAmount(Math.abs(rawAdjustment.cost_adjustment), db.metadata.reporting_commodity);
+		rawAdjustment.cost_adjustment = serialiseAmount(rawAdjustment.cost_adjustment, db.metadata.reporting_commodity);
 		
 		adjustment.value = rawAdjustment as EditingCGTAdjustment;
 	}
diff --git a/src/plugins/austax/MultiNewCGTAdjustmentView.vue b/src/plugins/austax/MultiNewCGTAdjustmentView.vue
index ea55bba..a5b9bf1 100644
--- a/src/plugins/austax/MultiNewCGTAdjustmentView.vue
+++ b/src/plugins/austax/MultiNewCGTAdjustmentView.vue
@@ -1,5 +1,5 @@
 <!--
-	DrCr: Web-based double-entry bookkeeping framework
+	DrCr: Double-entry bookkeeping framework
 	Copyright (C) 2022-2025  Lee Yingtong Li (RunasSudo)
 	
 	This program is free software: you can redistribute it and/or modify
@@ -57,13 +57,7 @@
 			<div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
 				<span class="text-gray-500">{{ db.metadata.reporting_commodity }}</span>
 			</div>
-			<input type="number" class="bordered-field pl-7 pr-16" step="0.01" v-model="cost_adjustment_abs" placeholder="0.00">
-			<div class="absolute inset-y-0 right-0 flex items-center">
-				<select class="h-full border-0 bg-transparent py-0 pl-2 pr-8 text-gray-900 focus:ring-2 focus:ring-inset focus:ring-indigo-600" v-model="sign">
-					<option value="dr">Dr</option>
-					<option value="cr">Cr</option>
-				</select>
-			</div>
+			<input type="number" class="bordered-field pl-7" step="0.01" v-model="cost_adjustment" placeholder="0.00">
 		</div>
 	</div>
 	
@@ -101,8 +95,7 @@
 	const commodity = ref('');
 	const dt = ref(dayjs().format('YYYY-MM-DD'));
 	const description = ref('');
-	const cost_adjustment_abs = ref(null! as number);
-	const sign = ref('dr');
+	const cost_adjustment = ref(null! as number);
 	
 	const error = ref(null as string | null);
 	
@@ -111,9 +104,9 @@
 		
 		error.value = null;
 		
-		let totalAdjustmentAbs;
+		let totalAdjustment;
 		try {
-			totalAdjustmentAbs = deserialiseAmount('' + cost_adjustment_abs.value);
+			totalAdjustment = deserialiseAmount('' + cost_adjustment.value).quantity;
 		} catch (err) {
 			if (err instanceof DeserialiseAmountError) {
 				error.value = err.message;
@@ -123,8 +116,6 @@
 			}
 		}
 		
-		const totalAdjustment = sign.value === 'dr' ? totalAdjustmentAbs.quantity : -totalAdjustmentAbs.quantity;
-		
 		// Get all postings to the CGT asset account
 		const session = await db.load();
 		const cgtPostings = await session.select(
diff --git a/src/plugins/austax/NewCGTAdjustmentView.vue b/src/plugins/austax/NewCGTAdjustmentView.vue
index a56e726..9259e14 100644
--- a/src/plugins/austax/NewCGTAdjustmentView.vue
+++ b/src/plugins/austax/NewCGTAdjustmentView.vue
@@ -1,5 +1,5 @@
 <!--
-	DrCr: Web-based double-entry bookkeeping framework
+	DrCr: Double-entry bookkeeping framework
 	Copyright (C) 2022-2025  Lee Yingtong Li (RunasSudo)
 	
 	This program is free software: you can redistribute it and/or modify
@@ -37,7 +37,6 @@
 		acquisition_dt: dayjs().format('YYYY-MM-DD'),
 		dt: dayjs().format('YYYY-MM-DD'),
 		description: '',
-		sign: 'dr',
-		cost_adjustment_abs: '',
+		cost_adjustment: '',
 	} as EditingCGTAdjustment);
 </script>