Compare commits

..

No commits in common. "9c88993c136c095311ff5ad4ebdb2acdda0bbe9d" and "68cdc4f9ee7e7507aeea71a2cf10da739ec748b3" have entirely different histories.

3 changed files with 8 additions and 8 deletions

View file

@ -1707,10 +1707,6 @@ window.app = Vue.createApp({
if (entry.tags && entry.tags.includes('equity-contribution')) return true if (entry.tags && entry.tags.includes('equity-contribution')) return true
if (entry.account && entry.account.includes('Equity')) return true if (entry.account && entry.account.includes('Equity')) return true
return false return false
},
isVoided(entry) {
// Voided entries keep '!' flag and carry a 'voided' tag (libra convention).
return Array.isArray(entry.tags) && entry.tags.includes('voided')
} }
}, },
async created() { async created() {

View file

@ -497,10 +497,7 @@
<!-- Status Flag Column --> <!-- Status Flag Column -->
<template v-slot:body-cell-flag="props"> <template v-slot:body-cell-flag="props">
<q-td :props="props"> <q-td :props="props">
<q-icon v-if="isVoided(props.row)" name="cancel" color="grey" size="sm"> <q-icon v-if="props.row.flag === '*'" name="check_circle" color="positive" size="sm">
<q-tooltip>Voided</q-tooltip>
</q-icon>
<q-icon v-else-if="props.row.flag === '*'" name="check_circle" color="positive" size="sm">
<q-tooltip>Cleared</q-tooltip> <q-tooltip>Cleared</q-tooltip>
</q-icon> </q-icon>
<q-icon v-else-if="props.row.flag === '!'" name="pending" color="orange" size="sm"> <q-icon v-else-if="props.row.flag === '!'" name="pending" color="orange" size="sm">
@ -509,6 +506,9 @@
<q-icon v-else-if="props.row.flag === '#'" name="flag" color="red" size="sm"> <q-icon v-else-if="props.row.flag === '#'" name="flag" color="red" size="sm">
<q-tooltip>Flagged</q-tooltip> <q-tooltip>Flagged</q-tooltip>
</q-icon> </q-icon>
<q-icon v-else-if="props.row.flag === 'x'" name="cancel" color="grey" size="sm">
<q-tooltip>Voided</q-tooltip>
</q-icon>
</q-td> </q-td>
</template> </template>

View file

@ -487,6 +487,10 @@ async def api_get_user_entries(
if e.get("flag") in _SYNTHETIC_FLAGS: if e.get("flag") in _SYNTHETIC_FLAGS:
continue continue
# Skip voided transactions
if "voided" in e.get("tags", []):
continue
# Extract user ID from metadata or account names # Extract user ID from metadata or account names
user_id_match = None user_id_match = None
entry_meta = e.get("meta", {}) entry_meta = e.get("meta", {})