merge migrations

This commit is contained in:
Matthias 2022-03-06 23:38:59 +01:00
parent 43395aca34
commit 7a54cb4cb8
No known key found for this signature in database
GPG Key ID: F50EF5741D33E076
3 changed files with 1 additions and 59 deletions

View File

@ -1,4 +1,4 @@
# Generated by Django 3.2.12 on 2022-03-04 00:04 # Generated by Django 3.2.12 on 2022-03-06 22:38
import InvenTree.fields import InvenTree.fields
import django.core.validators import django.core.validators
@ -15,21 +15,6 @@ class Migration(migrations.Migration):
] ]
operations = [ operations = [
migrations.AddField(
model_name='salesorder',
name='checksum',
field=models.CharField(blank=True, help_text='Stored order checksum', max_length=128, verbose_name='order checksum'),
),
migrations.AddField(
model_name='salesorder',
name='sell_price',
field=InvenTree.fields.InvenTreeModelMoneyField(blank=True, currency_choices=[], decimal_places=4, default_currency='', help_text='Price for this sale order', max_digits=19, null=True, validators=[djmoney.models.validators.MinMoneyValidator(0)], verbose_name='Sell Price'),
),
migrations.AddField(
model_name='salesorder',
name='sell_price_currency',
field=djmoney.models.fields.CurrencyField(choices=[], default='', editable=False, max_length=3),
),
migrations.CreateModel( migrations.CreateModel(
name='SalesOrderAdditionalLineItem', name='SalesOrderAdditionalLineItem',
fields=[ fields=[
@ -38,7 +23,6 @@ class Migration(migrations.Migration):
('reference', models.CharField(blank=True, help_text='Line item reference', max_length=100, verbose_name='Reference')), ('reference', models.CharField(blank=True, help_text='Line item reference', max_length=100, verbose_name='Reference')),
('notes', models.CharField(blank=True, help_text='Line item notes', max_length=500, verbose_name='Notes')), ('notes', models.CharField(blank=True, help_text='Line item notes', max_length=500, verbose_name='Notes')),
('target_date', models.DateField(blank=True, help_text='Target shipping date for this line item', null=True, verbose_name='Target Date')), ('target_date', models.DateField(blank=True, help_text='Target shipping date for this line item', null=True, verbose_name='Target Date')),
('title', models.CharField(help_text='titel of the additional line', max_length=250, verbose_name='title')),
('sale_price_currency', djmoney.models.fields.CurrencyField(choices=[], default='', editable=False, max_length=3)), ('sale_price_currency', djmoney.models.fields.CurrencyField(choices=[], default='', editable=False, max_length=3)),
('sale_price', InvenTree.fields.InvenTreeModelMoneyField(blank=True, currency_choices=[], decimal_places=4, default_currency='', help_text='Unit sale price', max_digits=19, null=True, validators=[djmoney.models.validators.MinMoneyValidator(0)], verbose_name='Sale Price')), ('sale_price', InvenTree.fields.InvenTreeModelMoneyField(blank=True, currency_choices=[], decimal_places=4, default_currency='', help_text='Unit sale price', max_digits=19, null=True, validators=[djmoney.models.validators.MinMoneyValidator(0)], verbose_name='Sale Price')),
('order', models.ForeignKey(help_text='Sales Order', on_delete=django.db.models.deletion.CASCADE, related_name='additional_lines', to='order.salesorder', verbose_name='Order')), ('order', models.ForeignKey(help_text='Sales Order', on_delete=django.db.models.deletion.CASCADE, related_name='additional_lines', to='order.salesorder', verbose_name='Order')),

View File

@ -1,25 +0,0 @@
# Generated by Django 3.2.12 on 2022-03-05 22:09
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('order', '0064_auto_20220304_0004'),
]
operations = [
migrations.RemoveField(
model_name='salesorder',
name='checksum',
),
migrations.RemoveField(
model_name='salesorder',
name='sell_price',
),
migrations.RemoveField(
model_name='salesorder',
name='sell_price_currency',
),
]

View File

@ -1,17 +0,0 @@
# Generated by Django 3.2.12 on 2022-03-06 01:19
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('order', '0065_auto_20220305_2209'),
]
operations = [
migrations.RemoveField(
model_name='salesorderadditionallineitem',
name='title',
),
]