diff --git a/templates/invoice-anvil/invoice.html b/templates/invoice-anvil/invoice.html index 3c5b0f68..e5b6dc9b 100644 --- a/templates/invoice-anvil/invoice.html +++ b/templates/invoice-anvil/invoice.html @@ -127,7 +127,7 @@
- {% if user.bank_account %}IBAN: {{ user.bank_account.IBAN }}
{% endif %} + {% if bank_account %}IBAN: {{ bank_account.IBAN }}
{% endif %}
{{ invoice.effective_due_date }} @@ -154,8 +154,8 @@
- {% if user.bank_account %}IBAN: {{ user.bank_account.IBAN }} | - BIC: {{ user.bank_account.BIC }} |{% endif %} + {% if bank_account %}IBAN: {{ bank_account.IBAN }} | + BIC: {{ bank_account.BIC }} |{% endif %} {% if seller_tax_id %}{{ seller_tax_id_label }}: {{ seller_tax_id }}{% endif %}
diff --git a/templates/invoice-bold/invoice.html b/templates/invoice-bold/invoice.html index 0e558eda..602e7836 100644 --- a/templates/invoice-bold/invoice.html +++ b/templates/invoice-bold/invoice.html @@ -101,11 +101,11 @@
{{ l.payment }} - {% if user.bank_account %} + {% if bank_account %} - {% if user.bank_account.name %}{% endif %} - - {% if user.bank_account.BIC %}{% endif %} + {% if bank_account.name %}{% endif %} + + {% if bank_account.BIC %}{% endif %}
{{ l.account_holder }}{{ user.bank_account.name }}
IBAN{{ user.bank_account.IBAN }}
BIC{{ user.bank_account.BIC }}
{{ l.account_holder }}{{ bank_account.name }}
IBAN{{ bank_account.IBAN }}
BIC{{ bank_account.BIC }}
{% endif %}
@@ -149,8 +149,8 @@
{{ user.name }} - {% if user.bank_account %}IBAN: {{ user.bank_account.IBAN }} - {% if user.bank_account.BIC %}BIC: {{ user.bank_account.BIC }}{% endif %}{% endif %} + {% if bank_account %}IBAN: {{ bank_account.IBAN }} + {% if bank_account.BIC %}BIC: {{ bank_account.BIC }}{% endif %}{% endif %} {% if seller_tax_id %}{{ seller_tax_id_label }}: {{ seller_tax_id }}{% endif %}
diff --git a/templates/invoice-classic/invoice.html b/templates/invoice-classic/invoice.html index ffe8f068..8b426e75 100644 --- a/templates/invoice-classic/invoice.html +++ b/templates/invoice-classic/invoice.html @@ -93,8 +93,8 @@
Payment Details
- {% if user.bank_account %}IBAN: {{ user.bank_account.IBAN }} - {% if user.bank_account.BIC %}
BIC: {{ user.bank_account.BIC }}{% endif %}{% endif %} + {% if bank_account %}IBAN: {{ bank_account.IBAN }} + {% if bank_account.BIC %}
BIC: {{ bank_account.BIC }}{% endif %}{% endif %}
@@ -134,8 +134,8 @@
{{ user.name }} - {% if user.bank_account %}IBAN: {{ user.bank_account.IBAN }} - {% if user.bank_account.BIC %}BIC: {{ user.bank_account.BIC }}{% endif %}{% endif %} + {% if bank_account %}IBAN: {{ bank_account.IBAN }} + {% if bank_account.BIC %}BIC: {{ bank_account.BIC }}{% endif %}{% endif %} {% if seller_tax_id %}{{ seller_tax_id_label }}: {{ seller_tax_id }}{% endif %}
diff --git a/templates/invoice-grayshades/invoice.html b/templates/invoice-grayshades/invoice.html index 3e7af288..aeeed078 100644 --- a/templates/invoice-grayshades/invoice.html +++ b/templates/invoice-grayshades/invoice.html @@ -130,9 +130,9 @@

{{ l.invoice_no }} {{ invoice.number }}

