diff --git a/api/app/account/resource.py b/api/app/account/resource.py
index 837f32a..c02ed80 100644
--- a/api/app/account/resource.py
+++ b/api/app/account/resource.py
@@ -100,15 +100,7 @@ class AccountResource:
@classmethod
def select(cls):
- split_filter = aliased(Split)
- account_filter = aliased(Account)
- columns = [Account.id, Account.name, Account.parent_account_id, Account.family, Account.type, Account.path,
- Split.amount.label("opening_balance"), literal_column('"1970-01-01"').label("opening_date")]
- return (select(*columns)
- .join(Split)
- .join(Transaction)
- .join(split_filter)
- .join(account_filter, account_filter.id == split_filter.account_id and Account.path == "/Equity/"))
+ return select(Account)
@classmethod
def list(cls, filters):
diff --git a/api/app/account/schemas.py b/api/app/account/schemas.py
index 39171ff..720af1e 100644
--- a/api/app/account/schemas.py
+++ b/api/app/account/schemas.py
@@ -21,8 +21,7 @@ class AccountBaseId(AccountBase):
path: str = Field(index=True)
class AccountRead(AccountBaseId):
- opening_date: date = Field()
- opening_balance: Decimal = Field(decimal_places=2, default=0)
+ pass
class BaseAccountWrite(AccountBase):
path: SkipJsonSchema[str] = Field(default="")
@@ -39,11 +38,10 @@ class AccountWrite(BaseAccountWrite):
}
}
})
- opening_date: date = Field()
- opening_balance: MonetaryAmount = Field()
class AccountCreate(AccountWrite):
- pass
+ opening_date: date = Field()
+ opening_balance: MonetaryAmount = Field()
class AccountUpdate(AccountWrite):
pass
@@ -63,11 +61,9 @@ class CategoryWrite(BaseAccountWrite):
}
})
+class CategoryCreate(CategoryWrite):
opening_date: SkipJsonSchema[date] = Field(default=date(1970, 1, 1))
opening_balance: SkipJsonSchema[Decimal] = Field(default=0)
-class CategoryCreate(CategoryWrite):
- pass
-
class CategoryUpdate(CategoryWrite):
pass
diff --git a/gui/app/src/pages/accounts/edit.tsx b/gui/app/src/pages/accounts/edit.tsx
index 90d5dc9..3d96d05 100644
--- a/gui/app/src/pages/accounts/edit.tsx
+++ b/gui/app/src/pages/accounts/edit.tsx
@@ -6,10 +6,17 @@ export const AccountEdit: React.FC = () => {
const { id } = useParams()
return (
-