diff --git a/src/accounting-app/views/AddIncome.vue b/src/accounting-app/views/AddIncome.vue index f9f80a7..a0dabf2 100644 --- a/src/accounting-app/views/AddIncome.vue +++ b/src/accounting-app/views/AddIncome.vue @@ -143,30 +143,6 @@ - - - Received into * - - Where the funds were received (Cash, Bank, Lightning, etc.) - - - - Reference @@ -269,7 +245,6 @@ const currentStep = ref(1) const selectedRevenueAccount = ref(null) const isSubmitting = ref(false) const availableCurrencies = ref([]) -const assetAccounts = ref([]) const showSuccessDialog = ref(false) const formSchema = toTypedSchema( @@ -277,7 +252,6 @@ const formSchema = toTypedSchema( description: z.string().min(1, 'Description is required').max(500, 'Description too long'), amount: z.coerce.number().min(0.01, 'Amount must be at least 0.01'), currency: z.string().min(1, 'Currency is required'), - paymentMethodAccount: z.string().min(1, 'Payment method is required'), reference: z.string().max(100, 'Reference too long').optional(), }) ) @@ -288,7 +262,6 @@ const form = useForm({ description: '', amount: 0, currency: '', - paymentMethodAccount: '', reference: '', } }) @@ -310,11 +283,6 @@ onMounted(async () => { const defaultCurrency = await expensesAPI.getDefaultCurrency() const initialCurrency = defaultCurrency || currencies[0] || 'EUR' form.setFieldValue('currency', initialCurrency) - - const allAccounts = await expensesAPI.getAccounts(wallet.inkey, false, true) - assetAccounts.value = allAccounts.filter( - (a) => a.name === 'Assets' || a.name.startsWith('Assets:') - ) } catch (error) { console.error('[AddIncome] Failed to load data:', error) toast.error('Failed to load form data', { description: 'Please check your connection and try again' }) @@ -345,7 +313,6 @@ const onSubmit = form.handleSubmit(async (values) => { description: values.description, amount: values.amount, revenue_account: selectedRevenueAccount.value.name, - payment_method_account: values.paymentMethodAccount, currency: values.currency, reference: values.reference, }) diff --git a/src/modules/expenses/types/index.ts b/src/modules/expenses/types/index.ts index dc12d13..1de01d4 100644 --- a/src/modules/expenses/types/index.ts +++ b/src/modules/expenses/types/index.ts @@ -80,13 +80,13 @@ export interface ExpenseEntry { } /** - * Income entry request payload + * Income entry request payload. Income lands on the submitting user as + * a receivable (Assets:Receivable:User-{id}) — no payment-method account. */ export interface IncomeEntryRequest { description: string amount: number revenue_account: string - payment_method_account: string currency: string reference?: string entry_date?: string @@ -101,7 +101,6 @@ export interface IncomeEntry { description: string amount: number revenue_account: string - payment_method_account: string currency: string reference?: string entry_date: string