diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f98ddbe996bb240061e0c8dea6226bd23410d24..b97f64fa6b8de380209c4d933d18ee374a98e28c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,11 +3,13 @@ include: file: /ci/general.yml - project: "AlekSIS/official/AlekSIS" file: /ci/prepare/lock.yml -# - project: "AlekSIS/official/AlekSIS" -# file: /ci/test.yml - project: "AlekSIS/official/AlekSIS" file: /ci/test/lint.yml - project: "AlekSIS/official/AlekSIS" file: /ci/test/security.yml - project: "AlekSIS/official/AlekSIS" file: /ci/build/dist.yml + - project: "AlekSIS/official/AlekSIS" + file: /ci/publish/pypi.yml + - project: "AlekSIS/official/AlekSIS" + file: /ci/docker/image.yml diff --git a/aleksis/apps/tezor/apps.py b/aleksis/apps/tezor/apps.py index 117588ff71bbca3953f1b0376f35ae39def71b06..91be7bb899eae1e9d1a56bd40651423b41fe37e8 100644 --- a/aleksis/apps/tezor/apps.py +++ b/aleksis/apps/tezor/apps.py @@ -10,6 +10,4 @@ class DefaultConfig(AppConfig): "Repository": "https://edugit.org/AlekSIS/onboarding//AlekSIS-App-Tezor", } licence = "EUPL-1.2+" - copyright_info = ( - ([2022], "Dominik George", "dominik.george@teckids.org"), - ) + copyright_info = (([2022], "Dominik George", "dominik.george@teckids.org"),) diff --git a/aleksis/apps/tezor/menus.py b/aleksis/apps/tezor/menus.py index ad4e680d5d7ca923c0363d44c4b61ed579e0904e..0fbbd2e79611043ca70c3e8218390c6e5b317462 100644 --- a/aleksis/apps/tezor/menus.py +++ b/aleksis/apps/tezor/menus.py @@ -10,8 +10,7 @@ MENUS = { "menu_generator.validators.is_authenticated", "aleksis.core.util.core_helpers.has_person", ], - "submenu": [ - ], + "submenu": [], } ] } diff --git a/aleksis/apps/tezor/models/invoice.py b/aleksis/apps/tezor/models/invoice.py index 9c82d15930b53d0fa8fce9f17f209b30c9056868..4b4c6d0b73ddd1b0063c5c1840bea213744e5fe7 100644 --- a/aleksis/apps/tezor/models/invoice.py +++ b/aleksis/apps/tezor/models/invoice.py @@ -10,7 +10,9 @@ from .base import Client class InvoiceGroup(ExtensibleModel): name = models.CharField(verbose_name=_("Invoice group name"), max_length=255) - client = models.ForeignKey(Client, verbose_name=_("Linked client"), related_name="invoice_groups") + client = models.ForeignKey( + Client, verbose_name=_("Linked client"), related_name="invoice_groups" + ) class Meta: constraints = [ @@ -19,7 +21,9 @@ class InvoiceGroup(ExtensibleModel): class Invoice(ExtensibleModel): - group = models.ForeignKey(InvoiceGroup, verbose_name=_("Invoice group"), related_name="invoices") + group = models.ForeignKey( + InvoiceGroup, verbose_name=_("Invoice group"), related_name="invoices" + ) number = models.CharField(verbose_name=_("Invoice number")) date = models.DateField(verbose_name=_("Invoice date")) diff --git a/pyproject.toml b/pyproject.toml index f30ab4900d9ee64d4195b48b7fd0344debdaedf1..f770a12f7087cd13c53722cff212e7d8d3886a5d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,6 +31,7 @@ secondary = true [tool.poetry.dependencies] python = "^3.9" aleksis-core = "^2.7" +django-money = "^2.1.1" [tool.poetry.dev-dependencies] aleksis-builddeps = "*"