mirror of
https://github.com/spiral-project/ihatemoney.git
synced 2025-05-06 13:01:50 +02:00
only populate billform currencies after creation
we can translate correctly, and exclude no_currency as needed
This commit is contained in:
parent
e2159b52a6
commit
37a5c427db
1 changed files with 8 additions and 14 deletions
|
@ -47,13 +47,14 @@ def get_billform_for(project, set_default=True, **kwargs):
|
||||||
if form.original_currency.data == "None":
|
if form.original_currency.data == "None":
|
||||||
form.original_currency.data = project.default_currency
|
form.original_currency.data = project.default_currency
|
||||||
|
|
||||||
if form.original_currency.data != CurrencyConverter.no_currency:
|
show_no_currency = form.original_currency.data == CurrencyConverter.no_currency
|
||||||
form.original_currency.choices.remove(
|
|
||||||
(
|
form.original_currency.choices = [
|
||||||
CurrencyConverter.no_currency,
|
(currency_name, render_localized_currency(currency_name, detailed=False))
|
||||||
render_localized_currency(CurrencyConverter.no_currency, detailed=False),
|
for currency_name in form.currency_helper.get_currencies(
|
||||||
)
|
with_no_currency=show_no_currency
|
||||||
)
|
)
|
||||||
|
]
|
||||||
|
|
||||||
active_members = [(m.id, m.name) for m in project.active_members]
|
active_members = [(m.id, m.name) for m in project.active_members]
|
||||||
|
|
||||||
|
@ -227,14 +228,7 @@ class BillForm(FlaskForm):
|
||||||
payer = SelectField(_("Payer"), validators=[DataRequired()], coerce=int)
|
payer = SelectField(_("Payer"), validators=[DataRequired()], coerce=int)
|
||||||
amount = CalculatorStringField(_("Amount paid"), validators=[DataRequired()])
|
amount = CalculatorStringField(_("Amount paid"), validators=[DataRequired()])
|
||||||
currency_helper = CurrencyConverter()
|
currency_helper = CurrencyConverter()
|
||||||
original_currency = SelectField(
|
original_currency = SelectField(_("Currency"), validators=[DataRequired()],)
|
||||||
_("Currency"),
|
|
||||||
choices=[
|
|
||||||
(currency_name, render_localized_currency(currency_name, detailed=False))
|
|
||||||
for currency_name in currency_helper.get_currencies()
|
|
||||||
],
|
|
||||||
validators=[DataRequired()],
|
|
||||||
)
|
|
||||||
external_link = URLField(
|
external_link = URLField(
|
||||||
_("External link"),
|
_("External link"),
|
||||||
validators=[Optional()],
|
validators=[Optional()],
|
||||||
|
|
Loading…
Reference in a new issue