Skip to content

Commit

Permalink
#194 notion feedback fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
BranDavidSebastian committed Jun 17, 2024
1 parent d728610 commit f193981
Show file tree
Hide file tree
Showing 12 changed files with 182 additions and 8 deletions.
18 changes: 18 additions & 0 deletions OneSila/core/migrations/0101_alter_multitenantuser_timezone.py

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions OneSila/core/migrations/0102_alter_multitenantuser_timezone.py

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions OneSila/core/migrations/0103_alter_multitenantuser_timezone.py

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions OneSila/core/migrations/0104_alter_multitenantuser_timezone.py

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions OneSila/core/migrations/0105_alter_multitenantuser_timezone.py

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 5.0.2 on 2024-06-16 17:13

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('currencies', '0003_remove_currency_unique_is_default_currency_and_more'),
]

operations = [
migrations.AlterField(
model_name='currency',
name='exchange_rate_official',
field=models.FloatField(blank=True, default=1, null=True),
),
migrations.AlterField(
model_name='currency',
name='round_prices_up_to',
field=models.IntegerField(blank=True, default=1, null=True),
),
]
18 changes: 18 additions & 0 deletions OneSila/currencies/migrations/0005_alter_currency_exchange_rate.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 5.0.2 on 2024-06-16 17:17

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('currencies', '0004_alter_currency_exchange_rate_official_and_more'),
]

operations = [
migrations.AlterField(
model_name='currency',
name='exchange_rate',
field=models.FloatField(blank=True, default=1, null=True),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Generated by Django 5.0.2 on 2024-06-16 17:19

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('core', '0103_alter_multitenantuser_timezone'),
('currencies', '0005_alter_currency_exchange_rate'),
]

operations = [
migrations.RemoveConstraint(
model_name='currency',
name='unique_is_default_currency',
),
migrations.AddConstraint(
model_name='currency',
constraint=models.UniqueConstraint(condition=models.Q(('is_default_currency', True)), fields=('multi_tenant_company',), name='unique_is_default_currency', violation_error_message='You can only have one default currency.'),
),
]
10 changes: 6 additions & 4 deletions OneSila/currencies/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ class Currency(models.Model):

inherits_from = models.ForeignKey('self', on_delete=models.SET_NULL, null=True, blank=True,
related_name='passes_to')
exchange_rate = models.FloatField(default=1)
exchange_rate_official = models.FloatField(default=1)
exchange_rate = models.FloatField(default=1, null=True, blank=True)
exchange_rate_official = models.FloatField(default=1, null=True, blank=True)
follow_official_rate = models.BooleanField(default=False)
round_prices_up_to = models.IntegerField(default=1)
round_prices_up_to = models.IntegerField(default=1, null=True, blank=True)
is_default_currency = models.BooleanField(default=False)
comment = models.TextField(null=True, blank=True)

Expand All @@ -51,5 +51,7 @@ class Meta:
models.UniqueConstraint(
fields=['multi_tenant_company'],
condition=Q(is_default_currency=True),
name='unique_is_default_currency')
name='unique_is_default_currency',
violation_error_message=_("You can only have one default currency.")
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 5.0.2 on 2024-06-16 18:30

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('contacts', '0016_company_currency'),
('sales_prices', '0004_alter_salespricelist_customers'),
]

operations = [
migrations.AlterField(
model_name='salespricelist',
name='customers',
field=models.ManyToManyField(blank=True, to='contacts.company'),
),
]
2 changes: 1 addition & 1 deletion OneSila/sales_prices/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class SalesPriceList(models.Model):
vat_included = models.BooleanField(default=False)
auto_update = models.BooleanField(default=True)

customers = models.ManyToManyField('contacts.Company')
customers = models.ManyToManyField('contacts.Company', blank=True)

objects = SalesPriceListManager()

Expand Down
6 changes: 3 additions & 3 deletions OneSila/sales_prices/schema/types/input.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from contacts.schema.types.input import CustomerPartialInput
from core.schema.core.types.types import auto
from core.schema.core.types.input import NodeInput, input, partial
from typing import List
from typing import List, Optional
from sales_prices.models import SalesPrice, SalesPriceList, \
SalesPriceListItem

Expand All @@ -18,12 +18,12 @@ class SalesPricePartialInput(NodeInput):

@input(SalesPriceList, fields="__all__")
class SalesPriceListInput:
customers: List[CustomerPartialInput]
customers: Optional[List[CustomerPartialInput]]


@partial(SalesPriceList, fields="__all__")
class SalesPriceListPartialInput(NodeInput):
customers: List[CustomerPartialInput] | None
customers: Optional[List[CustomerPartialInput]]


@input(SalesPriceListItem, fields="__all__")
Expand Down

0 comments on commit f193981

Please sign in to comment.