{{ user.name }}
- {% if user.bank_account %}IBAN: {{ user.bank_account.IBAN }}{% endif %} + {% if bank_account %}IBAN: {{ bank_account.IBAN }}{% endif %} {% if user.phone_number %}Tel. {{ user.phone_number }}{% endif %} - {% if user.bank_account and user.bank_account.BIC %}
BIC: {{ user.bank_account.BIC }}{% endif %} + {% if bank_account and bank_account.BIC %}
BIC: {{ bank_account.BIC }}{% endif %} {% if user.website %}{{ user.website }}{% endif %}
diff --git a/templates/invoice-minimal/invoice.html b/templates/invoice-minimal/invoice.html index 1eaa4394..cf57e060 100644 --- a/templates/invoice-minimal/invoice.html +++ b/templates/invoice-minimal/invoice.html @@ -129,7 +129,7 @@
{{ l.payment }}
- {% if user.bank_account %}
IBAN: {{ user.bank_account.IBAN }}{% if user.bank_account.BIC %} BIC: {{ user.bank_account.BIC }}{% endif %}
{% endif %} + {% if bank_account %}
IBAN: {{ bank_account.IBAN }}{% if bank_account.BIC %} BIC: {{ bank_account.BIC }}{% endif %}
{% endif %}
@@ -149,8 +149,8 @@
{{ user.name }} - {% if user.bank_account %}IBAN: {{ user.bank_account.IBAN }} - {% if user.bank_account.BIC %}BIC: {{ user.bank_account.BIC }}{% endif %}{% endif %} + {% if bank_account %}IBAN: {{ bank_account.IBAN }} + {% if bank_account.BIC %}BIC: {{ bank_account.BIC }}{% endif %}{% endif %} {% if seller_tax_id %}{{ seller_tax_id_label }}: {{ seller_tax_id }}{% endif %}
diff --git a/templates/invoice-modern/invoice.html b/templates/invoice-modern/invoice.html index 0c11e57b..279374b7 100644 --- a/templates/invoice-modern/invoice.html +++ b/templates/invoice-modern/invoice.html @@ -102,11 +102,11 @@
{{ l.payment }} - {% if user.bank_account %} + {% if bank_account %} - {% if user.bank_account.name %}{% endif %} - - {% if user.bank_account.BIC %}{% endif %} + {% if bank_account.name %}{% endif %} + + {% if bank_account.BIC %}{% endif %}
{{ l.account_holder if l.account_holder else "Account" }}{{ user.bank_account.name }}
IBAN{{ user.bank_account.IBAN }}
BIC{{ user.bank_account.BIC }}
{{ l.account_holder if l.account_holder else "Account" }}{{ bank_account.name }}
IBAN{{ bank_account.IBAN }}
BIC{{ bank_account.BIC }}
{% endif %}
@@ -151,8 +151,8 @@
{{ user.name }} - {% if user.bank_account %}IBAN: {{ user.bank_account.IBAN }} - {% if user.bank_account.BIC %}BIC: {{ user.bank_account.BIC }}{% endif %}{% endif %} + {% if bank_account %}IBAN: {{ bank_account.IBAN }} + {% if bank_account.BIC %}BIC: {{ bank_account.BIC }}{% endif %}{% endif %} {% if seller_tax_id %}{{ seller_tax_id_label }}: {{ seller_tax_id }}{% endif %}
diff --git a/templates/invoice/invoice.html b/templates/invoice/invoice.html index 4386f313..4a5bb397 100644 --- a/templates/invoice/invoice.html +++ b/templates/invoice/invoice.html @@ -108,7 +108,7 @@

