mirror of
https://github.com/spiral-project/ihatemoney.git
synced 2025-05-05 12:41:49 +02:00
Bill explicit init parameters
This commit is contained in:
parent
8d9cb82569
commit
7a7d0a2bcf
1 changed files with 22 additions and 24 deletions
|
@ -346,14 +346,14 @@ class Project(db.Model):
|
||||||
# Create bills
|
# Create bills
|
||||||
db.session.add(
|
db.session.add(
|
||||||
Bill(
|
Bill(
|
||||||
b["amount"],
|
amount=b["amount"],
|
||||||
parse(b["date"]),
|
date=parse(b["date"]),
|
||||||
"",
|
external_link="",
|
||||||
b["currency"],
|
original_currency=b["currency"],
|
||||||
Person.query.get_by_names(b["owers"], self),
|
owers=Person.query.get_by_names(b["owers"], self),
|
||||||
id_dict[b["payer_name"]],
|
payer_id=id_dict[b["payer_name"]],
|
||||||
self.default_currency,
|
project_default_currency=self.default_currency,
|
||||||
b["what"],
|
what=b["what"],
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
@ -476,14 +476,12 @@ class Project(db.Model):
|
||||||
for (payer, amount, owers, what) in operations:
|
for (payer, amount, owers, what) in operations:
|
||||||
db.session.add(
|
db.session.add(
|
||||||
Bill(
|
Bill(
|
||||||
amount,
|
amount=amount,
|
||||||
None,
|
original_currency=project.default_currency,
|
||||||
None,
|
owers=[members[name] for name in owers],
|
||||||
"XXX",
|
payer_id=members[payer].id,
|
||||||
[members[name] for name in owers],
|
project_default_currency=project.default_currency,
|
||||||
members[payer].id,
|
what=what,
|
||||||
project.default_currency,
|
|
||||||
what,
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -622,14 +620,14 @@ class Bill(db.Model):
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
amount,
|
amount: float,
|
||||||
date,
|
date: object = None,
|
||||||
external_link,
|
external_link: str = "",
|
||||||
original_currency,
|
original_currency: str = "",
|
||||||
owers,
|
owers: list[Person] = [],
|
||||||
payer_id,
|
payer_id: int = None,
|
||||||
project_default_currency,
|
project_default_currency: str = "",
|
||||||
what,
|
what: str = "",
|
||||||
) -> None:
|
) -> None:
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self.amount = amount
|
self.amount = amount
|
||||||
|
|
Loading…
Reference in a new issue