Merge 553422372f into c2db991ffd

Co-authored-by: Baptiste Jonglez <git@bitsofnetworks.org>
Co-authored-by: Alexis Métaireau <alexis@notmyidea.org>

CHANGELOG.md

@@ -5,6 +5,10 @@ This document describes changes between each past release.
 ## 6.2.0 (unreleased)
 
 - Add support for python 3.12 (#757)
+- Migrate from setup.cfg to pyproject.toml (#1243)
+- Update to wtforms 3.1 (#1248)
+- Document [repository rules](https://ihatemoney.readthedocs.io/en/latest/contributing.html#repository-rules) (#1253)
+- Add "reimbursement" bills and allow to create them directly from the "Settle" page (#1290)
 - Remove support for python 3.7
 - Replace the black linter by ruff
 - Replace virtualenv and pip by uv

ihatemoney/templates/forms.html

@@ -165,7 +165,6 @@
     {% include "display_errors.html" %}
     {{ form.hidden_tag() }}
     {{ input(form.date, inline=True) }}
-    {{ input(form.bill_type, inline=True) }}
     {{ input(form.what, inline=True) }}
     {{ input(form.payer, inline=True, class="form-control custom-select") }}
     <div data-toggle="tooltip" data-placement="top" title='{{ _("Simple operations are allowed, e.g. (18+36.2)/3") }}'>
@@ -201,6 +200,7 @@
         {% if g.project.default_currency != "XXX" %}
             {{ input(form.original_currency, inline=True, class="form-control custom-select") }}
         {% endif %}
+        {{ input(form.bill_type, inline=True) }}
         {{ input(form.external_link, inline=True) }}
     </details>
     </fieldset>