{% if is_reminder %}{{ reminder_title }}{% else %}Invoice No. {{ invoice.num {{ invoice.effective_due_date }} - {% if user.bank_account %}{{ user.bank_account.IBAN }}{% endif %} + {% if bank_account %}{{ bank_account.IBAN }}{% endif %} {{ invoice.total | as_currency }} @@ -136,7 +136,7 @@

{% if is_reminder %}{{ reminder_title }}{% else %}Invoice No. {{ invoice.num {% if seller_tax_id %}{{ seller_tax_id_label }}: {{ seller_tax_id }}
{% endif %} - {% if user.bank_account %}IBAN: {{ user.bank_account.IBAN }}{% endif %} + {% if bank_account %}IBAN: {{ bank_account.IBAN }}{% endif %} diff --git a/tuttle/app/contracts/intent.py b/tuttle/app/contracts/intent.py index 0aac0001..5b077624 100644 --- a/tuttle/app/contracts/intent.py +++ b/tuttle/app/contracts/intent.py @@ -189,7 +189,7 @@ def _describe_save_error(exc) -> str: if "NOT NULL" in detail: return "A required field is missing." if "FOREIGN KEY" in detail or "foreign key" in detail: - return "The selected client is invalid." + return "The selected client or bank account is invalid." return "Failed to save the contract." toggle_complete_status = CrudIntent.toggle_completed diff --git a/tuttle/app/users/intent.py b/tuttle/app/users/intent.py index 20830561..7936ec20 100644 --- a/tuttle/app/users/intent.py +++ b/tuttle/app/users/intent.py @@ -294,11 +294,14 @@ def create(self, params: Dict[str, Any], **_kw) -> IntentResult: ) bank = params.get("bank_account") if bank and any(bank.get(k) for k in ("IBAN", "BIC", "name")): - user.bank_account = BankAccount( - name=bank.get("name", ""), - IBAN=bank.get("IBAN", ""), - BIC=bank.get("BIC", ""), - ) + user.bank_accounts = [ + BankAccount( + name=bank.get("name", ""), + IBAN=bank.get("IBAN", ""), + BIC=bank.get("BIC", ""), + is_default=True, + ) + ] s.add(user) s.commit() engine.dispose() @@ -308,6 +311,54 @@ def create(self, params: Dict[str, Any], **_kw) -> IntentResult: # -- profile update ------------------------------------------------------- + def _resolve_bank_accounts(self, profile, raw): + """Resolve an incoming ``bank_accounts`` list into a full replacement. + + Returns ``(error_msg, accounts)`` where a falsy ``error_msg`` means + success. + + Existing accounts keep their identity by id, so contracts referencing + one keep pointing at it. Exactly one account ends up default (the + flagged one, else the first). Removing an account a contract still + invoices from is refused. + """ + rows = [r for r in raw if isinstance(r, dict) and any((r.get(k) or "").strip() for k in ("name", "IBAN", "BIC"))] + + existing = {a.id: a for a in profile.bank_accounts if a.id is not None} + flagged = [r for r in rows if r.get("is_default")] + default_index = rows.index(flagged[0]) if flagged else (0 if rows else -1) + + accounts = [] + for i, row in enumerate(rows): + fields = {k: (row.get(k) or "").strip() for k in ("name", "IBAN", "BIC")} + account = existing.get(row.get("id")) + if account is None: + account = BankAccount(**fields) + else: + for key, value in fields.items(): + setattr(account, key, value) + account.is_default = i == default_index + accounts.append(account) + + removed_ids = {a.id for a in existing.values()} - {a.id for a in accounts} + if removed_ids: + from ...model import Contract + + engine = sql_create_engine(f"sqlite:///{get_active_db()}") + try: + with SqlSession(engine) as s: + referenced = s.exec(select(Contract).where(Contract.bank_account_id.in_(removed_ids))).all() + finally: + engine.dispose() + if referenced: + titles = ", ".join(c.title for c in referenced) + return ( + "Cannot remove a bank account that is still used for invoicing " + f"by: {titles}. Clear the account on the contract(s) first.", + None, + ) + return None, accounts + def update_profile(self, profile_data: Dict[str, Any]) -> IntentResult: """Update the active user's profile from a dict.""" ds = UserDataSource() @@ -369,18 +420,12 @@ def update_profile(self, profile_data: Dict[str, Any]) -> IntentResult: else: profile.address = Address(**{k: v for k, v in addr.items() if k != "id" and not k.startswith("_")}) - bank = profile_data.get("bank_account") - if bank is not None: - if profile.bank_account: - for k in ("name", "IBAN", "BIC"): - if k in bank: - setattr(profile.bank_account, k, bank[k]) - else: - profile.bank_account = BankAccount( - name=bank.get("name", ""), - IBAN=bank.get("IBAN", ""), - BIC=bank.get("BIC", ""), - ) + raw_accounts = profile_data.get("bank_accounts") + if isinstance(raw_accounts, list): + error, accounts = self._resolve_bank_accounts(profile, raw_accounts) + if error: + return IntentResult(was_intent_successful=False, error_msg=error) + profile.bank_accounts = accounts with ds.create_session() as s: s.add(profile) diff --git a/tuttle/demo.py b/tuttle/demo.py index bacb4a1a..5effbe28 100644 --- a/tuttle/demo.py +++ b/tuttle/demo.py @@ -473,6 +473,8 @@ def create_usd_security_data(user: User) -> tuple[Project, Invoice, ClientContac volume=10, term_of_payment=14, billing_cycle=Cycle.monthly, + # Harry keeps a dedicated USD account for dollar invoices. + bank_account=next(a for a in user.bank_accounts if not a.is_default), ) project = Project( @@ -847,11 +849,20 @@ def create_demo_user() -> User: postal_code="555555", country="Brazil", ), - bank_account=BankAccount( - name="Giro", - IBAN="BZ99830994950003161565", - BIC="BANKINFO101", - ), + bank_accounts=[ + BankAccount( + name="Harry Tuttle", + IBAN="BZ99830994950003161565", + BIC="BANKINFO101", + is_default=True, + ), + BankAccount( + name="Harry Tuttle", + IBAN="US88589600002547441617", + BIC="TRWIBEB1", + is_default=False, + ), + ], ) return user diff --git a/tuttle/einvoice.py b/tuttle/einvoice.py index 85d5f4b3..353c75f7 100644 --- a/tuttle/einvoice.py +++ b/tuttle/einvoice.py @@ -207,12 +207,15 @@ def build_zugferd_document( doc.trade.settlement.currency_code = currency # -- Payment means (not in MINIMUM) ---------------------------------------- - if not is_minimum and user.bank_account and user.bank_account.IBAN: + # The bank account named on the contract takes precedence; otherwise the + # user's default account (which ``User.bank_account`` resolves to). + payee = contract.bank_account or user.bank_account + if not is_minimum and payee and payee.IBAN: pm = PaymentMeans() pm.type_code = "58" # SEPA credit transfer - pm.payee_account.iban = user.bank_account.IBAN - if user.bank_account.BIC and profile not in ("BASIC",): - pm.payee_institution.bic = user.bank_account.BIC + pm.payee_account.iban = payee.IBAN + if payee.BIC and profile not in ("BASIC",): + pm.payee_institution.bic = payee.BIC doc.trade.settlement.payment_means.add(pm) # -- Line items & tax (not in MINIMUM) ------------------------------------- diff --git a/tuttle/migrations/versions/f87515d1d068_multiple_bank_accounts_is_default_user_.py b/tuttle/migrations/versions/f87515d1d068_multiple_bank_accounts_is_default_user_.py new file mode 100644 index 00000000..8b335e0b --- /dev/null +++ b/tuttle/migrations/versions/f87515d1d068_multiple_bank_accounts_is_default_user_.py @@ -0,0 +1,112 @@ +"""multiple bank accounts: is_default/user_id on bankaccount, contract.bank_account_id + +Revision ID: f87515d1d068 +Revises: 9cad5ae77a79 +Create Date: 2026-08-10 18:10:41.686326 + +====================================================================== +FROZEN HISTORICAL SNAPSHOT — NOT THE SCHEMA SOURCE OF TRUTH. + +The source of truth is tuttle/model.py. This file captures the schema +DELTA from the previous revision to this point in history. It is +APPEND-ONLY: once committed, never edit it. To change the schema, edit +tuttle/model.py and run `just migrate ""` to ADD a new revision. + +Reading this file to learn the current schema is a MISTAKE — it is a +point-in-time snapshot. Read tuttle/model.py instead. +====================================================================== + +MANDATORY REVIEW CHECKLIST before committing this file: + +1. RENAMES — autogenerate emits drop_column + add_column for renames, + which DESTROYS DATA. If you intended a rename, replace the pair with + op.alter_column(, , new_column_name=). + +2. NO MODEL IMPORTS — never `from tuttle.model import ...` here. + Model classes drift over time; this script must be pinned to the + schema at this point in history. For data transformations, declare + a local sa.table(...) snapshot with only the columns this revision + touches. + +3. BATCH MODE — render_as_batch=True rebuilds tables for SQLite. After + a batch op on a table with foreign keys, verify integrity inside the + migration: op.execute("PRAGMA foreign_key_check"). + +See tuttle/migrations/README.md. +---------------------------------------------------------------------- +""" + +# pyright: reportAttributeAccessIssue=false +# sqlmodel.sql.sqltypes is a submodule resolved at runtime; basedpyright +# does not statically expose `sql` as an attribute of `sqlmodel`. +from typing import Sequence, Union + +import sqlalchemy as sa +import sqlmodel +import sqlmodel.sql.sqltypes # noqa: F401 — ensures runtime resolution of AutoString +from alembic import op + +revision: str = "f87515d1d068" +down_revision: Union[str, Sequence[str], None] = "9cad5ae77a79" +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + """Upgrade schema.""" + with op.batch_alter_table("bankaccount", schema=None) as batch_op: + batch_op.add_column(sa.Column("is_default", sa.Boolean(), nullable=False, server_default=sa.false())) + batch_op.add_column(sa.Column("user_id", sa.Integer(), nullable=True)) + batch_op.create_foreign_key("fk_bankaccount_user_id_user", "user", ["user_id"], ["id"], ondelete="CASCADE") + + # Backfill while user.bank_account_id still exists: the account the user + # had in the old 1:1 becomes the owner (BankAccount.user_id) and the + # default. Accounts that were never linked stay owned by nobody, and only + # the linked one is marked default. + bankaccount = sa.table( + "bankaccount", + sa.column("id", sa.Integer), + sa.column("user_id", sa.Integer), + sa.column("is_default", sa.Boolean), + ) + user = sa.table( + "user", + sa.column("id", sa.Integer), + sa.column("bank_account_id", sa.Integer), + ) + op.execute( + bankaccount.update().values( + user_id=sa.select(user.c.id).where(user.c.bank_account_id == bankaccount.c.id).scalar_subquery(), + ) + ) + op.execute( + bankaccount.update() + .values(is_default=True) + .where(bankaccount.c.id.in_(sa.select(user.c.bank_account_id).where(user.c.bank_account_id.is_not(None)))) + ) + + with op.batch_alter_table("contract", schema=None) as batch_op: + batch_op.add_column(sa.Column("bank_account_id", sa.Integer(), nullable=True)) + batch_op.create_foreign_key( + "fk_contract_bank_account_id_bankaccount", "bankaccount", ["bank_account_id"], ["id"], ondelete="SET NULL" + ) + + with op.batch_alter_table("user", schema=None) as batch_op: + batch_op.drop_column("bank_account_id") + + op.execute("PRAGMA foreign_key_check") + + +def downgrade() -> None: + """Downgrades are not supported. + + Tuttle is a single-user desktop app. Rolling back schema is destructive + (data in dropped columns is lost) and offers nothing over restoring a + timestamped backup from ensure_schema()'s pre-upgrade snapshot. + + If you need to iterate on a migration during development: + 1. Delete this revision file (versions/f87515d1d068_*.py) + 2. Run `just reset` to wipe ~/.tuttle + 3. Edit model.py, run `just migrate` again + """ + raise NotImplementedError("Downgrades are not supported. Restore from a .bak- snapshot instead.") diff --git a/tuttle/model.py b/tuttle/model.py index cf61a0cd..ce4513d7 100644 --- a/tuttle/model.py +++ b/tuttle/model.py @@ -150,7 +150,7 @@ def is_empty(self) -> bool: class User(RpcMixin, SQLModel, table=True): """User of the application, a freelancer.""" - __rpc_relationships__ = ("address", "bank_account") + __rpc_relationships__ = ("address", "bank_accounts") id: Optional[int] = Field(default=None, primary_key=True) name: str @@ -183,11 +183,14 @@ class User(RpcMixin, SQLModel, table=True): description="Tax number (Steuernummer) of the user. Required on invoices " "outside the scope of VAT, where EN16931 BR-O-02 forbids the VAT number.", ) - # User 1:1 business BankAccount - bank_account_id: Optional[int] = Field(default=None, foreign_key="bankaccount.id") - bank_account: Optional["BankAccount"] = Relationship( + # User 1:n BankAccount + bank_accounts: List["BankAccount"] = Relationship( back_populates="user", - sa_relationship_kwargs={"lazy": "subquery"}, + sa_relationship_kwargs={ + "lazy": "subquery", + "cascade": "all, delete-orphan", + "order_by": "BankAccount.id", + }, ) logo: Optional[str] = Field( default=None, @@ -202,14 +205,20 @@ class User(RpcMixin, SQLModel, table=True): description="Hex accent color for branding (e.g. '#C8281E'). Used in invoice templates and other documents.", ) + @property + def bank_account(self) -> Optional["BankAccount"]: + """The user's default bank account. + + Backwards-compatible view over ``bank_accounts``: the account marked + default, else the first one. Invoices prefer the bank account named on + their contract and fall back to this. + """ + return next((a for a in self.bank_accounts if a.is_default), None) or next(iter(self.bank_accounts), None) + @property def bank_account_not_set(self) -> bool: - """True if bank account is not set.""" - if not self.bank_account: - return True - if not self.bank_account.BIC or not self.bank_account.IBAN or not self.bank_account.name: - return True - return False + """True if no bank account is fully filled in.""" + return not any(a.BIC and a.IBAN and a.name for a in self.bank_accounts) class Bank(SQLModel, table=True): @@ -224,8 +233,18 @@ class BankAccount(SQLModel, table=True): name: str IBAN: str BIC: str + is_default: bool = Field( + default=False, + description="Whether this is the user's default account, used when an " + "invoice's contract names no bank account of its own.", + ) # username: str # online banking user name - user: User = Relationship(back_populates="bank_account") + user_id: Optional[int] = Field(default=None, foreign_key="user.id", ondelete="CASCADE") + user: Optional[User] = Relationship(back_populates="bank_accounts") + contracts: List["Contract"] = Relationship( + back_populates="bank_account", + sa_relationship_kwargs={"lazy": "subquery", "passive_deletes": "all"}, + ) class Contact(RpcMixin, SQLModel, table=True): @@ -497,6 +516,7 @@ class Contract(RpcMixin, VatCategoryMixin, SQLModel, table=True): "projects": ("id", "title"), "invoices": ("id",), "charges": None, + "bank_account": None, } __rpc_computed__ = ("unit_abbrev", "is_fixed_price") @@ -523,6 +543,19 @@ class Contract(RpcMixin, VatCategoryMixin, SQLModel, table=True): foreign_key="client.id", ondelete="RESTRICT", ) + # The bank account this contract invoices from. Named when the contract is + # agreed; invoices for the contract pay into it. None falls back to the + # user's default account. + bank_account_id: Optional[int] = Field( + default=None, + foreign_key="bankaccount.id", + ondelete="SET NULL", + description="Bank account to invoice from for this contract.", + ) + bank_account: Optional["BankAccount"] = Relationship( + back_populates="contracts", + sa_relationship_kwargs={"lazy": "subquery"}, + ) type: ContractType = Field( description="Whether the contract is time-based (rate per unit) or fixed-price. " "The authoritative discriminator: a contract is exactly one type.", diff --git a/tuttle/rendering.py b/tuttle/rendering.py index aa2e89a7..c2d39ea4 100644 --- a/tuttle/rendering.py +++ b/tuttle/rendering.py @@ -252,6 +252,10 @@ def unit_label(raw_unit, quantity=None): seller_tax_id_label = labels.get("tax_number", "Tax No.") seller_tax_id = user.tax_number or "" + # The bank account named on the contract takes precedence; without one the + # user's default account is used. + payee_account = (invoice.contract.bank_account if invoice.contract else None) or user.bank_account + invoice_template = template_env.get_template("invoice.html") html = invoice_template.render( user=user, @@ -266,6 +270,7 @@ def unit_label(raw_unit, quantity=None): include_due_date=include_due_date, include_signature=include_signature, accent_color=accent_color or "", + bank_account=payee_account, ) if out_dir is None: return html diff --git a/tuttle_tests/conftest.py b/tuttle_tests/conftest.py index 60ee17c3..6f101751 100644 --- a/tuttle_tests/conftest.py +++ b/tuttle_tests/conftest.py @@ -73,11 +73,13 @@ def demo_user(): postal_code="555555", country="Brazil", ), - bank_account=BankAccount( - name="Giro", - IBAN="BZ99830994950003161565", - BIC="BANKINFO101", - ), + bank_accounts=[ + BankAccount( + name="Harry Tuttle", + IBAN="BZ99830994950003161565", + BIC="BANKINFO101", + ), + ], ) return user diff --git a/tuttle_tests/demo.py b/tuttle_tests/demo.py index 8fa812e5..2671d07c 100644 --- a/tuttle_tests/demo.py +++ b/tuttle_tests/demo.py @@ -28,11 +28,13 @@ postal_code="555555", country="Brazil", ), - bank_account=BankAccount( - name="Giro", - IBAN="BZ99830994950003161565", - BIC="BANKINFO101", - ), + bank_accounts=[ + BankAccount( + name="Harry Tuttle", + IBAN="BZ99830994950003161565", + BIC="BANKINFO101", + ), + ], ) # CONTACTS diff --git a/tuttle_tests/test_einvoice.py b/tuttle_tests/test_einvoice.py index ebf8cc63..ae8b4634 100644 --- a/tuttle_tests/test_einvoice.py +++ b/tuttle_tests/test_einvoice.py @@ -42,11 +42,13 @@ def _make_user() -> User: city="Berlin", country="Germany", ), - bank_account=BankAccount( - name="Business", - IBAN="DE89370400440532013000", - BIC="COBADEFFXXX", - ), + bank_accounts=[ + BankAccount( + name="Business", + IBAN="DE89370400440532013000", + BIC="COBADEFFXXX", + ), + ], ) diff --git a/tuttle_tests/test_migrations.py b/tuttle_tests/test_migrations.py index 276fd04a..9c9368d6 100644 --- a/tuttle_tests/test_migrations.py +++ b/tuttle_tests/test_migrations.py @@ -476,3 +476,74 @@ def test_backfill_leaves_no_null_categories(backfilled_db): for table in ("contract", "invoiceitem"): count = backfilled_db.execute(f'SELECT COUNT(*) FROM {table} WHERE "VAT_category" IS NULL').fetchone()[0] assert count == 0, f"{table} has NULL VAT_category rows" + + +# -- Bank account ownership backfill (revision f87515d1d068) ------------------ + +_BANK_ACCOUNTS_REVISION = "f87515d1d068" +_BEFORE_BANK_ACCOUNTS = "9cad5ae77a79" + + +@pytest.fixture +def bank_accounts_db(tmp_db: tuple[Path, str]): + """A DB seeded with the old 1:1 user -> bank account link, then upgraded. + + Two accounts exist: the one the user was linked to, and one left + unreferenced by an earlier profile edit. + """ + db, url = tmp_db + cfg = _alembic_config_for(url) + command.upgrade(cfg, _BEFORE_BANK_ACCOUNTS) + + con = sqlite3.connect(db) + cur = con.cursor() + _insert(cur, "bankaccount", id=1, name="Linked", IBAN="DE1", BIC="B1") + _insert(cur, "bankaccount", id=2, name="Unreferenced", IBAN="DE2", BIC="B2") + _insert(cur, "user", id=1, name="Legacy User", bank_account_id=1) + _insert(cur, "client", id=1, name="ACME") + _insert(cur, "contract", id=1, title="c1", client_id=1, currency="EUR", unit="hour", type="time_based") + con.commit() + con.close() + + command.upgrade(cfg, _BANK_ACCOUNTS_REVISION) + con = sqlite3.connect(db) + yield con + con.close() + + +def test_linked_account_becomes_owned_and_default(bank_accounts_db): + """The account behind the old user.bank_account_id must survive as the default.""" + row = bank_accounts_db.execute("SELECT user_id, is_default FROM bankaccount WHERE id = 1").fetchone() + assert row == (1, 1) + + +def test_unreferenced_account_is_kept_but_not_default(bank_accounts_db): + """An account no user pointed at is not deleted and does not become a default.""" + row = bank_accounts_db.execute("SELECT user_id, is_default FROM bankaccount WHERE id = 2").fetchone() + assert row == (None, 0) + + +def test_user_bank_account_id_is_dropped(bank_accounts_db): + cols = {r[1] for r in bank_accounts_db.execute("PRAGMA table_info(user)")} + assert "bank_account_id" not in cols + assert bank_accounts_db.execute("SELECT COUNT(*) FROM user").fetchone()[0] == 1 + + +def test_contract_gains_a_null_bank_account(bank_accounts_db): + """Existing contracts invoice from the user's default until one is picked.""" + row = bank_accounts_db.execute("SELECT bank_account_id FROM contract WHERE id = 1").fetchone() + assert row[0] is None + + +@pytest.mark.parametrize( + "table,column,on_delete", + [ + ("bankaccount", "user_id", "CASCADE"), + ("contract", "bank_account_id", "SET NULL"), + ], +) +def test_foreign_keys_survive_the_batch_rebuild(bank_accounts_db, table, column, on_delete): + """Batch mode rebuilds tables; the new FKs must come back with their actions.""" + fks = [f for f in bank_accounts_db.execute(f"PRAGMA foreign_key_list({table})") if f[3] == column] + assert len(fks) == 1, f"{table}.{column} has no foreign key after the rebuild" + assert fks[0][6] == on_delete diff --git a/ui/src/components/business/ContractsView.tsx b/ui/src/components/business/ContractsView.tsx index 8bde40d1..5962c914 100644 --- a/ui/src/components/business/ContractsView.tsx +++ b/ui/src/components/business/ContractsView.tsx @@ -43,6 +43,7 @@ export function ContractsView() { const [parsedContracts, setParsedContracts] = useState([]); const [parsing, setParsing] = useState(false); const [parseError, setParseError] = useState(null); + const [bankAccounts, setBankAccounts] = useState([]); const selectedIdRef = useRef(null); useEffect(() => { selectedIdRef.current = selected?.id ?? null; }, [selected]); @@ -50,11 +51,12 @@ export function ContractsView() { async function load() { setLoading(true); - const [res, clRes, curRes, supRes] = await Promise.all([ + const [res, clRes, curRes, supRes, accRes] = await Promise.all([ rpc("contracts.get_all"), rpc>("contracts.get_all_clients"), rpc("contracts.get_default_currency"), rpc<{ supported: string[] }>("settings.get_currency"), + rpc("users.get_active"), ]); if (res.ok && res.data) { setContracts(res.data); @@ -67,6 +69,8 @@ export function ContractsView() { if (clRes.ok && clRes.data) setClients(clRes.data); if (curRes.ok && curRes.data) setDefaultCurrency(curRes.data); if (supRes.ok && supRes.data?.supported?.length) setCurrencies(supRes.data.supported); + const profile = accRes.ok && accRes.data ? (accRes.data.profile as Entity | undefined) : undefined; + setBankAccounts(profile ? entityList(profile, "bank_accounts") : []); setLoading(false); } @@ -98,6 +102,7 @@ export function ContractsView() { end_date: data.endDate || null, term_of_payment: data.termOfPayment || null, units_per_workday: data.unitsPerWorkday, + bank_account_id: data.bankAccountId || null, // Always sent, so clearing the last charge clears it server-side too. charges: data.charges.map((c) => ({ id: c.id, @@ -218,9 +223,9 @@ export function ContractsView() { onDiscard={discardContract} onUpdate={updateParsedContract} onClose={() => setMode("view")} /> ) : mode === "create" ? ( - setMode("view")} error={saveError} /> + setMode("view")} error={saveError} /> ) : mode === "edit" && selected ? ( - setMode("view")} error={saveError} /> + setMode("view")} error={saveError} /> ) : selected ? ( setMode("edit")} @@ -457,6 +462,7 @@ interface ContractFormData { endDate: string; termOfPayment: number | null; unitsPerWorkday: number; + bankAccountId: number | ""; charges: ChargeRow[]; } @@ -477,7 +483,7 @@ interface ChargeRow { basis: ChargeBasis; } -function chargeRowsFrom(contract?: Entity): ChargeRow[] { +function chargeRowsFrom(contract?: Entity | null): ChargeRow[] { if (!contract) return []; return entityList(contract, "charges").map((c) => ({ id: c.id, @@ -491,11 +497,12 @@ function isBlankCharge(row: ChargeRow): boolean { return !row.description.trim() && !row.amount.trim(); } -function ContractForm({ contract, clients, defaultCurrency, currencies, onSave, onCancel, error }: { - contract?: Entity; +function ContractForm({ contract, clients, defaultCurrency, currencies, bankAccounts, onSave, onCancel, error }: { + contract: Entity | null; clients: Record; defaultCurrency: string; currencies: string[]; + bankAccounts: Entity[]; onSave: (data: ContractFormData) => void; onCancel: () => void; error?: string | null; @@ -506,6 +513,7 @@ function ContractForm({ contract, clients, defaultCurrency, currencies, onSave, ? ((str(contract, "type") as PricingMode) || (initFixed ? "fixed_price" : "time_based")) : "time_based"; const [pricingMode, setPricingMode] = useState(initType); + const contractBankId: number | "" = contract ? (subEntity(contract, "bank_account")?.id ?? "") : ""; const [form, setForm] = useState(() => { if (contract) return { title: str(contract, "title"), @@ -528,12 +536,14 @@ function ContractForm({ contract, clients, defaultCurrency, currencies, onSave, endDate: str(contract, "end_date"), termOfPayment: num(contract, "term_of_payment") || null, unitsPerWorkday: num(contract, "units_per_workday") || 8, + bankAccountId: contractBankId, charges: chargeRowsFrom(contract), }; return { title: "", clientId: null, type: "time_based", fixedPrice: null, rate: null, currency: defaultCurrency, unit: "hour", billingCycle: "monthly", volume: null, vatRate: 0.19, vatCategory: "S", signatureDate: "", startDate: "", endDate: "", termOfPayment: 31, unitsPerWorkday: 8, + bankAccountId: "", charges: [], }; }); @@ -796,6 +806,24 @@ function ContractForm({ contract, clients, defaultCurrency, currencies, onSave, )} +
+ + +

+ Invoices for this contract pay into this account. Leave unset to pay into the default account. +

+
); diff --git a/ui/src/components/settings/SettingsView.tsx b/ui/src/components/settings/SettingsView.tsx index 42095957..80e3524b 100644 --- a/ui/src/components/settings/SettingsView.tsx +++ b/ui/src/components/settings/SettingsView.tsx @@ -11,11 +11,11 @@ */ import { useEffect, useRef, useState } from "react"; -import { Settings, RefreshCw, Save, CheckCircle2, AlertCircle, User, Bot, FileText, RotateCcw, Trash2, AlertTriangle, Monitor, Globe, Info, Image as ImageIcon, X, Sun, Moon, Laptop, Palette, Terminal, Clipboard, Check } from "lucide-react"; +import { Settings, Plus, RefreshCw, Save, CheckCircle2, AlertCircle, User, Bot, FileText, RotateCcw, Trash2, AlertTriangle, Monitor, Globe, Info, Image as ImageIcon, X, Sun, Moon, Laptop, Palette, Terminal, Clipboard, Check } from "lucide-react"; import { useTheme, type ThemeChoice } from "../../hooks/useTheme"; import { rpc } from "../../api/rpc"; import type { Entity } from "../../api/types"; -import { str } from "../../api/entity"; +import { str, bool, list as entityList } from "../../api/entity"; import { useStatusBar, type StatusMessage, type MessageType } from "../shared/status-bar-context"; // --------------------------------------------------------------------------- @@ -38,6 +38,14 @@ const DEFAULT_CONFIG: LLMConfig = { request_timeout: 600, }; +interface BankAccountRow { + id: number | null; + name: string; + IBAN: string; + BIC: string; + is_default: boolean; +} + interface ProfileForm { name: string; subtitle: string; @@ -55,9 +63,7 @@ interface ProfileForm { postal_code: string; city: string; country: string; - bank_name: string; - bank_IBAN: string; - bank_BIC: string; + bank_accounts: BankAccountRow[]; } const EMPTY_PROFILE: ProfileForm = { @@ -66,7 +72,7 @@ const EMPTY_PROFILE: ProfileForm = { accent_color: "#2563eb", VAT_number: "", tax_number: "", operating_country: "", street: "", number: "", postal_code: "", city: "", country: "", - bank_name: "", bank_IBAN: "", bank_BIC: "", + bank_accounts: [], }; // Reject logos larger than this before upload; the backend also downscales. @@ -233,7 +239,6 @@ export function SettingsView() { const p = d.profile as Entity | undefined; if (p) { const addr = p.address as Entity | undefined; - const bank = p.bank_account as Entity | undefined; setProfile({ name: str(p, "name"), subtitle: str(p, "subtitle"), @@ -251,9 +256,13 @@ export function SettingsView() { postal_code: addr ? str(addr, "postal_code") : "", city: addr ? str(addr, "city") : "", country: addr ? str(addr, "country") : "", - bank_name: bank ? str(bank, "name") : "", - bank_IBAN: bank ? str(bank, "IBAN") : "", - bank_BIC: bank ? str(bank, "BIC") : "", + bank_accounts: entityList(p, "bank_accounts").map((b) => ({ + id: b.id ?? null, + name: str(b, "name"), + IBAN: str(b, "IBAN"), + BIC: str(b, "BIC"), + is_default: bool(b, "is_default"), + })), }); } } @@ -283,11 +292,13 @@ export function SettingsView() { city: profile.city, country: profile.country, }, - bank_account: { - name: profile.bank_name, - IBAN: profile.bank_IBAN, - BIC: profile.bank_BIC, - }, + bank_accounts: profile.bank_accounts.map((b) => ({ + id: b.id, + name: b.name, + IBAN: b.IBAN, + BIC: b.BIC, + is_default: b.is_default, + })), }, }; const res = await rpc("users.update_profile", payload); @@ -313,6 +324,13 @@ export function SettingsView() { return (e: React.ChangeEvent) => setProfile((p) => ({ ...p, [key]: e.target.value })); } + function patchAccount(idx: number, patch: Partial) { + setProfile((p) => ({ + ...p, + bank_accounts: p.bank_accounts.map((a, i) => (i === idx ? { ...a, ...patch } : a)), + })); + } + const [logoDragOver, setLogoDragOver] = useState(false); const [sigDragOver, setSigDragOver] = useState(false); @@ -547,20 +565,79 @@ export function SettingsView() {
- Bank Account -
-
- - -
-
- - -
-
- - -
+ Bank Accounts +

+ Multiple accounts let you invoice from the right one: contracts name the account to pay into, + falling back to the default. Mark the account used when no contract picks one. +

+
+ {profile.bank_accounts.map((acc, idx) => ( +
+ +
+ + patchAccount(idx, { name: e.target.value })} + placeholder="Your Name or Bank Name" + /> +
+
+ + patchAccount(idx, { IBAN: e.target.value })} /> +
+
+ + patchAccount(idx, { BIC: e.target.value })} /> +
+
+ +
+
+ ))} + +