[Issue #174] removed intermediate migration files and replaced them b…

…y a single overall migration file

koalixcrm/accounting/migrations/0008_auto_20181012_2056.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-10-12 20:56
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounting', '0007_auto_20180422_2105'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProductCategory',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=50, verbose_name='Product Category Title')),
+            ],
+            options={
+                'verbose_name': 'Product Category',
+                'verbose_name_plural': 'Product Categories',
+            },
+        ),
+        migrations.RemoveField(
+            model_name='productcategorie',
+            name='loss_account',
+        ),
+        migrations.RemoveField(
+            model_name='productcategorie',
+            name='profit_account',
+        ),
+    ]

koalixcrm/accounting/migrations/0009_auto_20181012_2056.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-10-12 20:56
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('crm', '0048_auto_20181012_2056'),
+        ('accounting', '0008_auto_20181012_2056'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='ProductCategorie',
+        ),
+        migrations.AddField(
+            model_name='productcategory',
+            name='loss_account',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='db_loss_account', to='accounting.Account', verbose_name='Loss Account'),
+        ),
+        migrations.AddField(
+            model_name='productcategory',
+            name='profit_account',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='db_profit_account', to='accounting.Account', verbose_name='Profit Account'),
+        ),
+    ]

koalixcrm/crm/migrations/0048_auto_20180913_2009.py → koalixcrm/crm/migrations/0048_auto_20181012_2056.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2018-09-13 18:09
+# Generated by Django 1.11.4 on 2018-10-12 20:56
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('djangoUserExtension', '0007_auto_20180702_1628'),
-        ('accounting', '0007_auto_20180422_2105'),
+        ('accounting', '0008_auto_20181012_2056'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('crm', '0047_work_worked_hours'),
     ]
@@ -21,13 +21,13 @@ class Migration(migrations.Migration):
             name='Agreement',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('agreement_from', models.DateField(verbose_name='Agreement From')),
-                ('agreement_to', models.DateField(verbose_name='Agreement To')),
-                ('agreement_amount', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='Amount')),
+                ('date_from', models.DateField(verbose_name='Agreement From')),
+                ('date_until', models.DateField(verbose_name='Agreement To')),
+                ('amount', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='Amount')),
             ],
             options={
-                'verbose_name': 'Estimation of Resource Consumption',
-                'verbose_name_plural': 'Estimation of Resource Consumptions',
+                'verbose_name': 'Agreement',
+                'verbose_name_plural': 'Agreements',
             },
         ),
         migrations.CreateModel(
@@ -71,26 +71,39 @@ class Migration(migrations.Migration):
             name='Estimation',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('estimation_from', models.DateField(verbose_name='Agreement From')),
-                ('estimation_to', models.DateField(verbose_name='Agreement To')),
-                ('estimation_amount', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='Amount')),
-                ('estimation_status', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.AgreementStatus')),
-                ('estimation_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.AgreementType')),
+                ('date_from', models.DateField(verbose_name='Estimation From')),
+                ('date_until', models.DateField(verbose_name='Estimation To')),
+                ('amount', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='Amount')),
+                ('reporting_period', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.ReportingPeriod', verbose_name='Reporting Period based on which the estimation was done')),
             ],
             options={
                 'verbose_name': 'Estimation of Resource Consumption',
                 'verbose_name_plural': 'Estimation of Resource Consumptions',
             },
         ),
         migrations.CreateModel(
-            name='ProductPrice',
+            name='EstimationStatus',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=250, verbose_name='Title')),
+                ('description', models.TextField(blank=True, null=True, verbose_name='Text')),
+                ('is_obsolete', models.BooleanField(verbose_name='Status represents estimation is obsolete')),
+            ],
+            options={
+                'verbose_name': 'Estimation Status',
+                'verbose_name_plural': 'Estimation Status',
+            },
+        ),
+        migrations.CreateModel(
+            name='ProductPrice',
+            fields=[
+                ('price_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='crm.Price')),
             ],
             options={
                 'verbose_name': 'Product Price',
                 'verbose_name_plural': 'Product Prices',
             },
+            bases=('crm.price',),
         ),
         migrations.CreateModel(
             name='ProductType',
@@ -99,10 +112,9 @@ class Migration(migrations.Migration):
                 ('description', models.TextField(blank=True, null=True, verbose_name='Description')),
                 ('title', models.CharField(max_length=200, verbose_name='Title')),
                 ('product_type_identifier', models.CharField(blank=True, max_length=200, null=True, verbose_name='Product Number')),
-                ('last_status_change', models.DateField(blank=True, verbose_name='Last Status Change')),
                 ('last_modification', models.DateTimeField(auto_now=True, verbose_name='Last modified')),
                 ('date_of_creation', models.DateTimeField(auto_now_add=True, verbose_name='Created at')),
-                ('accounting_product_categorie', models.ForeignKey(blank='True', null=True, on_delete=django.db.models.deletion.CASCADE, to='accounting.ProductCategorie', verbose_name='Accounting Product Categorie')),
+                ('accounting_product_category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='accounting.ProductCategory', verbose_name='Accounting Product Category')),
                 ('default_unit', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.Unit', verbose_name='Unit')),
                 ('last_modified_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Last modified by')),
                 ('tax', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.Tax')),
@@ -164,10 +176,19 @@ class Migration(migrations.Migration):
             name='unittransform',
             options={'verbose_name': 'Unit Transform', 'verbose_name_plural': 'Unit Transforms'},
         ),
+        migrations.RenameField(
+            model_name='genericprojectlink',
+            old_name='task',
+            new_name='project',
+        ),
         migrations.RemoveField(
             model_name='customergrouptransform',
             name='product',
         ),
+        migrations.RemoveField(
+            model_name='position',
+            name='product',
+        ),
         migrations.RemoveField(
             model_name='price',
             name='product',
@@ -232,7 +253,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='project',
             name='default_currency',
-            field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.CASCADE, to='crm.Currency', verbose_name='Default Currency'),
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='crm.Currency', verbose_name='Default Currency'),
             preserve_default=False,
         ),
         migrations.AlterField(
@@ -245,6 +266,11 @@ class Migration(migrations.Migration):
             name='to_customer_group',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='db_reltransfromtocustomergroup', to='crm.CustomerGroup', verbose_name='To Customer Group'),
         ),
