Skip to content
Snippets Groups Projects
Commit a42f6019 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

run hooks

parent 4cd5a62b
No related branches found
No related tags found
1 merge request!3Release
Pipeline #12562 passed
Stage: build
Stage: test_deploy
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 373 additions and 391 deletions
contracts/admin.py
+ 3
− 1
View file @ a42f6019
......@@ -363,7 +363,9 @@ class ContractAdmin(
AutocompleteFilterFactory("Typ", "types"),
AutocompleteFilterFactory("Spisovna", "filing_area"),
AutocompleteFilterFactory("Problém", "issues"),
AutocompleteFilterFactory("Naše smluvná strana", "contractee_signatures__contractee"),
AutocompleteFilterFactory(
"Naše smluvná strana", "contractee_signatures__contractee"
),
AutocompleteFilterFactory("Jiná smluvní strana", "signee_signatures__signee"),
"is_approved",
"is_valid",
......
contracts/management/commands/import_old_contracts.py
+ 201
− 329
View file @ a42f6019
This diff is collapsed.
contracts/migrations/0053_alter_contractfile_file.py
+ 9
− 6
View file @ a42f6019
# Generated by Django 4.1.4 on 2023-04-21 12:10
import contracts.models
from django.db import migrations
import contracts.models
class Migration(migrations.Migration):
class Migration(migrations.Migration):
dependencies = [
('contracts', '0052_remove_contract_legal_state_contract_is_valid'),
("contracts", "0052_remove_contract_legal_state_contract_is_valid"),
]
operations = [
migrations.AlterField(
model_name='contractfile',
name='file',
field=contracts.models.ContractFileField(upload_to=contracts.models.get_contract_file_loaction, verbose_name='Soubor'),
model_name="contractfile",
name="file",
field=contracts.models.ContractFileField(
upload_to=contracts.models.get_contract_file_loaction,
verbose_name="Soubor",
),
),
]
contracts/migrations/0054_alter_signee_address_zip_alter_signee_ico_number.py
+ 19
− 8
View file @ a42f6019
......@@ -4,20 +4,31 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('contracts', '0053_alter_contractfile_file'),
("contracts", "0053_alter_contractfile_file"),
]
operations = [
migrations.AlterField(
model_name='signee',
name='address_zip',
field=models.CharField(blank=True, help_text='Veřejné pouze, když typ není nastaven na fyzickou osobu.', max_length=256, null=True, verbose_name='PSČ'),
model_name="signee",
name="address_zip",
field=models.CharField(
blank=True,
help_text="Veřejné pouze, když typ není nastaven na fyzickou osobu.",
max_length=256,
null=True,
verbose_name="PSČ",
),
),
migrations.AlterField(
model_name='signee',
name='ico_number',
field=models.CharField(blank=True, help_text='U právnických a podnikajících fyzických osob musí být vyplněno. Vyplněním můžeš automaticky načíst data z ARES.', max_length=256, null=True, verbose_name='IČO'),
model_name="signee",
name="ico_number",
field=models.CharField(
blank=True,
help_text="U právnických a podnikajících fyzických osob musí být vyplněno. Vyplněním můžeš automaticky načíst data z ARES.",
max_length=256,
null=True,
verbose_name="IČO",
),
),
]
contracts/migrations/0055_alter_contractee_address_zip_and_more.py
+ 19
− 9
View file @ a42f6019
# Generated by Django 4.1.4 on 2023-04-21 22:52
import contracts.models
from django.db import migrations, models
import contracts.models
class Migration(migrations.Migration):
class Migration(migrations.Migration):
dependencies = [
('contracts', '0054_alter_signee_address_zip_alter_signee_ico_number'),
("contracts", "0054_alter_signee_address_zip_alter_signee_ico_number"),
]
operations = [
migrations.AlterField(
model_name='contractee',
name='address_zip',
field=models.CharField(default=contracts.models.get_default_contractee_zip, max_length=256, verbose_name='PSČ'),
model_name="contractee",
name="address_zip",
field=models.CharField(
default=contracts.models.get_default_contractee_zip,
max_length=256,
verbose_name="PSČ",
),
),
migrations.AlterField(
model_name='contractee',
name='ico_number',
field=models.CharField(blank=True, default=contracts.models.get_default_contractee_ico_number, max_length=256, null=True, verbose_name='IČO'),
model_name="contractee",
name="ico_number",
field=models.CharField(
blank=True,
default=contracts.models.get_default_contractee_ico_number,
max_length=256,
null=True,
verbose_name="IČO",
),
),
]
contracts/migrations/0056_rename_contractee_signature_contracteesignaturerepresentative_signature_and_more.py
+ 7
− 8
View file @ a42f6019
......@@ -4,20 +4,19 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('contracts', '0055_alter_contractee_address_zip_and_more'),
("contracts", "0055_alter_contractee_address_zip_and_more"),
]
operations = [
migrations.RenameField(
model_name='contracteesignaturerepresentative',
old_name='contractee_signature',
new_name='signature',
model_name="contracteesignaturerepresentative",
old_name="contractee_signature",
new_name="signature",
),
migrations.RenameField(
model_name='signeesignaturerepresentative',
old_name='signee_signature',
new_name='signature',
model_name="signeesignaturerepresentative",
old_name="signee_signature",
new_name="signature",
),
]
contracts/migrations/0057_alter_contract_options_alter_contractee_options_and_more.py
+ 57
− 14
View file @ a42f6019
......@@ -4,34 +4,77 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('contracts', '0056_rename_contractee_signature_contracteesignaturerepresentative_signature_and_more'),
(
"contracts",
"0056_rename_contractee_signature_contracteesignaturerepresentative_signature_and_more",
),
]
operations = [
migrations.AlterModelOptions(
name='contract',
options={'ordering': ('-created_on', '-updated_on', '-name'), 'permissions': [('approve', 'Schválit / zrušit schválení'), ('view_confidential', 'Zobrazit tajné informace'), ('edit_when_approved', 'Upravit schválené'), ('delete_when_approved', 'Odstranit schválené'), ('edit_others', 'Upravit cizí'), ('delete_others', 'Odstranit cizí'), ('can_edit_contract_settings', 'Can edit Smlouva settings')], 'verbose_name': 'Smlouva', 'verbose_name_plural': 'Smlouvy'},
name="contract",
options={
"ordering": ("-created_on", "-updated_on", "-name"),
"permissions": [
("approve", "Schválit / zrušit schválení"),
("view_confidential", "Zobrazit tajné informace"),
("edit_when_approved", "Upravit schválené"),
("delete_when_approved", "Odstranit schválené"),
("edit_others", "Upravit cizí"),
("delete_others", "Odstranit cizí"),
("can_edit_contract_settings", "Can edit Smlouva settings"),
],
"verbose_name": "Smlouva",
"verbose_name_plural": "Smlouvy",
},
),
migrations.AlterModelOptions(
name='contractee',
options={'ordering': ['-name', '-department'], 'permissions': [('edit_others', 'Upravit cizí'), ('delete_others', 'Odstranit cizí')], 'verbose_name': 'Naše smluvní strana', 'verbose_name_plural': 'Naše smluvní strany'},
name="contractee",
options={
"ordering": ["-name", "-department"],
"permissions": [
("edit_others", "Upravit cizí"),
("delete_others", "Odstranit cizí"),
],
"verbose_name": "Naše smluvní strana",
"verbose_name_plural": "Naše smluvní strany",
},
),
migrations.AlterModelOptions(
name='contractfilingarea',
options={'ordering': ['-name'], 'verbose_name': 'Spisovna', 'verbose_name_plural': 'Spisovny'},
name="contractfilingarea",
options={
"ordering": ["-name"],
"verbose_name": "Spisovna",
"verbose_name_plural": "Spisovny",
},
),
migrations.AlterModelOptions(
name='contractissue',
options={'ordering': ['-name'], 'verbose_name': 'Problém se smlouvou', 'verbose_name_plural': 'Problémy se smlouvami'},
name="contractissue",
options={
"ordering": ["-name"],
"verbose_name": "Problém se smlouvou",
"verbose_name_plural": "Problémy se smlouvami",
},
),
migrations.AlterModelOptions(
name='contracttype',
options={'ordering': ['-name'], 'verbose_name': 'Typ smlouvy', 'verbose_name_plural': 'Typy smluv'},
name="contracttype",
options={
"ordering": ["-name"],
"verbose_name": "Typ smlouvy",
"verbose_name_plural": "Typy smluv",
},
),
migrations.AlterModelOptions(
name='signee',
options={'ordering': ['-name', '-department'], 'permissions': [('edit_others', 'Upravit cizí'), ('delete_others', 'Odstranit cizí')], 'verbose_name': 'Jiná smluvní strana', 'verbose_name_plural': 'Ostatní smluvní strany'},
name="signee",
options={
"ordering": ["-name", "-department"],
"permissions": [
("edit_others", "Upravit cizí"),
("delete_others", "Odstranit cizí"),
],
"verbose_name": "Jiná smluvní strana",
"verbose_name_plural": "Ostatní smluvní strany",
},
),
]
contracts/migrations/0058_alter_contract_options_alter_contractee_options_and_more.py
+ 54
− 14
View file @ a42f6019
......@@ -4,34 +4,74 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('contracts', '0057_alter_contract_options_alter_contractee_options_and_more'),
("contracts", "0057_alter_contract_options_alter_contractee_options_and_more"),
]
operations = [
migrations.AlterModelOptions(
name='contract',
options={'ordering': ('-created_on', '-updated_on', 'name'), 'permissions': [('approve', 'Schválit / zrušit schválení'), ('view_confidential', 'Zobrazit tajné informace'), ('edit_when_approved', 'Upravit schválené'), ('delete_when_approved', 'Odstranit schválené'), ('edit_others', 'Upravit cizí'), ('delete_others', 'Odstranit cizí'), ('can_edit_contract_settings', 'Can edit Smlouva settings')], 'verbose_name': 'Smlouva', 'verbose_name_plural': 'Smlouvy'},
name="contract",
options={
"ordering": ("-created_on", "-updated_on", "name"),
"permissions": [
("approve", "Schválit / zrušit schválení"),
("view_confidential", "Zobrazit tajné informace"),
("edit_when_approved", "Upravit schválené"),
("delete_when_approved", "Odstranit schválené"),
("edit_others", "Upravit cizí"),
("delete_others", "Odstranit cizí"),
("can_edit_contract_settings", "Can edit Smlouva settings"),
],
"verbose_name": "Smlouva",
"verbose_name_plural": "Smlouvy",
},
),
migrations.AlterModelOptions(
name='contractee',
options={'ordering': ['name', 'department'], 'permissions': [('edit_others', 'Upravit cizí'), ('delete_others', 'Odstranit cizí')], 'verbose_name': 'Naše smluvní strana', 'verbose_name_plural': 'Naše smluvní strany'},
name="contractee",
options={
"ordering": ["name", "department"],
"permissions": [
("edit_others", "Upravit cizí"),
("delete_others", "Odstranit cizí"),
],
"verbose_name": "Naše smluvní strana",
"verbose_name_plural": "Naše smluvní strany",
},
),
migrations.AlterModelOptions(
name='contractfilingarea',
options={'ordering': ['name'], 'verbose_name': 'Spisovna', 'verbose_name_plural': 'Spisovny'},
name="contractfilingarea",
options={
"ordering": ["name"],
"verbose_name": "Spisovna",
"verbose_name_plural": "Spisovny",
},
),
migrations.AlterModelOptions(
name='contractissue',
options={'ordering': ['name'], 'verbose_name': 'Problém se smlouvou', 'verbose_name_plural': 'Problémy se smlouvami'},
name="contractissue",
options={
"ordering": ["name"],
"verbose_name": "Problém se smlouvou",
"verbose_name_plural": "Problémy se smlouvami",
},
),
migrations.AlterModelOptions(
name='contracttype',
options={'ordering': ['name'], 'verbose_name': 'Typ smlouvy', 'verbose_name_plural': 'Typy smluv'},
name="contracttype",
options={
"ordering": ["name"],
"verbose_name": "Typ smlouvy",
"verbose_name_plural": "Typy smluv",
},
),
migrations.AlterModelOptions(
name='signee',
options={'ordering': ['name', 'department'], 'permissions': [('edit_others', 'Upravit cizí'), ('delete_others', 'Odstranit cizí')], 'verbose_name': 'Jiná smluvní strana', 'verbose_name_plural': 'Ostatní smluvní strany'},
name="signee",
options={
"ordering": ["name", "department"],
"permissions": [
("edit_others", "Upravit cizí"),
("delete_others", "Odstranit cizí"),
],
"verbose_name": "Jiná smluvní strana",
"verbose_name_plural": "Ostatní smluvní strany",
},
),
]
contracts/models.py
+ 4
− 2
View file @ a42f6019
......@@ -8,8 +8,8 @@ from django.conf import settings
from django.core.exceptions import ValidationError
from django.core.validators import RegexValidator, URLValidator
from django.db import models
from django.db.models.signals import post_save
from django.db.models.fields.files import FieldFile
from django.db.models.signals import post_save
from django.dispatch import receiver
from django.urls import reverse
from django.utils.safestring import mark_safe
......@@ -843,7 +843,9 @@ def get_contract_file_loaction(instance, filename):
class ContractFileProxy(FieldFile):
@property
def url(self) -> str:
return reverse("contracts:download_contract_file", args=(str(self.instance.id),))
return reverse(
"contracts:download_contract_file", args=(str(self.instance.id),)
)
class ContractFileField(models.FileField):
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Pirátský GitLab - Home of the CopyLeft