+        migrations.AlterField(
+            model_name='salesdocument',
+            name='custom_date_field',
+            field=models.DateField(blank=True, null=True, verbose_name='Custom Date'),
+        ),
         migrations.CreateModel(
             name='HumanResource',
             fields=[
@@ -261,11 +287,6 @@ class Migration(migrations.Migration):
             name='resource',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.Resource', verbose_name='Resource'),
         ),
-        migrations.AddField(
-            model_name='resource',
-            name='default_resource_price',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='db_default_resource_price', to='crm.ResourcePrice', verbose_name='Default Price'),
-        ),
         migrations.AddField(
             model_name='resource',
             name='resource_manager',
@@ -276,11 +297,6 @@ class Migration(migrations.Migration):
             name='resource_type',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='crm.ResourceType', verbose_name='Resource Type'),
         ),
-        migrations.AddField(
-            model_name='productprice',
-            name='price',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.Price', verbose_name='Price'),
-        ),
         migrations.AddField(
             model_name='productprice',
             name='product_type',
@@ -291,6 +307,11 @@ class Migration(migrations.Migration):
             name='resource',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.Resource'),
         ),
+        migrations.AddField(
+            model_name='estimation',
+            name='status',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.EstimationStatus', verbose_name='Status of the estimation'),
+        ),
         migrations.AddField(
             model_name='estimation',
             name='task',
@@ -306,16 +327,6 @@ class Migration(migrations.Migration):
             name='to_currency',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='db_reltransformtocurrency', to='crm.Currency', verbose_name='To Currency'),
         ),
-        migrations.AddField(
-            model_name='agreement',
-            name='agreement_status',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.AgreementStatus'),
-        ),
-        migrations.AddField(
-            model_name='agreement',
-            name='agreement_type',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.AgreementType'),
-        ),
         migrations.AddField(
             model_name='agreement',
             name='costs',
@@ -326,11 +337,21 @@ class Migration(migrations.Migration):
             name='resource',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.Resource'),
         ),
+        migrations.AddField(
+            model_name='agreement',
+            name='status',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.AgreementStatus'),
+        ),
         migrations.AddField(
             model_name='agreement',
             name='task',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.Task', verbose_name='Task'),
         ),
+        migrations.AddField(
+            model_name='agreement',
+            name='type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.AgreementType'),
+        ),
         migrations.AddField(
             model_name='agreement',
             name='unit',
@@ -339,25 +360,30 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='customergrouptransform',
             name='product_type',
-            field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.CASCADE, to='crm.ProductType', verbose_name='Product Type'),
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='crm.ProductType', verbose_name='Product Type'),
             preserve_default=False,
         ),
+        migrations.AddField(
+            model_name='position',
+            name='product_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='crm.ProductType', verbose_name='Product'),
+        ),
         migrations.AddField(
             model_name='product',
             name='product_type',
-            field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.CASCADE, to='crm.ProductType', verbose_name='Product Type'),
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='crm.ProductType', verbose_name='Product Type'),
             preserve_default=False,
         ),
         migrations.AddField(
             model_name='unittransform',
             name='product_type',
-            field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.CASCADE, to='crm.ProductType', verbose_name='Product Type'),
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='crm.ProductType', verbose_name='Product Type'),
             preserve_default=False,
         ),
         migrations.AddField(
             model_name='work',
             name='human_resource',
-            field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.CASCADE, to='crm.HumanResource'),
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='crm.HumanResource'),
             preserve_default=False,
         ),
     ]